Merge branch 'update'

Author: lkrms

composer.json

@@ -23,7 +23,7 @@
         "psr/http-factory": "^1",
         "psr/http-message": "^1.1 || ^2",
         "psr/log": "^1",
-        "psr/simple-cache": "^1 || ^2 || ^3"
+        "psr/simple-cache": "^1 || ^2"
     },
     "require-dev": {
         "adodb/adodb-php": "^5",
@@ -70,7 +70,7 @@
         "psr/http-factory-implementation": "^1",
         "psr/http-message-implementation": "^1.1 || ^2",
         "psr/log-implementation": "^1",
-        "psr/simple-cache-implementation": "^1 || ^2 || ^3"
+        "psr/simple-cache-implementation": "^1 || ^2"
     },
     "suggest": {
         "adodb/adodb-php": "Required for access to databases",

composer.lock

@@ -19,7 +19,7 @@
         "salient/core": "self.version"
     },
     "provide": {
-        "psr/simple-cache-implementation": "^1 || ^2 || ^3"
+        "psr/simple-cache-implementation": "^1 || ^2"
     },
     "autoload": {
         "psr-4": {

src/Toolkit/Cache/composer.json

@@ -20,7 +20,7 @@
         "psr/http-client": "^1",
         "psr/http-message": "^1.1 || ^2",
         "psr/log": "^1",
-        "psr/simple-cache": "^1 || ^2 || ^3"
+        "psr/simple-cache": "^1 || ^2"
     },
     "autoload": {
         "psr-4": {

src/Toolkit/Contract/composer.json

@@ -8,14 +8,14 @@
 use Salient\Contract\Core\Pipeline\PipelineInterface;
 use Salient\Contract\Sync\SyncContextInterface;
 use Salient\Contract\Sync\SyncEntityInterface;
-use Salient\Contract\Sync\SyncOperation as OP;
 use Salient\Contract\Sync\SyncProviderInterface;
 use Salient\Contract\Sync\SyncStoreInterface;
 use Salient\Core\AbstractProvider;
 use Salient\Core\Pipeline;
 use Salient\Sync\Support\SyncContext;
 use Salient\Sync\Support\SyncEntityProvider;
 use Salient\Sync\Support\SyncIntrospector;
+use Salient\Sync\Support\SyncPipelineArgument;
 use Salient\Utility\Regex;
 use Salient\Utility\Str;
 use Closure;
@@ -174,11 +174,11 @@ protected function run(SyncContextInterface $context, callable $operation)
      * @template T of SyncEntityInterface
      *
      * @param class-string<T> $entity
-     * @return PipelineInterface<mixed[],T,array{0:OP::*,1:SyncContextInterface,2?:int|string|T|T[]|null,...}>
+     * @return PipelineInterface<mixed[],T,SyncPipelineArgument>
      */
     protected function pipelineFrom(string $entity): PipelineInterface
     {
-        /** @var PipelineInterface<mixed[],T,array{0:OP::*,1:SyncContextInterface,2?:int|string|T|T[]|null,...}> */
+        /** @var PipelineInterface<mixed[],T,SyncPipelineArgument> */
         return Pipeline::create($this->App);
     }
 
@@ -188,11 +188,11 @@ protected function pipelineFrom(string $entity): PipelineInterface
      * @template T of SyncEntityInterface
      *
      * @param class-string<T> $entity
-     * @return PipelineInterface<T,mixed[],array{0:OP::*,1:SyncContextInterface,2?:int|string|T|T[]|null,...}>
+     * @return PipelineInterface<T,mixed[],SyncPipelineArgument>
      */
     protected function pipelineTo(string $entity): PipelineInterface
     {
-        /** @var PipelineInterface<T,mixed[],array{0:OP::*,1:SyncContextInterface,2?:int|string|T|T[]|null,...}> */
+        /** @var PipelineInterface<T,mixed[],SyncPipelineArgument> */
         return Pipeline::create($this->App);
     }
 

src/Toolkit/Sync/AbstractSyncProvider.php

@@ -31,7 +31,7 @@ public function createUri($uri)
     /**
      * @return array<array{PsrUriInterface,string}>
      */
-    public function getPaths(): array
+    public static function getPaths(): array
     {
         /** @var array<array{PsrUriInterface,string}> */
         $data = parent::getPaths();