add attributes remaining

src/Field.php

@@ -436,8 +436,10 @@ public function getCaption(): string
 
     /**
      * When field is used as expression, this method will be called.
-     * Universal way to convert ourselves to expression. Off-load implementation into persistence.
+     *
+     * Off-load implementation into persistence.
      */
+    #[\Override]
     public function getDsqlExpression(Expression $expression): Expression
     {
         $this->getOwner()->assertHasPersistence();

src/Field/SqlExpressionField.php

@@ -35,18 +35,13 @@ class SqlExpressionField extends Field
     /** @var string Specifies which field to use. */
     public $field;
 
-    /**
-     * Should this field use alias?
-     * Expression fields always need alias.
-     */
+    #[\Override]
     public function useAlias(): bool
     {
         return true;
     }
 
-    /**
-     * When field is used as expression, this method will be called.
-     */
+    #[\Override]
     public function getDsqlExpression(Expression $expression): Expression
     {
         $expr = $this->expr;

src/Model.php

@@ -1775,6 +1775,7 @@ public function export(array $fields = null, string $keyField = null, bool $type
      *
      * @return \Traversable<static>
      */
+    #[\Override]
     final public function getIterator(): \Traversable
     {
         return $this->createIteratorBy([]);

src/Model/Scope.php

@@ -143,12 +143,8 @@ public function isAnd(): bool
         return $this->junction === self::AND;
     }
 
-    /**
-     * Clears the compound condition from nested conditions.
-     *
-     * @return static
-     */
-    public function clear()
+    #[\Override]
+    public function clear(): self
     {
         $this->elements = [];
 
@@ -169,10 +165,9 @@ public function simplify(): AbstractScope
 
     /**
      * Use De Morgan's laws to negate.
-     *
-     * @return static
      */
-    public function negate()
+    #[\Override]
+    public function negate(): self
     {
         $this->junction = $this->junction === self::OR ? self::AND : self::OR;
 

src/Model/Scope/AbstractScope.php

@@ -49,17 +49,16 @@ public function getModel(): ?Model
     /**
      * Empty the scope object.
      *
-     * @return static
+     * @return $this
      */
-    abstract public function clear();
+    abstract public function clear(): self;
 
     /**
-     * Negate the scope object
-     * e.g from '=' to '!='.
+     * Negate the scope object e.g. from '=' to '!='.
      *
-     * @return static
+     * @return $this
      */
-    abstract public function negate();
+    abstract public function negate(): self;
 
     /**
      * Return if scope has any conditions.

src/Model/Scope/Condition.php

@@ -264,7 +264,8 @@ public function isEmpty(): bool
         return array_filter([$this->key, $this->operator, $this->value]) ? false : true;
     }
 
-    public function clear()
+    #[\Override]
+    public function clear(): self
     {
         $this->key = null; // @phpstan-ignore-line
         $this->operator = null;
@@ -273,7 +274,8 @@ public function clear()
         return $this;
     }
 
-    public function negate()
+    #[\Override]
+    public function negate(): self
     {
         if (isset(self::$operators[$this->operator]['negate'])) {
             $this->operator = self::$operators[$this->operator]['negate'];

src/Model/Scope/RootScope.php

@@ -45,7 +45,7 @@ public function getModel(): Model
     }
 
     #[\Override]
-    public function negate()
+    public function negate(): self
     {
         throw new Exception('Model scope cannot be negated');
     }

src/Persistence/Array_.php

@@ -166,9 +166,7 @@ private function saveRow(Model $model, array $rowData, $id): void
         }
     }
 
-    /**
-     * @param array<string, mixed> $defaults
-     */
+    #[\Override]
     public function add(Model $model, array $defaults = []): void
     {
         $defaults = array_merge([

src/Persistence/Array_/Action/RenameColumnIterator.php

@@ -29,9 +29,7 @@ public function __construct(\Traversable $iterator, string $origName, string $ne
         $this->newName = $newName;
     }
 
-    /**
-     * @return array<string, mixed>
-     */
+    #[\Override]
     public function current(): array
     {
         $row = parent::current();

src/Persistence/Sql.php

@@ -80,9 +80,7 @@ public function getConnection(): Connection
         return $this->_connection;
     }
 
-    /**
-     * Disconnect from database explicitly.
-     */
+    #[\Override]
     public function disconnect(): void
     {
         parent::disconnect();
@@ -96,11 +94,13 @@ public function atomic(\Closure $fx)
         return $this->getConnection()->atomic($fx);
     }
 
+    #[\Override]
     public function getDatabasePlatform(): AbstractPlatform
     {
         return $this->getConnection()->getDatabasePlatform();
     }
 
+    #[\Override]
     public function add(Model $model, array $defaults = []): void
     {
         $defaults = array_merge([
@@ -547,6 +547,7 @@ private function assertExactlyOneRecordUpdated(Model $model, $idRaw, int $affect
     /**
      * @param array<scalar|Expressionable|null> $dataRaw
      */
+    #[\Override]
     protected function insertRaw(Model $model, array $dataRaw)
     {
         $insert = $this->initQuery($model);
@@ -583,6 +584,7 @@ protected function insertRaw(Model $model, array $dataRaw)
     /**
      * @param array<scalar|Expressionable|null> $dataRaw
      */
+    #[\Override]
     protected function updateRaw(Model $model, $idRaw, array $dataRaw): void
     {
         $update = $this->initQuery($model);

src/Persistence/Sql/DbalDriverMiddleware.php

@@ -62,6 +62,7 @@ public function createDatabasePlatformForVersion($version): AbstractPlatform
     /**
      * @return AbstractSchemaManager<AbstractPlatform>
      */
+    #[\Override]
     public function getSchemaManager(DbalConnection $connection, AbstractPlatform $platform): AbstractSchemaManager
     {
         if ($platform instanceof SQLitePlatform) {

src/Persistence/Sql/Expression.php

@@ -93,34 +93,26 @@ public function __construct($template = [], array $arguments = [])
     /**
      * @return $this
      */
+    #[\Override]
     public function getDsqlExpression(self $expression): self
     {
         return $this;
     }
 
-    /**
-     * @param int|string $offset
-     */
+    #[\Override]
     public function offsetExists($offset): bool
     {
         return array_key_exists($offset, $this->args['custom']);
     }
 
-    /**
-     * @param int|string $offset
-     *
-     * @return mixed
-     */
+    #[\Override]
     #[\ReturnTypeWillChange]
     public function offsetGet($offset)
     {
         return $this->args['custom'][$offset];
     }
 
-    /**
-     * @param int|string|null $offset
-     * @param mixed           $value  The value to set
-     */
+    #[\Override]
     public function offsetSet($offset, $value): void
     {
         if ($offset === null) {
@@ -130,9 +122,7 @@ public function offsetSet($offset, $value): void
         }
     }
 
-    /**
-     * @param int|string $offset
-     */
+    #[\Override]
     public function offsetUnset($offset): void
     {
         unset($this->args['custom'][$offset]);

src/Persistence/Sql/Query.php

@@ -953,6 +953,7 @@ public function __debugInfo(): array
     /**
      * Renders query template. If the template is not explicitly use "select" mode.
      */
+    #[\Override]
     public function render(): array
     {
         if ($this->template === null) {
@@ -971,6 +972,7 @@ public function render(): array
         return parent::render();
     }
 
+    #[\Override]
     protected function renderNested(): array
     {
         if (isset($this->args['order']) && !isset($this->args['limit'])) {
@@ -1015,12 +1017,7 @@ public function mode($mode)
         return $this;
     }
 
-    /**
-     * Create Expression object with the same connection.
-     *
-     * @param string|array<string, mixed> $template
-     * @param array<int|string, mixed>    $arguments
-     */
+    #[\Override]
     public function expr($template = [], array $arguments = []): Expression
     {
         $class = $this->expressionClass;

src/Reference/ContainsBase.php

@@ -27,10 +27,7 @@ abstract class ContainsBase extends Reference
     /** @var string Required! We need table alias for internal use only. */
     protected $tableAlias = 'tbl';
 
-    /**
-     * Reference\ContainsOne will also add a field corresponding
-     * to 'ourField' unless it exists of course.
-     */
+    #[\Override]
     protected function init(): void
     {
         parent::init();

src/Reference/HasMany.php

@@ -80,6 +80,7 @@ protected function referenceOurValue(): Field
     /**
      * Returns referenced model with condition set.
      */
+    #[\Override]
     public function ref(Model $ourModel, array $defaults = []): Model
     {
         $ourModel = $this->getOurModel($ourModel);

src/Reference/HasOne.php

@@ -13,10 +13,7 @@ class HasOne extends Reference
     use Model\FieldPropertiesTrait;
     use Model\JoinLinkTrait;
 
-    /**
-     * Reference\HasOne will also add a field corresponding
-     * to 'ourField' unless it exists.
-     */
+    #[\Override]
     protected function init(): void
     {
         parent::init();
@@ -73,11 +70,12 @@ protected function referenceOurValue(): Field
     }
 
     /**
-     * If our model is loaded, then return their model with respective record loaded.
+     * If our model is loaded, then return their model with respective loaded entity.
      *
      * If our model is not loaded, then return their model with condition set.
      * This can happen in case of deep traversal $model->ref('Many')->ref('one_id'), for example.
      */
+    #[\Override]
     public function ref(Model $ourModel, array $defaults = []): Model
     {
         $ourModel = $this->getOurModel($ourModel);