Laravel version compatibility redo

Collapsed the Laravel version compatibility layer from 12 files (4 dispatchers + 4 v11 traits
  + 4 v12 traits) into 4 self-contained traits. Eliminated file-level conditional trait loading
  — version checks now happen inside each method, using spread operators to handle different
  constructor signatures across Laravel versions. Removed the phpstan bootstrap class_alias
  hacks that were needed to make the old pattern analysable.

Author: pdphilip

composer.lock

@@ -1,8 +1,3 @@
 <?php
 
 require_once __DIR__.'/vendor/autoload.php';
-
-class_alias('PDPhilip\\Elasticsearch\\Laravel\\v11\\Connection\\ConnectionCompatibility', 'PDPhilip\\Elasticsearch\\Laravel\\Compatibility\\Connection\\ConnectionCompatibility');
-class_alias('PDPhilip\\Elasticsearch\\Laravel\\v11\\Schema\\BlueprintCompatibility', 'PDPhilip\\Elasticsearch\\Laravel\\Compatibility\\Schema\\BlueprintCompatibility');
-class_alias('PDPhilip\\Elasticsearch\\Laravel\\v11\\Schema\\BuilderCompatibility', 'PDPhilip\\Elasticsearch\\Laravel\\Compatibility\\Schema\\BuilderCompatibility');
-class_alias('PDPhilip\\Elasticsearch\\Laravel\\v11\\Schema\\GrammarCompatibility', 'PDPhilip\\Elasticsearch\\Laravel\\Compatibility\\Schema\\GrammarCompatibility');

phpstan-bootstrap.php

@@ -2,20 +2,35 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Connection;
 
-use PDPhilip\Elasticsearch\Laravel\v11\Connection\ConnectionCompatibility as ConnectionCompatibility11;
-use PDPhilip\Elasticsearch\Laravel\v12\Connection\ConnectionCompatibility as ConnectionCompatibility12;
+use PDPhilip\Elasticsearch\Query;
+use PDPhilip\Elasticsearch\Schema;
 use PDPhilip\Elasticsearch\Utils\Helpers;
 
-$laravelVersion = Helpers::getLaravelCompatabilityVersion();
+trait ConnectionCompatibility
+{
+    /**
+     * @return Schema\Grammars\Grammar
+     */
+    public function getSchemaGrammar()
+    {
+        return new Schema\Grammars\Grammar(...$this->grammarArgs());
+    }
+
+    /** {@inheritdoc} */
+    protected function getDefaultQueryGrammar(): Query\Grammar\Grammar
+    {
+        return new Query\Grammar\Grammar(...$this->grammarArgs());
+    }
 
-if ($laravelVersion >= 12) {
-    trait ConnectionCompatibility
+    /** {@inheritdoc} */
+    protected function getDefaultSchemaGrammar(): Schema\Grammars\Grammar
     {
-        use ConnectionCompatibility12;
+        return new Schema\Grammars\Grammar(...$this->grammarArgs());
     }
-} else {
-    trait ConnectionCompatibility
+
+    /** @phpstan-ignore return.type */
+    private function grammarArgs(): array
     {
-        use ConnectionCompatibility11;
+        return Helpers::getLaravelCompatabilityVersion() >= 12 ? [$this] : [];
     }
 }

src/Laravel/Compatibility/Connection/ConnectionCompatibility.php

@@ -2,20 +2,29 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\Elasticsearch\Laravel\v11\Schema\BlueprintCompatibility as BlueprintCompatibility11;
-use PDPhilip\Elasticsearch\Laravel\v12\Schema\BlueprintCompatibility as BlueprintCompatibility12;
 use PDPhilip\Elasticsearch\Utils\Helpers;
 
-$laravelVersion = Helpers::getLaravelCompatabilityVersion();
-
-if ($laravelVersion >= 12) {
-    trait BlueprintCompatibility
+trait BlueprintCompatibility
+{
+    public function getConnection()
     {
-        use BlueprintCompatibility12;
+        return $this->connection ?? null;
     }
-} else {
-    trait BlueprintCompatibility
+
+    /** @phpstan-ignore method.childParameterType */
+    public function build($connection = null, $grammar = null): void
     {
-        use BlueprintCompatibility11;
+        if (Helpers::getLaravelCompatabilityVersion() >= 12) {
+            $connection = $this->connection;
+            $grammar = $this->grammar;
+        }
+
+        foreach ($this->toDSL($connection, $grammar) as $statement) {
+            if ($connection->pretending()) {
+                return;
+            }
+
+            $statement($this, $connection);
+        }
     }
 }

src/Laravel/Compatibility/Schema/BlueprintCompatibility.php

@@ -2,20 +2,29 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\Elasticsearch\Laravel\v11\Schema\BuilderCompatibility as BuilderCompatibility11;
-use PDPhilip\Elasticsearch\Laravel\v12\Schema\BuilderCompatibility as BuilderCompatibility12;
+use Closure;
+use PDPhilip\Elasticsearch\Schema\Blueprint;
 use PDPhilip\Elasticsearch\Utils\Helpers;
 
-$laravelVersion = Helpers::getLaravelCompatabilityVersion();
+trait BuilderCompatibility
+{
+    /** {@inheritDoc} */
+    protected function createBlueprint($table, ?Closure $callback = null): Blueprint
+    {
+        return new Blueprint(...$this->blueprintArgs($table, $callback));
+    }
 
-if ($laravelVersion >= 12) {
-    trait BuilderCompatibility
+    public function getTableListing($schema = null, $schemaQualified = true)
     {
-        use BuilderCompatibility12;
+        return array_column($this->getTables(), 'name');
     }
-} else {
-    trait BuilderCompatibility
+
+    private function blueprintArgs(string $table, ?Closure $callback): array
     {
-        use BuilderCompatibility11;
+        if (Helpers::getLaravelCompatabilityVersion() >= 12) {
+            return [$this->connection, $table, $callback];
+        }
+
+        return [$table, $callback];
     }
 }

src/Laravel/Compatibility/Schema/BuilderCompatibility.php

@@ -2,20 +2,17 @@
 
 namespace PDPhilip\Elasticsearch\Laravel\Compatibility\Schema;
 
-use PDPhilip\Elasticsearch\Laravel\v11\Schema\GrammarCompatibility as GrammarCompatibility11;
-use PDPhilip\Elasticsearch\Laravel\v12\Schema\GrammarCompatibility as GrammarCompatibility12;
+use PDPhilip\Elasticsearch\Schema\Blueprint;
 use PDPhilip\Elasticsearch\Utils\Helpers;
 
-$laravelVersion = Helpers::getLaravelCompatabilityVersion();
-
-if ($laravelVersion >= 12) {
-    trait GrammarCompatibility
-    {
-        use GrammarCompatibility12;
-    }
-} else {
-    trait GrammarCompatibility
+trait GrammarCompatibility
+{
+    private function createBlueprint(Blueprint $blueprint): Blueprint
     {
-        use GrammarCompatibility11;
+        if (Helpers::getLaravelCompatabilityVersion() >= 12) {
+            return new Blueprint($blueprint->getConnection(), '');
+        }
+
+        return new Blueprint(''); // @phpstan-ignore arguments.count
     }
 }