Fix scope uncasting in the ManyToMany relation

cycle · Jul 26, 2023 · f0b7197 · f0b7197
1 parent 1a2f48a
commit f0b7197
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/src/Relation/ManyToMany.php b/src/Relation/ManyToMany.php
@@ -47,8 +47,13 @@ class ManyToMany extends Relation\AbstractRelation
     protected FactoryInterface $factory;
     private HeapInterface $heap;
 
-    public function __construct(ORMInterface $orm, string $role, string $name, string $target, array $schema)
-    {
+    public function __construct(
+        ORMInterface $orm,
+        private string $role,
+        string $name,
+        string $target,
+        array $schema
+    ) {
         parent::__construct($orm, $role, $name, $target, $schema);
         $this->heap = $orm->getHeap();
         $this->sourceProvider = $orm->getService(SourceProviderInterface::class);
@@ -287,7 +292,7 @@ public function resolve(ReferenceInterface $reference, bool $load): ?iterable
         $root->linkNode('output', $node);
 
         // emulate presence of parent entity
-        $root->parseRow(0, $this->mapperProvider->getMapper($reference->getRole())->uncast($scope));
+        $root->parseRow(0, $this->mapperProvider->getMapper($this->role)->uncast($scope));
 
         $iterator = $query->getIterator();
         foreach ($iterator as $row) {

diff --git a/tests/ORM/Functional/Driver/Common/Integration/Case318/CaseTest.php b/tests/ORM/Functional/Driver/Common/Integration/Case318/CaseTest.php
@@ -46,8 +46,9 @@ public function testSelect(): void
 
         $user = $this->orm->getRepository(Entity\User::class)
             ->findByPK($userUuid);
+        $groups = $user->groups;
 
-        $this->assertEquals($groupUuid, $user->groups[0]->uuid);
+        $this->assertEquals($groupUuid, $groups[0]->uuid);
     }
 
     private function makeTables(): void

diff --git a/tests/ORM/Functional/Driver/Common/Integration/Case416/CaseTest.php b/tests/ORM/Functional/Driver/Common/Integration/Case416/CaseTest.php
@@ -10,6 +10,9 @@
 use Cycle\ORM\Tests\Traits\TableTrait;
 use Ramsey\Uuid\Uuid;
 
+/**
+ * @link https://github.com/cycle/orm/issues/416
+ */
 abstract class CaseTest extends BaseTest
 {
     use IntegrationTestTrait;

diff --git a/tests/ORM/Functional/Driver/Common/Integration/Case427/CaseTest.php b/tests/ORM/Functional/Driver/Common/Integration/Case427/CaseTest.php
@@ -11,6 +11,9 @@
 use Cycle\ORM\Tests\Functional\Driver\Common\Integration\IntegrationTestTrait;
 use Cycle\ORM\Tests\Traits\TableTrait;
 
+/**
+ * @link https://github.com/cycle/orm/issues/427
+ */
 abstract class CaseTest extends BaseTest
 {
     use IntegrationTestTrait;