Update php-cs-fixer's config to play better with post-2.3.x versions …

…and fix a couple of violations that still happen with newer versions
paratestphp · Dec 13, 2017 · 1530c4c · 1530c4c
1 parent 455c41a
commit 1530c4c
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -36,6 +36,7 @@ return PhpCsFixer\Config::create()
         'simplified_null_return' => true,
         'strict_comparison' => true,
         'strict_param' => true,
+        'yoda_style' => false,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()

diff --git a/src/Runners/PHPUnit/Configuration.php b/src/Runners/PHPUnit/Configuration.php
@@ -134,7 +134,7 @@ public function getSuiteByName(string $suiteName)
                                     unset($excludedPaths[$dir]);
                                 }
                             }
-                            // not breaking on purpose
+                            // no break on purpose
                         default:
                             foreach ($this->getSuitePaths((string) $nodeContent) as $path) {
                                 $suites[(string) $node['name']][] = new SuitePath(

diff --git a/src/Runners/PHPUnit/ExecutableTest.php b/src/Runners/PHPUnit/ExecutableTest.php
@@ -279,10 +279,12 @@ protected function assertValidCommandLineLength(string $cmd)
                 throw new \RuntimeException('Command line is too long, try to decrease max batch size');
             }
         }
-            // TODO: Implement command line length validation for linux/osx/freebsd
-            //       Please note that on unix environment variables also became part of command line
-            // linux: echo | xargs --show-limits
-            // osx/linux: getconf ARG_MAX
+        /*
+         * @todo Implement command line length validation for linux/osx/freebsd.
+         *       Please note that on unix environment variables also became part of command line:
+         *         - linux: echo | xargs --show-limits
+         *         - osx/linux: getconf ARG_MAX
+         */
     }
 
     /**
@@ -320,7 +322,6 @@ protected function getCommandString(string $binary, array $options = [])
         $arguments[] = $this->fullyQualifiedClassName ?? '';
         $arguments[] = $this->getPath();
 
-
         return (new Process($arguments))->getCommandLine();
     }
 

diff --git a/test/functional/PHPUnitTest.php b/test/functional/PHPUnitTest.php
@@ -21,7 +21,8 @@ public function testWithBootstrapThatDoesNotExist()
         // The [RuntimeException] message appears only on lower 6.x versions of Phpunit
         $this->assertRegExp(
             '/(\[RuntimeException\]|Bootstrap specified but could not be found)/',
-            $errors, 'Expected exception name not found in output'
+            $errors,
+            'Expected exception name not found in output'
         );
     }