LaravelFreelancerNL · LaravelFreelancerNL · Mar 12, 2025 · Feb 25, 2025 · Feb 25, 2025 · Mar 12, 2025
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        laravel: ['^11.0']
+        laravel: ['^12.0']
         include:
-          - laravel: '^11.0'
-            testbench: '^9.0'
+          - laravel: '^12.0'
+            testbench: '^10.0'
 
     name:  Test coverage (Scrutinizer)
 

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -17,10 +17,10 @@ jobs:
       matrix:
         arangodb: ['3.11', '3.12']
         php: ['8.2', '8.3', '8.4']
-        laravel: ['^11.0']
+        laravel: ['^12.0']
         include:
-          - laravel: '^11.0'
-            testbench: '^9.0'
+          - laravel: '^12.0'
+            testbench: '^10.0'
 
 
     name:  QA L ${{ matrix.laravel }} / P ${{ matrix.php }} / A ${{ matrix.arangodb }} - ${{ matrix.dependency-version }}

diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
         "composer/composer": "^2.8.0",
         "laravel-freelancer-nl/arangodb-php-client": "^2.8.0",
         "laravel-freelancer-nl/fluentaql": "^2.0",
-        "laravel/framework": "^11.0",
+        "laravel/framework": "^12.0",
         "spatie/laravel-data": "^4.4.0",
         "stevebauman/unfinalize": "^2.1",
         "vlucas/phpdotenv": "^5.4"
@@ -36,13 +36,12 @@
         "laravel/pint": "^1.10",
         "mockery/mockery": "^1.5.0",
         "nunomaduro/collision": "^8.0",
-        "larastan/larastan": "^2.0",
-        "orchestra/testbench": "^9.0",
-        "pestphp/pest": "^2.6.1",
-        "pestphp/pest-plugin-faker": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
+        "larastan/larastan": "^3.1",
+        "orchestra/testbench": "^10.0",
+        "pestphp/pest": "^3.7.4",
+        "pestphp/pest-plugin-faker": "^3.0",
+        "pestphp/pest-plugin-laravel": "^3.1",
         "phpmd/phpmd": "2.13",
-        "phpstan/phpstan": "^1.0",
         "spatie/laravel-ray": "^1.32",
         "timacdonald/log-fake": "^2.2.0"
     },

diff --git a/phpstan.neon b/phpstan.neon
@@ -5,9 +5,12 @@ parameters:
     level: 8
     ignoreErrors:
         - identifier: missingType.generics
+        - identifier: trait.unused
     universalObjectCratesClasses:
         - 'Illuminate\Support\Fluent'
     paths:
         - src
     excludePaths:
-        - src/Schema
+        - src/Schema
+        - src/Facades/Schema.php
+    treatPhpDocTypesAsCertain: false
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
@@ -5,9 +5,12 @@ parameters:
     level: 8
     ignoreErrors:
         - identifier: missingType.generics
+        - identifier: trait.unused
     universalObjectCratesClasses:
         - 'Illuminate\Support\Fluent'
     paths:
         - src
     excludePaths:
-        - src/Schema
+        - src/Schema
+        - src/Facades/Schema.php
+    treatPhpDocTypesAsCertain: false
diff --git a/readme.md b/readme.md
@@ -34,10 +34,11 @@ You may then use composer to install Aranguent:
 
 
 ### Version compatibility
-| Laravel       | ArangoDB | PHP  | Aranguent |
-|:--------------|:---------|:-----|:----------|
-| ^8.0 and ^9.0 | ^3.7     | ^8.0 | ^0.13     |
-| ^11.0         | ^3.11    | ^8.2 | ^1.0.0    |
+| Laravel       | ArangoDB | PHP  | Aranguent                |
+|:--------------|:---------|:-----|:-------------------------|
+| ^8.0 and ^9.0 | ^3.7     | ^8.0 | ^0.13                    |
+| ^11.0         | ^3.11    | ^8.2 | ^1.0.0 - 1.0.0-beta.11   |
+| ^12.0         | ^3.11    | ^8.2 | ^v1.0.0-beta.12          |
 
 ## Documentation
 1) [Connect to ArangoDB](docs/connect-to-arangodb.md): set up a connection

