Support PHP 8.5 (#154)

PHP 8.3 -> PHP 8.4:

* Function parameters that are null by default must be declared nullable.

PHP 8.4 -> PHP 8.5

* Several aliases of SplObjectStorage methods are deprecated in 8.5.
* Using null as array key is deprecated.

In addition the `phpstan-baseline.neon` has been updated,
because some of it's errors were no longer reported.

Author: lippserd

phpstan-baseline.neon

@@ -17,7 +17,7 @@ class AliasedExpression extends Expression
      * @param ?array $columns   The columns used by the expression
      * @param mixed ...$values  The values for the expression
      */
-    public function __construct(string $alias, string $statement, array $columns = null, ...$values)
+    public function __construct(string $alias, string $statement, ?array $columns = null, ...$values)
     {
         parent::__construct($statement, $columns, ...$values);
 

src/AliasedExpression.php

@@ -79,7 +79,7 @@ public function rewriteCondition(Condition $condition, $relation = null)
          * {@see \ipl\Orm\Compat\FilterProcessor::requireAndResolveFilterColumns()}
          */
         $column = $condition->metaData()->get('columnName');
-        if (isset($this->properties[$column])) {
+        if ($column !== null && isset($this->properties[$column])) {
             $value = $condition->metaData()->get('originalValue');
 
             if ($this->isPostgres && is_resource($value)) {

src/Behavior/Binary.php

@@ -17,9 +17,9 @@ class InvalidRelationException extends Exception
      * Create a new InvalidRelationException
      *
      * @param string $relation The relation name
-     * @param Model $model The target model
+     * @param ?Model $model The target model
      */
-    public function __construct($relation, Model $model = null)
+    public function __construct($relation, ?Model $model = null)
     {
         $this->relation = (string) $relation;
         $this->model = $model;

src/Exception/InvalidRelationException.php

@@ -14,7 +14,7 @@ abstract class Model implements \ArrayAccess, \IteratorAggregate
 {
     use PropertiesWithDefaults;
 
-    final public function __construct(array $properties = null)
+    final public function __construct(?array $properties = null)
     {
         if ($this->hasProperties()) {
             $this->setProperties($properties);

src/Model.php

@@ -602,7 +602,7 @@ public function derive($relation, Model $source)
      *
      * @return static
      */
-    public function createSubQuery(Model $target, $targetPath, Model $from = null, bool $link = true)
+    public function createSubQuery(Model $target, $targetPath, ?Model $from = null, bool $link = true)
     {
         $subQuery = (new static())
             ->setDb($this->getDb())
@@ -744,9 +744,9 @@ protected function groupColumnsByTarget(Generator $columns)
         $columnStorage = new SplObjectStorage();
 
         foreach ($columns as list($target, $alias, $column)) {
-            if (! $columnStorage->contains($target)) {
+            if (! $columnStorage->offsetExists($target)) {
                 $resolved = new ArrayObject();
-                $columnStorage->attach($target, $resolved);
+                $columnStorage->offsetSet($target, $resolved);
             } else {
                 $resolved = $columnStorage[$target];
             }

src/Query.php

@@ -81,10 +81,10 @@ public function __construct(Query $query)
      */
     public function getRelations(Model $model)
     {
-        if (! $this->relations->contains($model)) {
+        if (! $this->relations->offsetExists($model)) {
             $relations = new Relations();
             $model->createRelations($relations);
-            $this->relations->attach($model, $relations);
+            $this->relations->offsetSet($model, $relations);
         }
 
         return $this->relations[$model];
@@ -99,10 +99,10 @@ public function getRelations(Model $model)
      */
     public function getBehaviors(Model $model)
     {
-        if (! $this->behaviors->contains($model)) {
+        if (! $this->behaviors->offsetExists($model)) {
             $behaviors = new Behaviors();
             $model->createBehaviors($behaviors);
-            $this->behaviors->attach($model, $behaviors);
+            $this->behaviors->offsetSet($model, $behaviors);
 
             foreach ($behaviors as $behavior) {
                 if ($behavior instanceof QueryAwareBehavior) {
@@ -123,10 +123,10 @@ public function getBehaviors(Model $model)
      */
     public function getDefaults(Model $model): Defaults
     {
-        if (! $this->defaults->contains($model)) {
+        if (! $this->defaults->offsetExists($model)) {
             $defaults = new Defaults();
             $model->createDefaults($defaults);
-            $this->defaults->attach($model, $defaults);
+            $this->defaults->offsetSet($model, $defaults);
         }
 
         return $this->defaults[$model];
@@ -143,7 +143,7 @@ public function getDefaults(Model $model): Defaults
      */
     public function getAlias(Model $model)
     {
-        if (! $this->aliases->contains($model)) {
+        if (! $this->aliases->offsetExists($model)) {
             throw new OutOfBoundsException(sprintf(
                 "Can't get alias for model '%s'. Alias does not exist",
                 get_class($model)
@@ -202,7 +202,7 @@ public function setAliasPrefix($alias)
      */
     public function hasSelectableColumn(Model $subject, $column)
     {
-        if (! $this->selectableColumns->contains($subject)) {
+        if (! $this->selectableColumns->offsetExists($subject)) {
             $this->collectColumns($subject);
         }
 
@@ -223,7 +223,7 @@ public function hasSelectableColumn(Model $subject, $column)
      */
     public function getSelectableColumns(Model $subject)
     {
-        if (! $this->selectableColumns->contains($subject)) {
+        if (! $this->selectableColumns->offsetExists($subject)) {
             $this->collectColumns($subject);
         }
 
@@ -239,7 +239,7 @@ public function getSelectableColumns(Model $subject)
      */
     public function getSelectColumns(Model $subject)
     {
-        if (! $this->selectColumns->contains($subject)) {
+        if (! $this->selectColumns->offsetExists($subject)) {
             $this->collectColumns($subject);
         }
 
@@ -255,8 +255,8 @@ public function getSelectColumns(Model $subject)
      */
     public function getColumnDefinitions(Model $subject)
     {
-        if (! $this->metaData->contains($subject)) {
-            $this->metaData->attach($subject, $this->collectMetaData($subject));
+        if (! $this->metaData->offsetExists($subject)) {
+            $this->metaData->offsetSet($subject, $this->collectMetaData($subject));
         }
 
         return $this->metaData[$subject];
@@ -329,14 +329,14 @@ public function qualifyColumn($column, $tableName)
      * Qualify the given columns by the specified model
      *
      * @param iterable $columns
-     * @param Model $model Leave null in case $columns is {@see Resolver::requireAndResolveColumns()}
+     * @param ?Model $model Leave null in case $columns is {@see Resolver::requireAndResolveColumns()}
      *
      * @return array
      *
      * @throws InvalidArgumentException If $columns is not iterable
      * @throws InvalidArgumentException If $model is not passed and $columns is not a generator
      */
-    public function qualifyColumns($columns, Model $model = null)
+    public function qualifyColumns($columns, ?Model $model = null)
     {
         $target = $model ?: $this->query->getModel();
         $targetAlias = $this->getAlias($target);
@@ -382,15 +382,15 @@ public function qualifyColumns($columns, Model $model = null)
      * Qualify the given columns and aliases by the specified model
      *
      * @param iterable $columns
-     * @param Model $model Leave null in case $columns is {@see Resolver::requireAndResolveColumns()}
+     * @param ?Model $model Leave null in case $columns is {@see Resolver::requireAndResolveColumns()}
      * @param bool $autoAlias Set an alias for columns which have none
      *
      * @return array
      *
      * @throws InvalidArgumentException If $columns is not iterable
      * @throws InvalidArgumentException If $model is not passed and $columns is not a generator
      */
-    public function qualifyColumnsAndAliases($columns, Model $model = null, $autoAlias = true)
+    public function qualifyColumnsAndAliases($columns, ?Model $model = null, $autoAlias = true)
     {
         $target = $model ?: $this->query->getModel();
         $targetAlias = $this->getAlias($target);
@@ -492,14 +492,14 @@ public function isDistinctRelation($path)
      * Also resolves all other relations.
      *
      * @param string $path
-     * @param Model  $subject
+     * @param ?Model $subject
      *
      * @return Relation
      */
-    public function resolveRelation($path, Model $subject = null)
+    public function resolveRelation($path, ?Model $subject = null)
     {
         $subject = $subject ?: $this->query->getModel();
-        if (! $this->resolvedRelations->contains($subject) || ! isset($this->resolvedRelations[$subject][$path])) {
+        if (! $this->resolvedRelations->offsetExists($subject) || ! isset($this->resolvedRelations[$subject][$path])) {
             foreach ($this->resolveRelations($path, $subject) as $_) {
                 // run and exhaust generator
             }
@@ -514,13 +514,13 @@ public function resolveRelation($path, Model $subject = null)
      * Traverses the entire path and yields the path travelled so far as key and the relation as value.
      *
      * @param string $path
-     * @param Model  $subject
+     * @param ?Model $subject
      *
      * @return Generator
      * @throws InvalidArgumentException In case $path is not fully qualified
      * @throws InvalidRelationException In case a relation is unknown
      */
-    public function resolveRelations($path, Model $subject = null)
+    public function resolveRelations($path, ?Model $subject = null)
     {
         $relations = explode('.', $path);
         $subject = $subject ?: $this->query->getModel();
@@ -533,7 +533,7 @@ public function resolveRelations($path, Model $subject = null)
         }
 
         $resolvedRelations = [];
-        if ($this->resolvedRelations->contains($subject)) {
+        if ($this->resolvedRelations->offsetExists($subject)) {
             $resolvedRelations = $this->resolvedRelations[$subject];
         }
 
@@ -585,22 +585,22 @@ public function resolveRelations($path, Model $subject = null)
             $resolvedRelations[$pathBeingResolved] = $relation;
         }
 
-        $this->resolvedRelations->attach($subject, $resolvedRelations);
+        $this->resolvedRelations->offsetSet($subject, $resolvedRelations);
     }
 
     /**
      * Require and resolve columns
      *
      * Related models will be automatically added for eager-loading.
      *
-     * @param array $columns
-     * @param Model $model
+     * @param array  $columns
+     * @param ?Model $model
      *
      * @return Generator
      *
      * @throws InvalidColumnException If a column does not exist
      */
-    public function requireAndResolveColumns(array $columns, Model $model = null)
+    public function requireAndResolveColumns(array $columns, ?Model $model = null)
     {
         $model = $model ?: $this->query->getModel();
         $tableName = $model->getTableAlias();
@@ -745,7 +745,7 @@ protected function collectColumns(Model $subject)
         // Don't fail if Model::getColumns() also contains the primary key columns
         $columns = array_merge((array) $subject->getKeyName(), (array) $subject->getColumns());
 
-        $this->selectColumns->attach($subject, $columns);
+        $this->selectColumns->offsetSet($subject, $columns);
 
         $selectable = [];
 
@@ -759,7 +759,7 @@ protected function collectColumns(Model $subject)
             }
         }
 
-        $this->selectableColumns->attach($subject, $selectable);
+        $this->selectableColumns->offsetSet($subject, $selectable);
     }
 
     /**