Merge branch 'fix-bind-override'

Author: lkrms

.gitattributes

@@ -23,6 +23,8 @@
 /src/Toolkit/Core/Facade/Sync.php linguist-generated
 /src/Toolkit/Curler/CurlerBuilder.php linguist-generated
 /src/Toolkit/Curler/Support/CurlerPageBuilder.php linguist-generated
+/src/Toolkit/Sync/DbSyncDefinitionBuilder.php linguist-generated
+/src/Toolkit/Sync/HttpSyncDefinitionBuilder.php linguist-generated
 /src/Toolkit/Sync/SyncErrorBuilder.php linguist-generated
 /src/Toolkit/Sync/SyncSerializeRulesBuilder.php linguist-generated
 /stubs/*.stub export-ignore

scripts/generate.php

@@ -81,8 +81,8 @@
     CliOption::class => [CliOptionBuilder::class, '--forward=load', '--api'],
     Curler::class => [CurlerBuilder::class, '--forward', '--skip', 'responseContentTypeIs,getQueryUrl'],
     CurlerPage::class => CurlerPageBuilder::class,
-    // DbSyncDefinition::class => [DbSyncDefinitionBuilder::class, '--forward=bindOverride'],
-    // HttpSyncDefinition::class => [HttpSyncDefinitionBuilder::class, '--forward=bindOverride'],
+    DbSyncDefinition::class => [DbSyncDefinitionBuilder::class, '--forward=bindOverride'],
+    HttpSyncDefinition::class => [HttpSyncDefinitionBuilder::class, '--forward=bindOverride'],
     SyncError::class => SyncErrorBuilder::class,
     SyncSerializeRules::class => SyncSerializeRulesBuilder::class,
 ];

src/Toolkit/Sync/AbstractSyncDefinition.php

@@ -212,12 +212,12 @@ abstract protected function getClosure($operation): ?Closure;
     /**
      * @var array<OP::*,Closure>
      */
-    private $Closures = [];
+    private array $Closures = [];
 
     /**
-     * @var static|null
+     * @var static
      */
-    private $WithoutOverrides;
+    private self $WithoutOverrides;
 
     /**
      * @param class-string<TEntity> $entity
@@ -296,13 +296,20 @@ public function __construct(
     public function __clone()
     {
         $this->Closures = [];
-        $this->WithoutOverrides = null;
+        unset($this->WithoutOverrides);
     }
 
     /**
-     * @template T of SyncEntityInterface
+     * Bind a sync operation closure to the definition
      *
-     * @param Closure(SyncDefinitionInterface<T,TProvider>, OP::*, SyncContextInterface, mixed...): (iterable<T>|T) $override
+     * Apply this method to a closure if necessary to satisfy static analysis
+     * tools that it's a valid override for an operation on entities serviced
+     * via the definition.
+     *
+     * @template T0 of SyncEntityInterface
+     * @template T1 of SyncDefinitionInterface
+     *
+     * @param Closure(T1, OP::*, SyncContextInterface, mixed...): (iterable<T0>|T0) $override
      * @return Closure(static, OP::*, SyncContextInterface, mixed...): (iterable<TEntity>|TEntity)
      */
     public function bindOverride(Closure $override): Closure
@@ -401,24 +408,27 @@ function (SyncContextInterface $ctx, $id, ...$args) use ($closure) {
      */
     final public function getFallbackClosure($operation): ?Closure
     {
-        $clone = $this->WithoutOverrides;
-        if (!$clone) {
+        if (!isset($this->WithoutOverrides)) {
             $clone = clone $this;
             $clone->Overrides = [];
             $this->WithoutOverrides = $clone;
         }
 
-        return $clone->getSyncOperationClosure($operation);
+        return $this->WithoutOverrides->getSyncOperationClosure($operation);
     }
 
     /**
      * Specify whether to perform READ operations by iterating over entities
      * returned by READ_LIST
      *
-     * @return $this
+     * @return static
      */
     final public function withReadFromReadList(bool $readFromReadList = true)
     {
+        if ($this->ReadFromReadList === $readFromReadList) {
+            return $this;
+        }
+
         $clone = clone $this;
         $clone->ReadFromReadList = $readFromReadList;
 

src/Toolkit/Sync/DbSyncDefinition.php

@@ -83,6 +83,18 @@ public function __construct(
         $this->Table = $table;
     }
 
+    /**
+     * @template T0 of SyncEntityInterface
+     * @template T1 of DbSyncDefinition
+     *
+     * @param Closure(T1, OP::*, SyncContextInterface, mixed...): (iterable<T0>|T0) $override
+     * @return Closure(DbSyncDefinition<TEntity,TProvider>, OP::*, SyncContextInterface, mixed...): (iterable<TEntity>|TEntity)
+     */
+    public function bindOverride(Closure $override): Closure
+    {
+        return parent::bindOverride($override);
+    }
+
     protected function getClosure($operation): ?Closure
     {
         // Return null if no table name has been provided

src/Toolkit/Sync/DbSyncDefinitionBuilder.php

@@ -303,6 +303,18 @@ public function __construct(
         $this->SyncOneEntityPerRequest = $syncOneEntityPerRequest;
     }
 
+    /**
+     * @template T0 of SyncEntityInterface
+     * @template T1 of HttpSyncDefinition
+     *
+     * @param Closure(T1, OP::*, SyncContextInterface, mixed...): (iterable<T0>|T0) $override
+     * @return Closure(HttpSyncDefinition<TEntity,TProvider>, OP::*, SyncContextInterface, mixed...): (iterable<TEntity>|TEntity)
+     */
+    public function bindOverride(Closure $override): Closure
+    {
+        return parent::bindOverride($override);
+    }
+
     /**
      * Set the path to the provider endpoint servicing the entity
      *