From 19702edc1665cac0b56b7899048ed6e5ce75364a Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Mon, 15 Jun 2026 20:25:37 +0400
Subject: [PATCH 1/5] Add RefersToMorphed relation attribute

Add the #[RefersToMorphed] (and @RefersToMorphed) attribute, the morphed
counterpart of RefersTo, mirroring BelongsToMorphed. It compiles to the
`refersToMorphed` relation type and allows self-linked / cyclic morphed
references that BelongsToMorphed cannot persist in a single transaction.

Adds functional tests across all four drivers verifying the relation is
generated as Relation::REFERS_TO_MORPHED with the morph and inner key columns.

Requires cycle/orm with Relation::REFERS_TO_MORPHED and cycle/schema-builder
with the `refersToMorphed` schema generator.
---
 .../Relation/Morphed/RefersToMorphed.php      | 58 ++++++++++++++++
 .../Fixtures/RefersToMorphed/Comment.php      | 28 ++++++++
 .../MorphedParentInterface.php                |  7 ++
 .../Fixtures/RefersToMorphed/Post.php         | 23 +++++++
 .../Morphed/RefersToMorphedTestCase.php       | 66 +++++++++++++++++++
 .../Relation/Morphed/RefersToMorphedTest.php  | 16 +++++
 .../Relation/Morphed/RefersToMorphedTest.php  | 16 +++++
 .../Relation/Morphed/RefersToMorphedTest.php  | 16 +++++
 .../Relation/Morphed/RefersToMorphedTest.php  | 16 +++++
 9 files changed, 246 insertions(+)
 create mode 100644 src/Annotation/Relation/Morphed/RefersToMorphed.php
 create mode 100644 tests/Annotated/Fixtures/RefersToMorphed/Comment.php
 create mode 100644 tests/Annotated/Fixtures/RefersToMorphed/MorphedParentInterface.php
 create mode 100644 tests/Annotated/Fixtures/RefersToMorphed/Post.php
 create mode 100644 tests/Annotated/Functional/Driver/Common/Relation/Morphed/RefersToMorphedTestCase.php
 create mode 100644 tests/Annotated/Functional/Driver/MySQL/Relation/Morphed/RefersToMorphedTest.php
 create mode 100644 tests/Annotated/Functional/Driver/Postgres/Relation/Morphed/RefersToMorphedTest.php
 create mode 100644 tests/Annotated/Functional/Driver/SQLServer/Relation/Morphed/RefersToMorphedTest.php
 create mode 100644 tests/Annotated/Functional/Driver/SQLite/Relation/Morphed/RefersToMorphedTest.php

