Fix some more tests when running phpunit with args

e.g: ./vendor/bin/phpunit --filter 'Psalm\\Tests\\VariadicTest'
vimeo · Nov 11, 2024 · bc2d66c · bc2d66c
1 parent bfbd53c
commit bc2d66c
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 4 deletions.
diff --git a/tests/Cache/CacheTest.php b/tests/Cache/CacheTest.php
@@ -26,6 +26,15 @@
 
 class CacheTest extends TestCase
 {
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        // hack to isolate Psalm from PHPUnit cli arguments
+        global $argv;
+        $argv = [];
+    }
+
     public function setUp(): void
     {
         parent::setUp();

diff --git a/tests/Config/ConfigFileTest.php b/tests/Config/ConfigFileTest.php
@@ -23,6 +23,15 @@ class ConfigFileTest extends TestCase
 {
     private string $file_path;
 
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        // hack to isolate Psalm from PHPUnit cli arguments
+        global $argv;
+        $argv = [];
+    }
+
     public function setUp(): void
     {
         RuntimeCaches::clearAll();

diff --git a/tests/Config/ConfigTest.php b/tests/Config/ConfigTest.php
@@ -56,6 +56,10 @@ class ConfigTest extends TestCase
 
     public static function setUpBeforeClass(): void
     {
+        // hack to isolate Psalm from PHPUnit cli arguments
+        global $argv;
+        $argv = [];
+
         self::$config = new TestConfig();
 
         if (!defined('PSALM_VERSION')) {
@@ -1334,10 +1338,6 @@ function handleThrow(I $e) : void {
 
     public function testModularConfig(): void
     {
-        // hack to isolate Psalm from PHPUnit arguments
-        global $argv;
-        $argv = [];
-
         $root = __DIR__ . '/../fixtures/ModularConfig';
         $config = Config::loadFromXMLFile($root . '/psalm.xml', $root);
         $this->assertEquals(

diff --git a/tests/ForbiddenCodeTest.php b/tests/ForbiddenCodeTest.php
@@ -19,6 +19,15 @@ class ForbiddenCodeTest extends TestCase
     use InvalidCodeAnalysisTestTrait;
     use ValidCodeAnalysisTestTrait;
 
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        // hack to isolate Psalm from PHPUnit cli arguments
+        global $argv;
+        $argv = [];
+    }
+
     public function providerInvalidCodeParse(): iterable
     {
         return [

diff --git a/tests/StubTest.php b/tests/StubTest.php
@@ -35,6 +35,10 @@ class StubTest extends TestCase
 
     public static function setUpBeforeClass(): void
     {
+        // hack to isolate Psalm from PHPUnit cli arguments
+        global $argv;
+        $argv = [];
+
         self::$config = new TestConfig();
 
         if (!defined('PSALM_VERSION')) {

diff --git a/tests/VariadicTest.php b/tests/VariadicTest.php
@@ -19,6 +19,15 @@ class VariadicTest extends TestCase
 {
     use ValidCodeAnalysisTestTrait;
 
+    public static function setUpBeforeClass(): void
+    {
+        parent::setUpBeforeClass();
+
+        // hack to isolate Psalm from PHPUnit cli arguments
+        global $argv;
+        $argv = [];
+    }
+
     public function testVariadicArrayBadParam(): void
     {
         $this->expectExceptionMessage('InvalidScalarArgument');