diff --git a/src/AranguentServiceProvider.php b/src/AranguentServiceProvider.php
@@ -72,7 +72,7 @@ function ($db) {
                     function ($config, $name) {
                         $config['name'] = $name;
                         $connection = new Connection($config);
-                        $connection->setSchemaGrammar(new SchemaGrammar());
+                        $connection->setSchemaGrammar(new SchemaGrammar($connection));
 
                         return $connection;
                     },

diff --git a/src/Concerns/RunsQueries.php b/src/Concerns/RunsQueries.php
@@ -33,7 +33,7 @@ protected function isUniqueConstraintError(Exception $exception)
      * @param  array<mixed>  $bindings
      * @param  bool  $useReadPdo
      * @return \Generator
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      */
     public function cursor($query, $bindings = [], $useReadPdo = true)
     {
@@ -195,7 +195,7 @@ protected function handleQueryBuilder($query, array $bindings): array
     /**
      * Run a select statement against the database.
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      *
      * @param  string|FluentAqlBuilder  $query
      * @param  array<mixed>  $bindings
@@ -210,7 +210,7 @@ public function select($query, $bindings = [], $useReadPdo = true)
     /**
      * Run an AQL query against the database and return the results.
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      *
      * @param  string|FluentAqlBuilder  $query
      * @param  array<mixed>  $bindings

diff --git a/src/Connection.php b/src/Connection.php
@@ -93,7 +93,7 @@ protected function getDefaultPostProcessor(): Processor
      */
     protected function getDefaultQueryGrammar()
     {
-        ($grammar = new QueryGrammar())->setConnection($this);
+        $grammar = new QueryGrammar($this);
 
         return $grammar;
     }
@@ -201,7 +201,7 @@ protected function escapeBinary($value)
      * @param  bool  $binary
      * @return string
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      */
     public function escape($value, $binary = false)
     {
@@ -221,7 +221,7 @@ public function escape($value, $binary = false)
      * @param  string  $value
      * @return string
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      */
     protected function escapeString($value, bool $binary = false)
     {

diff --git a/src/Console/DbCommand.php b/src/Console/DbCommand.php
@@ -14,7 +14,7 @@ class DbCommand extends IlluminateDbCommand
      *
      * @return int
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public function handle()
     {

diff --git a/src/Console/Migrations/MigrateMakeCommand.php b/src/Console/Migrations/MigrateMakeCommand.php
@@ -111,7 +111,7 @@ public function handle()
      *
      * @throws Exception
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      */
     protected function writeMigration($name, $table, $create, $edge = false)
     {

diff --git a/src/Console/TableCommand.php b/src/Console/TableCommand.php
@@ -66,10 +66,17 @@ public function handle(ConnectionResolverInterface $connections)
             return 1;
         }
 
-        $tableName = $this->withoutTablePrefix($connection, $table['name']);
+        [$columns, $indexes] = $connection->withoutTablePrefix(function ($connection) use ($table) {
+            $schema = $connection->getSchemaBuilder();
+            $tableName = $table['name'];
+
+            return [
+                $this->columns($schema, $tableName),
+                $this->indexes($schema, $tableName),
+            ];
+        });
+
 
-        $columns = $this->columns($schema, $tableName);
-        $indexes = $this->indexes($schema, $tableName);
 
         $data = [
             'table' => $table,

diff --git a/src/Eloquent/Casts/AsArrayObject.php b/src/Eloquent/Casts/AsArrayObject.php
@@ -17,7 +17,7 @@ class AsArrayObject extends IlluminateAsArrayObject
      * @param  array<array-key, mixed>  $arguments
      * @return \Illuminate\Contracts\Database\Eloquent\CastsAttributes<\Illuminate\Database\Eloquent\Casts\ArrayObject<array-key, mixed>, iterable<array-key, mixed>>
      *
-     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+     * @SuppressWarnings("PHPMD.UnusedFormalParameter")
      */
     public static function castUsing(array $arguments)
     {
@@ -44,7 +44,7 @@ public function get($model, $key, $value, $attributes)
              * @param mixed[] $attributes
              * @return mixed[]
              *
-             * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+             * @SuppressWarnings("PHPMD.UnusedFormalParameter")
              */
             public function set($model, $key, $value, $attributes)
             {

diff --git a/src/Eloquent/Casts/AsCollection.php b/src/Eloquent/Casts/AsCollection.php
@@ -11,8 +11,8 @@
 use LaravelFreelancerNL\Aranguent\Eloquent\Model;
 
 /**
- * @SuppressWarnings(PHPMD.UndefinedVariable)
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings("PHPMD.UndefinedVariable")
+ * @SuppressWarnings("PHPMD.UnusedFormalParameter")
  */
 class AsCollection extends IlluminateAsCollection
 {
@@ -37,7 +37,7 @@ public function __construct(protected array $arguments) {}
              * @param $attributes
              * @return Collection|mixed|void|null
              *
-             * @SuppressWarnings(PHPMD.UndefinedVariable)
+             * @SuppressWarnings("PHPMD.UndefinedVariable")
              */
             public function get($model, $key, $value, $attributes)
             {
@@ -68,7 +68,7 @@ public function get($model, $key, $value, $attributes)
              * @param mixed[] $attributes
              * @return mixed[]
              *
-             * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+             * @SuppressWarnings("PHPMD.UnusedFormalParameter")
              */
             public function set($model, $key, $value, $attributes)
             {

diff --git a/src/Eloquent/Casts/AsEnumArrayObject.php b/src/Eloquent/Casts/AsEnumArrayObject.php
@@ -10,8 +10,8 @@
 use LaravelFreelancerNL\Aranguent\Eloquent\Model;
 
 /**
- * @SuppressWarnings(PHPMD.UndefinedVariable)
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
+ * @SuppressWarnings("PHPMD.UndefinedVariable")
+ * @SuppressWarnings("PHPMD.UnusedFormalParameter")
  */
 class AsEnumArrayObject extends IlluminateAsEnumArrayObjectAlias
 {
@@ -23,7 +23,7 @@ class AsEnumArrayObject extends IlluminateAsEnumArrayObjectAlias
      * @param  array{class-string<TEnum>}  $arguments
      * @return \Illuminate\Contracts\Database\Eloquent\CastsAttributes<\Illuminate\Database\Eloquent\Casts\ArrayObject<array-key, TEnum>, iterable<TEnum>>
      *
-     * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
+     * @SuppressWarnings("PHPMD.ExcessiveMethodLength")
      */
     public static function castUsing(array $arguments)
     {
@@ -36,7 +36,7 @@ public static function castUsing(array $arguments)
             /**
              * @param array<class-string<TEnum>> $arguments
              *
-             * @SuppressWarnings(PHPMD.UndefinedVariable)
+             * @SuppressWarnings("PHPMD.UndefinedVariable")
              */
             public function __construct(array $arguments)
             {
@@ -50,7 +50,7 @@ public function __construct(array $arguments)
              * @param $attributes
              * @return ArrayObject|void
              *
-             * @SuppressWarnings(PHPMD.UndefinedVariable)
+             * @SuppressWarnings("PHPMD.UndefinedVariable")
              */
             public function get($model, $key, $value, $attributes)
             {
@@ -83,8 +83,8 @@ public function get($model, $key, $value, $attributes)
              * @param mixed[] $attributes
              * @return mixed[]
              *
-             * @SuppressWarnings(PHPMD.UnusedFormalParameter)
-             * @SuppressWarnings(PHPMD.UndefinedVariable)
+             * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+             * @SuppressWarnings("PHPMD.UndefinedVariable")
              */
             public function set($model, $key, $value, $attributes)
             {
@@ -136,7 +136,7 @@ protected function getStorableEnumValue($enum)
      * @param  class-string  $class
      * @return string
      *
-     * @SuppressWarnings(PHPMD.ShortMethodName)
+     * @SuppressWarnings("PHPMD.ShortMethodName")
      */
     public static function of($class)
     {

diff --git a/src/Eloquent/Casts/AsEnumCollection.php b/src/Eloquent/Casts/AsEnumCollection.php
@@ -11,9 +11,9 @@
 use LaravelFreelancerNL\Aranguent\Eloquent\Model;
 
 /**
- * @SuppressWarnings(PHPMD.UndefinedVariable)
- * @SuppressWarnings(PHPMD.UnusedFormalParameter)
- * @SuppressWarnings(PHPMD.ShortMethodName)
+ * @SuppressWarnings("PHPMD.UndefinedVariable")
+ * @SuppressWarnings("PHPMD.UnusedFormalParameter")
+ * @SuppressWarnings("PHPMD.ShortMethodName")
  */
 class AsEnumCollection extends IlluminateAsEnumCollection
 {

diff --git a/src/Eloquent/Concerns/HasAranguentRelationships.php b/src/Eloquent/Concerns/HasAranguentRelationships.php
@@ -163,8 +163,8 @@ protected function newMorphTo(Builder $query, Model $parent, $foreignKey, $owner
      *
      *  Laravel API PHPMD exclusions
      *
-     *  @SuppressWarnings(PHPMD.BooleanArgumentFlag)
-     *  @SuppressWarnings(PHPMD.ExcessiveParameterList)
+     *  @SuppressWarnings("PHPMD.BooleanArgumentFlag")
+     *  @SuppressWarnings("PHPMD.ExcessiveParameterList")
      *
      * @param  string  $name
      * @param  string  $table

diff --git a/src/Eloquent/Concerns/HasAttributes.php b/src/Eloquent/Concerns/HasAttributes.php
@@ -24,7 +24,7 @@ protected function isJsonCastable($key)
      * @param  bool  $asObject
      * @return mixed
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      */
     public function fromJson($value, $asObject = false)
     {

diff --git a/src/Eloquent/Concerns/QueriesAranguentRelationships.php b/src/Eloquent/Concerns/QueriesAranguentRelationships.php
@@ -125,7 +125,7 @@ public function mergeConstraintsFrom(Builder $from)
      * @param  string  $function
      * @return $this
      *
-     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings("PHPMD.CyclomaticComplexity")
      */
     public function withAggregate($relations, $column, $function = null)
     {
@@ -179,7 +179,8 @@ public function withAggregate($relations, $column, $function = null)
             // If the query contains certain elements like orderings / more than one column selected
             // then we will remove those elements from the query so that it will execute properly
             // when given to the database. Otherwise, we may receive SQL errors or poor syntax.
-            unset($query->orders);
+            $query->orders = null;
+
             $query->setBindings([], 'order');
 
             if (is_array($query->columns) && count($query->columns) > 1) {

diff --git a/src/Migrations/MigrationCreator.php b/src/Migrations/MigrationCreator.php
@@ -59,7 +59,7 @@ public function stubPath()
      *
      * @throws FileNotFoundException
      *
-     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
+     * @SuppressWarnings("PHPMD.BooleanArgumentFlag")
      */
     protected function getStub($table, $create, $edge = false)
     {
@@ -107,7 +107,7 @@ protected function getStub($table, $create, $edge = false)
      *
      * @throws \Exception
      */
-    /**  @phpstan-ignore-next-line  @SuppressWarnings(PHPMD.BooleanArgumentFlag) */
+    /**  @phpstan-ignore-next-line  @SuppressWarnings("PHPMD.BooleanArgumentFlag") */
     public function create($name, $path, $table = null, $create = false, $edge = false)
     {
         if ($this->useFallback()) {

diff --git a/src/Providers/CommandServiceProvider.php b/src/Providers/CommandServiceProvider.php
@@ -48,7 +48,7 @@ public function register()
      * @param  string[]  $commands
      * @return void
      *
-     * @SuppressWarnings(PHPMD.ElseExpression)
+     * @SuppressWarnings("PHPMD.ElseExpression")
      */
     protected function registerCommands(array $commands)
     {