Get rid of phpunit bridge

.gitattributes

@@ -14,6 +14,5 @@
 /phpstan.neon.dist export-ignore
 /phpstan-baseline.neon export-ignore
 /phpunit.xml.dist export-ignore
-/phpunit-phpstan.xml.dist export-ignore
 /tests export-ignore
 /CONTRIBUTING.md export-ignore

.github/workflows/continuous-integration.yml

@@ -51,46 +51,4 @@ jobs:
           composer update ${{ env.COMPOSER_FLAGS }}
 
       - name: "Run tests"
-        run: "vendor/bin/simple-phpunit --verbose"
-
-  phpstan_tests:
-    name: "CI PHPStan Ext"
-
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php-version:
-          - "7.3"
-          - "8.3"
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2"
-
-      - name: "Install PHP"
-        uses: "shivammathur/setup-php@v2"
-        with:
-          coverage: "none"
-          php-version: "${{ matrix.php-version }}"
-
-      - name: Get composer cache directory
-        id: composercache
-        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
-
-      - name: Cache dependencies
-        uses: actions/cache@v2
-        with:
-          path: ${{ steps.composercache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-
-
-      - name: "Install latest dependencies"
-        run: |
-          # Require PHPUnit directly bypassing the symfony bridge
-          composer remove symfony/phpunit-bridge --dev --no-update
-          composer require phpunit/phpunit:^9 --dev --no-update
-          composer update ${{ env.COMPOSER_FLAGS }}
-
-      - name: "Run tests"
-        run: vendor/bin/phpunit -c phpunit-phpstan.xml.dist
+        run: "vendor/bin/phpunit"

.github/workflows/phpstan.yml

@@ -44,8 +44,5 @@ jobs:
       - name: "Install latest dependencies"
         run: "composer update ${{ env.COMPOSER_FLAGS }}"
 
-      - name: "Initialize PHPUnit sources"
-        run: "vendor/bin/simple-phpunit --filter NO_TEST_JUST_AUTOLOAD_THANKS"
-
       - name: "Run PHPStan"
         run: "composer phpstan"

composer.json

@@ -20,7 +20,7 @@
         "php": "^7.2 || ^8.0"
     },
     "require-dev": {
-        "symfony/phpunit-bridge": "^7",
+        "phpunit/phpunit": "^8 || ^9",
         "phpstan/phpstan": "^1.11.6",
         "phpstan/phpstan-strict-rules": "^1.1"
     },
@@ -43,7 +43,7 @@
         }
     },
     "scripts": {
-        "test": "SYMFONY_PHPUNIT_REMOVE_RETURN_TYPEHINT=1 vendor/bin/simple-phpunit",
+        "test": "vendor/bin/phpunit",
         "phpstan": "phpstan analyse"
     }
 }

phpstan.neon.dist

@@ -8,7 +8,7 @@ parameters:
     treatPhpDocTypesAsCertain: false
 
     bootstrapFiles:
-        - tests/phpstan-locate-phpunit-autoloader.php
+        - vendor/autoload.php
 
     excludePaths:
         - tests/PHPStanTests/nsrt/*

phpunit.xml.dist

@@ -8,8 +8,7 @@
     >
     <testsuites>
         <testsuite name="PCRE Test Suite">
-            <directory>tests/PregTests</directory>
-            <directory>tests/RegexTests</directory>
+            <directory>tests</directory>
         </testsuite>
     </testsuites>