Address the lazy-load guard review

CHANGELOG.md

@@ -2,8 +2,7 @@
 
 ## 1.1.1 under development
 
-- Enh #590, #594: Add `LazyLoadGuardTrait` and `LazyLoadGuard` to detect N+1 queries
-  (@KalimeroMK)
+- Enh #590, #594, #596: Add `LazyLoadGuardTrait` and `LazyLoadGuard` to detect N+1 queries (@KalimeroMK)
 
 ## 1.1.0 May 14, 2026
 

src/ActiveQuery.php

@@ -321,7 +321,8 @@ public function populate(array $rows): array
 
         $models = $this->createModels($rows);
 
-        if (count($models) > 1) {
+        if (!$this->asArray && count($models) > 1) {
+            /** @var ActiveRecordInterface[] $models */
             LazyLoadGuard::registerResultSet($models);
         }
 

src/LazyLoadGuard.php

@@ -54,7 +54,7 @@ public static function set(LazyLoadGuardMode $mode, ?LoggerInterface $logger = n
      * the same result set, which is an N+1 query, from the same relation loaded by records that were each
      * fetched by a query of their own, which has nothing to eager load across.
      *
-     * @param ActiveRecordInterface[]|array[] $models The models populated from one result set.
+     * @param ActiveRecordInterface[] $models The models populated from one result set.
      *
      * @see ActiveQuery::populate()
      */
@@ -64,7 +64,7 @@ public static function registerResultSet(array $models): void
         $resultSet = null;
 
         foreach ($models as $model) {
-            if (!$model instanceof ActiveRecordInterface || !self::isGuarded($model::class)) {
+            if (!self::isGuarded($model::class)) {
                 continue;
             }
 
@@ -89,12 +89,10 @@ public static function check(ActiveRecordInterface $model, string $relationName)
 
         $resultSets = self::resultSets();
 
-        /**
-         * A record populated outside a result set is a result set of its own.
-         *
-         * @psalm-suppress PossiblyNullArgument
-         */
-        $resultSets[$model] ??= new LazyLoadResultSet();
+        // A record fetched by a query of its own has nothing to eager load across.
+        if (!isset($resultSets[$model])) {
+            return;
+        }
 
         /** @psalm-var LazyLoadResultSet $resultSet */
         $resultSet = $resultSets[$model];