Merge branch 'fix'

Author: lkrms

src/Toolkit/Collection/ReadOnlyCollectionTrait.php

@@ -35,6 +35,14 @@ public function __construct($items = [])
         $this->Items = $this->getItemsArray($items);
     }
 
+    /**
+     * @inheritDoc
+     */
+    public function isEmpty(): bool
+    {
+        return !$this->Items;
+    }
+
     /**
      * @inheritDoc
      */

src/Toolkit/Contract/Collection/CollectionInterface.php

@@ -11,8 +11,6 @@
 use OutOfRangeException;
 
 /**
- * An array-like collection of items
- *
  * @api
  *
  * @template TKey of array-key
@@ -60,6 +58,15 @@ interface CollectionInterface extends
      */
     public function __construct($items = []);
 
+    /**
+     * Check if the collection is empty
+     *
+     * @phpstan-assert-if-false non-empty-array<TKey,TValue> $this->all()
+     * @phpstan-assert-if-false !null $this->first()
+     * @phpstan-assert-if-false !null $this->last()
+     */
+    public function isEmpty(): bool;
+
     /**
      * Add or replace an item with a given key
      *
@@ -73,6 +80,9 @@ public function set($key, $value);
      * Check if an item with a given key exists
      *
      * @param TKey $key
+     * @phpstan-assert-if-true non-empty-array<TKey,TValue> $this->all()
+     * @phpstan-assert-if-true !null $this->first()
+     * @phpstan-assert-if-true !null $this->last()
      */
     public function has($key): bool;
 
@@ -246,6 +256,9 @@ public function slice(int $offset, ?int $length = null);
      * Check if a value is in the collection
      *
      * @param TValue $value
+     * @phpstan-assert-if-true non-empty-array<TKey,TValue> $this->all()
+     * @phpstan-assert-if-true !null $this->first()
+     * @phpstan-assert-if-true !null $this->last()
      */
     public function hasValue($value, bool $strict = false): bool;
 

src/Toolkit/Utility/Get.php

@@ -553,8 +553,11 @@ public static function code(
         }
         $classes = Arr::toIndex($classes);
         $constRegex = [];
-        foreach (array_keys($constants) as $string) {
-            $constRegex[] = preg_quote($string, '/');
+        if ($constants) {
+            uksort($constants, fn($a, $b) => strlen($b) <=> strlen($a));
+            foreach (array_keys($constants) as $string) {
+                $constRegex[] = preg_quote($string, '/');
+            }
         }
         switch (count($constRegex)) {
             case 0:

src/Toolkit/Utility/Reflect.php

@@ -8,6 +8,7 @@
 use ReflectionAttribute;
 use ReflectionClass;
 use ReflectionClassConstant;
+use ReflectionConstant;
 use ReflectionException;
 use ReflectionExtension;
 use ReflectionFunction;
@@ -36,7 +37,7 @@ final class Reflect extends AbstractUtility
     /**
      * Get a list of names from a list of reflectors
      *
-     * @param array<ReflectionAttribute<object>|ReflectionClass<object>|ReflectionClassConstant|ReflectionExtension|ReflectionFunctionAbstract|ReflectionNamedType|ReflectionParameter|ReflectionProperty|ReflectionZendExtension> $reflectors
+     * @param array<ReflectionAttribute<object>|ReflectionClass<object>|ReflectionClassConstant|ReflectionConstant|ReflectionExtension|ReflectionFunctionAbstract|ReflectionNamedType|ReflectionParameter|ReflectionProperty|ReflectionZendExtension> $reflectors
      * @return string[]
      */
     public static function getNames(array $reflectors): array
@@ -248,7 +249,7 @@ public static function getAcceptedTypes(
             $union[] = Arr::unwrap($intersection);
         }
 
-        /** @var array<class-string[]|class-string> */
+        /** @var array<class-string[]|class-string>|array<string[]|string> */
         return $union ?? [];
     }
 
@@ -314,8 +315,8 @@ private static function doGetTypes(?ReflectionType $type, bool $names): array
             return [];
         }
 
+        /** @var ReflectionNamedType $type */
         foreach (Arr::flatten(self::doNormaliseType($type)) as $type) {
-            /** @var ReflectionNamedType $type */
             $name = $type->getName();
             if (isset($seen[$name])) {
                 continue;

tests/phpstan-conditional.php

@@ -17,6 +17,19 @@
 
 $dir = dirname(__DIR__);
 
+$ignoreErrors = \PHP_VERSION_ID >= 80400 ? [] : [
+    [
+        'message' => '#^Call to method getName\(\) on an unknown class ReflectionConstant\.$#',
+        'identifier' => 'class.notFound',
+    ],
+    [
+        'message' => '#^Parameter \$reflectors of method Salient\\\\Utility\\\\Reflect\:\:getNames\(\) has invalid type ReflectionConstant\.$#',
+        'identifier' => 'class.notFound',
+        'count' => 1,
+        'path' => "$dir/src/Toolkit/Utility/Reflect.php",
+    ],
+];
+
 if (\PHP_VERSION_ID < 80000) {
     return [
         'includes' => $includes,
@@ -32,7 +45,7 @@
                     "$dir/tests/unit/Toolkit/Core/EventDispatcher/listenerWithIntersectionType.php",
                 ],
             ],
-            'ignoreErrors' => [
+            'ignoreErrors' => array_merge([
                 [
                     'message' => '#^Parameter \#1 \$ch of function curl_(?:errno|exec|getinfo|reset|setopt(?:_array)?) expects resource, CurlHandle\|resource(\|null)? given\.$#',
                 ],
@@ -66,15 +79,15 @@
                     'count' => 1,
                     'path' => "$dir/src/Toolkit/Utility/Str.php",
                 ],
-            ],
+            ], $ignoreErrors),
         ] + $parameters,
     ];
 }
 
 return [
     'includes' => $includes,
     'parameters' => [
-        'ignoreErrors' => [
+        'ignoreErrors' => array_merge([
             [
                 'message' => '#^Parameter \#1 \$handle of function curl_(?:errno|exec|getinfo|reset|setopt(?:_array)?) expects CurlHandle, CurlHandle\|resource(\|null)? given\.$#',
             ],
@@ -94,6 +107,6 @@
                 'count' => 1,
                 'path' => "$dir/src/Toolkit/Utility/Arr.php",
             ],
-        ],
+        ], $ignoreErrors),
     ] + $parameters,
 ];