Attempt upgrade to Laravel 11 (#37)

* Attempt upgrade to Laravel 11

* Add test bench details

* Working Laravel 11 grammar tests

* Fix test namespace

* Test fix

* database script change

* Update CRDB version

* Fix of tests

* Add Eager Load Limit test

* Remove the tiny int test

* Fix PHP styling

* Add test skip

* Fix version test

* Adds a custom casting test

* Skips test with missing method

* small test fixes

* Fix PHP styling

* bump crdb version

* skip one last test

* Fix PHP styling

* wrong way dumby

* PHPStan fixes for missing Doctrine classes

* Additional tests

* Blocks out some scenarios pre L11

* More version blocking

* Another one

* Last one for Laravel 10 and above

* Fix PHP styling

---------

Co-authored-by: peterfox <[email protected]>

Author: peterfox

.github/workflows/run-tests.yml

@@ -15,11 +15,13 @@ jobs:
       fail-fast: false
       matrix:
         os: [ ubuntu-latest ]
-        php: [ 8.1, 8.2, 8.3 ]
-        laravel: [ 10.*, 9.* ]
-        cockroachdb: [ v22.2.17, v23.1.13 ]
+        php: [ 8.2, 8.3 ]
+        laravel: [ 11.*, 10.*, 9.* ]
+        cockroachdb: [ v22.2.17, v23.2.2 ]
         dependencies: [ stable, lowest ]
         include:
+          - laravel: 11.*
+            testbench: ^9.0
           - laravel: 10.*
             testbench: ^8.0
           - laravel: 9.*

composer.json

@@ -17,22 +17,22 @@
         }
     ],
     "require": {
-        "php": "^8.1",
+        "php": "^8.2",
         "spatie/laravel-package-tools": "^1.9.2",
-        "illuminate/contracts": "10.*|9.*|8.*"
+        "illuminate/contracts": "11.*|10.*|9.*"
     },
     "require-dev": {
         "doctrine/dbal": "^3.2",
         "laravel/pint": "^1.2",
-        "nunomaduro/collision": "7.2|^6.0|^5.10",
-        "nunomaduro/larastan": "^2.0|^1.0",
-        "orchestra/testbench": "^8.0|^7.0|^6.24",
+        "nunomaduro/collision": "^8.1|7.2|^6.0|^5.10",
+        "larastan/larastan": "^2.0",
+        "orchestra/testbench": "^9.0|^8.0|^7.0",
         "pestphp/pest": "^1.21|^2.23",
         "pestphp/pest-plugin-laravel": "^1.1|^2.2",
         "phpstan/extension-installer": "^1.1",
         "phpstan/phpstan-deprecation-rules": "^1.0",
         "phpstan/phpstan-phpunit": "^1.0",
-        "rector/rector": "^0.14.2",
+        "rector/rector": "^0.14.2|^1.0",
         "spatie/laravel-ray": "^1.26"
     },
     "autoload": {

database.php

@@ -25,15 +25,14 @@
         heredoc);
 
     $statements = [
-        'SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = true;',
         'SET CLUSTER SETTING kv.range_merge.queue_interval = \'50ms\';',
         'SET CLUSTER SETTING jobs.registry.interval.gc = \'30s\';',
         'SET CLUSTER SETTING jobs.registry.interval.cancel = \'180s\';',
         'SET CLUSTER SETTING jobs.retention_time = \'15s\';',
         'SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;',
         'SET CLUSTER SETTING kv.range_split.by_load_merge_delay = \'5s\';',
-        'ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 5;',
-        'ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 5;',
+        'ALTER RANGE default CONFIGURE ZONE USING "gc.ttlseconds" = 600;',
+        'ALTER DATABASE system CONFIGURE ZONE USING "gc.ttlseconds" = 600;',
     ];
 
     foreach ($statements as $statement) {

docker-compose.yml

@@ -1,7 +1,7 @@
 version: '3'
 services:
   crdb:
-    image: "cockroachdb/cockroach:${VERSION:-v23.1.13}"
+    image: "cockroachdb/cockroach:${VERSION:-v23.2.2}"
     ports:
       - "26257:26257"
       - "8080:8080"

src/CockroachDbConnection.php

@@ -10,7 +10,7 @@
 use YlsIdeas\CockroachDb\Builder\CockroachDbBuilder as DbBuilder;
 use YlsIdeas\CockroachDb\Processor\CockroachDbProcessor as DbProcessor;
 use YlsIdeas\CockroachDb\Query\CockroachGrammar as QueryGrammar;
-use YlsIdeas\CockroachDb\Schema\CockroachGrammar as SchemaGrammar;
+use YlsIdeas\CockroachDb\Schema\CockroachDbGrammar as SchemaGrammar;
 use YlsIdeas\CockroachDb\Schema\CockroachSchemaState as SchemaState;
 
 class CockroachDbConnection extends PostgresConnection implements ConnectionInterface
@@ -73,9 +73,11 @@ protected function getDefaultPostProcessor(): DbProcessor
      * Get the Doctrine DBAL driver.
      *
      * @return \Illuminate\Database\PDO\PostgresDriver
+     * @phpstan-ignore-next-line Missing in Laravel 11
      */
     protected function getDoctrineDriver()
     {
+        /** @phpstan-ignore-next-line Now redundant in Laravel 11 */
         return new PostgresDriver();
     }
 

src/Processor/CockroachDbProcessor.php

@@ -6,4 +6,30 @@
 
 class CockroachDbProcessor extends PostgresProcessor
 {
+    public function processColumns($results)
+    {
+        return array_map(function ($result) {
+            $result = (object) $result;
+
+            $autoincrement = $result->default !== null && str_starts_with($result->default, 'nextval(');
+
+            return [
+                'name' => $result->name,
+                'type_name' => $result->type_name,
+                'type' => $result->type,
+                'collation' => $result->collation,
+                'nullable' => (bool) $result->nullable,
+                'default' => ($result->generated ?? null) ? null : $result->default,
+                'auto_increment' => $autoincrement,
+                'comment' => $result->comment,
+                'generation' => ($result->generated ?? null) ? [
+                    'type' => match ($result->generated) {
+                        's' => 'stored',
+                        default => null,
+                    },
+                    'expression' => $result->default,
+                ] : null,
+            ];
+        }, $results);
+    }
 }

src/Schema/CockroachGrammar.php renamed to src/Schema/CockroachDbGrammar.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Fluent;
 use YlsIdeas\CockroachDb\Exceptions\FeatureNotSupportedException;
 
-class CockroachGrammar extends PostgresGrammar
+class CockroachDbGrammar extends PostgresGrammar
 {
     /**
      * Compile the query to determine the tables.