Skip to content

Commit 250c5b5

Browse files
authored
Merge pull request cycle#106: update meta-storm syntax
2 parents 6791784 + db590fe commit 250c5b5

9 files changed

+63
-516
lines changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
],
3939
"require": {
4040
"php": ">=8.1",
41-
"cycle/orm": "^2.9.1",
41+
"cycle/orm": "^2.9.2",
4242
"cycle/schema-builder": "^2.11.1",
4343
"spiral/attributes": "^2.8|^3.0",
4444
"spiral/tokenizer": "^2.8|^3.0",

resources/annotated.meta-storm.xml

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,14 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<meta-storm xmlns="meta-storm">
33
<definitions>
4-
<collection
5-
className="\Cycle\Annotated\Annotation\Embeddable"
6-
methodName="__construct"
7-
argumentIndex="0"
8-
collectionName="entity-class"
9-
/>
10-
<collection
11-
className="\Cycle\Annotated\Annotation\Embeddable"
12-
methodName="__construct"
13-
argumentIndex="0"
14-
collectionName="entity-role"
15-
/>
4+
<classConstructor class="\Cycle\Annotated\Annotation\Embeddable" argument="0">
5+
<collection name="cycle/orm:entity-class" argument="0" />
6+
<collection name="cycle/orm:entity-role" argument="0" />
7+
</classConstructor>
168

17-
<collection
18-
className="\Cycle\Annotated\Annotation\ForeignKey"
19-
methodName="__construct"
20-
argumentIndex="0"
21-
collectionName="entity-class"
22-
/>
23-
<collection
24-
className="\Cycle\Annotated\Annotation\ForeignKey"
25-
methodName="__construct"
26-
argumentIndex="0"
27-
collectionName="entity-role"
28-
/>
9+
<classConstructor class="\Cycle\Annotated\Annotation\ForeignKey" argument="0">
10+
<collection name="cycle/orm:entity-class" argument="0" />
11+
<collection name="cycle/orm:entity-role" argument="0" />
12+
</classConstructor>
2913
</definitions>
3014
</meta-storm>

resources/collections.meta-storm.xml

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,17 @@
22
<meta-storm xmlns="meta-storm">
33
<collections>
44
<attributeArgument
5-
name="entity-role"
6-
className="\Cycle\Annotated\Annotation\Entity"
7-
argumentIndex="0"
5+
name="cycle/orm:entity-role"
6+
class="\Cycle\Annotated\Annotation\Entity"
7+
argument="0"
88
/>
99
<attributeClass
10-
name="entity-class"
11-
className="\Cycle\Annotated\Annotation\Entity"
10+
name="cycle/orm:entity-class"
11+
class="\Cycle\Annotated\Annotation\Entity"
1212
/>
1313
<attributeClass
14-
name="entity-embeddable-class"
15-
className="\Cycle\Annotated\Annotation\Embeddable"
16-
/>
17-
<attributeClass
18-
name="cycle-mapper"
19-
className="\Cycle\Annotated\Annotation\Embeddable"
14+
name="cycle/orm:entity-embeddable-class"
15+
class="\Cycle\Annotated\Annotation\Embeddable"
2016
/>
2117
</collections>
2218
</meta-storm>

resources/orm-factory.meta-storm.xml

Lines changed: 0 additions & 82 deletions
This file was deleted.

resources/orm-iterator.meta-storm.xml

Lines changed: 0 additions & 30 deletions
This file was deleted.

resources/orm-schema.meta-storm.xml

Lines changed: 0 additions & 82 deletions
This file was deleted.

resources/orm-services.meta-storm.xml

Lines changed: 0 additions & 121 deletions
This file was deleted.

0 commit comments

Comments
 (0)