Remove STI and MTI implementations

phpstan.neon.dist

@@ -4,7 +4,7 @@ parameters:
     - src/
     - tests/
   ignoreErrors:
-    - message: '/Call to an undefined (static )?method Respect\\Data\\(AbstractMapper|InMemoryMapper|Collections\\(Collection|Composite|Typed))::\w+\(\)\./'
+    - message: '/Call to an undefined (static )?method Respect\\Data\\(AbstractMapper|InMemoryMapper|Collections\\Collection)::\w+\(\)\./'
     - message: '/Unsafe usage of new static\(\)\./'
     -
       message: '/Property .+ is never read, only written\./'

src/Collections/Collection.php

@@ -37,32 +37,12 @@ public function derive(
     ): static {
         return new static(
             $this->name,
-            ...$this->deriveArgs(
-                with: $with,
-                filter: $filter,
-                required: $required,
-            ),
+            with: [...$this->with, ...$with],
+            filter: $filter ?? $this->filter,
+            required: $required ?? $this->required,
         );
     }
 
-    /**
-     * @param list<Collection> $with
-     * @param array<scalar, mixed>|scalar|null $filter
-     *
-     * @return array{with: list<Collection>, filter: array|int|float|string|bool|null, required: bool}
-     */
-    protected function deriveArgs( // @phpstan-ignore missingType.iterableValue
-        array $with = [],
-        array|int|float|string|bool|null $filter = null,
-        bool|null $required = null,
-    ): array {
-        return [
-            'with' => [...$this->with, ...$with],
-            'filter' => $filter ?? $this->filter,
-            'required' => $required ?? $this->required,
-        ];
-    }
-
     /**
      * @param list<Collection> $children
      *

src/EntityFactory.php

@@ -192,7 +192,7 @@ public function extractProperties(object $entity): array
         $props = [];
 
         foreach ($this->reflectProperties($entity::class) as $name => $prop) {
-            if (!$prop->isInitialized($entity) || $prop->getAttributes(NotPersistable::class)) {
+            if ($prop->isVirtual() || !$prop->isInitialized($entity) || $prop->getAttributes(NotPersistable::class)) {
                 continue;
             }
 
@@ -218,7 +218,7 @@ public function enumerateFields(string $collectionName): array
         $fields = [];
 
         foreach ($this->reflectProperties($class) as $name => $prop) {
-            if ($prop->getAttributes(NotPersistable::class) || isset($relations[$name])) {
+            if ($prop->isVirtual() || $prop->getAttributes(NotPersistable::class) || isset($relations[$name])) {
                 continue;
             }
 

src/Hydrators/Base.php

@@ -6,7 +6,6 @@
 
 use DomainException;
 use Respect\Data\Collections\Collection;
-use Respect\Data\Collections\Typed;
 use Respect\Data\EntityFactory;
 use Respect\Data\Hydrator;
 use SplObjectStorage;
@@ -75,20 +74,4 @@ protected function wireRelationships(SplObjectStorage $entities): void
             }
         }
     }
-
-    /**
-     * @param object|array<mixed, mixed> $row
-     *
-     * @return class-string
-     */
-    protected function resolveEntityClass(
-        Collection $collection,
-        object|array $row,
-    ): string {
-        if ($collection instanceof Typed) {
-            return $collection->resolveEntityClass($this->entityFactory, $row);
-        }
-
-        return $this->entityFactory->resolveClass((string) $collection->name);
-    }
 }

src/Hydrators/Nested.php

