Merge branch '2.12' into 2.14

# Conflicts:
#	tests/Fixer/Alias/NoAliasFunctionsFixerTest.php

Author: keradus

src/Console/Output/ErrorOutput.php

@@ -65,7 +65,7 @@ public function listErrors($process, array $errors)
             $message = $e->getMessage();
             $code = $e->getCode();
             if (0 !== $code) {
-                $message .= " (${code})";
+                $message .= " ({$code})";
             }
 
             $length = max(\strlen($class), \strlen($message));

src/DocBlock/Tag.php

@@ -94,7 +94,7 @@ public function setName($name)
             throw new \RuntimeException('Cannot set name on unknown tag.');
         }
 
-        $this->line->setContent(Preg::replace("/@${current}/", "@${name}", $this->line->getContent(), 1));
+        $this->line->setContent(Preg::replace("/@{$current}/", "@{$name}", $this->line->getContent(), 1));
 
         $this->name = $name;
     }

src/Fixer/ControlStructure/NoBreakCommentFixer.php

@@ -184,7 +184,7 @@ private function isNoBreakComment(Token $token)
 
         $text = preg_quote($this->configuration['comment_text'], '~');
 
-        return 1 === Preg::match("~^((//|#)\\s*${text}\\s*)|(/\\*\\*?\\s*${text}\\s*\\*/)$~i", $token->getContent());
+        return 1 === Preg::match("~^((//|#)\\s*{$text}\\s*)|(/\\*\\*?\\s*{$text}\\s*\\*/)$~i", $token->getContent());
     }
 
     /**

src/Fixer/PhpUnit/PhpUnitInternalClassFixer.php

@@ -132,7 +132,7 @@ private function createDocBlock(Tokens $tokens, $docBlockIndex)
         $lineEnd = $this->whitespacesConfig->getLineEnding();
         $originalIndent = $this->detectIndent($tokens, $tokens->getNextNonWhitespace($docBlockIndex));
         $toInsert = [
-            new Token([T_DOC_COMMENT, '/**'.$lineEnd."${originalIndent} * @internal".$lineEnd."${originalIndent} */"]),
+            new Token([T_DOC_COMMENT, '/**'.$lineEnd."{$originalIndent} * @internal".$lineEnd."{$originalIndent} */"]),
             new Token([T_WHITESPACE, $lineEnd.$originalIndent]),
         ];
         $index = $tokens->getNextMeaningfulToken($docBlockIndex);

src/Fixer/PhpUnit/PhpUnitNoExpectationAnnotationFixer.php

@@ -280,7 +280,7 @@ private function annotationsToParamList(array $annotations)
         if ($this->configuration['use_class_const']) {
             $params[] = $exceptionClass.'::class';
         } else {
-            $params[] = "'${exceptionClass}'";
+            $params[] = "'{$exceptionClass}'";
         }
 
         if (isset($annotations['expectedExceptionMessage'])) {

src/Fixer/PhpUnit/PhpUnitTestAnnotationFixer.php

@@ -346,7 +346,7 @@ private function createDocBlock(Tokens $tokens, $docBlockIndex)
         $lineEnd = $this->whitespacesConfig->getLineEnding();
         $originalIndent = $this->detectIndent($tokens, $tokens->getNextNonWhitespace($docBlockIndex));
         $toInsert = [
-            new Token([T_DOC_COMMENT, '/**'.$lineEnd."${originalIndent} * @test".$lineEnd."${originalIndent} */"]),
+            new Token([T_DOC_COMMENT, '/**'.$lineEnd."{$originalIndent} * @test".$lineEnd."{$originalIndent} */"]),
             new Token([T_WHITESPACE, $lineEnd.$originalIndent]),
         ];
         $index = $tokens->getNextMeaningfulToken($docBlockIndex);

src/RuleSet.php

@@ -271,7 +271,7 @@ final class RuleSet implements RuleSetInterface
             'php_unit_set_up_tear_down_visibility' => true,
             'php_unit_strict' => true,
             'php_unit_test_annotation' => true,
-            'php_unit_test_case_static_method_calls' => ['call_type' => 'this'],
+            'php_unit_test_case_static_method_calls' => true,
             'strict_comparison' => true,
             'strict_param' => true,
             'string_line_ending' => true,

tests/AbstractFunctionReferenceFixerTest.php

@@ -56,7 +56,7 @@ public function testAbstractFunctionReferenceFixer(
     ) {
         $tokens = Tokens::fromCode($source);
 
-        $this->assertSame(
+        static::assertSame(
             $expected,
             $this->fixer->findTest(
                 $functionNameToSearch,
@@ -66,7 +66,7 @@ public function testAbstractFunctionReferenceFixer(
             )
         );
 
-        $this->assertFalse($tokens->isChanged());
+        static::assertFalse($tokens->isChanged());
     }
 
     public function provideAbstractFunctionReferenceFixerCases()

tests/AutoReview/CommandTest.php

@@ -34,7 +34,7 @@ final class CommandTest extends TestCase
      */
     public function testCommandHasNameConst(Command $command)
     {
-        $this->assertSame($command->getName(), \constant(\get_class($command).'::COMMAND_NAME'));
+        static::assertSame($command->getName(), \constant(\get_class($command).'::COMMAND_NAME'));
     }
 
     public function provideCommandHasNameConstCases()

tests/AutoReview/ComposerTest.php

@@ -35,7 +35,7 @@ public function testBranchAlias()
             return;
         }
 
-        $this->assertSame(
+        static::assertSame(
             ['dev-master' => $this->convertAppVersionToAliasedVersion(Application::VERSION)],
             $composerJson['extra']['branch-alias']
         );