Fix leaking PHP iterator (#966)

Author: mvorisek

src/Persistence/Array_/Action.php

@@ -17,6 +17,9 @@ class Action
     /** @var \Iterator */
     public $generator;
 
+    /** @var \Closure[] hack for GC for PHP 8.1.3 or older */
+    private $_filterFxs = [];
+
     public function __construct(array $data)
     {
         $this->generator = new \ArrayIterator($data);
@@ -30,18 +33,19 @@ public function __construct(array $data)
     public function filter(Model\Scope\AbstractScope $condition)
     {
         if (!$condition->isEmpty()) {
-            // CallbackFilterIterator with circular reference (bound function) is not GCed in PHP 7.4, see
+            // CallbackFilterIterator with circular reference (bound function) is not GCed
             // https://github.com/php/php-src/commit/afab9eb48c883766b7870f76f2e2b0a4bd575786
-            // remove the if below once PHP 7.4 is no longer supported
-            $filterFx = function ($row) use ($condition) {
+            // https://github.com/php/php-src/commit/fb70460d8e7593e32abdaaf8ae8849345d49c8fd
+            // remove the if below once PHP 8.1.3 (or older) is no longer supported
+            $filterFx = function (array $row) use ($condition): bool {
                 return $this->match($row, $condition);
             };
-            if (\PHP_MAJOR_VERSION === 7 && \PHP_MINOR_VERSION === 4) {
+            if (\PHP_VERSION_ID < 80104 && count($this->_filterFxs) !== \PHP_INT_MAX) {
+                $this->_filterFxs[] = $filterFx; // prevent filter function to be GCed
                 $filterFxWeakRef = \WeakReference::create($filterFx);
                 $this->generator = new \CallbackFilterIterator($this->generator, static function (array $row) use ($filterFxWeakRef) {
                     return $filterFxWeakRef->get()($row);
                 });
-                $this->generator->filterFx = $filterFx; // @phpstan-ignore-line prevent filter function to be GCed
             } else {
                 $this->generator = new \CallbackFilterIterator($this->generator, $filterFx);
             }
@@ -253,14 +257,7 @@ public function order(array $fields)
      */
     public function limit(?int $limit, int $offset = 0)
     {
-        // LimitIterator with circular reference is not GCed in PHP 7.4 - ???, see
-        // https://github.com/php/php-src/issues/7958
-        if (\PHP_MAJOR_VERSION < 20) { // TODO update condition once fixed in php-src
-            $data = array_slice($this->getRows(), $offset, $limit, true);
-            $this->generator = new \ArrayIterator($data);
-        } else {
-            $this->generator = new \LimitIterator($this->generator, $offset, $limit ?? -1);
-        }
+        $this->generator = new \LimitIterator($this->generator, $offset, $limit ?? -1);
 
         return $this;
     }