@@ -43,7 +43,7 @@ private function hydrateNode(
         SplObjectStorage $entities,
     ): void {
         $entity = $this->entityFactory->create(
-            $this->resolveEntityClass($collection, $data),
+            $this->entityFactory->resolveClass((string) $collection->name),
         );
 
         foreach ($data as $key => $value) {

src/Hydrators/PrestyledAssoc.php

@@ -7,10 +7,8 @@
 use DomainException;
 use Respect\Data\CollectionIterator;
 use Respect\Data\Collections\Collection;
-use Respect\Data\Collections\Composite;
 use SplObjectStorage;
 
-use function array_keys;
 use function explode;
 use function is_array;
 
@@ -52,11 +50,15 @@ public function hydrateAll(
         $instances = [];
 
         foreach ($grouped as $prefix => $props) {
-            $basePrefix = $this->resolveCompositionBase($prefix, $collMap);
+            if (!isset($collMap[$prefix])) {
+                throw new DomainException('Unknown column prefix "' . $prefix . '" in hydration row');
+            }
+
+            $basePrefix = $prefix;
 
             if (!isset($instances[$basePrefix])) {
                 $coll = $collMap[$basePrefix];
-                $class = $this->resolveEntityClass($coll, $props);
+                $class = $this->entityFactory->resolveClass((string) $coll->name);
                 $instances[$basePrefix] = $this->entityFactory->create($class);
                 $entities[$instances[$basePrefix]] = $coll;
             }
@@ -83,45 +85,11 @@ private function buildCollMap(Collection $collection): array
 
         $this->collMap = [];
         foreach (CollectionIterator::recursive($collection) as $spec => $c) {
-            if ($c->name === null) {
-                continue;
-            }
-
             $this->collMap[$spec] = $c;
         }
 
         $this->cachedCollection = $collection;
 
         return $this->collMap;
     }
-
-    /**
-     * Resolve a composition prefix back to its base entity specifier.
-     *
-     * Composition columns use prefixes like "post_WITH_comment" (see Composite::COMPOSITION_MARKER).
-     * This returns "post" so properties are merged into the parent entity.
-     *
-     * @param array<string, Collection> $collMap
-     */
-    private function resolveCompositionBase(string $prefix, array $collMap): string
-    {
-        if (isset($collMap[$prefix])) {
-            return $prefix;
-        }
-
-        // Look for a base specifier where this prefix is a composition alias
-        foreach ($collMap as $spec => $coll) {
-            if (!$coll instanceof Composite) {
-                continue;
-            }
-
-            foreach (array_keys($coll->compositions) as $compName) {
-                if ($prefix === $spec . Composite::COMPOSITION_MARKER . $compName) {
-                    return $spec;
-                }
-            }
-        }
-
-        throw new DomainException('Unknown column prefix "' . $prefix . '" in hydration row');
-    }
 }

tests/AbstractMapperTest.php

@@ -9,7 +9,6 @@
 use PHPUnit\Framework\TestCase;
 use ReflectionObject;
 use Respect\Data\Collections\Collection;
-use Respect\Data\Collections\Composite;
 use Respect\Data\Hydrators\Nested;
 use Respect\Data\Styles\CakePHP;
 use Respect\Data\Styles\Standard;
@@ -52,20 +51,6 @@ public function registerCollectionShouldAddCollectionToPool(): void
         $this->assertEquals($coll->name, $clone->name);
     }
 
-    #[Test]
-    public function callingRegisteredCollectionWithArgsDerives(): void
-    {
-        $coll = Composite::post(['comment' => ['text']]);
-        $this->mapper->registerCollection('postComment', $coll);
-
-        $derived = $this->mapper->postComment(filter: 5);
-
-        $this->assertInstanceOf(Composite::class, $derived);
-        $this->assertEquals('post', $derived->name);
-        $this->assertEquals(['comment' => ['text']], $derived->compositions);
-        $this->assertEquals(5, $derived->filter);
-    }
-
     #[Test]
     public function callingRegisteredCollectionWithoutArgsClones(): void
     {
@@ -1305,4 +1290,14 @@ public function mergeWithIdentityMapNormalizesConditionFallback(): void
         $this->assertTrue($mapper->isTracked($merged));
         $this->assertFalse($mapper->isTracked($fetched));
     }
+
+    #[Test]
+    public function callingRegisteredCollectionWithArgsDerives(): void
+    {
+        $coll = Collection::post();
+        $this->mapper->registerCollection('post', $coll);
+        $derived = $this->mapper->post(filter: 5);
+        $this->assertEquals('post', $derived->name);
+        $this->assertEquals(5, $derived->filter);
+    }
 }