Merge pull request #2 from Sweetchuck/fix-ci

Fix CI
Sweetchuck · Jul 1, 2018 · 191fe04 · 191fe04
2 parents 13ff23b + 3c3ec71
commit 191fe04
Show file tree

Hide file tree

Showing 7 changed files with 253 additions and 37 deletions.
diff --git a/composer.json b/composer.json
@@ -10,6 +10,7 @@
     },
     "require": {
         "php": ">=7.1",
+        "ext-pcre": "*",
         "consolidation/robo": "^1.0",
         "sweetchuck/cli-cmd-builder": "^0.0"
     },

diff --git a/composer.lock b/composer.lock
diff --git a/src/Task/LintInputTask.php b/src/Task/LintInputTask.php
@@ -149,7 +149,8 @@ protected function processRunCallback(string $type, string $data): void
                 break;
 
             case Process::ERR:
-                $data = preg_replace('/(?<= in )-(?= on line \d+)/', $this->currentFile['fileName'], $data);
+                $pattern = '/(?<= in )(-|Standard input code)(?= on line \d+)/';
+                $data = preg_replace($pattern, $this->currentFile['fileName'], $data);
                 $this->printTaskError($data);
                 break;
         }

diff --git a/tests/_support/Helper/RoboFiles/PhpLintRoboFile.php b/tests/_support/Helper/RoboFiles/PhpLintRoboFile.php
@@ -18,15 +18,13 @@ class PhpLintRoboFile extends Tasks
      */
     public function phpLintFilesDefault(
         array $options = [
-            'workingDirectory' => '',
             'parallelizer' => '',
             'fileNamePatterns' => [],
         ]
     ): TaskInterface {
         $lintOptions = array_filter(array_intersect_key(
             $options,
             array_flip([
-                'workingDirectory',
                 'parallelizer',
                 'fileNamePatterns',
             ])
@@ -44,20 +42,18 @@ public function phpLintFilesDefault(
      */
     public function phpLintFilesCustom(
         array $options = [
-            'workingDirectory' => '',
             'parallelizer' => '',
             'fileNamePattern' => '*.php',
         ]
     ): TaskInterface {
         $fileListerCommand = sprintf(
             'for fileName in %s; do echo -n $fileName"\\0"; done',
-            ($options['workingDirectory'] ?: '.') . '/' . $options['fileNamePattern']
+            $options['fileNamePattern']
         );
 
         $lintOptions = array_intersect_key(
             $options,
             array_flip([
-                'workingDirectory',
                 'parallelizer',
                 'fileNamePatterns',
             ])

diff --git a/tests/acceptance/Task/LintCestBase.php b/tests/acceptance/Task/LintCestBase.php
@@ -2,6 +2,8 @@
 
 namespace Sweetchuck\Robo\PhpLint\Tests\Acceptance\Task;
 
+use Webmozart\PathUtil\Path;
+
 class LintCestBase
 {
     protected function getDefaultPhpDefinitions(): string
@@ -18,10 +20,6 @@ protected function getDefaultPhpDefinitions(): string
 
     protected function getFixturesDir(): string
     {
-        return preg_replace(
-            '/^' . preg_quote(getcwd() . '/', '/') . '/',
-            '',
-            codecept_data_dir('fixtures')
-        );
+        return Path::makeRelative(codecept_data_dir('fixtures'), getcwd());
     }
 }
diff --git a/tests/acceptance/Task/LintFilesCest.php b/tests/acceptance/Task/LintFilesCest.php
@@ -7,16 +7,15 @@
 
 class LintFilesCest extends LintCestBase
 {
-    public function phpLintFilesDefaultTrue(AcceptanceTester $I)
+    public function phpLintFilesDefaultTrueParallel(AcceptanceTester $I)
     {
         $fixturesDir = $this->getFixturesDir();
-        $id = 'php-lint:files:default:true';
+        $id = 'php-lint:files:default:true:parallel';
         $I->runRoboTask(
             $id,
             PhpLintRoboFile::class,
             'php-lint:files:default',
-            "--workingDirectory=$fixturesDir",
-            '--fileNamePatterns=./true.*.php'
+            "--fileNamePatterns=$fixturesDir/true.*.php"
         );
 
         $exitCode = $I->getRoboTaskExitCode($id);
@@ -28,7 +27,7 @@ public function phpLintFilesDefaultTrue(AcceptanceTester $I)
         $expectedStdOutput = '';
         $expectedStdError = implode(' ', [
             ' [PHP Lint files]',
-            "cd '$fixturesDir' && git ls-files -z -- './true.*.php'",
+            "git ls-files -z -- '$fixturesDir/true.*.php'",
             '|',
             'parallel --null',
             "\"php -n $phpDefinitions -l {} 1>'/dev/null'",
@@ -39,16 +38,50 @@ public function phpLintFilesDefaultTrue(AcceptanceTester $I)
         $I->assertContains($expectedStdError, $stdError);
     }
 
-    public function phpLintFilesDefaultFalse(AcceptanceTester $I)
+    public function phpLintFilesDefaultTrueXargs(AcceptanceTester $I)
     {
         $fixturesDir = $this->getFixturesDir();
-        $id = 'php-lint:files:default:false';
+        $id = 'php-lint:files:default:true:xargs';
         $I->runRoboTask(
             $id,
             PhpLintRoboFile::class,
             'php-lint:files:default',
-            "--workingDirectory=$fixturesDir",
-            '--fileNamePatterns=./false.*.php'
+            "--fileNamePatterns=$fixturesDir/true.*.php",
+            '--parallelizer=xargs'
+        );
+
+        $exitCode = $I->getRoboTaskExitCode($id);
+        $stdOutput = $I->getRoboTaskStdOutput($id);
+        $stdError = $I->getRoboTaskStdError($id);
+
+        $phpDefinitions = $this->getDefaultPhpDefinitions();
+
+        $expectedStdOutput = implode(PHP_EOL, [
+            'No syntax errors detected in tests/_data/fixtures/true.01.php',
+            'No syntax errors detected in tests/_data/fixtures/true.02.php',
+        ]);
+        $expectedStdError = implode(' ', [
+            ' [PHP Lint files]',
+            "git ls-files -z -- '$fixturesDir/true.*.php'",
+            '|',
+            'xargs -0 --max-args=\'1\' --max-procs="$(nproc)"',
+            "php -n $phpDefinitions -l\n",
+        ]);
+
+        $I->assertSame(0, $exitCode);
+        $I->assertSame($expectedStdOutput, $this->sortLines($stdOutput));
+        $I->assertStringStartsWith($expectedStdError, $stdError);
+    }
+
+    public function phpLintFilesDefaultFalseParallel(AcceptanceTester $I)
+    {
+        $fixturesDir = $this->getFixturesDir();
+        $id = 'php-lint:files:default:false:parallel';
+        $I->runRoboTask(
+            $id,
+            PhpLintRoboFile::class,
+            'php-lint:files:default',
+            "--fileNamePatterns=$fixturesDir/*.php"
         );
         $exitCode = $I->getRoboTaskExitCode($id);
         $stdOutput = $I->getRoboTaskStdOutput($id);
@@ -60,7 +93,139 @@ public function phpLintFilesDefaultFalse(AcceptanceTester $I)
         $expectedStdOutput = '';
         $expectedStdError = implode(' ', [
             ' [PHP Lint files]',
-            "cd '$fixturesDir' && git ls-files -z -- './false.*.php'",
+            "git ls-files -z -- '$fixturesDir/*.php'",
+            '|',
+            'parallel --null',
+            "\"php -n $phpDefinitions -l {} 1>'/dev/null'",
+        ]);
+
+        $I->assertSame($expectedExitCode, $exitCode);
+        $I->assertSame($expectedStdOutput, $stdOutput);
+        $I->assertContains($expectedStdError, $stdError);
+    }
+
+    public function phpLintFilesDefaultFalseXargs(AcceptanceTester $I)
+    {
+        $fixturesDir = $this->getFixturesDir();
+        $id = 'php-lint:files:default:false:xargs';
+        $I->runRoboTask(
+            $id,
+            PhpLintRoboFile::class,
+            'php-lint:files:default',
+            "--fileNamePatterns=$fixturesDir/*.php",
+            '--parallelizer=xargs'
+        );
+
+        $exitCode = $I->getRoboTaskExitCode($id);
+        $stdOutput = $I->getRoboTaskStdOutput($id);
+        $stdError = $I->getRoboTaskStdError($id);
+
+        $phpDefinitions = $this->getDefaultPhpDefinitions();
+
+        $expectedExitCode = 124;
+        $expectedStdOutput = implode(PHP_EOL, [
+            'Errors parsing tests/_data/fixtures/false.01.php',
+            'Errors parsing tests/_data/fixtures/false.02.php',
+            'No syntax errors detected in tests/_data/fixtures/true.01.php',
+            'No syntax errors detected in tests/_data/fixtures/true.02.php',
+        ]);
+        $expectedStdError = implode(' ', [
+            ' [PHP Lint files]',
+            "git ls-files -z -- '$fixturesDir/*.php'",
+            '|',
+            'xargs -0 --max-args=\'1\' --max-procs="$(nproc)"',
+            "php -n $phpDefinitions -l\n",
+        ]);
+
+        $I->assertSame($expectedExitCode, $exitCode);
+        $I->assertSame($expectedStdOutput, $this->sortLines($stdOutput));
+        $I->assertStringStartsWith($expectedStdError, $stdError);
+    }
+
+    public function phpLintFilesCustomTrueParallel(AcceptanceTester $I)
+    {
+        $fixturesDir = $this->getFixturesDir();
+        $id = 'php-lint:files:custom:true:parallel';
+        $I->runRoboTask(
+            $id,
+            PhpLintRoboFile::class,
+            'php-lint:files:custom',
+            "--fileNamePattern=$fixturesDir/true.*.php"
+        );
+        $exitCode = $I->getRoboTaskExitCode($id);
+        $stdOutput = $I->getRoboTaskStdOutput($id);
+        $stdError = $I->getRoboTaskStdError($id);
+
+        $phpDefinitions = $this->getDefaultPhpDefinitions();
+
+        $expectedExitCode = 1;
+        $expectedStdOutput = '';
+        $expectedStdError = implode(' ', [
+            ' [PHP Lint files]',
+            "for fileName in $fixturesDir/true.*.php; do echo -n \$fileName\"\\0\"; done",
+            '|',
+            'parallel --null',
+            "\"php -n $phpDefinitions -l {} 1>'/dev/null'",
+        ]);
+
+        $I->assertSame($expectedExitCode, $exitCode);
+        $I->assertSame($expectedStdOutput, $stdOutput);
+        $I->assertContains($expectedStdError, $stdError);
+    }
+
+    public function phpLintFilesCustomTrueXargs(AcceptanceTester $I)
+    {
+        $fixturesDir = $this->getFixturesDir();
+        $id = 'php-lint:files:custom:true:xargs';
+        $I->runRoboTask(
+            $id,
+            PhpLintRoboFile::class,
+            'php-lint:files:custom',
+            "--fileNamePattern=$fixturesDir/true.*.php",
+            '--parallelizer=xargs'
+        );
+        $exitCode = $I->getRoboTaskExitCode($id);
+        $stdOutput = $I->getRoboTaskStdOutput($id);
+        $stdError = $I->getRoboTaskStdError($id);
+
+        $phpDefinitions = $this->getDefaultPhpDefinitions();
+
+        $expectedExitCode = 123;
+        $expectedStdOutput = '';
+        $expectedStdError = implode(' ', [
+            ' [PHP Lint files]',
+            "for fileName in $fixturesDir/true.*.php; do echo -n \$fileName\"\\0\"; done",
+            '|',
+            'xargs -0 --max-args=\'1\' --max-procs="$(nproc)"',
+            "php -n $phpDefinitions -l" . PHP_EOL,
+        ]);
+
+        $I->assertSame($expectedExitCode, $exitCode);
+        $I->assertSame($expectedStdOutput, $stdOutput);
+        $I->assertContains($expectedStdError, $stdError);
+    }
+
+    public function phpLintFilesCustomFalseParallel(AcceptanceTester $I)
+    {
+        $fixturesDir = $this->getFixturesDir();
+        $id = 'php-lint:files:custom:false:parallel';
+        $I->runRoboTask(
+            $id,
+            PhpLintRoboFile::class,
+            'php-lint:files:custom',
+            "--fileNamePattern=$fixturesDir/*.php"
+        );
+        $exitCode = $I->getRoboTaskExitCode($id);
+        $stdOutput = $I->getRoboTaskStdOutput($id);
+        $stdError = $I->getRoboTaskStdError($id);
+
+        $phpDefinitions = $this->getDefaultPhpDefinitions();
+
+        $expectedExitCode = 1;
+        $expectedStdOutput = '';
+        $expectedStdError = implode(' ', [
+            ' [PHP Lint files]',
+            "for fileName in $fixturesDir/*.php; do echo -n \$fileName\"\\0\"; done",
             '|',
             'parallel --null',
             "\"php -n $phpDefinitions -l {} 1>'/dev/null'",
@@ -70,4 +235,44 @@ public function phpLintFilesDefaultFalse(AcceptanceTester $I)
         $I->assertSame($expectedStdOutput, $stdOutput);
         $I->assertContains($expectedStdError, $stdError);
     }
+
+    public function phpLintFilesCustomFalseXargs(AcceptanceTester $I)
+    {
+        $fixturesDir = $this->getFixturesDir();
+        $id = 'php-lint:files:custom:false:xargs';
+        $I->runRoboTask(
+            $id,
+            PhpLintRoboFile::class,
+            'php-lint:files:custom',
+            "--fileNamePattern=$fixturesDir/*.php",
+            '--parallelizer=xargs'
+        );
+        $exitCode = $I->getRoboTaskExitCode($id);
+        $stdOutput = $I->getRoboTaskStdOutput($id);
+        $stdError = $I->getRoboTaskStdError($id);
+
+        $phpDefinitions = $this->getDefaultPhpDefinitions();
+
+        $expectedExitCode = 123;
+        $expectedStdOutput = '';
+        $expectedStdError = implode(' ', [
+            ' [PHP Lint files]',
+            "for fileName in $fixturesDir/*.php; do echo -n \$fileName\"\\0\"; done",
+            '|',
+            'xargs -0 --max-args=\'1\' --max-procs="$(nproc)"',
+            "php -n $phpDefinitions -l" . PHP_EOL,
+        ]);
+
+        $I->assertSame($expectedExitCode, $exitCode);
+        $I->assertSame($expectedStdOutput, $stdOutput);
+        $I->assertContains($expectedStdError, $stdError);
+    }
+
+    protected function sortLines(string $text): string
+    {
+        $lines = explode(PHP_EOL, trim($text));
+        sort($lines);
+
+        return implode(PHP_EOL, $lines);
+    }
 }