Merge remote-tracking branch 'origin/remove-onepopulate-allpopulate' …

…into remove-onepopulate-allpopulate

# Conflicts:
#	src/ActiveQueryInterface.php

src/ActiveQueryInterface.php

@@ -30,13 +30,13 @@ interface ActiveQueryInterface extends QueryInterface
     /**
      * @inheritdoc
      *
-     * @return array[]|ActiveRecordInterface[] All rows of the query result. Each array element is an `array` or
-     * instance of {@see ActiveRecordInterface} representing a row of data, depends on {@see isAsArray()} result.
-     * Empty array if the query results in nothing.
-     *
      * @throws Exception
      * @throws InvalidConfigException
      * @throws Throwable
+     *
+     * @return array[]|ActiveRecordInterface[] All rows of the query result. Each array element is an `array` or
+     * instance of {@see ActiveRecordInterface} representing a row of data, depends on {@see isAsArray()} result.
+     * Empty array if the query results in nothing.
      */
     public function all(): array;
 
@@ -609,15 +609,15 @@ public function getMultiple(): bool;
     /**
      * @inheritdoc
      *
-     * @return array|ActiveRecordInterface|null The first row as an `array` or instance of {@see ActiveRecordInterface}
-     * of the query result, depends on {@see isAsArray()} result. `null` if the query results in nothing.
-     *
      * @throws Exception
      * @throws InvalidArgumentException
      * @throws InvalidConfigException
      * @throws NotSupportedException
      * @throws ReflectionException
      * @throws Throwable
+     *
+     * @return array|ActiveRecordInterface|null The first row as an `array` or instance of {@see ActiveRecordInterface}
+     * of the query result, depends on {@see isAsArray()} result. `null` if the query results in nothing.
      */
     public function one(): array|ActiveRecordInterface|null;
 }