Merge branch 'review'

Author: lkrms

composer.json

@@ -73,6 +73,7 @@
         "psr/simple-cache-implementation": "^1 || ^2"
     },
     "suggest": {
+        "ext-sqlite3": "Required by CacheStore and SyncStore",
         "adodb/adodb-php": "Required for access to databases",
         "analog/analog": "Allows Analog handlers to be used as console message targets",
         "firebase/php-jwt": "Required for validation of OAuth 2.0 access tokens",

phpstan-baseline-7.4.neon

@@ -20,6 +20,7 @@
 $check = !in_array('--force', $args);
 
 $files = File::find()
+    ->files()
     ->in(dirname(__DIR__) . '/tests/unit')
     ->include('/Test\.php$/')
     ->toArray();

phpstan-baseline-8.3.neon

@@ -94,7 +94,7 @@
 
 $builders = [
     CliOption::class => [CliOptionBuilder::class, '--forward=load', '--no-declare=valueCallback', '--desc', '', '--api'],
-    Curler::class => [CurlerBuilder::class, '--forward=head,get,post,put,patch,delete,getP,postP,putP,patchP,deleteP,postR,putR,patchR,deleteR', '--desc', '', '--api'],
+    Curler::class => [CurlerBuilder::class, '--constructor', 'create', '--forward=head,get,post,put,patch,delete,getP,postP,putP,patchP,deleteP,postR,putR,patchR,deleteR,sendRequest', '--desc', '', '--api'],
     DbSyncDefinition::class => [DbSyncDefinitionBuilder::class, '--no-declare=overrides', '--desc', ''],
     HttpSyncDefinition::class => [HttpSyncDefinitionBuilder::class, '--no-declare=callback,curlerCallback,overrides', '--desc', ''],
     SyncError::class => [SyncErrorBuilder::class, '--desc', ''],
@@ -256,6 +256,7 @@ function generated($commandOrFile): void
 
 foreach (
     File::find()
+        ->files()
         ->in($dir)
         ->include('%/phpstan-baseline.*\.neon$%')
         ->doNotRecurse() as $file

scripts/delete-covers.php

@@ -15,8 +15,10 @@
     },
     "require": {
         "php": ">=7.4",
+        "ext-sqlite3": "*",
         "salient/contracts": "self.version",
-        "salient/core": "self.version"
+        "salient/core": "self.version",
+        "salient/utils": "self.version"
     },
     "provide": {
         "psr/simple-cache-implementation": "^1 || ^2"

scripts/generate.php

@@ -3,6 +3,7 @@
 namespace Salient\Collection;
 
 use Salient\Contract\Collection\CollectionInterface;
+use IteratorAggregate;
 
 /**
  * @api
@@ -11,9 +12,10 @@
  * @template TValue
  *
  * @implements CollectionInterface<TKey,TValue>
+ * @implements IteratorAggregate<TKey,TValue>
  */
-class Collection implements CollectionInterface
+class Collection implements CollectionInterface, IteratorAggregate
 {
-    /** @use CollectionTrait<TKey,TValue> */
+    /** @use CollectionTrait<TKey,TValue,static<TKey|int,TValue>> */
     use CollectionTrait;
 }

src/Toolkit/Cache/composer.json

@@ -9,6 +9,7 @@
  *
  * @template TKey of array-key
  * @template TValue
+ * @template TKeyless
  *
  * @phpstan-require-implements CollectionInterface
  */
@@ -47,6 +48,7 @@ public function add($value)
     {
         $items = $this->Items;
         $items[] = $value;
+        /** @var TKeyless */
         return $this->replaceItems($items, true);
     }
 
@@ -95,7 +97,6 @@ public function reverse()
      */
     public function map(callable $callback, int $mode = CollectionInterface::CALLBACK_USE_VALUE)
     {
-        $items = [];
         $prev = null;
         $item = null;
         $key = null;
@@ -116,28 +117,25 @@ public function map(callable $callback, int $mode = CollectionInterface::CALLBAC
         }
 
         // @phpstan-ignore argument.type, return.type
-        return $this->maybeReplaceItems($items, true);
+        return $this->maybeReplaceItems($items ?? [], true);
     }
 
     /**
      * @inheritDoc
      */
     public function filter(callable $callback, int $mode = CollectionInterface::CALLBACK_USE_VALUE)
     {
-        $items = [];
         $prev = null;
         $item = null;
         $key = null;
         $value = null;
 
         foreach ($this->Items as $nextKey => $nextValue) {
             $next = $this->getCallbackValue($mode, $nextKey, $nextValue);
-            if ($item !== null) {
-                if ($callback($item, $next, $prev)) {
-                    /** @var TKey $key */
-                    /** @var TValue $value */
-                    $items[$key] = $value;
-                }
+            if ($item !== null && $callback($item, $next, $prev)) {
+                /** @var TKey $key */
+                /** @var TValue $value */
+                $items[$key] = $value;
             }
             $prev = $item;
             $item = $next;
@@ -150,7 +148,7 @@ public function filter(callable $callback, int $mode = CollectionInterface::CALL
             $items[$key] = $value;
         }
 
-        return $this->maybeReplaceItems($items);
+        return $this->maybeReplaceItems($items ?? []);
     }
 
     /**
@@ -204,10 +202,12 @@ public function slice(int $offset, ?int $length = null)
     public function push(...$items)
     {
         if (!$items) {
+            /** @var TKeyless */
             return $this;
         }
         $_items = $this->Items;
         array_push($_items, ...$items);
+        /** @var TKeyless */
         return $this->replaceItems($_items, true);
     }
 
@@ -246,15 +246,15 @@ public function shift(&$first = null)
     public function unshift(...$items)
     {
         if (!$items) {
+            /** @var TKeyless */
             return $this;
         }
         $_items = $this->Items;
         array_unshift($_items, ...$items);
+        /** @var TKeyless */
         return $this->replaceItems($_items, true);
     }
 
-    // Partial implementation of `ArrayAccess`:
-
     /**
      * @param TKey|null $offset
      * @param TValue $value
@@ -281,8 +281,6 @@ public function offsetUnset($offset): void
         $this->maybeReplaceItems($items, false, false);
     }
 
-    // --
-
     /**
      * @param array<TKey,TValue> $items
      * @return static

src/Toolkit/Collection/Collection.php

@@ -3,16 +3,18 @@
 namespace Salient\Collection;
 
 use Salient\Contract\Collection\CollectionInterface;
+use IteratorAggregate;
 
 /**
  * @api
  *
  * @template TValue
  *
  * @implements CollectionInterface<int,TValue>
+ * @implements IteratorAggregate<int,TValue>
  */
-class ListCollection implements CollectionInterface
+class ListCollection implements CollectionInterface, IteratorAggregate
 {
-    /** @use ListCollectionTrait<int,TValue> */
+    /** @use ListCollectionTrait<int,TValue,static<TValue>> */
     use ListCollectionTrait;
 }

src/Toolkit/Collection/CollectionTrait.php

@@ -10,12 +10,13 @@
  *
  * @template TKey of int
  * @template TValue
+ * @template TKeyless
  *
  * @phpstan-require-implements CollectionInterface
  */
 trait ListCollectionTrait
 {
-    /** @use CollectionTrait<int,TValue> */
+    /** @use CollectionTrait<int,TValue,TKeyless> */
     use CollectionTrait {
         getItems as private doGetItems;
         replaceItems as private doReplaceItems;
@@ -48,8 +49,6 @@ public function shift(&$first = null)
         return $this->replaceItems($items, true);
     }
 
-    // --
-
     /**
      * @param Arrayable<array-key,TValue>|iterable<array-key,TValue> $items
      * @return iterable<TValue>