Merge branch 'cleanup'

Author: lkrms

.gitattributes

@@ -47,6 +47,7 @@
 /tests/fixtures/Toolkit/Sync/Entity/Provider/PhotoProvider.php linguist-generated
 /tests/fixtures/Toolkit/Sync/Entity/Provider/PostProvider.php linguist-generated
 /tests/fixtures/Toolkit/Sync/Entity/Provider/TaskProvider.php linguist-generated
+/tests/fixtures/Toolkit/Sync/Entity/Provider/UnimplementedProvider.php linguist-generated
 /tests/fixtures/Toolkit/Sync/Entity/Provider/UserProvider.php linguist-generated
 /tests/fixtures/Toolkit/Sync/Entity/Task.php linguist-generated
 /tests/fixtures/Toolkit/Sync/Entity/User.php linguist-generated

phpstan-baseline-7.4.neon

@@ -57,6 +57,7 @@
 use Salient\Tests\Sync\Entity\Photo;
 use Salient\Tests\Sync\Entity\Post;
 use Salient\Tests\Sync\Entity\Task;
+use Salient\Tests\Sync\Entity\Unimplemented;
 use Salient\Tests\Sync\Entity\User;
 use Salient\Tests\Sync\Provider\JsonPlaceholderApi;
 
@@ -103,6 +104,7 @@
     Post::class => [],
     Task::class => [],
     User::class => [],
+    Unimplemented::class => [],
 ];
 
 $app = new CliApplication(dirname(__DIR__));

phpstan-baseline-8.3.neon

@@ -400,6 +400,11 @@ protected static function getRemovablePrefixes(): ?array
                     continue;
                 }
 
+                if (is_array($value) && Arr::ofString(array_keys($value))) {
+                    $properties[$key] = 'array<string,mixed>|null';
+                    continue;
+                }
+
                 $type = gettype($value);
                 $type = $typeMap[$type] ?? $type;
                 $type .= '|null';

scripts/generate.php

@@ -443,6 +443,7 @@ public function getAllKeys(?int $maxAge = null): array
      *
      * @param int|null $now If given, items expire relative to this Unix
      * timestamp instead of the time {@see CacheStore::asOfNow()} is called.
+     * @return static
      */
     public function asOfNow(?int $now = null): self
     {
@@ -468,6 +469,9 @@ private function now(): int
             : $this->Now;
     }
 
