up

Author: gam6itko

src/Configurator.php

@@ -97,7 +97,7 @@ public function initEmbedding(Embeddable $emb, \ReflectionClass $class): EntityS
 
     public function initFields(EntitySchema $entity, \ReflectionClass $class, string $columnPrefix = ''): void
     {
-        foreach ($this->getActualProperties($class) as $property) {
+        foreach ($class->getProperties() as $property) {
             try {
                 $column = $this->reader->firstPropertyMetadata($property, Column::class);
             } catch (\Exception $e) {
@@ -114,13 +114,14 @@ public function initFields(EntitySchema $entity, \ReflectionClass $class, string
 
             $field = $this->initField($property->getName(), $column, $class, $columnPrefix);
             $field->setEntityClass($property->getDeclaringClass()->getName());
+            $field->setObsolete($this->isObsolete($property));
             $entity->getFields()->set($property->getName(), $field);
         }
     }
 
     public function initRelations(EntitySchema $entity, \ReflectionClass $class): void
     {
-        foreach ($this->getActualProperties($class) as $property) {
+        foreach ($class->getProperties() as $property) {
             $metadata = $this->getPropertyMetadata($property, RelationAnnotation\RelationInterface::class);
 
             foreach ($metadata as $meta) {
@@ -173,6 +174,7 @@ public function initRelations(EntitySchema $entity, \ReflectionClass $class): vo
                     $relation->getOptions()->set($option, $value);
                 }
 
+                $relation->setObsolete($this->isObsolete($property));
                 // need relation definition
                 $entity->getRelations()->set($property->getName(), $relation);
             }
@@ -415,22 +417,8 @@ private function isOnInsertGeneratedField(Field $field): bool
         };
     }
 
-    /**
-     * @return \Generator<\ReflectionProperty>
-     */
-    private function getActualProperties(\ReflectionClass $class): \Generator
+    private function isObsolete(\ReflectionProperty $property): bool
     {
-        foreach ($class->getProperties() as $property) {
-            // Obsolete property must not be included in the scheme.
-            $metadata = $this->getPropertyMetadata($property, Obsolete::class);
-            if (!\is_array($metadata)) {
-                $metadata = \iterator_to_array($metadata);
-            }
-            if ($metadata !== []) {
-                continue;
-            }
-
-            yield $property;
-        }
+        return $this->reader->firstPropertyMetadata($property, Obsolete::class) !== null;
     }
 }

tests/Annotated/Fixtures/Fixtures26/Address.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures26;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Embeddable;
+
+/**
+ * @Embeddable(columnPrefix="address_")
+ */
+#[Embeddable(columnPrefix: 'address_')]
+class Address
+{
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    protected $city;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    protected $country;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    protected $address;
+
+    /** @Column(type="int") */
+    #[Column(type: 'integer')]
+    protected $zipcode;
+}

tests/Annotated/Fixtures/Fixtures26/Passport.php

@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures26;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+use Cycle\Annotated\Annotation\Obsolete;
+use Cycle\Annotated\Annotation\Relation\BelongsTo;
+
+/**
+ * @Entity(table="passport")
+ */
+#[Entity(table: 'passport')]
+class Passport
+{
+    /** @Column(type="primary") */
+    #[Column(type: 'primary')]
+    protected $id;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    protected $number;
+
+    /**
+     * @Obsolete
+     * @BelongsTo(target=User::class)
+     */
+    #[Obsolete]
+    #[BelongsTo(target: User::class, innerKey: 'passport_id', outerKey: 'id')]
+    protected User $user;
+}

tests/Annotated/Fixtures/Fixtures26/User.php

@@ -7,6 +7,8 @@
 use Cycle\Annotated\Annotation\Column;
 use Cycle\Annotated\Annotation\Entity;
 use Cycle\Annotated\Annotation\Obsolete;
+use Cycle\Annotated\Annotation\Relation\Embedded;
+use Cycle\Annotated\Annotation\Relation\HasOne;
 
 /**
  * @Entity(table="user")
@@ -23,8 +25,8 @@ class User
     protected $name;
 
     /**
-     * @Column(type="integer", nullable=true)
      * @Obsolete
+     * @Column(type="integer", nullable=true)
      *
      * @deprecated Since May 5, 2025
      */
@@ -36,5 +38,25 @@ class User
      * There is must not be problems with it.
      */
     #[Obsolete]
-    private $secret;
+    protected $secret;
+
+    /**
+     * @Obsolete
+     * @Embedded(target=Address::class)
+     */
+    #[Obsolete]
+    #[Embedded(target: Address::class)]
+    protected Address $address;
+
+    /**
+     * @Obsolete
+     * @HasOne(target=Passport::class)
+     */
+    #[Obsolete]
+    #[HasOne(target: Passport::class)]
+    protected $passport;
+
+    public function __construct() {
+        $this->address = new Address();
+    }
 }

tests/Annotated/Functional/Driver/Common/ObsoleteTest.php

@@ -4,7 +4,9 @@
 
 namespace Cycle\Annotated\Tests\Functional\Driver\Common;
 
+use Cycle\Annotated\Embeddings;
 use Cycle\Annotated\Entities;
+use Cycle\Annotated\Locator\TokenizerEmbeddingLocator;
 use Cycle\Annotated\Locator\TokenizerEntityLocator;
 use Cycle\Annotated\MergeColumns;
 use Cycle\Annotated\MergeIndexes;
@@ -40,6 +42,7 @@ public function testObsoleteColumn(ReaderInterface $reader): void
         $r = new Registry($this->dbal);
 
         $schema = (new Compiler())->compile($r, [
+            new Embeddings(new TokenizerEmbeddingLocator($locator, $reader), $reader),
             new Entities(new TokenizerEntityLocator($locator, $reader), $reader),
             new ResetTables(),
             new MergeColumns($reader),
@@ -52,7 +55,13 @@ public function testObsoleteColumn(ReaderInterface $reader): void
             new GenerateTypecast(),
         ]);
 
+        $this->assertArrayNotHasKey('user:address:address', $schema);
+        // user
         $this->assertArrayNotHasKey('skype', $schema['user'][SchemaInterface::COLUMNS]);
         $this->assertArrayNotHasKey('skype', $schema['user'][SchemaInterface::TYPECAST]);
+        $this->assertArrayNotHasKey('passport', $schema['user'][SchemaInterface::RELATIONS]);
+        $this->assertArrayNotHasKey('address', $schema['user'][SchemaInterface::RELATIONS]);
+        // passport
+        $this->assertArrayNotHasKey('user', $schema['passport'][SchemaInterface::RELATIONS]);
     }
 }