Upgrades for Laravel 12

Author: peterfox

.github/workflows/run-tests.yml

@@ -16,13 +16,15 @@ jobs:
             matrix:
                 os: [ubuntu-latest]
                 php: [8.4, 8.3, 8.2]
-                laravel: [11.*, 10.*]
+                laravel: [12.*, 11.*, 10.*]
                 dependencies: [lowest, stable]
                 include:
                     -   laravel: 10.*
                         testbench: ^8.0
                     -   laravel: 11.*
                         testbench: 9.*
+                    -   laravel: 12.*
+                        testbench: 10.*
                     -   dependencies: lowest
                         carbon: ^2.62.1
 

composer.json

@@ -17,22 +17,21 @@
     ],
     "require": {
         "php": "^8.2",
-        "illuminate/contracts": "11.*|10.*"
+        "illuminate/contracts": "12.*|11.*|10.*"
     },
     "require-dev": {
         "composer/semver": "^3.0",
         "larastan/larastan": "^3.0|^2.0|^1.0",
         "laravel/pint": "^1.0",
         "mockery/mockery": "^1.6.12",
         "nunomaduro/collision": "^8.0|^7.8|^6.0",
-        "orchestra/testbench": "^9.0|^8.0|^7.0",
-        "pestphp/pest": "^1.21|^2.34",
-        "pestphp/pest-plugin-arch": "^2.6",
-        "pestphp/pest-plugin-laravel": "^1.1|^2.3",
+        "orchestra/testbench": "^10.0|^9.0|^8.0",
+        "pestphp/pest": "^1.21|^2.34|^3.0",
+        "pestphp/pest-plugin-arch": "^2.6|^3.0",
+        "pestphp/pest-plugin-laravel": "^1.1|^2.3|^3.0",
         "phpstan/extension-installer": "^1.4",
         "phpstan/phpdoc-parser": "^2.0",
         "phpstan/phpstan-deprecation-rules": "^1.0|^2.0",
-        "phpunit/phpunit": "^10.5.36",
         "rector/rector": "^1.0|^2.0"
     },
     "autoload": {

tests/QueryBuilderMixinTest.php

@@ -26,7 +26,7 @@ protected function getPackageProviders($app): array
     public function test_modifying_queries_when_the_feature_is_enabled(bool $flag, string $expectedSql): void
     {
         // Laravel 11 for some reason changed how SQL is generated
-        if (! InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^11.0')) {
+        if (! InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^12.0|^11.0')) {
             $expectedSql = Str::replace('"', '`', $expectedSql);
         }
         Features::fake(['my-feature' => $flag]);
@@ -54,7 +54,7 @@ public static function positiveSqlStatements(): Generator
     public function test_modifying_queries_when_the_feature_is_not_enabled(bool $flag, string $expectedSql): void
     {
         // Laravel 11 for some reason changed how SQL is generated
-        if (! InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^11.0')) {
+        if (! InstalledVersions::satisfies(new VersionParser(), 'illuminate/contracts', '^12.0|^11.0')) {
             $expectedSql = Str::replace('"', '`', $expectedSql);
         }
         Features::fake(['my-feature' => $flag]);

tests/Support/GatewayInspectorTest.php

@@ -5,6 +5,7 @@
 use Generator;
 use Mockery;
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
+use PHPUnit\Framework\Assert;
 use PHPUnit\Framework\Attributes\DataProvider;
 use PHPUnit\Framework\TestCase;
 use YlsIdeas\FeatureFlags\ActionableFlag;
@@ -202,7 +203,7 @@ public function test_it_provides_debug_information(callable $constructs, callabl
         $assert($result->log());
     }
 
-    public function debugScenarios(): Generator
+    public static function debugScenarios(): Generator
     {
         yield 'found result' => [
             fn (string $feature): array => [
@@ -212,7 +213,7 @@ public function debugScenarios(): Generator
                     ->getMock(),
             ],
             function (ActionDebugLog $log): void {
-                $this->assertSame([
+                Assert::assertSame([
                     [
                         'pipe' => 'test',
                         'reason' => ActionDebugLog::REASON_RESULT,
@@ -235,7 +236,7 @@ function (ActionDebugLog $log): void {
                     ->getMock(),
             ],
             function (ActionDebugLog $log): void {
-                $this->assertSame([
+                Assert::assertSame([
                     [
                         'pipe' => 'test',
                         'reason' => ActionDebugLog::REASON_CACHE,
@@ -254,7 +255,7 @@ function (ActionDebugLog $log): void {
                     ->getMock(),
             ],
             function (ActionDebugLog $log): void {
-                $this->assertSame([
+                Assert::assertSame([
                     [
                         'pipe' => 'test',
                         'reason' => ActionDebugLog::REASON_FILTER,
@@ -268,7 +269,7 @@ function (ActionDebugLog $log): void {
                 'gateway' => Mockery::mock(Gateway::class),
             ],
             function (ActionDebugLog $log): void {
-                $this->assertSame([
+                Assert::assertSame([
                     [
                         'pipe' => 'test',
                         'reason' => ActionDebugLog::REASON_RESULT_ALREADY_FOUND,
@@ -286,7 +287,7 @@ function (ActionDebugLog $log): void {
                     ->getMock(),
             ],
             function (ActionDebugLog $log): void {
-                $this->assertSame([
+                Assert::assertSame([
                     [
                         'pipe' => 'test',
                         'reason' => ActionDebugLog::REASON_NO_RESULT,