Merge pull request #2 from efureev/laravel-12

Laravel 12

Author: efureev

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
       fail-fast: false
       matrix:
         setup: [ 'basic', 'lowest', 'stable' ]
-        php: [ '8.2' , '8.3' ]
+        php: [ '8.2', '8.3', '8.4' ]
 
     services:
       postgres:
@@ -55,19 +55,6 @@ jobs:
           extensions: mbstring
           coverage: xdebug
 
-      - name: Get Composer Cache Directory # Docs: <https://github.com/actions/cache/blob/master/examples.md#php---composer>
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
       - name: Validate composer.json
         run: composer validate
 
@@ -123,19 +110,6 @@ jobs:
           extensions: mbstring
           coverage: xdebug
 
-      - name: Get Composer Cache Directory # Docs: <https://github.com/actions/cache/blob/master/examples.md#php---composer>
-        id: composer-cache
-        run: |
-          echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-
-      - name: Cache dependencies
-        uses: actions/cache@v4
-        with:
-          path: ${{ steps.composer-cache.outputs.dir }}
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: |
-            ${{ runner.os }}-composer-
-
       - name: Install [BASIC] Composer dependencies
         run: composer update --prefer-dist --no-interaction --no-suggest
 

.meta.php

@@ -37,16 +37,16 @@ class Blueprint
     {
     }
 }
-
-namespace Illuminate\Database\Query {
-
-    /**
-     * @mixin \Php\Support\Laravel\Database\Query\Builder
-     */
-    class Builder
-    {
-    }
-}
+//
+//namespace Illuminate\Database\Query {
+//
+//    /**
+//     * @mixin \Php\Support\Laravel\Database\Query\Builder
+//     */
+//    class Builder
+//    {
+//    }
+//}
 
 namespace Illuminate\Database\Eloquent {
 

CHANGELOG.md

@@ -9,6 +9,12 @@ Check MD [online][check-online].
 
 ## [unreleased]
 
+## [3.0.0] - 2025-02-24
+
+### Added
+
+- Add a support for Laravel 12
+
 ## [2.1.0] - 2024-07-22
 
 ### Added

composer.json

@@ -19,11 +19,11 @@
   "require": {
     "php": "^8.2",
     "ext-pdo": "*",
-    "illuminate/database": "^11.0 || ^12.0"
+    "illuminate/database": "^12.0"
   },
   "require-dev": {
     "ergebnis/composer-normalize": "^2.42",
-    "orchestra/testbench": "^9.0 || ^10.0",
+    "orchestra/testbench": "^10.0",
     "phpstan/phpstan": "^2.0",
     "phpunit/phpunit": "^11.5",
     "squizlabs/php_codesniffer": "^3.9"

src/Schema/Postgres/Builder.php

@@ -5,13 +5,20 @@
 namespace Php\Support\Laravel\Database\Schema\Postgres;
 
 use Closure;
+use Illuminate\Container\Container;
 use Illuminate\Database\Schema\PostgresBuilder;
 
 class Builder extends PostgresBuilder
 {
     protected function createBlueprint($table, ?Closure $callback = null)
     {
-        return new Blueprint($table, $callback);
+        $connection = $this->connection;
+
+        if (isset($this->resolver)) {
+            return call_user_func($this->resolver, $connection, $table, $callback);
+        }
+
+        return Container::getInstance()->make(Blueprint::class, compact('connection', 'table', 'callback'));
     }
 
     /**

src/Schema/Postgres/Connection.php

@@ -13,7 +13,7 @@ class Connection extends BasePostgresConnection
 {
     protected function getDefaultSchemaGrammar()
     {
-        return $this->withTablePrefix((new Grammar())->addModifier('Compression'));
+        return (new Grammar($this))->addModifier('Compression');
     }
 
 
@@ -36,7 +36,7 @@ public function query()
 
     protected function getDefaultQueryGrammar()
     {
-        return new QueryPostgresGrammar();
+        return new QueryPostgresGrammar($this);
     }
 
     public function bindValues($statement, $bindings): void
@@ -47,6 +47,7 @@ public function bindValues($statement, $bindings): void
 
                 $dataType = match (true) {
                     is_bool($value) => PDO::PARAM_BOOL,
+                    is_resource($value) => PDO::PARAM_LOB,
                     $value === null => PDO::PARAM_NULL,
                     default => PDO::PARAM_STR,
                 };

src/Schema/Postgres/Grammar.php

@@ -20,7 +20,7 @@ class Grammar extends PostgresGrammar
     use CompressionModifier;
 
 
-    public function naming(array $names)
+    public function naming(array $names): string
     {
         return implode(', ', array_map([$this, 'wrap'], $names));
     }

src/Schema/Postgres/Grammar/CompressionModifier.php

@@ -4,16 +4,15 @@
 
 namespace Php\Support\Laravel\Database\Schema\Postgres\Grammar;
 
-use Illuminate\Database\Connection;
 use Illuminate\Database\Schema\Blueprint as BaseBlueprint;
 use Illuminate\Support\Fluent;
 use Php\Support\Laravel\Database\Schema\Postgres\Blueprint;
 
 trait CompressionModifier
 {
-    public function compileChange(BaseBlueprint $blueprint, Fluent $command, Connection $connection)
+    public function compileChange(BaseBlueprint $blueprint, Fluent $command)
     {
-        $queries = (array)parent::compileChange($blueprint, $command, $connection);
+        $queries = (array)parent::compileChange($blueprint, $command);
 
         foreach ($blueprint->getChangedColumns() as $changedColumn) {
             if ($changedColumn->compression !== null) {

src/ServiceProvider.php

@@ -27,6 +27,8 @@ protected function registerConnectionServices(): void
 
         $this->app->bind('db.connection', static fn($app) => $app['db']->connection());
 
+        $this->app->bind('db.schema', static fn($app) => $app['db']->connection()->getSchemaBuilder());
+
         $this->app->singleton('db.transactions', static fn($app) => new DatabaseTransactionsManager());
     }