Fix ActiveRecordInterface::class. (#263)

terabytesoftw · web-flow · commit 0ebe2c763b4b · 2023-05-11T10:57:34.000-04:00
diff --git a/composer.json b/composer.json
@@ -27,7 +27,7 @@
     "require-dev": {
         "maglnet/composer-require-checker": "^4.2",
         "phpunit/phpunit": "^9.6|^10.0",
-        "rector/rector": "^0.15",
+        "rector/rector": "^0.16",
         "roave/infection-static-analysis-plugin": "^1.16",
         "spatie/phpunit-watcher": "^1.23",
         "vimeo/psalm": "^4.8|^5.8",
diff --git a/src/ActiveRecordInterface.php b/src/ActiveRecordInterface.php
@@ -9,6 +9,7 @@
 use Yiisoft\Db\Exception\Exception;
 use Yiisoft\Db\Exception\InvalidArgumentException;
 use Yiisoft\Db\Exception\InvalidConfigException;
+use Yiisoft\Db\Exception\NotSupportedException;
 use Yiisoft\Db\Exception\StaleObjectException;
 
 interface ActiveRecordInterface
@@ -36,7 +37,7 @@ public function attributes(): array;
      *
      * @return false|int The number of rows deleted, or `false` if the deletion is unsuccessful for some reason.
      *
-     * Note that it is possible the number of rows deleted is 0, even though the deletion execution is successful.
+     * Note that it's possible the number of rows deleted is 0, even though the deletion execution is successful.
      */
     public function delete(): false|int;
 
@@ -50,7 +51,7 @@ public function delete(): false|int;
      * $customer->deleteAll('status = 3');
      * ```
      *
-     * > Warning: If you do not specify any condition, this method will delete **all** rows in the table.
+     * > Warning: If you don't specify any condition, this method will delete **all** rows in the table.
      *
      * ```php
      * $customerQuery = new ActiveQuery(Customer::class, $this->db);
@@ -77,7 +78,7 @@ public function deleteAll(array $condition = []): int;
      * Returns a value indicating whether the given active record is the same as the current one.
      *
      * The comparison is made by comparing the table names and the primary key values of the two active records. If one
-     * of the records {@see isNewRecord|is new} they are also considered not equal.
+     * of the records {@see isNewRecord|is new} they're also considered not equal.
      *
      * @param self $record Record to compare to.
      *
@@ -94,7 +95,7 @@ public function equals(self $record): bool;
     public function fields(): array;
 
     /**
-     * Filters array condition before it is assigned to a Query filter.
+     * Filters array condition before it's assigned to a Query filter.
      *
      * This method will ensure that an array condition only filters on existing table columns.
      *
@@ -110,7 +111,7 @@ public function fields(): array;
     public function filterCondition(array $condition, array $aliases = []): array;
 
     /**
-     * Returns table aliases which are not the same as the name of the tables.
+     * Returns table aliases which aren't the same as the name of the tables.
      *
      * @throws InvalidArgumentException
      * @throws InvalidConfigException
@@ -120,16 +121,31 @@ public function filterValidAliases(ActiveQuery $query): array;
     /**
      * Returns the named attribute value.
      *
-     * If this record is the result of a query and the attribute is not loaded, `null` will be returned.
+     * If this record is the result of a query and the attribute isn't loaded, `null` will be returned.
      *
      * @param string $name The attribute name.
      *
-     * @return mixed The attribute value. `null` if the attribute is not set or does not exist.
+     * @return mixed The attribute value. `null` if the attribute isn't set or doesn't exist.
      *
      * {@see hasAttribute()}
      */
     public function getAttribute(string $name): mixed;
 
+    /**
+     * Returns attribute values.
+     *
+     * @param array|null $names List of attributes whose value needs to be returned. Defaults to null, meaning all
+     * attributes listed in {@see attributes()} will be returned.
+     * If it's an array, only the attributes in the array will be returned.
+     * @param array $except List of attributes whose value shouldn't be returned.
+     *
+     * @throws InvalidConfigException
+     * @throws Exception
+     *
+     * @return array Attribute values (name => value).
+     */
+    public function getAttributes(array $names = null, array $except = []): array;
+
     /**
      * Returns a value indicating whether the current record is new (not saved in the database).
      *
@@ -140,14 +156,14 @@ public function getIsNewRecord(): bool;
     /**
      * Returns the old primary key value(s).
      *
-     * This refers to the primary key value that is populated into the record after executing a find method (e.g.
+     * This refers to the primary key value that's populated into the record after executing a find method (for example
      * findOne()).
      *
      * The value remains unchanged even if the primary key attribute is manually assigned with a different value.
      *
      * @param bool $asArray Whether to return the primary key value as an array. If true, the return value will be an
      * array with column name as key and column value as value. If this is `false` (default), a scalar value will be
-     * returned for non-composite primary key.
+     * returned for a non-composite primary key.
      *
      * @return mixed The old primary key value. An array (column name => column value) is returned if the primary key
      * is composite or `$asArray` is true. A string is returned otherwise (`null` will be returned if the key value is
@@ -174,9 +190,9 @@ public function getPrimaryKey(bool $asArray = false): mixed;
      * A relation is defined by a getter method which returns an object implementing the {@see ActiveQueryInterface}
      * (normally this would be a relational {@see ActiveQuery} object).
      *
-     * @param string $name The relation name, e.g. `orders` for a relation defined via `getOrders()` method
+     * @param string $name The relation name, for example `orders` for a relation defined via `getOrders()` method
      * (case-sensitive).
-     * @param bool $throwException Whether to throw exception if the relation does not exist.
+     * @param bool $throwException Whether to throw exception if the relation doesn't exist.
      *
      * @return ActiveQueryInterface|null The relational query object.
      */
@@ -210,9 +226,9 @@ public function hasAttribute(string $name): bool;
     /**
      * Inserts a row into the associated database table using the attribute values of this record.
      *
-     * Only the {@see dirtyAttributes|changed attribute values} will be inserted into database.
+     * Only the {@see dirtyAttributes|changed attribute values} will be inserted into a database.
      *
-     * If the table's primary key is auto-incremental and is `null` during insertion, it will be populated with the
+     * If the table's primary key is auto incremental and is `null` during insertion, it will be populated with the
      * actual value after insertion.
      *
      * For example, to insert a customer record:
@@ -246,7 +262,7 @@ public function isPrimaryKey(array $keys): bool;
     /**
      * Check whether the named relation has been populated with records.
      *
-     * @param string $name The relation name, e.g. `orders` for a relation defined via `getOrders()` method
+     * @param string $name The relation name, for example `orders` for a relation defined via `getOrders()` method
      * (case-sensitive).
      *
      * @return bool Whether relation has been populated with records.
@@ -261,18 +277,18 @@ public function isRelationPopulated(string $name): bool;
      * The relationship is established by setting the foreign key value(s) in one record to be the corresponding primary
      * key value(s) in the other record.
      *
-     * The record with the foreign key will be saved into database without performing validation.
+     * The record with the foreign key will be saved into a database without performing validation.
      *
      * If the relationship involves a junction table, a new row will be inserted into the junction table which contains
      * the primary key values from both records.
      *
-     * This method requires that the primary key value is not `null`.
+     * This method requires that the primary key value isn't `null`.
      *
-     * @param string $name The case-sensitive name of the relationship, e.g. `orders` for a relation defined via
+     * @param string $name The case-sensitive name of the relationship, for example `orders` for a relation defined via
      * `getOrders()` method.
      * @param self $arClass The record to be linked with the current one.
-     * @param array $extraColumns Additional column values to be saved into the junction table. This parameter is only
-     * meaningful for a relationship involving a junction table (i.e., a relation set with
+     * @param array $extraColumns More column values to be saved into the junction table. This parameter is only
+     * meaningful for a relationship involving a junction table (that's a relation set with
      * {@see ActiveQueryInterface::via()}).
      */
     public function link(string $name, self $arClass, array $extraColumns = []): void;
@@ -282,7 +298,7 @@ public function link(string $name, self $arClass, array $extraColumns = []): voi
      *
      * This method is required by the SPL interface {@see ArrayAccess}.
      *
-     * It is implicitly called when you use something like `$value = $model[$offset];`.
+     * It's implicitly called when you use something like `$value = $model[$offset];`.
      *
      * @param mixed $offset the offset to retrieve element.
      *
@@ -293,9 +309,9 @@ public function offsetGet(mixed $offset): mixed;
     /**
      * Populates the named relation with the related records.
      *
-     * Note that this method does not check if the relation exists or not.
+     * Note that this method doesn't check if the relation exists or not.
      *
-     * @param string $name The relation name, e.g. `orders` for a relation defined via `getOrders()` method
+     * @param string $name The relation name, for example `orders` for a relation defined via `getOrders()` method
      * (case-sensitive).
      * @param array|self|null $records The related records to be populated into the relation.
      */
@@ -304,13 +320,13 @@ public function populateRelation(string $name, array|self|null $records): void;
     /**
      * Returns the primary key name(s) for this AR class.
      *
-     * The default implementation will return the primary key(s) as declared in the DB table that is associated with
+     * The default implementation will return the primary key(s) as declared in the DB table that's associated with
      * this AR class.
      *
-     * If the DB table does not declare any primary key, you should override this method to return the attributes that
+     * If the DB table doesn't declare any primary key, you should override this method to return the attributes that
      * you want to use as primary keys for this AR class.
      *
-     * Note that an array should be returned even for a table with single primary key.
+     * Note that an array should be returned even for a table with a single primary key.
      *
      * @throws Exception
      * @throws InvalidConfigException
@@ -337,7 +353,7 @@ public function primaryKey(): array;
      * @param array|null $attributeNames List of attribute names that need to be saved. Defaults to `null`,
      * meaning all attributes that are loaded from DB will be saved.
      *
-     * @return bool Whether the saving succeeded (i.e. no validation errors occurred).
+     * @return bool Whether the saving succeeded (that's no validation errors occurred).
      */
     public function save(array $attributeNames = null): bool;
 
@@ -347,14 +363,14 @@ public function save(array $attributeNames = null): bool;
      * @param string $name The attribute name.
      * @param mixed $value The attribute value.
      *
-     * @throws InvalidArgumentException If the named attribute does not exist.
+     * @throws InvalidArgumentException If the named attribute doesn't exist.
      */
     public function setAttribute(string $name, mixed $value): void;
 
     /**
      * Saves the changes to this active record into the associated database table.
      *
-     * Only the {@see dirtyAttributes|changed attribute values} will be saved into database.
+     * Only the {@see dirtyAttributes|changed attribute values} will be saved into a database.
      *
      * For example, to update a customer record:
      *
@@ -365,8 +381,9 @@ public function setAttribute(string $name, mixed $value): void;
      * $customer->update();
      * ```
      *
-     * Note that it is possible the update does not affect any row in the table. In this case, this method will return
-     * 0. For this reason, you should use the following code to check if update() is successful or not:
+     * Note that it's possible the update doesn't affect any row in the table.
+     * In this case, this method will return 0.
+     * For this reason, you should use the following code to check if update() is successful or not:
      *
      * ```php
      * if ($customer->update() !== false) {
@@ -398,7 +415,7 @@ public function update(array $attributeNames = null): false|int;
      * $customer->updateAll(['status' => 1], 'status = 2');
      * ```
      *
-     * > Warning: If you do not specify any condition, this method will update **all** rows in the table.
+     * > Warning: If you don't specify any condition, this method will update **all** rows in the table.
      *
      * ```php
      * $customerQuery = new ActiveQuery(Customer::class, $db);
@@ -417,21 +434,43 @@ public function update(array $attributeNames = null): false|int;
      * @param array $params The parameters (name => value) to be bound to the query.
      *
      * @throws InvalidConfigException
-     * @throws Throwable if the models cannot be unlinked.
+     * @throws Throwable if the models can't be unlinked.
      * @throws Exception
      *
      * @return int The number of rows updated.
      */
     public function updateAll(array $attributes, array|string $condition = [], array $params = []): int;
 
+    /**
+     * Updates the specified attributes.
+     *
+     * This method is a shortcut to {@see update()} when data validation isn't needed and only a small set attributes
+     * need to be updated.
+     *
+     * You may specify the attributes to be updated as name list or name-value pairs.
+     * If the latter, the corresponding attribute values will be modified so.
+     *
+     * The method will then save the specified attributes into a database.
+     *
+     * Note that this method will **not** perform data validation and will **not** trigger events.
+     *
+     * @param array $attributes The attributes (names or name-value pairs) to be updated.
+     *
+     * @throws Exception
+     * @throws NotSupportedException
+     *
+     * @return int The number of rows affected.
+     */
+    public function updateAttributes(array $attributes): int;
+
     /**
      * Destroys the relationship between two records.
      *
      * The record with the foreign key of the relationship will be deleted if `$delete` is true.
      *
      * Otherwise, the foreign key will be set `null` and the record will be saved without validation.
      *
-     * @param string $name The case-sensitive name of the relationship, e.g. `orders` for a relation defined via
+     * @param string $name The case-sensitive name of the relationship, for example `orders` for a relation defined via
      * `getOrders()` method.
      * @param self $arClass The active record to be unlinked from the current one.
      * @param bool $delete Whether to delete the active record that contains the foreign key.
@@ -451,7 +490,8 @@ public function getOldAttributes(): array;
      * Populates an active record object using a row of data from the database/storage.
      *
      * This is an internal method meant to be called to create active record objects after fetching data from the
-     * database. It is mainly used by {@see ActiveQuery} to populate the query results into active records.
+     * database.
+     * It's mainly used by {@see ActiveQuery} to populate the query results into active records.
      *
      * @param array|object $row Attribute values (name => value).
      *
@@ -461,7 +501,7 @@ public function getOldAttributes(): array;
     public function populateRecord(array|object $row): void;
 
     /**
-     * Serializes the active record into its array implementation with attribute name as key and it value as... value.
+     * Serializes the active record into its array implementation with attribute name as a key, and it values as value.
      */
     public function toArray(): array;
 }
diff --git a/src/BaseActiveRecord.php b/src/BaseActiveRecord.php
@@ -129,16 +129,6 @@ public function getAttribute(string $name): mixed
         return $this->attributes[$name] ?? null;
     }
 
