Fix failed tests

Author: bancer

.github/workflows/ci.yml

@@ -36,8 +36,6 @@ jobs:
       matrix:
         include:
           # ORM 4 requires PHP >= 7.2
-          - { php: '7.2', orm: '4' }
-          - { php: '7.3', orm: '4' }
           - { php: '7.4', orm: '4' }
           - { php: '8.0', orm: '4' }
           - { php: '8.1', orm: '4' }

composer.json

@@ -3,7 +3,7 @@
     "description": "A small CakePHP ORM-based library for hydrating raw SQL query results into entity graphs.",
     "type": "library",
     "require": {
-        "php": ">=7.2.0",
+        "php": ">=7.4.0",
         "cakephp/database": "^4.0|^5.0",
         "cakephp/orm": "^4.0|^5.0"
     },

src/ORM/AutoHydratorRecursive.php

@@ -4,7 +4,6 @@
 
 namespace Bancer\NativeQueryMapper\ORM;
 
-use Cake\Database\StatementInterface;
 use Cake\Datasource\EntityInterface;
 use Cake\ORM\Table;
 use Cake\ORM\Entity;
@@ -141,7 +140,7 @@ public function hydrateMany(array $rows): array
         $results = [];
         $rootAlias = $this->rootTable->getAlias();
         foreach ($rows as $row) {
-            $tree = $this->buildEntityRecursive($this->rootTable, $row, $rootAlias);
+            $tree = $this->buildEntityRecursive($this->rootTable, $row);
             $root = $tree[$rootAlias];
             $key = $this->entityKey($root, $this->rootTable);
             if (!isset($results[$key])) {
@@ -156,14 +155,12 @@ public function hydrateMany(array $rows): array
     /**
      * @param Table $table
      * @param mixed[] $row
-     * @param string $expectedAlias
      * @param mixed[] $visited
      * @return \Cake\Datasource\EntityInterface[]
      */
     protected function buildEntityRecursive(
         Table $table,
         array $row,
-        string $expectedAlias,
         array &$visited = []
     ): array {
         $alias = $table->getAlias();
@@ -203,7 +200,7 @@ protected function buildEntityRecursive(
                 continue;
             }
             if ($assoc instanceof HasMany) {
-                $tree = $this->buildEntityRecursive($target, $row, $childAlias, $visited);
+                $tree = $this->buildEntityRecursive($target, $row, $visited);
                 if ($tree) {
                     $list = $entity->get($assoc->getProperty());
                     if (!is_array($list)) {
@@ -216,25 +213,25 @@ protected function buildEntityRecursive(
                 continue;
             }
             if ($assoc instanceof BelongsTo || $assoc instanceof HasOne) {
-                $tree = $this->buildEntityRecursive($target, $row, $childAlias, $visited);
+                $tree = $this->buildEntityRecursive($target, $row, $visited);
                 if ($tree) {
                     $entity->set($assoc->getProperty(), $tree[$childAlias]);
                     $out += $tree;
                 }
                 continue;
             }
             if ($assoc instanceof BelongsToMany) {
-                $junctionAlias = $assoc->getThrough();
-                if (is_object($junctionAlias)) {
-                    $junctionAlias = $junctionAlias->getAlias();
-                }
-                $tree = $this->buildEntityRecursive($target, $row, $childAlias, $visited);
+                $tree = $this->buildEntityRecursive($target, $row, $visited);
                 if ($tree) {
                     $child = $tree[$childAlias];
+                    $junctionAlias = $assoc->getThrough();
+                    if (is_object($junctionAlias)) {
+                        $junctionAlias = $junctionAlias->getAlias();
+                    }
                     // hydrate join data only if the row contains it
-                    if (isset($this->aliasMap[$junctionAlias])) {
+                    if ($junctionAlias !== null && isset($this->aliasMap[$junctionAlias])) {
                         $junctionTable = TableRegistry::getTableLocator()->get($junctionAlias);
-                        $jTree = $this->buildEntityRecursive($junctionTable, $row, $junctionAlias, $visited);
+                        $jTree = $this->buildEntityRecursive($junctionTable, $row, $visited);
                         if ($jTree) {
                             $child->set('_joinData', $jTree[$junctionAlias]);
                             $out += $jTree;
@@ -251,7 +248,7 @@ protected function buildEntityRecursive(
                 continue;
             }
             // fallback
-            $tree = $this->buildEntityRecursive($target, $row, $childAlias, $visited);
+            $tree = $this->buildEntityRecursive($target, $row, $visited);
             if ($tree) {
                 $entity->set($assoc->getProperty(), $tree[$childAlias]);
                 $out += $tree;

tests/bootstrap.php

@@ -17,6 +17,7 @@
 ]);
 ConnectionManager::alias('test', 'default');
 
+/** @var \Cake\Database\Connection $connection */
 $connection = ConnectionManager::get('test');
 
 $connection->execute("