+    /**
+     * @return static
+     */
     private function maybeAsOfNow(): self
     {
         return $this->Now === null

src/Sli/Command/Generate/GenerateSyncEntity.php

@@ -263,7 +263,7 @@ private function addRule(string $id, array $rule): void
     }
 
     /**
-     * @inheritDoc
+     * @return static
      */
     final public function inContextOf(string $id): self
     {
@@ -358,7 +358,7 @@ private function _bind(
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function bind(
         string $id,
@@ -369,7 +369,7 @@ final public function bind(
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function bindIf(
         string $id,
@@ -384,7 +384,7 @@ final public function bindIf(
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function singleton(
         string $id,
@@ -395,7 +395,7 @@ final public function singleton(
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function singletonIf(
         string $id,
@@ -418,7 +418,7 @@ final public function hasProvider(string $id): bool
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function provider(
         string $id,
@@ -520,7 +520,7 @@ private function applyService(
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function addContextualBinding($context, string $dependency, $value): self
     {
@@ -563,7 +563,7 @@ final public function addContextualBinding($context, string $dependency, $value)
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function instance(string $id, $instance): self
     {
@@ -573,7 +573,7 @@ final public function instance(string $id, $instance): self
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function instanceIf(string $id, $instance): self
     {
@@ -585,7 +585,7 @@ final public function instanceIf(string $id, $instance): self
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function providers(
         array $serviceMap,
@@ -630,7 +630,7 @@ final public function getProviders(): array
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function unbind(string $id): self
     {
@@ -640,7 +640,7 @@ final public function unbind(string $id): self
     }
 
     /**
-     * @inheritDoc
+     * @return $this
      */
     final public function unbindInstance(string $id): self
     {

src/Toolkit/Cache/CacheStore.php

@@ -215,9 +215,9 @@ abstract protected function getClosure($operation): ?Closure;
     private array $Closures = [];
 
     /**
-     * @var static
+     * @var static|null
      */
-    private self $WithoutOverrides;
+    private $WithoutOverrides;
 
     /**
      * @param class-string<TEntity> $entity
@@ -296,7 +296,7 @@ public function __construct(
     public function __clone()
     {
         $this->Closures = [];
-        unset($this->WithoutOverrides);
+        $this->WithoutOverrides = null;
     }
 
     /**
@@ -408,7 +408,7 @@ function (SyncContextInterface $ctx, $id, ...$args) use ($closure) {
      */
     final public function getFallbackClosure($operation): ?Closure
     {
-        if (!isset($this->WithoutOverrides)) {
+        if ($this->WithoutOverrides === null) {
             $clone = clone $this;
             $clone->Overrides = [];
             $this->WithoutOverrides = $clone;

src/Toolkit/Container/Container.php

@@ -264,7 +264,7 @@ final public function with(string $entity, $context = null): SyncEntityProvider
 
         return $container->get(
             SyncEntityProvider::class,
-            [$entity, $this, $this->getDefinition($entity), $context]
+            [$entity, $this, $context]
         );
     }
 

src/Toolkit/Sync/AbstractSyncDefinition.php

@@ -16,6 +16,7 @@
 use Salient\Contract\Sync\SyncProviderInterface;
 use Salient\Iterator\IterableIterator;
 use Salient\Sync\Exception\SyncOperationNotImplementedException;
+use Salient\Sync\AbstractSyncEntity;
 use Salient\Sync\SyncStore;
 use Generator;
 use LogicException;
@@ -76,13 +77,11 @@ final class SyncEntityProvider implements SyncEntityProviderInterface
     /**
      * @param class-string<TEntity> $entity
      * @param TProvider $provider
-     * @param SyncDefinitionInterface<TEntity,TProvider> $definition
      */
     public function __construct(
         ContainerInterface $container,
         string $entity,
         SyncProviderInterface $provider,
-        SyncDefinitionInterface $definition,
         ?SyncContextInterface $context = null
     ) {
         if (!is_a($entity, SyncEntityInterface::class, true)) {
@@ -93,14 +92,62 @@ public function __construct(
             ));
         }
 
-        $entityProvider = SyncIntrospector::entityToProvider($entity);
-        if (!($provider instanceof $entityProvider)) {
-            throw new LogicException(get_class($provider) . ' does not implement ' . $entityProvider);
+        if ($context && $context->getProvider() !== $provider) {
+            throw new LogicException(sprintf(
+                '%s has different provider (%s, expected %s)',
+                get_class($context),
+                $context->getProvider()->name(),
+                $provider->name(),
+            ));
+        }
+
+        $_entity = $entity;
+        $checked = [];
+        do {
+            $entityProvider = SyncIntrospector::entityToProvider($entity, $container);
+            if (interface_exists($entityProvider)) {
+                break;
+            }
+            $checked[] = $entityProvider;
+            $entityProvider = null;
+            $entity = get_parent_class($entity);
+            if ($entity === false ||
+                    $entity === AbstractSyncEntity::class ||
+                    !is_a($entity, SyncEntityInterface::class, true)) {
+                break;
+            }
+        } while (true);
+
+        if ($entityProvider === null) {
+            throw new LogicException(sprintf(
+                '%s does not have a provider interface (tried: %s)',
+                $_entity,
+                implode(', ', $checked),
+            ));
+        }
+
+        if (!is_a($provider, $entityProvider)) {
+            throw new LogicException(sprintf(
+                '%s does not implement %s',
+                get_class($provider),
+                $entityProvider
+            ));
+        }
+
+        /** @var class-string $entity */
+        if ($entity !== $_entity && $container->getName($entity) !== $_entity) {
+            throw new LogicException(sprintf(
+                '%s cannot be serviced by provider interface %s unless it is bound to the container as %s',
+                $_entity,
+                $entityProvider,
+                $entity,
+            ));
         }
 
+        /** @var class-string<TEntity> $entity */
         $this->Entity = $entity;
         $this->Provider = $provider;
-        $this->Definition = $definition;
+        $this->Definition = $provider->getDefinition($entity);
         $this->Context = $context ?? $provider->getContext($container);
         $this->Store = $provider->store();
     }