initialize filter iterator by default

atk4 · Jan 17, 2022 · 8af65a9 · 8af65a9
1 parent b363b30
commit 8af65a9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Persistence/Array_.php b/src/Persistence/Array_.php
@@ -214,7 +214,6 @@ public function tryLoad(Model $model, $id): ?array
     {
         if ($id === self::ID_LOAD_ONE || $id === self::ID_LOAD_ANY) {
             $action = $this->action($model, 'select');
-            $action->generator->rewind(); // TODO needed for some reasons!
 
             $selectRow = $action->getRow();
             if ($selectRow === null) {
@@ -238,7 +237,6 @@ public function tryLoad(Model $model, $id): ?array
             $condition->key = $model->getField($model->id_field);
             $condition->setOwner($model->createEntity()); // TODO needed for typecasting to apply
             $action->filter($condition);
-            $action->generator->rewind(); // TODO needed for some reasons!
 
             $rowData = $action->getRow();
             if ($rowData === null) {

diff --git a/src/Persistence/Array_/Action.php b/src/Persistence/Array_/Action.php
@@ -45,6 +45,9 @@ public function filter(Model\Scope\AbstractScope $condition)
             } else {
                 $this->generator = new \CallbackFilterIterator($this->generator, $filterFx);
             }
+            // initialize filter iterator, it is not rewound by default
+            // https://github.com/php/php-src/issues/7952
+            $this->generator->rewind();
         }
 
         return $this;