fix: phpstan issues

Author: tpetry

src/Backports/GrammarBackportEscape.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tpetry\PostgresqlEnhanced\Backports;
+
+use RuntimeException;
+
+/**
+ * To support some features these commits from laravel needed to be backported for older versions:
+ * - [10.x] Escaping functionality within the Grammar (https://github.com/laravel/framework/commit/e953137280cdf6e0fe3c3e4c49d7209ad86c92c0).
+ */
+trait GrammarBackportEscape
+{
+    /**
+     * The connection used for escaping values.
+     *
+     * @var \Illuminate\Database\Connection
+     */
+    protected $connection;
+
+    /**
+     * Escapes a value for safe SQL embedding.
+     *
+     * @param string|float|int|bool|null $value
+     * @param bool $binary
+     */
+    public function escape($value, $binary = false): string
+    {
+        if (null === $this->connection) {
+            throw new RuntimeException("The database driver's grammar implementation does not support escaping values.");
+        }
+
+        return $this->connection->escape($value, $binary);
+    }
+
+    /**
+     * Set the grammar's database connection.
+     *
+     * @param \Illuminate\Database\Connection $connection
+     */
+    public function setConnection($connection): static
+    {
+        $this->connection = $connection;
+
+        return $this;
+    }
+}

src/Backports/GrammarBackport.php renamed to src/Backports/GrammarBackportSubstituteBindings.php

@@ -4,22 +4,13 @@
 
 namespace Tpetry\PostgresqlEnhanced\Backports;
 
-use RuntimeException;
-
 /**
  * To support some features these commits from laravel needed to be backported for older versions:
- * - [10.x] Escaping functionality within the Grammar (https://github.com/laravel/framework/commit/e953137280cdf6e0fe3c3e4c49d7209ad86c92c0).
  * - [10.x] Add toRawSql, dumpRawSql() and ddRawSql() to Query Builders (https://github.com/laravel/framework/commit/830efbeeb815a5f1558433b673a58b0ddcbdc750).
  * - [11.x] Allow for custom Postgres operators to be added (https://github.com/laravel/framework/commit/029e993cb976e76a8d34d6b175eed8c8af1c3ed8)
  */
-trait GrammarBackport
+trait GrammarBackportSubstituteBindings
 {
-    /**
-     * The connection used for escaping values.
-     *
-     * @var \Illuminate\Database\Connection
-     */
-    protected $connection;
     /**
      * The Postgres grammar specific custom operators.
      *
@@ -37,21 +28,6 @@ public static function customOperators(array $operators): void
         );
     }
 
-    /**
-     * Escapes a value for safe SQL embedding.
-     *
-     * @param string|float|int|bool|null $value
-     * @param bool $binary
-     */
-    public function escape($value, $binary = false): string
-    {
-        if (null === $this->connection) {
-            throw new RuntimeException("The database driver's grammar implementation does not support escaping values.");
-        }
-
-        return $this->connection->escape($value, $binary);
-    }
-
     /**
      * Get the Postgres grammar specific operators.
      */
@@ -60,18 +36,6 @@ public function getOperators(): array
         return array_values(array_unique(array_merge($this->operators, static::$customOperators)));
     }
 
-    /**
-     * Set the grammar's database connection.
-     *
-     * @param \Illuminate\Database\Connection $connection
-     */
-    public function setConnection($connection): static
-    {
-        $this->connection = $connection;
-
-        return $this;
-    }
-
     /**
      * Substitute the given bindings into the given raw SQL query.
      *

src/Query/Grammar.php

@@ -6,11 +6,13 @@
 
 use Illuminate\Database\Query\Builder as BaseBuilder;
 use Illuminate\Database\Query\Grammars\PostgresGrammar;
-use Tpetry\PostgresqlEnhanced\Backports\GrammarBackport;
+use Tpetry\PostgresqlEnhanced\Backports\GrammarBackportEscape;
+use Tpetry\PostgresqlEnhanced\Backports\GrammarBackportSubstituteBindings;
 
 class Grammar extends PostgresGrammar
 {
-    use GrammarBackport;
+    use GrammarBackportEscape;
+    use GrammarBackportSubstituteBindings;
     use GrammarCte;
     use GrammarFullText;
     use GrammarOrder;

src/Schema/Grammars/Grammar.php

@@ -5,11 +5,11 @@
 namespace Tpetry\PostgresqlEnhanced\Schema\Grammars;
 
 use Illuminate\Database\Schema\Grammars\PostgresGrammar;
-use Tpetry\PostgresqlEnhanced\Backports\GrammarBackport;
+use Tpetry\PostgresqlEnhanced\Backports\GrammarBackportEscape;
 
 class Grammar extends PostgresGrammar
 {
-    use GrammarBackport;
+    use GrammarBackportEscape;
     use GrammarIndex;
     use GrammarTable;
     use GrammarTrigger;
@@ -22,6 +22,22 @@ class Grammar extends PostgresGrammar
      */
     protected $modifiers = ['Compression', 'Collate', 'Nullable', 'Default', 'VirtualAs', 'StoredAs', 'GeneratedAs', 'Increment'];
 
+    /**
+     * Convert an array of columns with optional suffix keywords into a delimited string.
+     *
+     * @param array<int, string> $columns
+     */
+    public function columnizeWithSuffix(array $columns): string
+    {
+        $columns = array_map(function (string $column): string {
+            $parts = explode(' ', $column, 2);
+
+            return trim(\sprintf('%s %s', $this->wrap($parts[0]), $parts[1] ?? ''));
+        }, $columns);
+
+        return implode(', ', $columns);
+    }
+
     /**
      * Convert an array of names into a delimited string.
      */