Merge branch '2.12' into 2.13

Author: keradus

README.rst

@@ -873,7 +873,7 @@ Choose from the list of available rules:
   with a single asterisk, after the opening slash. Both must end with a
   single asterisk before the closing slash.
 
-* **multiline_whitespace_before_semicolons**
+* **multiline_whitespace_before_semicolons** [@PhpCsFixer]
 
   Forbid multi-line whitespace before the closing semicolon or move the
   semicolon to the new line for chained calls.

src/Console/ConfigurationResolver.php

@@ -324,7 +324,8 @@ public function getFixers()
             $this->fixers = $this->createFixerFactory()
                 ->useRuleSet($this->getRuleSet())
                 ->setWhitespacesConfig(new WhitespacesFixerConfig($this->config->getIndent(), $this->config->getLineEnding()))
-                ->getFixers();
+                ->getFixers()
+            ;
 
             if (false === $this->getRiskyAllowed()) {
                 $riskyFixers = array_map(

src/RuleSet.php

@@ -213,6 +213,7 @@ final class RuleSet implements RuleSetInterface
             'method_argument_space' => ['on_multiline' => 'ensure_fully_multiline'],
             'method_chaining_indentation' => true,
             'multiline_comment_opening_closing' => true,
+            'multiline_whitespace_before_semicolons' => ['strategy' => 'new_line_for_chained_calls'],
             'no_alternative_syntax' => true,
             'no_binary_string' => true,
             'no_extra_blank_lines' => ['tokens' => [

tests/Console/ConfigurationResolverTest.php

@@ -347,7 +347,8 @@ public function testResolvePathWithFileThatIsExcludedDirectlyOverridePathMode()
         $config = new Config();
         $config->getFinder()
             ->in(__DIR__)
-            ->notPath(basename(__FILE__));
+            ->notPath(basename(__FILE__))
+        ;
 
         $resolver = $this->createConfigurationResolver(
             ['path' => [__FILE__]],
@@ -362,7 +363,8 @@ public function testResolvePathWithFileThatIsExcludedDirectlyIntersectionPathMod
         $config = new Config();
         $config->getFinder()
             ->in(__DIR__)
-            ->notPath(basename(__FILE__));
+            ->notPath(basename(__FILE__))
+        ;
 
         $resolver = $this->createConfigurationResolver([
             'path' => [__FILE__],
@@ -378,7 +380,8 @@ public function testResolvePathWithFileThatIsExcludedByDirOverridePathMode()
         $config = new Config();
         $config->getFinder()
             ->in($dir)
-            ->exclude(basename(__DIR__));
+            ->exclude(basename(__DIR__))
+        ;
 
         $resolver = $this->createConfigurationResolver(
             ['path' => [__FILE__]],
@@ -394,7 +397,8 @@ public function testResolvePathWithFileThatIsExcludedByDirIntersectionPathMode()
         $config = new Config();
         $config->getFinder()
             ->in($dir)
-            ->exclude(basename(__DIR__));
+            ->exclude(basename(__DIR__))
+        ;
 
         $resolver = $this->createConfigurationResolver([
             'path-mode' => 'intersection',
@@ -410,7 +414,8 @@ public function testResolvePathWithFileThatIsNotExcluded()
         $config = new Config();
         $config->getFinder()
             ->in($dir)
-            ->notPath('foo-'.basename(__FILE__));
+            ->notPath('foo-'.basename(__FILE__))
+        ;
 
         $resolver = $this->createConfigurationResolver(
             ['path' => [__FILE__]],

tests/FixerDefinition/VersionSpecificCodeSampleTest.php

@@ -65,7 +65,8 @@ public function testIsSuitableForUsesVersionSpecification($version, $isSatisfied
 
         $versionSpecification
             ->isSatisfiedBy($version)
-            ->willReturn($isSatisfied);
+            ->willReturn($isSatisfied)
+        ;
 
         $codeSample = new VersionSpecificCodeSample(
             '<php echo $foo;',

tests/Runner/RunnerTest.php

@@ -40,13 +40,16 @@ public function testThatFixSuccessfully()
         $linterProphecy = $this->prophesize(\PhpCsFixer\Linter\LinterInterface::class);
         $linterProphecy
             ->isAsync()
-            ->willReturn(false);
+            ->willReturn(false)
+        ;
         $linterProphecy
             ->lintFile(Argument::type('string'))
-            ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal());
+            ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal())
+        ;
         $linterProphecy
             ->lintSource(Argument::type('string'))
-            ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal());
+            ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal())
+        ;
 
         $fixers = [
             new Fixer\ClassNotation\VisibilityRequiredFixer(),

tests/Test/AbstractFixerTestCase.php

@@ -194,7 +194,8 @@ private function getLinter()
                 $linterProphecy = $this->prophesize(\PhpCsFixer\Linter\LinterInterface::class);
                 $linterProphecy
                     ->lintSource(Argument::type('string'))
-                    ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal());
+                    ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal())
+                ;
 
                 $linter = $linterProphecy->reveal();
             } else {

tests/Test/AbstractIntegrationTestCase.php

@@ -353,7 +353,8 @@ private static function createFixers(IntegrationCase $case)
             ->setWhitespacesConfig(
                 new WhitespacesFixerConfig($config['indent'], $config['lineEnding'])
             )
-            ->getFixers();
+            ->getFixers()
+        ;
     }
 
     /**
@@ -384,13 +385,16 @@ private function getLinter()
                 $linterProphecy = $this->prophesize(\PhpCsFixer\Linter\LinterInterface::class);
                 $linterProphecy
                     ->lintSource(Argument::type('string'))
-                    ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal());
+                    ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal())
+                ;
                 $linterProphecy
                     ->lintFile(Argument::type('string'))
-                    ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal());
+                    ->willReturn($this->prophesize(\PhpCsFixer\Linter\LintingResultInterface::class)->reveal())
+                ;
                 $linterProphecy
                     ->isAsync()
-                    ->willReturn(false);
+                    ->willReturn(false)
+                ;
 
                 $linter = $linterProphecy->reveal();
             } else {