PhpStorm integration: consider phpunit binary located in bin directory (

#689) * Update PhpstormHelper.php In some environments, PHPUnit is located under `bin/phpunit`. * -add tests * Update src/Util/PhpstormHelper.php * Adapt test expectations Co-authored-by: Filippo Tessarotto <[email protected]>
paratestphp · Aug 25, 2022 · f2d781b · f2d781b
1 parent 5249af4
commit f2d781b
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 3 deletions.
diff --git a/composer.json b/composer.json
@@ -39,10 +39,10 @@
         "ext-reflection": "*",
         "ext-simplexml": "*",
         "jean85/pretty-package-versions": "^2.0.5",
-        "phpunit/php-code-coverage": "^9.2.15",
+        "phpunit/php-code-coverage": "^9.2.16",
         "phpunit/php-file-iterator": "^3.0.6",
         "phpunit/php-timer": "^5.0.3",
-        "phpunit/phpunit": "^9.5.21",
+        "phpunit/phpunit": "^9.5.23",
         "sebastian/environment": "^5.1.4",
         "symfony/console": "^5.4.9 || ^6.1.2",
         "symfony/polyfill-php80": "^v1.26.0",

diff --git a/src/Util/PhpstormHelper.php b/src/Util/PhpstormHelper.php
@@ -21,7 +21,7 @@ final class PhpstormHelper
      */
     public static function handleArgvFromPhpstorm(array &$argv, string $paratestBinary): string
     {
-        $phpunitKey = self::getArgvKeyFor($argv, 'vendor/phpunit/phpunit/phpunit');
+        $phpunitKey = self::getArgvKeyFor($argv, '/phpunit');
 
         if (! in_array('--filter', $argv, true)) {
             $coverageArgKey = self::getCoverageArgvKey($argv);

diff --git a/test/Unit/Util/PhpstormHelperTest.php b/test/Unit/Util/PhpstormHelperTest.php
@@ -7,6 +7,7 @@
 use Generator;
 use ParaTest\Util\PhpstormHelper;
 use PHPUnit\Framework\TestCase;
+use RuntimeException;
 
 use function array_values;
 use function sprintf;
@@ -19,6 +20,16 @@
  */
 final class PhpstormHelperTest extends TestCase
 {
+    public function testThrowExceptionWithInvalidArgv(): void
+    {
+        $argv = [];
+
+        self::expectException(RuntimeException::class);
+        self::expectExceptionMessage("Missing path to '/phpunit'");
+
+        PhpstormHelper::handleArgvFromPhpstorm($argv, 'some-paratest-binary');
+    }
+
     /**
      * @param array<int, string> $argv
      * @param array<int, string> $expectedArgv
@@ -178,5 +189,32 @@ public function providePhpstormCases(): Generator
             $paratestBinary,
             $paratestBinary,
         ];
+
+        $argv   = [];
+        $argv[] = $paratestBinary;
+        $argv[] = sprintf('%s/bin/phpunit', uniqid());
+
+        $argv[] = '--runner';
+        $argv[] = 'WrapperRunner';
+        $argv[] = '--no-coverage';
+        $argv[] = '--configuration';
+        $argv[] = '/home/user/repos/test/phpunit.xml';
+        $argv[] = '--teamcity';
+
+        $expected   = [];
+        $expected[] = $paratestBinary;
+        $expected[] = '--runner';
+        $expected[] = 'WrapperRunner';
+        $expected[] = '--no-coverage';
+        $expected[] = '--configuration';
+        $expected[] = '/home/user/repos/test/phpunit.xml';
+        $expected[] = '--teamcity';
+
+        yield 'with phpunit binary under bin/phpunit' => [
+            $argv,
+            $expected,
+            $paratestBinary,
+            $paratestBinary,
+        ];
     }
 }