Split off the phpstan tests again

composer · Jul 11, 2024 · f457867 · f457867
1 parent 0613a55
commit f457867
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
@@ -51,4 +51,6 @@ jobs:
           composer update ${{ env.COMPOSER_FLAGS }}
 
       - name: "Run tests"
-        run: "vendor/bin/phpunit"
+        run: |
+          vendor/bin/phpunit
+          vendor/bin/phpunit --group phpstan
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -12,6 +12,12 @@
         </testsuite>
     </testsuites>
 
+    <groups>
+        <exclude>
+            <group>phpstan</group>
+        </exclude>
+    </groups>
+
     <filter>
         <whitelist>
             <directory>src</directory>

diff --git a/tests/BaseTestCase.php b/tests/BaseTestCase.php
@@ -37,7 +37,7 @@ protected function doExpectWarning(string $message): void
 
     protected function expectPcreEngineException(string $pattern): void
     {
-        $error = function_exists('preg_last_error_msg') ? 'Backtrack limit exhausted' : 'PREG_BACKTRACK_LIMIT_ERROR';
+        $error = PHP_VERSION_ID >= 80000 ? 'Backtrack limit exhausted' : 'PREG_BACKTRACK_LIMIT_ERROR';
         $this->expectPcreException($pattern, $error);
     }
 
@@ -49,18 +49,14 @@ protected function expectPcreException(string $pattern, ?string $error = null):
 
         if (null === $error) {
             // Only use a message if the error can be reliably determined
-            if (function_exists('preg_last_error_msg')) {
+            if (PHP_VERSION_ID >= 80000) {
                 $error = 'Internal error';
             } else {
                 $error = 'PREG_INTERNAL_ERROR';
             }
         }
 
-        if (null !== $error) {
-            $message = sprintf('%s: failed executing "%s": %s', $this->pregFunction, $pattern, $error);
-        } else {
-            $message = null;
-        }
+        $message = sprintf('%s: failed executing "%s": %s', $this->pregFunction, $pattern, $error);
 
         $this->doExpectException('Composer\Pcre\PcreException', $message);
     }

diff --git a/tests/PHPStanTests/TypeInferenceTest.php b/tests/PHPStanTests/TypeInferenceTest.php
@@ -13,6 +13,13 @@
 
 use PHPStan\Testing\TypeInferenceTestCase;
 
+/**
+ * Run with "vendor/bin/phpunit --group phpstan"
+ *
+ * This is excluded by default to avoid side effects with the library tests
+ *
+ * @group phpstan
+ */
 class TypeInferenceTest extends TypeInferenceTestCase
 {
     /**