Fix some legacy tests

Author: riasvdv

src/Database/Queries/Concerns/QueriesNestedElements.php

@@ -116,12 +116,12 @@ function (JoinClause $join) {
             $allowOwnerRevisions = $elementQuery->allowOwnerRevisions ?? ($elementQuery->id || $elementQuery->primaryOwnerId || $elementQuery->ownerId);
 
             if (! $allowOwnerDrafts || ! $allowOwnerRevisions) {
-                $this->subQuery->join(
+                $elementQuery->subQuery->join(
                     new Alias(Table::ELEMENTS, 'owners'),
                     fn (JoinClause $join) => $join->when(
                         $elementQuery->ownerId,
                         fn (JoinClause $join) => $join->on('owners.id', '=', 'elements_owners.ownerId'),
-                        fn (JoinClause $join) => $join->on('owners.id', '=', $this->getPrimaryOwnerIdColumn()),
+                        fn (JoinClause $join) => $join->on('owners.id', '=', $elementQuery->getPrimaryOwnerIdColumn()),
                     )
                 );
 
@@ -134,7 +134,7 @@ function (JoinClause $join) {
                 }
             }
 
-            $this->defaultOrderBy = ['elements_owners.sortOrder' => SORT_ASC];
+            $elementQuery->defaultOrderBy = ['elements_owners.sortOrder' => SORT_ASC];
         });
     }
 
@@ -381,19 +381,19 @@ protected function cacheTags(): array
         $tags = [];
 
         if ($this->fieldId) {
-            foreach ($this->fieldId as $fieldId) {
+            foreach (Arr::wrap($this->fieldId) as $fieldId) {
                 $tags[] = "field:$fieldId";
             }
         }
 
         if ($this->primaryOwnerId) {
-            foreach ($this->primaryOwnerId as $ownerId) {
+            foreach (Arr::wrap($this->primaryOwnerId) as $ownerId) {
                 $tags[] = "element::$ownerId";
             }
         }
 
         if ($this->ownerId) {
-            foreach ($this->ownerId as $ownerId) {
+            foreach (Arr::wrap($this->ownerId) as $ownerId) {
                 $tags[] = "element::$ownerId";
             }
         }

yii2-adapter/legacy/elements/NestedElementManager.php

@@ -20,6 +20,7 @@
 use craft\events\DuplicateNestedElementsEvent;
 use craft\helpers\Cp;
 use craft\helpers\ElementHelper;
+use CraftCms\Cms\Database\Queries\ElementQuery;
 use CraftCms\Cms\Database\Table;
 use CraftCms\Cms\Element\Drafts;
 use CraftCms\Cms\Element\Enums\PropagationMethod;
@@ -174,12 +175,12 @@ public function getIsTranslatable(?ElementInterface $owner = null): bool
         return $this->propagationMethod !== PropagationMethod::All;
     }
 
-    private function nestedElementQuery(ElementInterface $owner): ElementQueryInterface
+    private function nestedElementQuery(ElementInterface $owner): ElementQueryInterface|ElementQuery
     {
         return call_user_func($this->queryFactory, $owner);
     }
 
-    private function getValue(ElementInterface $owner, bool $fetchAll = false): ElementQueryInterface|ElementCollection
+    private function getValue(ElementInterface $owner, bool $fetchAll = false): ElementQueryInterface|ElementQuery|ElementCollection
     {
         if (isset($this->valueGetter)) {
             return call_user_func($this->valueGetter, $owner, $fetchAll);
@@ -211,7 +212,7 @@ private function getValue(ElementInterface $owner, bool $fetchAll = false): Elem
         return $query;
     }
 
-    private function setValue(ElementInterface $owner, ElementQueryInterface|ElementCollection $value): void
+    private function setValue(ElementInterface $owner, ElementQueryInterface|ElementQuery|ElementCollection $value): void
     {
         if ($this->valueSetter === false) {
             return;