diff --git a/src/Annotation/Relation/Morphed/RefersToMorphed.php b/src/Annotation/Relation/Morphed/RefersToMorphed.php
new file mode 100644
index 00000000..d9f0728d
--- /dev/null
+++ b/src/Annotation/Relation/Morphed/RefersToMorphed.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Annotation\Relation\Morphed;
+
+use Cycle\Annotated\Annotation\Relation\Inverse;
+use Cycle\Annotated\Annotation\Relation\Relation;
+use Cycle\Annotated\Annotation\Relation\Traits\InverseTrait;
+use Doctrine\Common\Annotations\Annotation\Target;
+use JetBrains\PhpStorm\ExpectedValues;
+use Spiral\Attributes\NamedArgumentConstructor;
+
+/**
+ * Morphed variation of the refers-to relation. Like {@see BelongsToMorphed} it stores the outer key
+ * and the target role on the owner, but resolves the outer key in a deferred way, so it can be used
+ * for self-linked and cyclic morphed references.
+ *
+ * @Annotation
+ * @NamedArgumentConstructor
+ * @Target("PROPERTY")
+ */
+#[\Attribute(\Attribute::TARGET_PROPERTY), NamedArgumentConstructor]
+class RefersToMorphed extends Relation
+{
+    use InverseTrait;
+
+    protected const TYPE = 'refersToMorphed';
+
+    /**
+     * @param non-empty-string $target
+     * @param bool $cascade Automatically save related data with source entity.
+     * @param bool $nullable Defines if the relation can be nullable (child can have no parent).
+     * @param array|non-empty-string|null $innerKey Inner key in source entity. Defaults to `{relationName}_{outerKey}`.
+     * @param array|non-empty-string|null $outerKey Outer key in the related entity. Defaults to primary key.
+     * @param non-empty-string|null $morphKey Name of key to store related entity role. Defaults to `{relationName}_role`.
+     * @param int $morphKeyLength The length of morph key.
+     * @param bool $indexCreate Create an index on morphKey and innerKey.
+     * @param non-empty-string $load Relation load approach.
+     */
+    public function __construct(
+        string $target,
+        protected bool $cascade = true,
+        protected bool $nullable = true,
+        protected array|string|null $innerKey = null,
+        protected array|string|null $outerKey = null,
+        protected ?string $morphKey = null,
+        protected int $morphKeyLength = 32,
+        protected bool $indexCreate = true,
+        #[ExpectedValues(values: ['lazy', 'eager'])]
+        string $load = 'lazy',
+        ?Inverse $inverse = null,
+    ) {
+        $this->inverse = $inverse;
+
+        parent::__construct($target, $load);
+    }
+}
diff --git a/tests/Annotated/Fixtures/RefersToMorphed/Comment.php b/tests/Annotated/Fixtures/RefersToMorphed/Comment.php
new file mode 100644
index 00000000..80f791a9
--- /dev/null
+++ b/tests/Annotated/Fixtures/RefersToMorphed/Comment.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\RefersToMorphed;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+use Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed;
+
+/**
+ * @Entity
+ */
+#[Entity]
+class Comment
+{
+    /** @Column(type="primary") */
+    #[Column(type: 'primary')]
+    protected $id;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    protected $message;
+
+    /** @RefersToMorphed(target="MorphedParentInterface") */
+    #[RefersToMorphed(target: 'MorphedParentInterface')]
+    protected $parent;
+}
diff --git a/tests/Annotated/Fixtures/RefersToMorphed/MorphedParentInterface.php b/tests/Annotated/Fixtures/RefersToMorphed/MorphedParentInterface.php
new file mode 100644
index 00000000..f2ea288e
--- /dev/null
+++ b/tests/Annotated/Fixtures/RefersToMorphed/MorphedParentInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\RefersToMorphed;
+
+interface MorphedParentInterface {}
diff --git a/tests/Annotated/Fixtures/RefersToMorphed/Post.php b/tests/Annotated/Fixtures/RefersToMorphed/Post.php
new file mode 100644
index 00000000..2219c264
--- /dev/null
+++ b/tests/Annotated/Fixtures/RefersToMorphed/Post.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Fixtures\RefersToMorphed;
+
+use Cycle\Annotated\Annotation\Column;
+use Cycle\Annotated\Annotation\Entity;
+
+/**
+ * @Entity
+ */
+#[Entity]
+class Post implements MorphedParentInterface
+{
+    /** @Column(type="primary") */
+    #[Column(type: 'primary')]
+    protected $id;
+
+    /** @Column(type="string") */
+    #[Column(type: 'string')]
+    protected $title;
+}
diff --git a/tests/Annotated/Functional/Driver/Common/Relation/Morphed/RefersToMorphedTestCase.php b/tests/Annotated/Functional/Driver/Common/Relation/Morphed/RefersToMorphedTestCase.php
new file mode 100644
index 00000000..373f2a35
--- /dev/null
+++ b/tests/Annotated/Functional/Driver/Common/Relation/Morphed/RefersToMorphedTestCase.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Functional\Driver\Common\Relation\Morphed;
+
+use Cycle\Annotated\Entities;
+use Cycle\Annotated\Locator\TokenizerEntityLocator;
+use Cycle\Annotated\MergeColumns;
+use Cycle\Annotated\MergeIndexes;
+use Cycle\Annotated\Tests\Fixtures\RefersToMorphed\MorphedParentInterface;
+use Cycle\Annotated\Tests\Functional\Driver\Common\BaseTestCase;
+use Cycle\ORM\Relation;
+use Cycle\ORM\SchemaInterface as Schema;
+use Cycle\Schema\Compiler;
+use Cycle\Schema\Generator\GenerateRelations;
+use Cycle\Schema\Generator\GenerateTypecast;
+use Cycle\Schema\Generator\RenderRelations;
+use Cycle\Schema\Generator\RenderTables;
+use Cycle\Schema\Generator\ResetTables;
+use Cycle\Schema\Generator\SyncTables;
+use Cycle\Schema\Registry;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Spiral\Attributes\ReaderInterface;
+use Spiral\Tokenizer\Config\TokenizerConfig;
+use Spiral\Tokenizer\Tokenizer;
+
+abstract class RefersToMorphedTestCase extends BaseTestCase
+{
+    #[DataProvider('allReadersProvider')]
+    public function testRelation(ReaderInterface $reader): void
+    {
+        $locator = (new Tokenizer(new TokenizerConfig([
+            'directories' => [__DIR__ . '/../../../../../Fixtures/RefersToMorphed'],
+            'exclude' => [],
+        ])))->classLocator();
+
+        $r = new Registry($this->dbal);
+
+        $schema = (new Compiler())->compile($r, [
+            new Entities(new TokenizerEntityLocator($locator, $reader), $reader),
+            new ResetTables(),
+            new MergeColumns($reader),
+            new GenerateRelations(),
+            new RenderTables(),
+            new RenderRelations(),
+            new MergeIndexes($reader),
+            new SyncTables(),
+            new GenerateTypecast(),
+        ]);
+
+        $this->assertArrayHasKey('parent', $schema['comment'][Schema::RELATIONS]);
+        $this->assertSame(
+            Relation::REFERS_TO_MORPHED,
+            $schema['comment'][Schema::RELATIONS]['parent'][Relation::TYPE],
+        );
+        $this->assertSame(
+            MorphedParentInterface::class,
+            $schema['comment'][Schema::RELATIONS]['parent'][Relation::TARGET],
+        );
+
+        // Morphed refers-to stores the outer key and the target role on the source entity.
+        $this->assertContains('parent_id', $schema['comment'][Schema::COLUMNS]);
+        $this->assertContains('parent_role', $schema['comment'][Schema::COLUMNS]);
+    }
+}
diff --git a/tests/Annotated/Functional/Driver/MySQL/Relation/Morphed/RefersToMorphedTest.php b/tests/Annotated/Functional/Driver/MySQL/Relation/Morphed/RefersToMorphedTest.php
new file mode 100644
index 00000000..30442dfe
--- /dev/null
+++ b/tests/Annotated/Functional/Driver/MySQL/Relation/Morphed/RefersToMorphedTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Functional\Driver\MySQL\Relation\Morphed;
+
+// phpcs:ignore
+use Cycle\Annotated\Tests\Functional\Driver\Common\Relation\Morphed\RefersToMorphedTestCase;
+use PHPUnit\Framework\Attributes\Group;
+
+#[Group('driver')]
+#[Group('driver-mysql')]
+final class RefersToMorphedTest extends RefersToMorphedTestCase
+{
+    public const DRIVER = 'mysql';
+}
diff --git a/tests/Annotated/Functional/Driver/Postgres/Relation/Morphed/RefersToMorphedTest.php b/tests/Annotated/Functional/Driver/Postgres/Relation/Morphed/RefersToMorphedTest.php
new file mode 100644
index 00000000..a354de26
--- /dev/null
+++ b/tests/Annotated/Functional/Driver/Postgres/Relation/Morphed/RefersToMorphedTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Functional\Driver\Postgres\Relation\Morphed;
+
+// phpcs:ignore
+use Cycle\Annotated\Tests\Functional\Driver\Common\Relation\Morphed\RefersToMorphedTestCase;
+use PHPUnit\Framework\Attributes\Group;
+
+#[Group('driver')]
+#[Group('driver-postgres')]
+final class RefersToMorphedTest extends RefersToMorphedTestCase
+{
+    public const DRIVER = 'postgres';
+}
diff --git a/tests/Annotated/Functional/Driver/SQLServer/Relation/Morphed/RefersToMorphedTest.php b/tests/Annotated/Functional/Driver/SQLServer/Relation/Morphed/RefersToMorphedTest.php
new file mode 100644
index 00000000..7616e33f
--- /dev/null
+++ b/tests/Annotated/Functional/Driver/SQLServer/Relation/Morphed/RefersToMorphedTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Functional\Driver\SQLServer\Relation\Morphed;
+
+// phpcs:ignore
+use Cycle\Annotated\Tests\Functional\Driver\Common\Relation\Morphed\RefersToMorphedTestCase;
+use PHPUnit\Framework\Attributes\Group;
+
+#[Group('driver')]
+#[Group('driver-sqlserver')]
+final class RefersToMorphedTest extends RefersToMorphedTestCase
+{
+    public const DRIVER = 'sqlserver';
+}
diff --git a/tests/Annotated/Functional/Driver/SQLite/Relation/Morphed/RefersToMorphedTest.php b/tests/Annotated/Functional/Driver/SQLite/Relation/Morphed/RefersToMorphedTest.php
new file mode 100644
index 00000000..bf584182
--- /dev/null
+++ b/tests/Annotated/Functional/Driver/SQLite/Relation/Morphed/RefersToMorphedTest.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Cycle\Annotated\Tests\Functional\Driver\SQLite\Relation\Morphed;
+
+// phpcs:ignore
+use Cycle\Annotated\Tests\Functional\Driver\Common\Relation\Morphed\RefersToMorphedTestCase;
+use PHPUnit\Framework\Attributes\Group;
+
+#[Group('driver')]
+#[Group('driver-sqlite')]
+final class RefersToMorphedTest extends RefersToMorphedTestCase
+{
+    public const DRIVER = 'sqlite';
+}

