Merge pull request #106: update meta-storm syntax

cycle · Jan 8, 2025 · 250c5b5 · 250c5b5
2 parents 6791784 + db590fe
commit 250c5b5
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 516 deletions.
diff --git a/composer.json b/composer.json
@@ -38,7 +38,7 @@
     ],
     "require": {
         "php": ">=8.1",
-        "cycle/orm": "^2.9.1",
+        "cycle/orm": "^2.9.2",
         "cycle/schema-builder": "^2.11.1",
         "spiral/attributes": "^2.8|^3.0",
         "spiral/tokenizer": "^2.8|^3.0",

diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml
@@ -1,30 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <meta-storm xmlns="meta-storm">
     <definitions>
-        <collection
-            className="\Cycle\Annotated\Annotation\Embeddable"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\Embeddable"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
+        <classConstructor class="\Cycle\Annotated\Annotation\Embeddable" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
 
-        <collection
-            className="\Cycle\Annotated\Annotation\ForeignKey"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-class"
-        />
-        <collection
-            className="\Cycle\Annotated\Annotation\ForeignKey"
-            methodName="__construct"
-            argumentIndex="0"
-            collectionName="entity-role"
-        />
+        <classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="0">
+            <collection name="cycle/orm:entity-class" argument="0" />
+            <collection name="cycle/orm:entity-role" argument="0" />
+        </classConstructor>
     </definitions>
 </meta-storm>
diff --git a/resources/collections.meta-storm.xml b/resources/collections.meta-storm.xml
@@ -2,21 +2,17 @@
 <meta-storm xmlns="meta-storm">
     <collections>
         <attributeArgument
-            name="entity-role"
-            className="\Cycle\Annotated\Annotation\Entity"
-            argumentIndex="0"
+            name="cycle/orm:entity-role"
+            class="\Cycle\Annotated\Annotation\Entity"
+            argument="0"
         />
         <attributeClass
-            name="entity-class"
-            className="\Cycle\Annotated\Annotation\Entity"
+            name="cycle/orm:entity-class"
+            class="\Cycle\Annotated\Annotation\Entity"
         />
         <attributeClass
-            name="entity-embeddable-class"
-            className="\Cycle\Annotated\Annotation\Embeddable"
-        />
-        <attributeClass
-            name="cycle-mapper"
-            className="\Cycle\Annotated\Annotation\Embeddable"
+            name="cycle/orm:entity-embeddable-class"
+            class="\Cycle\Annotated\Annotation\Embeddable"
         />
     </collections>
 </meta-storm>
diff --git a/resources/orm-factory.meta-storm.xml b/resources/orm-factory.meta-storm.xml
diff --git a/resources/orm-iterator.meta-storm.xml b/resources/orm-iterator.meta-storm.xml
diff --git a/resources/orm-schema.meta-storm.xml b/resources/orm-schema.meta-storm.xml
diff --git a/resources/orm-services.meta-storm.xml b/resources/orm-services.meta-storm.xml