-    /**
-     * Returns attribute values.
-     *
-     * @param array|null $names List of attributes whose value needs to be returned. Defaults to null, meaning all
-     * attributes listed in {@see attributes()} will be returned. If it is an array, only the attributes in the array
-     * will be returned.
-     * @param array $except List of attributes whose value should NOT be returned.
-     *
-     * @return array Attribute values (name => value).
-     */
     public function getAttributes(array $names = null, array $except = []): array
     {
         $values = [];
@@ -236,6 +226,10 @@ public function getOldAttributes(): array
         return $this->oldAttributes ?? [];
     }
 
+    /**
+     * @throws InvalidConfigException
+     * @throws Exception
+     */
     public function getOldPrimaryKey(bool $asArray = false): array|string|null
     {
         $keys = $this->primaryKey();
@@ -751,26 +745,6 @@ public function updateAll(array $attributes, array|string $condition = [], array
         return $command->execute();
     }
 
-    /**
-     * Updates the specified attributes.
-     *
-     * This method is a shortcut to {@see update()} when data validation is not needed and only a small set attributes
-     * need to be updated.
-     *
-     * You may specify the attributes to be updated as name list or name-value pairs. If the latter, the corresponding
-     * attribute values will be modified accordingly.
-     *
-     * The method will then save the specified attributes into database.
-     *
-     * Note that this method will **not** perform data validation and will **not** trigger events.
-     *
-     * @param array $attributes The attributes (names or name-value pairs) to be updated.
-     *
-     * @throws Exception
-     * @throws NotSupportedException
-     *
-     * @return int The number of rows affected.
-     */
     public function updateAttributes(array $attributes): int
     {
         $attrs = [];

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`use Yiisoft\Db\Exception\Exception;`
`10`	`10`	`use Yiisoft\Db\Exception\InvalidArgumentException;`
`11`	`11`	`use Yiisoft\Db\Exception\InvalidConfigException;`
	`12`	`+use Yiisoft\Db\Exception\NotSupportedException;`
`12`	`13`	`use Yiisoft\Db\Exception\StaleObjectException;`
`13`	`14`
`14`	`15`	`interface ActiveRecordInterface`
`@@ -36,7 +37,7 @@ public function attributes(): array;`
`36`	`37`	`*`
`37`	`38`	* @return false\|int The number of rows deleted, or `false` if the deletion is unsuccessful for some reason.
`38`	`39`	`*`
`39`		`- * Note that it is possible the number of rows deleted is 0, even though the deletion execution is successful.`
	`40`	`+ * Note that it's possible the number of rows deleted is 0, even though the deletion execution is successful.`
`40`	`41`	`*/`
`41`	`42`	`public function delete(): false\|int;`
`42`	`43`
`@@ -50,7 +51,7 @@ public function delete(): false\|int;`
`50`	`51`	`* $customer->deleteAll('status = 3');`
`51`	`52`	* ```
`52`	`53`	`*`
`53`		`- * > Warning: If you do not specify any condition, this method will delete all rows in the table.`
	`54`	`+ * > Warning: If you don't specify any condition, this method will delete all rows in the table.`
`54`	`55`	`*`
`55`	`56`	* ```php
`56`	`57`	`* $customerQuery = new ActiveQuery(Customer::class, $this->db);`
`@@ -77,7 +78,7 @@ public function deleteAll(array $condition = []): int;`
`77`	`78`	`* Returns a value indicating whether the given active record is the same as the current one.`
`78`	`79`	`*`
`79`	`80`	`* The comparison is made by comparing the table names and the primary key values of the two active records. If one`
`80`		`- * of the records {@see isNewRecord\|is new} they are also considered not equal.`
	`81`	`+ * of the records {@see isNewRecord\|is new} they're also considered not equal.`
`81`	`82`	`*`
`82`	`83`	`* @param self $record Record to compare to.`
`83`	`84`	`*`
`@@ -94,7 +95,7 @@ public function equals(self $record): bool;`
`94`	`95`	`public function fields(): array;`
`95`	`96`
`96`	`97`	`/**`
`97`		`- * Filters array condition before it is assigned to a Query filter.`
	`98`	`+ * Filters array condition before it's assigned to a Query filter.`
`98`	`99`	`*`
`99`	`100`	`* This method will ensure that an array condition only filters on existing table columns.`
`100`	`101`	`*`
`@@ -110,7 +111,7 @@ public function fields(): array;`
`110`	`111`	`public function filterCondition(array $condition, array $aliases = []): array;`
`111`	`112`
`112`	`113`	`/**`
`113`		`- * Returns table aliases which are not the same as the name of the tables.`
	`114`	`+ * Returns table aliases which aren't the same as the name of the tables.`
`114`	`115`	`*`
`115`	`116`	`* @throws InvalidArgumentException`
`116`	`117`	`* @throws InvalidConfigException`
`@@ -120,16 +121,31 @@ public function filterValidAliases(ActiveQuery $query): array;`
`120`	`121`	`/**`
`121`	`122`	`* Returns the named attribute value.`
`122`	`123`	`*`
`123`		- * If this record is the result of a query and the attribute is not loaded, `null` will be returned.
	`124`	+ * If this record is the result of a query and the attribute isn't loaded, `null` will be returned.
`124`	`125`	`*`
`125`	`126`	`* @param string $name The attribute name.`
`126`	`127`	`*`
`127`		- * @return mixed The attribute value. `null` if the attribute is not set or does not exist.
	`128`	+ * @return mixed The attribute value. `null` if the attribute isn't set or doesn't exist.
`128`	`129`	`*`
`129`	`130`	`* {@see hasAttribute()}`
`130`	`131`	`*/`
`131`	`132`	`public function getAttribute(string $name): mixed;`
`132`	`133`
	`134`	`+ /**`
	`135`	`+ * Returns attribute values.`
	`136`	`+ *`
	`137`	`+ * @param array\|null $names List of attributes whose value needs to be returned. Defaults to null, meaning all`
	`138`	`+ * attributes listed in {@see attributes()} will be returned.`
	`139`	`+ * If it's an array, only the attributes in the array will be returned.`
	`140`	`+ * @param array $except List of attributes whose value shouldn't be returned.`
	`141`	`+ *`
	`142`	`+ * @throws InvalidConfigException`
	`143`	`+ * @throws Exception`
	`144`	`+ *`
	`145`	`+ * @return array Attribute values (name => value).`
	`146`	`+ */`
	`147`	`+ public function getAttributes(array $names = null, array $except = []): array;`
	`148`	`+`
`133`	`149`	`/**`
`134`	`150`	`* Returns a value indicating whether the current record is new (not saved in the database).`
`135`	`151`	`*`
`@@ -140,14 +156,14 @@ public function getIsNewRecord(): bool;`
`140`	`156`	`/**`
`141`	`157`	`* Returns the old primary key value(s).`
`142`	`158`	`*`
`143`		`- * This refers to the primary key value that is populated into the record after executing a find method (e.g.`
	`159`	`+ * This refers to the primary key value that's populated into the record after executing a find method (for example`
`144`	`160`	`* findOne()).`
`145`	`161`	`*`
`146`	`162`	`* The value remains unchanged even if the primary key attribute is manually assigned with a different value.`
`147`	`163`	`*`
`148`	`164`	`* @param bool $asArray Whether to return the primary key value as an array. If true, the return value will be an`
`149`	`165`	* array with column name as key and column value as value. If this is `false` (default), a scalar value will be
`150`		`- * returned for non-composite primary key.`
	`166`	`+ * returned for a non-composite primary key.`
`151`	`167`	`*`
`152`	`168`	`* @return mixed The old primary key value. An array (column name => column value) is returned if the primary key`
`153`	`169`	* is composite or `$asArray` is true. A string is returned otherwise (`null` will be returned if the key value is
`@@ -174,9 +190,9 @@ public function getPrimaryKey(bool $asArray = false): mixed;`
`174`	`190`	`* A relation is defined by a getter method which returns an object implementing the {@see ActiveQueryInterface}`
`175`	`191`	`* (normally this would be a relational {@see ActiveQuery} object).`
`176`	`192`	`*`
`177`		- * @param string $name The relation name, e.g. `orders` for a relation defined via `getOrders()` method
	`193`	+ * @param string $name The relation name, for example `orders` for a relation defined via `getOrders()` method
`178`	`194`	`* (case-sensitive).`
`179`		`- * @param bool $throwException Whether to throw exception if the relation does not exist.`
	`195`	`+ * @param bool $throwException Whether to throw exception if the relation doesn't exist.`
`180`	`196`	`*`
`181`	`197`	`* @return ActiveQueryInterface\|null The relational query object.`
`182`	`198`	`*/`
`@@ -210,9 +226,9 @@ public function hasAttribute(string $name): bool;`
`210`	`226`	`/**`
`211`	`227`	`* Inserts a row into the associated database table using the attribute values of this record.`
`212`	`228`	`*`
`213`		`- * Only the {@see dirtyAttributes\|changed attribute values} will be inserted into database.`
	`229`	`+ * Only the {@see dirtyAttributes\|changed attribute values} will be inserted into a database.`
`214`	`230`	`*`
`215`		- * If the table's primary key is auto-incremental and is `null` during insertion, it will be populated with the
	`231`	+ * If the table's primary key is auto incremental and is `null` during insertion, it will be populated with the
`216`	`232`	`* actual value after insertion.`
`217`	`233`	`*`
`218`	`234`	`* For example, to insert a customer record:`
`@@ -246,7 +262,7 @@ public function isPrimaryKey(array $keys): bool;`
`246`	`262`	`/**`
`247`	`263`	`* Check whether the named relation has been populated with records.`
`248`	`264`	`*`
`249`		- * @param string $name The relation name, e.g. `orders` for a relation defined via `getOrders()` method
	`265`	+ * @param string $name The relation name, for example `orders` for a relation defined via `getOrders()` method
`250`	`266`	`* (case-sensitive).`
`251`	`267`	`*`
`252`	`268`	`* @return bool Whether relation has been populated with records.`
`@@ -261,18 +277,18 @@ public function isRelationPopulated(string $name): bool;`
`261`	`277`	`* The relationship is established by setting the foreign key value(s) in one record to be the corresponding primary`
`262`	`278`	`* key value(s) in the other record.`
`263`	`279`	`*`
`264`		`- * The record with the foreign key will be saved into database without performing validation.`
	`280`	`+ * The record with the foreign key will be saved into a database without performing validation.`
`265`	`281`	`*`
`266`	`282`	`* If the relationship involves a junction table, a new row will be inserted into the junction table which contains`
`267`	`283`	`* the primary key values from both records.`
`268`	`284`	`*`
`269`		- * This method requires that the primary key value is not `null`.
	`285`	+ * This method requires that the primary key value isn't `null`.
`270`	`286`	`*`
`271`		- * @param string $name The case-sensitive name of the relationship, e.g. `orders` for a relation defined via
	`287`	+ * @param string $name The case-sensitive name of the relationship, for example `orders` for a relation defined via
`272`	`288`	* `getOrders()` method.
`273`	`289`	`* @param self $arClass The record to be linked with the current one.`
`274`		`- * @param array $extraColumns Additional column values to be saved into the junction table. This parameter is only`
`275`		`- * meaningful for a relationship involving a junction table (i.e., a relation set with`
	`290`	`+ * @param array $extraColumns More column values to be saved into the junction table. This parameter is only`
	`291`	`+ * meaningful for a relationship involving a junction table (that's a relation set with`
`276`	`292`	`* {@see ActiveQueryInterface::via()}).`
`277`	`293`	`*/`
`278`	`294`	`public function link(string $name, self $arClass, array $extraColumns = []): void;`
`@@ -282,7 +298,7 @@ public function link(string $name, self $arClass, array $extraColumns = []): voi`
`282`	`298`	`*`
`283`	`299`	`* This method is required by the SPL interface {@see ArrayAccess}.`
`284`	`300`	`*`
`285`		- * It is implicitly called when you use something like `$value = $model[$offset];`.
	`301`	+ * It's implicitly called when you use something like `$value = $model[$offset];`.
`286`	`302`	`*`
`287`	`303`	`* @param mixed $offset the offset to retrieve element.`
`288`	`304`	`*`
`@@ -293,9 +309,9 @@ public function offsetGet(mixed $offset): mixed;`
`293`	`309`	`/**`
`294`	`310`	`* Populates the named relation with the related records.`
`295`	`311`	`*`
`296`		`- * Note that this method does not check if the relation exists or not.`
	`312`	`+ * Note that this method doesn't check if the relation exists or not.`
`297`	`313`	`*`
`298`		- * @param string $name The relation name, e.g. `orders` for a relation defined via `getOrders()` method
	`314`	+ * @param string $name The relation name, for example `orders` for a relation defined via `getOrders()` method
`299`	`315`	`* (case-sensitive).`
`300`	`316`	`* @param array\|self\|null $records The related records to be populated into the relation.`
`301`	`317`	`*/`
`@@ -304,13 +320,13 @@ public function populateRelation(string $name, array\|self\|null $records): void;`
`304`	`320`	`/**`
`305`	`321`	`* Returns the primary key name(s) for this AR class.`
`306`	`322`	`*`
`307`		`- * The default implementation will return the primary key(s) as declared in the DB table that is associated with`
	`323`	`+ * The default implementation will return the primary key(s) as declared in the DB table that's associated with`
`308`	`324`	`* this AR class.`
`309`	`325`	`*`
`310`		`- * If the DB table does not declare any primary key, you should override this method to return the attributes that`
	`326`	`+ * If the DB table doesn't declare any primary key, you should override this method to return the attributes that`
`311`	`327`	`* you want to use as primary keys for this AR class.`
`312`	`328`	`*`
`313`		`- * Note that an array should be returned even for a table with single primary key.`
	`329`	`+ * Note that an array should be returned even for a table with a single primary key.`
`314`	`330`	`*`
`315`	`331`	`* @throws Exception`
`316`	`332`	`* @throws InvalidConfigException`
`@@ -337,7 +353,7 @@ public function primaryKey(): array;`
`337`	`353`	* @param array\|null $attributeNames List of attribute names that need to be saved. Defaults to `null`,
`338`	`354`	`* meaning all attributes that are loaded from DB will be saved.`
`339`	`355`	`*`
`340`		`- * @return bool Whether the saving succeeded (i.e. no validation errors occurred).`
	`356`	`+ * @return bool Whether the saving succeeded (that's no validation errors occurred).`
`341`	`357`	`*/`
`342`	`358`	`public function save(array $attributeNames = null): bool;`
`343`	`359`
`@@ -347,14 +363,14 @@ public function save(array $attributeNames = null): bool;`
`347`	`363`	`* @param string $name The attribute name.`
`348`	`364`	`* @param mixed $value The attribute value.`
`349`	`365`	`*`
`350`		`- * @throws InvalidArgumentException If the named attribute does not exist.`
	`366`	`+ * @throws InvalidArgumentException If the named attribute doesn't exist.`
`351`	`367`	`*/`
`352`	`368`	`public function setAttribute(string $name, mixed $value): void;`
`353`	`369`
`354`	`370`	`/**`
`355`	`371`	`* Saves the changes to this active record into the associated database table.`
`356`	`372`	`*`
`357`		`- * Only the {@see dirtyAttributes\|changed attribute values} will be saved into database.`
	`373`	`+ * Only the {@see dirtyAttributes\|changed attribute values} will be saved into a database.`
`358`	`374`	`*`
`359`	`375`	`* For example, to update a customer record:`
`360`	`376`	`*`
`@@ -365,8 +381,9 @@ public function setAttribute(string $name, mixed $value): void;`
`365`	`381`	`* $customer->update();`
`366`	`382`	* ```
`367`	`383`	`*`
`368`		`- * Note that it is possible the update does not affect any row in the table. In this case, this method will return`
`369`		`- * 0. For this reason, you should use the following code to check if update() is successful or not:`
	`384`	`+ * Note that it's possible the update doesn't affect any row in the table.`
	`385`	`+ * In this case, this method will return 0.`
	`386`	`+ * For this reason, you should use the following code to check if update() is successful or not:`
`370`	`387`	`*`
`371`	`388`	* ```php
`372`	`389`	`* if ($customer->update() !== false) {`
`@@ -398,7 +415,7 @@ public function update(array $attributeNames = null): false\|int;`
`398`	`415`	`* $customer->updateAll(['status' => 1], 'status = 2');`
`399`	`416`	* ```
`400`	`417`	`*`
`401`		`- * > Warning: If you do not specify any condition, this method will update all rows in the table.`
	`418`	`+ * > Warning: If you don't specify any condition, this method will update all rows in the table.`
`402`	`419`	`*`
`403`	`420`	* ```php
`404`	`421`	`* $customerQuery = new ActiveQuery(Customer::class, $db);`
`@@ -417,21 +434,43 @@ public function update(array $attributeNames = null): false\|int;`
`417`	`434`	`* @param array $params The parameters (name => value) to be bound to the query.`
`418`	`435`	`*`
`419`	`436`	`* @throws InvalidConfigException`
`420`		`- * @throws Throwable if the models cannot be unlinked.`
	`437`	`+ * @throws Throwable if the models can't be unlinked.`
`421`	`438`	`* @throws Exception`
`422`	`439`	`*`
`423`	`440`	`* @return int The number of rows updated.`
`424`	`441`	`*/`
`425`	`442`	`public function updateAll(array $attributes, array\|string $condition = [], array $params = []): int;`
`426`	`443`
	`444`	`+ /**`
	`445`	`+ * Updates the specified attributes.`
	`446`	`+ *`
	`447`	`+ * This method is a shortcut to {@see update()} when data validation isn't needed and only a small set attributes`
	`448`	`+ * need to be updated.`
	`449`	`+ *`
	`450`	`+ * You may specify the attributes to be updated as name list or name-value pairs.`
	`451`	`+ * If the latter, the corresponding attribute values will be modified so.`
	`452`	`+ *`
	`453`	`+ * The method will then save the specified attributes into a database.`
	`454`	`+ *`
	`455`	`+ * Note that this method will not perform data validation and will not trigger events.`
	`456`	`+ *`
	`457`	`+ * @param array $attributes The attributes (names or name-value pairs) to be updated.`
	`458`	`+ *`
	`459`	`+ * @throws Exception`
	`460`	`+ * @throws NotSupportedException`
	`461`	`+ *`
	`462`	`+ * @return int The number of rows affected.`
	`463`	`+ */`
	`464`	`+ public function updateAttributes(array $attributes): int;`
	`465`	`+`
`427`	`466`	`/**`
`428`	`467`	`* Destroys the relationship between two records.`
`429`	`468`	`*`
`430`	`469`	* The record with the foreign key of the relationship will be deleted if `$delete` is true.
`431`	`470`	`*`
`432`	`471`	* Otherwise, the foreign key will be set `null` and the record will be saved without validation.
`433`	`472`	`*`
`434`		- * @param string $name The case-sensitive name of the relationship, e.g. `orders` for a relation defined via
	`473`	+ * @param string $name The case-sensitive name of the relationship, for example `orders` for a relation defined via
`435`	`474`	* `getOrders()` method.
`436`	`475`	`* @param self $arClass The active record to be unlinked from the current one.`
`437`	`476`	`* @param bool $delete Whether to delete the active record that contains the foreign key.`
`@@ -451,7 +490,8 @@ public function getOldAttributes(): array;`
`451`	`490`	`* Populates an active record object using a row of data from the database/storage.`
`452`	`491`	`*`
`453`	`492`	`* This is an internal method meant to be called to create active record objects after fetching data from the`
`454`		`- * database. It is mainly used by {@see ActiveQuery} to populate the query results into active records.`
	`493`	`+ * database.`
	`494`	`+ * It's mainly used by {@see ActiveQuery} to populate the query results into active records.`
`455`	`495`	`*`
`456`	`496`	`* @param array\|object $row Attribute values (name => value).`
`457`	`497`	`*`
`@@ -461,7 +501,7 @@ public function getOldAttributes(): array;`
`461`	`501`	`public function populateRecord(array\|object $row): void;`
`462`	`502`
`463`	`503`	`/**`
`464`		`- * Serializes the active record into its array implementation with attribute name as key and it value as... value.`
	`504`	`+ * Serializes the active record into its array implementation with attribute name as a key, and it values as value.`
`465`	`505`	`*/`
`466`	`506`	`public function toArray(): array;`
`467`	`507`	`}`