Chore/support php84 (#170)

* Fixed implicit nullable php 8.4 deprecations * Fixed parameter type mismatch * Removed left over ray call * Suppressed BooleanArgumentFlag phpmd warning * Suppressed CyclomaticComplexity phpmd warning * Suppressed UnusedFormalParameter phpmd warning * Removed ray call * Added php 8.4 to the test matrix * Added support for testing transactions on multiple connections
LaravelFreelancerNL · Nov 23, 2024 · e248271 · e248271
1 parent 8b405eb
commit e248271
Show file tree

Hide file tree

Showing 13 changed files with 28 additions and 20 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         arangodb: ['3.11', '3.12']
-        php: ['8.2', '8.3']
+        php: ['8.2', '8.3', '8.4']
         laravel: ['^11.0']
         include:
           - laravel: '^11.0'

diff --git a/src/Eloquent/Builder.php b/src/Eloquent/Builder.php
@@ -33,7 +33,6 @@ public function createOrFirst(array $attributes = [], array $values = [])
         try {
             return $this->withSavepointIfNeeded(fn() => $this->create(array_merge($attributes, $values)));
         } catch (UniqueConstraintViolationException $e) {
-            ray($e);
             return $this->useWritePdo()->where($attributes)->first() ?? throw $e;
         }
     }

diff --git a/src/Eloquent/Concerns/QueriesAranguentRelationships.php b/src/Eloquent/Concerns/QueriesAranguentRelationships.php
@@ -169,7 +169,7 @@ public function withAggregate($relations, $column, $function = null)
             $query = $relation->getRelationExistenceQuery(
                 $relation->getRelated()->newQuery(),
                 $this,
-                new Expression($expression),
+                [$expression],
             )->setBindings([], 'select');
 
             $query->callScope($constraints);

diff --git a/src/Eloquent/Relations/Concerns/IsAranguentRelation.php b/src/Eloquent/Relations/Concerns/IsAranguentRelation.php
@@ -5,7 +5,6 @@
 namespace LaravelFreelancerNL\Aranguent\Eloquent\Relations\Concerns;
 
 use Illuminate\Database\Eloquent\Builder;
-use Illuminate\Database\Query\Expression;
 
 trait IsAranguentRelation
 {
@@ -41,7 +40,6 @@ public function getRelationExistenceCountQuery(Builder $query, Builder $parentQu
         return $this->getRelationExistenceQuery(
             $query,
             $parentQuery,
-            new Expression('*'),
         );
     }
 }
