From d8e9d4c876cd8c70ac62dfa7282d1b1f09772d9b Mon Sep 17 00:00:00 2001
From: makedo <krivousa@gmail.com>
Date: Tue, 21 Jun 2022 23:50:44 +0200
Subject: [PATCH 1/3] Remove check for docblock when trying to find parent
 entities (#54)

---
 src/Utils/EntityUtils.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Utils/EntityUtils.php b/src/Utils/EntityUtils.php
index 796f88f1..184c0980 100644
--- a/src/Utils/EntityUtils.php
+++ b/src/Utils/EntityUtils.php
@@ -48,10 +48,6 @@ public function findParent(string $class, bool $root = true): ?string
                 continue;
             }
 
-            if ($class->getDocComment() === false) {
-                continue;
-            }
-
             $ann = $this->reader->firstClassMetadata($class, Entity::class);
             if ($ann !== null) {
                 return $parent;

From c82adb25d2adc2dce127f1a2ce8bde4e6772e8f2 Mon Sep 17 00:00:00 2001
From: makedo <krivousa@gmail.com>
Date: Tue, 28 Jun 2022 03:56:46 +0300
Subject: [PATCH 2/3] Add tests for parent class finder (#54)

---
 .../Fixtures19/Annotated/LocalManager.php     | 12 ++++
 .../Fixtures19/Annotated/LocalSupplier.php    | 12 ++++
 .../Fixtures/Fixtures19/Annotated/Person.php  | 12 ++++
 .../Fixtures19/Annotated/Supplier.php         | 11 ++++
 .../Fixtures19/Attributed/LocalManager.php    | 12 ++++
 .../Fixtures19/Attributed/LocalSupplier.php   | 12 ++++
 .../Fixtures/Fixtures19/Attributed/Person.php | 12 ++++
 .../Fixtures19/Attributed/Supplier.php        |  9 +++
 .../Annotated/Unit/Utils/EntityUtilsTest.php  | 61 +++++++++++++++++++
 9 files changed, 153 insertions(+)
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php
 create mode 100644 tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php
 create mode 100644 tests/Annotated/Unit/Utils/EntityUtilsTest.php

diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php b/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php
new file mode 100644
index 00000000..979d6ac8
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+
+use Cycle\Annotated\Annotation\Entity;
+
+/** @Entity*/
+class LocalManager extends LocalSupplier
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php b/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php
new file mode 100644
index 00000000..4e693d26
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+
+use Cycle\Annotated\Annotation\Entity;
+
+/** @Entity */
+class LocalSupplier extends Supplier
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php b/tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php
new file mode 100644
index 00000000..5f55052e
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+
+use Cycle\Annotated\Annotation\Entity;
+
+/** @Entity */
+class Person
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php b/tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php
new file mode 100644
index 00000000..46c946d8
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php
@@ -0,0 +1,11 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+
+use Cycle\Annotated\Annotation\Entity;
+
+class Supplier extends Person
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php b/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php
new file mode 100644
index 00000000..68994834
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+
+use Cycle\Annotated\Annotation\Entity;
+
+#[Entity]
+class LocalManager extends LocalSupplier
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php b/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php
new file mode 100644
index 00000000..262665c2
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+
+use Cycle\Annotated\Annotation\Entity;
+
+#[Entity]
+class LocalSupplier extends Supplier
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php b/tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php
new file mode 100644
index 00000000..e7b88276
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php
@@ -0,0 +1,12 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+
+use Cycle\Annotated\Annotation\Entity;
+
+#[Entity]
+class Person
+{
+}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php b/tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php
new file mode 100644
index 00000000..80aabfff
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+
+class Supplier extends Person
+{
+}
diff --git a/tests/Annotated/Unit/Utils/EntityUtilsTest.php b/tests/Annotated/Unit/Utils/EntityUtilsTest.php
new file mode 100644
index 00000000..9b3e7a7f
--- /dev/null
+++ b/tests/Annotated/Unit/Utils/EntityUtilsTest.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Unit\Utils;
+
+use Cycle\Annotated\Utils\EntityUtils;
+use PHPUnit\Framework\TestCase;
+use Spiral\Attributes\AnnotationReader;
+use Spiral\Attributes\AttributeReader;
+use Spiral\Attributes\ReaderInterface;
+
+class EntityUtilsTest extends TestCase
+{
+    /**
+     * @dataProvider findParentDataProvider
+     */
+    public function testFindParent(
+        ReaderInterface $reader,
+        string $child,
+        bool $root,
+        ?string $expectedParent
+    ): void {
+        $entityUtils = new EntityUtils($reader);
+
+        $actualParent = $entityUtils->findParent($child, $root);
+
+        $this->assertEquals($expectedParent, $actualParent);
+    }
+
+    public function findParentDataProvider(): iterable
+    {
+        $namespace = 'Cycle\Annotated\Tests\Fixtures\Fixtures19';
+        $readers = [
+            'Attributed' => new AttributeReader(),
+            'Annotated' => new AnnotationReader(),
+        ];
+
+        foreach ($readers as $readerType => $reader) {
+            yield "$readerType Child Root"
+                => [$reader, "$namespace\\$readerType\\Person", true, null];
+            yield "$readerType Child Not Root"
+                => [$reader, "$namespace\\$readerType\\Person", false, null];
+
+            yield "$readerType 1st Level Root"
+                => [$reader, "$namespace\\$readerType\\Supplier", true, "$namespace\\$readerType\\Person"];
+            yield "$readerType 1st Level Not Root"
+                => [$reader, "$namespace\\$readerType\\Supplier", false, "$namespace\\$readerType\\Person"];
+
+            yield "$readerType 2nd Level Root"
+                => [$reader, "$namespace\\$readerType\\LocalSupplier", true, "$namespace\\$readerType\\Person"];
+            yield "$readerType 2nd Level Root No Entity Attribute"
+                => [$reader, "$namespace\\$readerType\\LocalSupplier", false, "$namespace\\$readerType\\Person"];
+
+            yield "$readerType 3rd Level Root"
+                => [$reader, "$namespace\\$readerType\\LocalManager", true, "$namespace\\$readerType\\Person"];
+            yield "$readerType 3rd Level Not Root"
+                => [$reader, "$namespace\\$readerType\\LocalManager", false, "$namespace\\$readerType\\LocalSupplier"];
+        }
+    }
+}

From 6e998d02a033b7642d732da084cdb9bfe2e536f7 Mon Sep 17 00:00:00 2001
From: Maxim Smakouz <m.smakouz@gmail.com>
Date: Wed, 1 Feb 2023 18:03:42 +0200
Subject: [PATCH 3/3] Fix tests

---
 .../Fixtures/Fixtures19/Annotated/Supplier.php        | 11 -----------
 .../Annotated/LocalManager.php                        |  2 +-
 .../Annotated/LocalSupplier.php                       |  2 +-
 .../{Fixtures19 => Fixtures22}/Annotated/Person.php   |  2 +-
 .../Attributed => Fixtures22/Annotated}/Supplier.php  |  2 +-
 .../Attributed/LocalManager.php                       |  2 +-
 .../Attributed/LocalSupplier.php                      |  2 +-
 .../{Fixtures19 => Fixtures22}/Attributed/Person.php  |  2 +-
 .../Fixtures/Fixtures22/Attributed/Supplier.php       |  9 +++++++++
 tests/Annotated/Unit/Utils/EntityUtilsTest.php        |  2 +-
 10 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php
 rename tests/Annotated/Fixtures/{Fixtures19 => Fixtures22}/Annotated/LocalManager.php (67%)
 rename tests/Annotated/Fixtures/{Fixtures19 => Fixtures22}/Annotated/LocalSupplier.php (67%)
 rename tests/Annotated/Fixtures/{Fixtures19 => Fixtures22}/Annotated/Person.php (62%)
 rename tests/Annotated/Fixtures/{Fixtures19/Attributed => Fixtures22/Annotated}/Supplier.php (51%)
 rename tests/Annotated/Fixtures/{Fixtures19 => Fixtures22}/Attributed/LocalManager.php (66%)
 rename tests/Annotated/Fixtures/{Fixtures19 => Fixtures22}/Attributed/LocalSupplier.php (66%)
 rename tests/Annotated/Fixtures/{Fixtures19 => Fixtures22}/Attributed/Person.php (61%)
 create mode 100644 tests/Annotated/Fixtures/Fixtures22/Attributed/Supplier.php

diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php b/tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php
deleted file mode 100644
index 46c946d8..00000000
--- a/tests/Annotated/Fixtures/Fixtures19/Annotated/Supplier.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
-
-use Cycle\Annotated\Annotation\Entity;
-
-class Supplier extends Person
-{
-}
diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php b/tests/Annotated/Fixtures/Fixtures22/Annotated/LocalManager.php
similarity index 67%
rename from tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php
rename to tests/Annotated/Fixtures/Fixtures22/Annotated/LocalManager.php
index 979d6ac8..daea747f 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalManager.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Annotated/LocalManager.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Annotated;
 
 use Cycle\Annotated\Annotation\Entity;
 
diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php b/tests/Annotated/Fixtures/Fixtures22/Annotated/LocalSupplier.php
similarity index 67%
rename from tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php
rename to tests/Annotated/Fixtures/Fixtures22/Annotated/LocalSupplier.php
index 4e693d26..9640ac76 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Annotated/LocalSupplier.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Annotated/LocalSupplier.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Annotated;
 
 use Cycle\Annotated\Annotation\Entity;
 
diff --git a/tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php b/tests/Annotated/Fixtures/Fixtures22/Annotated/Person.php
similarity index 62%
rename from tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php
rename to tests/Annotated/Fixtures/Fixtures22/Annotated/Person.php
index 5f55052e..f961379d 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Annotated/Person.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Annotated/Person.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Annotated;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Annotated;
 
 use Cycle\Annotated\Annotation\Entity;
 
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php b/tests/Annotated/Fixtures/Fixtures22/Annotated/Supplier.php
similarity index 51%
rename from tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php
rename to tests/Annotated/Fixtures/Fixtures22/Annotated/Supplier.php
index 80aabfff..6902fee4 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Attributed/Supplier.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Annotated/Supplier.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Annotated;
 
 class Supplier extends Person
 {
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php b/tests/Annotated/Fixtures/Fixtures22/Attributed/LocalManager.php
similarity index 66%
rename from tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php
rename to tests/Annotated/Fixtures/Fixtures22/Attributed/LocalManager.php
index 68994834..e9e954c6 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalManager.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Attributed/LocalManager.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Attributed;
 
 use Cycle\Annotated\Annotation\Entity;
 
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php b/tests/Annotated/Fixtures/Fixtures22/Attributed/LocalSupplier.php
similarity index 66%
rename from tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php
rename to tests/Annotated/Fixtures/Fixtures22/Attributed/LocalSupplier.php
index 262665c2..fd2e4a90 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Attributed/LocalSupplier.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Attributed/LocalSupplier.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Attributed;
 
 use Cycle\Annotated\Annotation\Entity;
 
diff --git a/tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php b/tests/Annotated/Fixtures/Fixtures22/Attributed/Person.php
similarity index 61%
rename from tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php
rename to tests/Annotated/Fixtures/Fixtures22/Attributed/Person.php
index e7b88276..8ec4e98b 100644
--- a/tests/Annotated/Fixtures/Fixtures19/Attributed/Person.php
+++ b/tests/Annotated/Fixtures/Fixtures22/Attributed/Person.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Cycle\Annotated\Tests\Fixtures\Fixtures19\Attributed;
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Attributed;
 
 use Cycle\Annotated\Annotation\Entity;
 
diff --git a/tests/Annotated/Fixtures/Fixtures22/Attributed/Supplier.php b/tests/Annotated/Fixtures/Fixtures22/Attributed/Supplier.php
new file mode 100644
index 00000000..843554cb
--- /dev/null
+++ b/tests/Annotated/Fixtures/Fixtures22/Attributed/Supplier.php
@@ -0,0 +1,9 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\Fixtures22\Attributed;
+
+class Supplier extends Person
+{
+}
diff --git a/tests/Annotated/Unit/Utils/EntityUtilsTest.php b/tests/Annotated/Unit/Utils/EntityUtilsTest.php
index 9b3e7a7f..ccbef926 100644
--- a/tests/Annotated/Unit/Utils/EntityUtilsTest.php
+++ b/tests/Annotated/Unit/Utils/EntityUtilsTest.php
@@ -30,7 +30,7 @@ public function testFindParent(
 
     public function findParentDataProvider(): iterable
     {
-        $namespace = 'Cycle\Annotated\Tests\Fixtures\Fixtures19';
+        $namespace = 'Cycle\Annotated\Tests\Fixtures\Fixtures22';
         $readers = [
             'Attributed' => new AttributeReader(),
             'Annotated' => new AnnotationReader(),