From 6bc7d9f689bf282e868fd3b568a9777c62a828f4 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Mon, 15 Jun 2026 22:10:48 +0400
Subject: [PATCH 2/5] Register RefersToMorphed attribute and bump cycle deps

Add the #[RefersToMorphed] IDE metadata (relations.meta-storm.xml) mirroring
BelongsToMorphed, and require cycle/orm ^2.18 and cycle/schema-builder ^2.12
which ship the REFERS_TO_MORPHED relation type the attribute compiles to.
---
 composer.json                      | 28 ++++++++++++++--------------
 resources/relations.meta-storm.xml | 23 +++++++++++++++++++++++
 2 files changed, 37 insertions(+), 14 deletions(-)

diff --git a/composer.json b/composer.json
index b6fb0a72..05fe7393 100644
--- a/composer.json
+++ b/composer.json
@@ -18,12 +18,12 @@
             "email": "wolfy-j@spiralscout.com"
         },
         {
-            "name": "Aleksei Gagarin (roxblnfk)",
-            "email": "alexey.gagarin@spiralscout.com"
+            "name": "Aleksei Gagarin",
+            "homepage": "https://github.com/roxblnfk"
         },
         {
-            "name": "Pavel Butchnev (butschster)",
-            "email": "pavel.buchnev@spiralscout.com"
+            "name": "Pavel Butchnev",
+            "homepage": "https://github.com/butschster"
         },
         {
             "name": "Maksim Smakouz (msmakouz)",
@@ -38,20 +38,20 @@
     ],
     "require": {
         "php": ">=8.1",
-        "cycle/database": "^2.16",
-        "cycle/orm": "^2.15",
-        "cycle/schema-builder": "^2.11.1",
-        "spiral/attributes": "^2.8|^3.0",
-        "spiral/tokenizer": "^2.8|^3.0",
-        "doctrine/inflector": "^2.0"
+        "cycle/database": "^2.20",
+        "cycle/orm": "^2.18",
+        "cycle/schema-builder": "^2.12",
+        "spiral/attributes": "^2.8 || ^3.1",
+        "spiral/tokenizer": "^2.8 || ^3.17",
+        "doctrine/inflector": "^2.1"
     },
     "require-dev": {
         "buggregator/trap": "^1.15",
-        "doctrine/annotations": "^1.14.3 || ^2.0.1",
-        "phpunit/phpunit": "^10.1",
-        "spiral/code-style": "^2.2",
+        "doctrine/annotations": "^1.14 || ^2.0",
+        "phpunit/phpunit": "^10.5",
+        "spiral/code-style": "^2.3",
         "spiral/dumper": "^3.3",
-        "vimeo/psalm": "^5.26 || ^6.0"
+        "vimeo/psalm": "^5.26 || ^6.16"
     },
     "autoload": {
         "psr-4": {
diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml
index 079f7feb..ab739b73 100644
--- a/resources/relations.meta-storm.xml
+++ b/resources/relations.meta-storm.xml
@@ -159,6 +159,29 @@
             </properties>
         </classConstructor>
 
+        <!-- Refers To Morphed -->
+        <!-- target: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="1">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
+        <!-- innerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="1" targetInArray="value">
+            <properties xpath="$containingClass">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
+        </classConstructor>
+        <!-- outerKey: -->
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="2" targetInArray="value">
+            <properties xpath="$argument[0]">
+                <filters>
+                    <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
+                </filters>
+            </properties>
+        </classConstructor>
+
         <!-- Morphed Has Many -->
         <!-- target: -->
         <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1">

From 2d656680392ef314eef9032d83115978e47f54e0 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Mon, 15 Jun 2026 22:13:02 +0400
Subject: [PATCH 3/5] Add RefersToMorphed to psalm baseline

Suppress the same DeprecatedClass (NamedArgumentConstructor) and
InvalidClassConstantType (TYPE) issues already baselined for the sibling
relation annotations.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 psalm-baseline.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index ecb12747..6359999f 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -112,6 +112,14 @@
       <code><![CDATA[TYPE]]></code>
     </InvalidClassConstantType>
   </file>
+  <file src="src/Annotation/Relation/Morphed/RefersToMorphed.php">
+    <DeprecatedClass>
+      <code><![CDATA[NamedArgumentConstructor]]></code>
+    </DeprecatedClass>
+    <InvalidClassConstantType>
+      <code><![CDATA[TYPE]]></code>
+    </InvalidClassConstantType>
+  </file>
   <file src="src/Annotation/Relation/RefersTo.php">
     <DeprecatedClass>
       <code><![CDATA[NamedArgumentConstructor]]></code>

From b1172f6a39bd6565cd188f0c3e48fbf7396d2782 Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Tue, 16 Jun 2026 00:23:52 +0400
Subject: [PATCH 4/5] Fix RefersToMorphed meta-storm argument indexes

The meta-storm `argument` attribute is the 0-based constructor parameter
position (confirmed by the docs and the ManyToMany mapping). The morphed
constructor is (target, cascade, nullable, innerKey, outerKey, ...), so the
correct indexes are target=0, innerKey=3, outerKey=4 - not the 1/1/2 that were
mirrored from the (buggy) sibling morphed entries. Without this, the IDE would
offer entity completion for the `cascade`/`nullable` parameters instead of
`target`/`innerKey`/`outerKey`.

Addresses the Copilot review comment on PR #123.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
---
 resources/relations.meta-storm.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml
index ab739b73..2da8ef37 100644
--- a/resources/relations.meta-storm.xml
+++ b/resources/relations.meta-storm.xml
@@ -161,12 +161,12 @@
 
         <!-- Refers To Morphed -->
         <!-- target: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="1">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
         <!-- innerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="1" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="3" targetInArray="value">
             <properties xpath="$containingClass">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
@@ -174,7 +174,7 @@
             </properties>
         </classConstructor>
         <!-- outerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="2" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\RefersToMorphed" argument="4" targetInArray="value">
             <properties xpath="$argument[0]">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>

From a5aa9206290336866cb74585ba1746b77eeb914e Mon Sep 17 00:00:00 2001
From: roxblnfk <roxblnfk@ya.ru>
Date: Tue, 16 Jun 2026 00:27:50 +0400
Subject: [PATCH 5/5] Fix meta-storm argument indexes for all morphed relations

BelongsToMorphed, MorphedHasOne and MorphedHasMany had the same incorrect
meta-storm argument indexes as RefersToMorphed: target/innerKey/outerKey were
mapped to 1/1/2 while the morphed constructor is
(target, cascade, nullable, innerKey, outerKey, ...), i.e. positions 0/3/4.
Align all four morphed relations so the IDE offers entity completion for the
target and column completion for the real innerKey/outerKey arguments.
---
 resources/relations.meta-storm.xml | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml
index 2da8ef37..9df3a63d 100644
--- a/resources/relations.meta-storm.xml
+++ b/resources/relations.meta-storm.xml
@@ -138,12 +138,12 @@
 
         <!-- Belongs To Morphed -->
         <!-- target: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
         <!-- innerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="1" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="3" targetInArray="value">
             <properties xpath="$containingClass">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
@@ -151,7 +151,7 @@
             </properties>
         </classConstructor>
         <!-- outerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="2" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\BelongsToMorphed" argument="4" targetInArray="value">
             <properties xpath="$argument[0]">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
@@ -184,12 +184,12 @@
 
         <!-- Morphed Has Many -->
         <!-- target: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
         <!-- innerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="1" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="3" targetInArray="value">
             <properties xpath="$containingClass">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
@@ -197,7 +197,7 @@
             </properties>
         </classConstructor>
         <!-- outerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="2" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasMany" argument="4" targetInArray="value">
             <properties xpath="$argument[0]">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
@@ -207,12 +207,12 @@
 
         <!-- Morphed Has One -->
         <!-- target: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="0">
             <collection name="cycle/orm:entity-class" argument="0" />
             <collection name="cycle/orm:entity-role" argument="0" />
         </classConstructor>
         <!-- innerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="1" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="3" targetInArray="value">
             <properties xpath="$containingClass">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>
@@ -220,7 +220,7 @@
             </properties>
         </classConstructor>
         <!-- outerKey: -->
-        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="2" targetInArray="value">
+        <classConstructor class="\Cycle\Annotated\Annotation\Relation\Morphed\MorphedHasOne" argument="4" targetInArray="value">
             <properties xpath="$argument[0]">
                 <filters>
                     <hasAttribute class="\Cycle\Annotated\Annotation\Column"/>