Support PHPUnit 11.1 (#206)

* Support PHPUnit 11 Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * wip Signed-off-by: Mior Muhammad Zaki <[email protected]> * Update parallel-tests.yaml * Update parallel-tests.yaml --------- Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Apr 24, 2024 · 08b26ef · 08b26ef
1 parent eabe0c7
commit 08b26ef
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/coveralls.yaml b/.github/workflows/coveralls.yaml
@@ -15,7 +15,7 @@ jobs:
         php:
           - 8.2
         phpunit:
-          - "10.5.x"
+          - "^11.0.0"
         dependencies:
           - "highest"
         experimental:

diff --git a/.github/workflows/parallel-tests.yaml b/.github/workflows/parallel-tests.yaml
@@ -19,12 +19,15 @@ jobs:
           - "^8.0"
         paratest:
           - "^7.3"
+        phpunit:
+          - "~10.5.0"
+          - "~11.0.0"
         dependencies:
           - "highest"
         experimental:
           - false
 
-    name: PHP${{ matrix.php }} on ${{ matrix.os }} (${{ matrix.dependencies }})
+    name: PHP:${{ matrix.php }} with PHPUnit:${{ matrix.phpunit }} on ${{ matrix.os }} (${{ matrix.dependencies }})
 
     steps:
       - name: Checkout code
@@ -39,7 +42,7 @@ jobs:
 
       - name: Install Paratest
         run: |
-          composer require "nunomaduro/collision:${{ matrix.collision }}" "brianium/paratest:${{ matrix.paratest }}" --dev --no-interaction --no-update
+          composer require "nunomaduro/collision:${{ matrix.collision }}" "brianium/paratest:${{ matrix.paratest }}" "phpunit/phpunit:${{ matrix.phpunit }}" --dev --no-interaction --no-update
 
       - name: Install dependencies
         uses: "ramsey/composer-install@v3"
@@ -51,13 +54,13 @@ jobs:
         run: |
           composer show -D
 
-      - name: Execute tests (with deprecations on PHPUnit 10)
+      - name: Execute tests (with deprecations)
         run: ./testbench package:test --parallel --exclude-group commander,without-parallel,database,session --no-coverage
         env:
           RAY_ENABLED: false
         if: matrix.dependencies == 'highest'
 
-      - name: Execute tests (without deprecations on PHPUnit 10)
+      - name: Execute tests (without deprecations)
         run: ./testbench package:test --parallel --exclude-group commander,without-parallel,database,session,deprecations --no-coverage
         env:
           RAY_ENABLED: false

diff --git a/.github/workflows/strict-tests.yaml b/.github/workflows/strict-tests.yaml
@@ -22,6 +22,7 @@ jobs:
           - "~10.5.0"
           - "10.5.4"
           - "~11.0.0"
+          - "~11.1.0"
         dependencies:
           - "highest"
         experimental:

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -23,6 +23,7 @@ jobs:
           - "~10.5.0"
           - "10.5.4"
           - "~11.0.0"
+          - "~11.1.0"
         dependencies:
           - "highest"
           - "lowest"

diff --git a/composer.json b/composer.json
@@ -55,7 +55,7 @@
         "brianium/paratest": "<7.3.0 || >=8.0.0",
         "laravel/framework": "<11.1.0 || >=12.0.0",
         "nunomaduro/collision": "<8.0.0 || >=9.0.0",
-        "phpunit/phpunit": "<10.5.0 || 11.0.0 || >=11.1.0"
+        "phpunit/phpunit": "<10.5.0 || 11.0.0 || >=11.2.0"
     },
     "suggest": {
         "ext-pcntl": "Required to use all features of the console signal trapping.",

diff --git a/src/Concerns/ApplicationTestingHooks.php b/src/Concerns/ApplicationTestingHooks.php
@@ -141,7 +141,7 @@ final protected function tearDownTheApplicationTestingHooks(?Closure $callback =
         $this->afterApplicationCreatedCallbacks = [];
         $this->beforeApplicationDestroyedCallbacks = [];
 
-        Testbench::flushState();
+        Testbench::flushState($this);
 
         if ($this->callbackException) {
             throw $this->callbackException;

diff --git a/src/Console/Commander.php b/src/Console/Commander.php
@@ -119,7 +119,7 @@ public function handle(): void
         } finally {
             $this->handleTerminatingConsole();
             Workbench::flush();
-            static::$testbench::flushState();
+            static::$testbench::flushState($this);
 
             $this->untrap();
         }

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -22,6 +22,7 @@
 use Illuminate\Support\Sleep;
 use Illuminate\View\Component;
 use Orchestra\Testbench\Concerns\CreatesApplication;
+use Orchestra\Testbench\Console\Commander;
 use Orchestra\Testbench\Contracts\Config as ConfigContract;
 use Orchestra\Testbench\Workbench\Workbench;
 
@@ -173,9 +174,10 @@ public static function createFromConfig(ConfigContract $config, ?callable $resol
     /**
      * Flush the application states.
      *
+     * @param  \Orchestra\Testbench\Console\Commander|\Orchestra\Testbench\PHPUnit\TestCase  $instance
      * @return void
      */
-    public static function flushState(): void
+    public static function flushState(object $instance): void
     {
         AboutCommand::flushState();
         Artisan::forgetBootstrappers();
@@ -184,7 +186,11 @@ public static function flushState(): void
         Component::forgetComponentsResolver();
         Component::forgetFactory();
         ConvertEmptyStringsToNull::flushState();
-        HandleExceptions::flushState();
+
+        if (! $instance instanceof Commander) {
+            HandleExceptions::flushState();
+        }
+
         JsonResource::wrap('data');
         Once::flush();
         Queue::createPayloadUsing(null);

diff --git a/tests/CreatesApplicationTest.php b/tests/CreatesApplicationTest.php
@@ -16,7 +16,7 @@ class CreatesApplicationTest extends TestCase
     #[\Override]
     protected function tearDown(): void
     {
-        Testbench::flushState();
+        Testbench::flushState($this);
     }
 
     #[Test]

diff --git a/tests/Foundation/ApplicationTest.php b/tests/Foundation/ApplicationTest.php
@@ -14,7 +14,7 @@ class ApplicationTest extends TestCase
     #[\Override]
     protected function tearDown(): void
     {
-        Application::flushState();
+        Application::flushState($this);
     }
 
     #[Test]

diff --git a/tests/TestCaseTest.php b/tests/TestCaseTest.php
@@ -18,7 +18,7 @@ class TestCaseTest extends TestCase
     #[\Override]
     protected function tearDown(): void
     {
-        Testbench::flushState();
+        Testbench::flushState($this);
     }
 
     #[Test]