diff --git a/src/Query/Builder.php b/src/Query/Builder.php
@@ -116,9 +116,9 @@ class Builder extends IlluminateQueryBuilder
      */
     public function __construct(
         IlluminateConnectionInterface $connection,
-        IlluminateQueryGrammar        $grammar = null,
-        IlluminateProcessor           $processor = null,
-        AQB                           $aqb = null,
+        ?IlluminateQueryGrammar        $grammar = null,
+        ?IlluminateProcessor           $processor = null,
+        ?AQB                           $aqb = null,
     ) {
         assert($connection instanceof IlluminateConnectionInterface);
         assert($processor instanceof IlluminateProcessor);

diff --git a/src/Query/Concerns/BuildsWheres.php b/src/Query/Concerns/BuildsWheres.php
@@ -444,6 +444,8 @@ public function whereJsonLength($column, $operator, $value = null, $boolean = 'a
      * @param  string  $boolean
      * @param  bool  $not
      * @return $this
+     *
+     * @SuppressWarnings(PHPMD.BooleanArgumentFlag)
      */
     public function whereLike($column, $value, $caseSensitive = false, $boolean = 'and', $not = false)
     {

diff --git a/src/Query/Concerns/CompilesColumns.php b/src/Query/Concerns/CompilesColumns.php
@@ -91,7 +91,7 @@ protected function prepareColumns(IlluminateQueryBuilder $query, array $columns)
     /**
      * @throws Exception
      */
-    protected function normalizeColumn(IlluminateQueryBuilder $query, mixed $column, string $table = null): mixed
+    protected function normalizeColumn(IlluminateQueryBuilder $query, mixed $column, ?string $table = null): mixed
     {
         assert($query instanceof Builder);
 
@@ -137,7 +137,7 @@ protected function normalizeColumn(IlluminateQueryBuilder $query, mixed $column,
      * @return array<mixed>
      * @throws Exception
      */
-    protected function normalizeStringColumn(Builder $query, int|string $key, string $column, string $table = null): array
+    protected function normalizeStringColumn(Builder $query, int|string $key, string $column, ?string $table = null): array
     {
         [$column, $alias] = $query->extractAlias($column, $key);
 
@@ -158,7 +158,7 @@ protected function normalizeStringColumn(Builder $query, int|string $key, string
      * @param string|null $table
      * @return string
      */
-    protected function normalizeColumnReferences(IlluminateQueryBuilder $query, string $column, string $table = null): string
+    protected function normalizeColumnReferences(IlluminateQueryBuilder $query, string $column, ?string $table = null): string
     {
         assert($query instanceof Builder);
 

diff --git a/src/Query/Concerns/CompilesDataManipulations.php b/src/Query/Concerns/CompilesDataManipulations.php
@@ -16,7 +16,7 @@ trait CompilesDataManipulations
      * @param string|null $bindVar
      * @return string
      */
-    public function compileInsert(Builder|IlluminateQueryBuilder $query, array $values, string $bindVar = null)
+    public function compileInsert(Builder|IlluminateQueryBuilder $query, array $values, ?string $bindVar = null)
     {
         $table = $this->prefixTable($query->from);
 
@@ -41,7 +41,7 @@ public function compileInsert(Builder|IlluminateQueryBuilder $query, array $valu
      * @param string|null $bindVar
      * @return string
      */
-    public function compileInsertGetId(IlluminateQueryBuilder $query, $values, $sequence = '_key', string $bindVar = null)
+    public function compileInsertGetId(IlluminateQueryBuilder $query, $values, $sequence = '_key', ?string $bindVar = null)
     {
         $table = $this->prefixTable($query->from);
 
@@ -68,7 +68,7 @@ public function compileInsertGetId(IlluminateQueryBuilder $query, $values, $sequ
      * @param array<mixed> $values
      * @return string
      */
-    public function compileInsertOrIgnore(IlluminateQueryBuilder $query, array $values, string $bindVar = null)
+    public function compileInsertOrIgnore(IlluminateQueryBuilder $query, array $values, ?string $bindVar = null)
     {
         $table = $this->prefixTable($query->from);
 

diff --git a/src/Query/Concerns/HandlesAliases.php b/src/Query/Concerns/HandlesAliases.php
@@ -45,7 +45,7 @@ public function convertColumnId(array|string|Expression $column): array|string|E
      *
      * @throws Exception
      */
-    public function extractAlias(string $entity, int|string $key = null): array
+    public function extractAlias(string $entity, int|null|string $key = null): array
     {
         $results = preg_split("/\sas\s/i", $entity);
 
@@ -155,7 +155,7 @@ public function prefixAlias(string $target, string $value): string
     /**
      * @throws Exception
      */
-    public function registerColumnAlias(string $column, string $alias = null): bool
+    public function registerColumnAlias(string $column, ?string $alias = null): bool
     {
         if (preg_match("/\sas\s/i", $column)) {
             [$column, $alias] = $this->extractAlias($column);
@@ -170,7 +170,10 @@ public function registerColumnAlias(string $column, string $alias = null): bool
         return false;
     }
 
-    public function registerTableAlias(string|Expression $table, string $alias = null): string
+    /**
+     * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     */
+    public function registerTableAlias(string|Expression $table, ?string $alias = null): string
     {
         if ($table instanceof Expression  && $alias !== null) {
             $table = 'Expression' . spl_object_id($table);

diff --git a/src/Query/Concerns/HandlesBindings.php b/src/Query/Concerns/HandlesBindings.php
@@ -78,7 +78,7 @@ protected function getLastBindVariable(string $type = 'where'): string
      * @param string|null $type
      * @return void
      */
-    public function importBindings($query, string $type = null): void
+    public function importBindings($query, ?string $type = null): void
     {
         if ($type) {
             $this->bindings[$type] = array_merge($this->bindings[$type], $query->bindings[$type]);

diff --git a/src/Testing/Concerns/InteractsWithDatabase.php b/src/Testing/Concerns/InteractsWithDatabase.php
@@ -16,6 +16,8 @@ trait InteractsWithDatabase
      * @param  array<mixed>|object|string  $value
      * @param string|null $connection
      * @return \Illuminate\Contracts\Database\Query\Expression
+     *
+     * @SuppressWarnings(PHPMD.UnusedFormalParameter)
      */
     public function castAsJson($value, $connection = null)
     {

diff --git a/src/Testing/DatabaseTransactions.php b/src/Testing/DatabaseTransactions.php
@@ -22,7 +22,9 @@ public function beginDatabaseTransaction()
     {
         $database = $this->app->make('db');
 
-        $this->app->instance('db.transactions', $transactionsManager = new DatabaseTransactionsManager());
+        $connections = $this->connectionsToTransact();
+
+        $this->app->instance('db.transactions', $transactionsManager = new DatabaseTransactionsManager($connections));
 
         foreach ($this->connectionsToTransact() as $name) {
             $connection = $database->connection($name);

diff --git a/src/Testing/RefreshDatabase.php b/src/Testing/RefreshDatabase.php
@@ -22,7 +22,9 @@ public function beginDatabaseTransaction()
     {
         $database = $this->app->make('db');
 
-        $this->app->instance('db.transactions', $transactionsManager = new DatabaseTransactionsManager());
+        $connections = $this->connectionsToTransact();
+
+        $this->app->instance('db.transactions', $transactionsManager = new DatabaseTransactionsManager($connections));
 
         foreach ($this->connectionsToTransact() as $name) {
             $connection = $database->connection($name);