diff --git a/src/ActiveQueryInterface.php b/src/ActiveQueryInterface.php index 90c6d4c47..094ee5156 100644 --- a/src/ActiveQueryInterface.php +++ b/src/ActiveQueryInterface.php @@ -636,11 +636,10 @@ public function one(): array|ActiveRecordInterface|null; * @param string $name The relation name. * @param ActiveRecordInterface[]|array[] $primaryModels Primary models. * - * @return ActiveRecordInterface[]|array[] The related models. - * * @throws Exception * @throws InvalidArgumentException|InvalidConfigException|NotSupportedException|Throwable If {@see link()} is * invalid. + * @return ActiveRecordInterface[]|array[] The related models. */ public function populateRelation(string $name, array &$primaryModels): array; } diff --git a/src/ActiveQueryTrait.php b/src/ActiveQueryTrait.php index 6eb492eb4..32880b4b7 100644 --- a/src/ActiveQueryTrait.php +++ b/src/ActiveQueryTrait.php @@ -105,9 +105,8 @@ public function with(array|string ...$with): static * * @param array[] $rows The rows to be converted. * - * @return ActiveRecordInterface[]|array[] The model instances. - * * @throws InvalidConfigException + * @return ActiveRecordInterface[]|array[] The model instances. */ protected function createModels(array $rows): array { diff --git a/src/ActiveRelationTrait.php b/src/ActiveRelationTrait.php index 5bc60d7ca..ac5065e81 100644 --- a/src/ActiveRelationTrait.php +++ b/src/ActiveRelationTrait.php @@ -59,7 +59,7 @@ trait ActiveRelationTrait */ private string|null $inverseOf = null; /** - * @var array|ActiveQueryInterface|null the relation associated with the junction table. + * @var ActiveQueryInterface|array|null the relation associated with the junction table. * @psalm-var array{string, ActiveQueryInterface, bool}|ActiveQueryInterface|null */ private array|ActiveQueryInterface|null $via = null; @@ -636,11 +636,10 @@ private function getModelKeys(ActiveRecordInterface|array $model, array $propert /** * @param ActiveRecordInterface[]|array[] $primaryModels either array of AR instances or arrays. * - * @return array[] - * * @throws Exception * @throws Throwable * @throws \Yiisoft\Definitions\Exception\InvalidConfigException + * @return array[] */ private function findJunctionRows(array $primaryModels): array {