Merge pull request #432 from greg0ire/3.0.x

Merge 2.3.x up into 3.0.x

.gitattributes

@@ -1,3 +1,4 @@
+/stubs export-ignore
 /tests export-ignore
 /.github export-ignore
 .doctrine-project.json export-ignore

composer.json

@@ -34,7 +34,8 @@
     "homepage": "https://www.doctrine-project.org/projects/collections.html",
     "require": {
         "php": "^8.1",
-        "doctrine/deprecations": "^1"
+        "doctrine/deprecations": "^1",
+        "symfony/polyfill-php84": "^1.30"
     },
     "require-dev": {
         "ext-json": "*",

psalm.xml.dist

@@ -16,6 +16,10 @@
         </ignoreFiles>
     </projectFiles>
 
+    <stubs>
+        <file name="stubs/array_find.phpstub" />
+    </stubs>
+
     <issueHandlers>
         <MixedArgument errorLevel="info" />
         <MixedArgumentTypeCoercion errorLevel="info" />
@@ -40,6 +44,12 @@
             </errorLevel>
         </PossiblyNullArgument>
 
+        <RedundantCastGivenDocblockType>
+            <errorLevel type="suppress">
+                <file name="src/ArrayCollection.php"/>
+            </errorLevel>
+        </RedundantCastGivenDocblockType>
+
         <UnsafeGenericInstantiation>
             <errorLevel type="suppress">
                 <file name="src/ArrayCollection.php"/>

src/ArrayCollection.php

@@ -10,7 +10,10 @@
 use Stringable;
 use Traversable;
 
+use function array_all;
+use function array_any;
 use function array_filter;
+use function array_find;
 use function array_key_exists;
 use function array_keys;
 use function array_map;
@@ -201,13 +204,10 @@ public function contains(mixed $element): bool
 
     public function exists(Closure $p): bool
     {
-        foreach ($this->elements as $key => $element) {
-            if ($p($key, $element)) {
-                return true;
-            }
-        }
-
-        return false;
+        return array_any(
+            $this->elements,
+            static fn (mixed $element, mixed $key): bool => (bool) $p($key, $element),
+        );
     }
 
     /**
@@ -326,24 +326,18 @@ public function filter(Closure $p): Collection
 
     public function findFirst(Closure $p): mixed
     {
-        foreach ($this->elements as $key => $element) {
-            if ($p($key, $element)) {
-                return $element;
-            }
-        }
-
-        return null;
+        return array_find(
+            $this->elements,
+            static fn (mixed $element, mixed $key): bool => (bool) $p($key, $element),
+        );
     }
 
     public function forAll(Closure $p): bool
     {
-        foreach ($this->elements as $key => $element) {
-            if (! $p($key, $element)) {
-                return false;
-            }
-        }
-
-        return true;
+        return array_all(
+            $this->elements,
+            static fn (mixed $element, mixed $key): bool => (bool) $p($key, $element),
+        );
     }
 
     /**

src/Expr/ClosureExpressionVisitor.php

@@ -8,6 +8,8 @@
 use Closure;
 use RuntimeException;
 
+use function array_all;
+use function array_any;
 use function explode;
 use function in_array;
 use function is_array;
@@ -176,29 +178,19 @@ public function walkCompositeExpression(CompositeExpression $expr): Closure
     /** @param callable[] $expressions */
     private function andExpressions(array $expressions): Closure
     {
-        return static function ($object) use ($expressions): bool {
-            foreach ($expressions as $expression) {
-                if (! $expression($object)) {
-                    return false;
-                }
-            }
-
-            return true;
-        };
+        return static fn ($object): bool => array_all(
+            $expressions,
+            static fn (callable $expression): bool => (bool) $expression($object),
+        );
     }
 
     /** @param callable[] $expressions */
     private function orExpressions(array $expressions): Closure
     {
-        return static function ($object) use ($expressions): bool {
-            foreach ($expressions as $expression) {
-                if ($expression($object)) {
-                    return true;
-                }
-            }
-
-            return false;
-        };
+        return static fn ($object): bool => array_any(
+            $expressions,
+            static fn (callable $expression): bool => (bool) $expression($object),
+        );
     }
 
     /** @param callable[] $expressions */

stubs/array_find.phpstub

@@ -0,0 +1,12 @@
+<?php
+
+/**
+ * @param array<TKey, TValue>                      $array
+ * @param callable(TValue $value, TKey $key): bool $callback
+ *
+ * @return TValue|null
+ *
+ * @template TKey of array-key
+ * @template TValue
+ */
+function array_find(array $array, callable $callback): mixed {}