Merge branch '8.x' into 9.x

Signed-off-by: Mior Muhammad Zaki <[email protected]>
orchestral · Jan 10, 2024 · 63302a4 · 63302a4
2 parents 62400af + beb3af0
commit 63302a4
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/.github/workflows/strict-tests.yaml b/.github/workflows/strict-tests.yaml
@@ -20,6 +20,7 @@ jobs:
           - 8.3
         phpunit:
           - "~10.5.0"
+          - "10.5.4"
           - "~11.0.0"
         dependencies:
           - "highest"

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

diff --git a/CHANGELOG-7.x.md b/CHANGELOG-7.x.md
@@ -2,6 +2,15 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
+## 7.39.1
+
+Released: 2024-01-10
+
+### Changes
+
+* Run `route:cache` using `Orchestra\Testbench\remote` function.
+* Add `Orchestra\Testbench\Concerns\InteractsWithTestCase` to `setUpTheTestEnvironmentTraitToBeIgnored` method.
+
 ## 7.39.0
 
 Released: 2023-12-28

diff --git a/CHANGELOG-8.x.md b/CHANGELOG-8.x.md
@@ -2,6 +2,21 @@
 
 This changelog references the relevant changes (bug and security fixes) done to `orchestra/testbench-core`.
 
+## 8.20.0
+
+Released: 2024-01-10
+
+### Added
+
+* Flush error and exception handlers between tests using `Orchestra\Testbench\Bootstrap\HandleExceptions::forgetApp()` for PHPUnit 10.
+
+### Changes
+
+* Run `route:cache` using `Orchestra\Testbench\remote` function.
+* Add following traits to `setUpTheTestEnvironmentTraitToBeIgnored` method:
+    - `Orchestra\Testbench\Concerns\InteractsWithPest`
+    - `Orchestra\Testbench\Concerns\InteractsWithTestCase`
+
 ## 8.19.0
 
 Released: 2023-12-28

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

diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
@@ -30,6 +30,16 @@ parameters:
 			count: 1
 			path: src/Bootstrap/HandleExceptions.php
 
+		-
+			message: "#^Parameter \\#1 \\$callback of function set_error_handler expects \\(callable\\(int, string, string, int\\)\\: bool\\)\\|null, Closure\\(\\)\\: null given\\.$#"
+			count: 1
+			path: src/Bootstrap/HandleExceptions.php
+
+		-
+			message: "#^Static property Illuminate\\\\Foundation\\\\Bootstrap\\\\HandleExceptions\\:\\:\\$app \\(Illuminate\\\\Contracts\\\\Foundation\\\\Application\\) does not accept null\\.$#"
+			count: 1
+			path: src/Bootstrap/HandleExceptions.php
+
 		-
 			message: "#^Call to an undefined method Illuminate\\\\Contracts\\\\Foundation\\\\Application\\:\\:environmentFile\\(\\)\\.$#"
 			count: 1

diff --git a/src/Foundation/Application.php b/src/Foundation/Application.php
@@ -6,6 +6,7 @@
 use Illuminate\Foundation\Bootstrap\HandleExceptions as LaravelHandleExceptions;
 use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
 use Illuminate\Foundation\Configuration\ApplicationBuilder;
+use Illuminate\Foundation\Console\AboutCommand;
 use Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull;
 use Illuminate\Foundation\Http\Middleware\TrimStrings;
 use Illuminate\Queue\Queue;
@@ -184,6 +185,7 @@ public static function flushState(): void
 
         Queue::createPayloadUsing(null);
         Sleep::fake(false);
+        AboutCommand::flushState();
         TrimStrings::flushState();
     }