From 3c31bc0b22039fadea5611c3937ed1f605323cd7 Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Thu, 2 Jan 2025 16:57:00 +0300 Subject: [PATCH 1/5] update meta-storm syntax --- resources/annotated.meta-storm.xml | 32 ++--- resources/collections.meta-storm.xml | 10 +- resources/orm-factory.meta-storm.xml | 96 ++++----------- resources/orm-iterator.meta-storm.xml | 32 ++--- resources/orm-schema.meta-storm.xml | 96 ++++----------- resources/orm-services.meta-storm.xml | 155 ++++++----------------- resources/orm.meta-storm.xml | 53 +++----- resources/relations.meta-storm.xml | 169 +++++++------------------- 8 files changed, 172 insertions(+), 471 deletions(-) diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml index 69716b53..5633a77d 100644 --- a/resources/annotated.meta-storm.xml +++ b/resources/annotated.meta-storm.xml @@ -1,30 +1,14 @@ - - + + + + - - + + + + diff --git a/resources/collections.meta-storm.xml b/resources/collections.meta-storm.xml index d3a629cd..963841f8 100644 --- a/resources/collections.meta-storm.xml +++ b/resources/collections.meta-storm.xml @@ -3,20 +3,20 @@ diff --git a/resources/orm-factory.meta-storm.xml b/resources/orm-factory.meta-storm.xml index 50f2685b..a54265e5 100644 --- a/resources/orm-factory.meta-storm.xml +++ b/resources/orm-factory.meta-storm.xml @@ -1,82 +1,34 @@ - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + diff --git a/resources/orm-iterator.meta-storm.xml b/resources/orm-iterator.meta-storm.xml index 865903a5..932c1b4f 100644 --- a/resources/orm-iterator.meta-storm.xml +++ b/resources/orm-iterator.meta-storm.xml @@ -1,30 +1,14 @@ - - + + + + - - + + + + diff --git a/resources/orm-schema.meta-storm.xml b/resources/orm-schema.meta-storm.xml index 918a88ee..2270ca6a 100644 --- a/resources/orm-schema.meta-storm.xml +++ b/resources/orm-schema.meta-storm.xml @@ -1,82 +1,34 @@ - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + - - + + + + diff --git a/resources/orm-services.meta-storm.xml b/resources/orm-services.meta-storm.xml index 263a1031..104a79aa 100644 --- a/resources/orm-services.meta-storm.xml +++ b/resources/orm-services.meta-storm.xml @@ -1,121 +1,44 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/resources/orm.meta-storm.xml b/resources/orm.meta-storm.xml index 9bb7ad52..284efeaf 100644 --- a/resources/orm.meta-storm.xml +++ b/resources/orm.meta-storm.xml @@ -1,43 +1,24 @@ - - + + + + - - + + + + - - + + + + + + + + + diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml index 614255c4..8903ebd1 100644 --- a/resources/relations.meta-storm.xml +++ b/resources/relations.meta-storm.xml @@ -1,127 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 9b5ef095149512103e98b489904483b6a89eb360 Mon Sep 17 00:00:00 2001 From: Dmitrii Derepko Date: Tue, 7 Jan 2025 14:12:41 +0300 Subject: [PATCH 2/5] add package prefix --- resources/annotated.meta-storm.xml | 8 +++--- resources/collections.meta-storm.xml | 8 +++--- resources/orm-factory.meta-storm.xml | 24 ++++++++--------- resources/orm-iterator.meta-storm.xml | 8 +++--- resources/orm-schema.meta-storm.xml | 24 ++++++++--------- resources/orm-services.meta-storm.xml | 32 +++++++++++----------- resources/orm.meta-storm.xml | 16 +++++------ resources/relations.meta-storm.xml | 38 +++++++++++++-------------- 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml index 5633a77d..25534b6b 100644 --- a/resources/annotated.meta-storm.xml +++ b/resources/annotated.meta-storm.xml @@ -2,13 +2,13 @@ - - + + - - + + diff --git a/resources/collections.meta-storm.xml b/resources/collections.meta-storm.xml index 963841f8..90627aa0 100644 --- a/resources/collections.meta-storm.xml +++ b/resources/collections.meta-storm.xml @@ -2,20 +2,20 @@ diff --git a/resources/orm-factory.meta-storm.xml b/resources/orm-factory.meta-storm.xml index a54265e5..d6ad4a98 100644 --- a/resources/orm-factory.meta-storm.xml +++ b/resources/orm-factory.meta-storm.xml @@ -2,33 +2,33 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/resources/orm-iterator.meta-storm.xml b/resources/orm-iterator.meta-storm.xml index 932c1b4f..15fc38ae 100644 --- a/resources/orm-iterator.meta-storm.xml +++ b/resources/orm-iterator.meta-storm.xml @@ -2,13 +2,13 @@ - - + + - - + + diff --git a/resources/orm-schema.meta-storm.xml b/resources/orm-schema.meta-storm.xml index 2270ca6a..e69ca8ab 100644 --- a/resources/orm-schema.meta-storm.xml +++ b/resources/orm-schema.meta-storm.xml @@ -2,33 +2,33 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/resources/orm-services.meta-storm.xml b/resources/orm-services.meta-storm.xml index 104a79aa..1e5e77c9 100644 --- a/resources/orm-services.meta-storm.xml +++ b/resources/orm-services.meta-storm.xml @@ -2,43 +2,43 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/resources/orm.meta-storm.xml b/resources/orm.meta-storm.xml index 284efeaf..b2261fad 100644 --- a/resources/orm.meta-storm.xml +++ b/resources/orm.meta-storm.xml @@ -2,23 +2,23 @@ - - + + - - + + - - + + - - + + diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml index 8903ebd1..3df2cc11 100644 --- a/resources/relations.meta-storm.xml +++ b/resources/relations.meta-storm.xml @@ -2,51 +2,51 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + From 10cee92dad19cd5a2244c0075f43ef2395f9fb32 Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Tue, 7 Jan 2025 15:32:37 +0400 Subject: [PATCH 3/5] meta storm metadata: fix collection names --- resources/annotated.meta-storm.xml | 8 +++--- resources/collections.meta-storm.xml | 8 +++--- resources/orm-factory.meta-storm.xml | 24 ++++++++--------- resources/orm-iterator.meta-storm.xml | 8 +++--- resources/orm-schema.meta-storm.xml | 24 ++++++++--------- resources/orm-services.meta-storm.xml | 32 +++++++++++----------- resources/orm.meta-storm.xml | 16 +++++------ resources/relations.meta-storm.xml | 38 +++++++++++++-------------- 8 files changed, 79 insertions(+), 79 deletions(-) diff --git a/resources/annotated.meta-storm.xml b/resources/annotated.meta-storm.xml index 25534b6b..5e1dfbc6 100644 --- a/resources/annotated.meta-storm.xml +++ b/resources/annotated.meta-storm.xml @@ -2,13 +2,13 @@ - - + + - - + + diff --git a/resources/collections.meta-storm.xml b/resources/collections.meta-storm.xml index 90627aa0..e5873b86 100644 --- a/resources/collections.meta-storm.xml +++ b/resources/collections.meta-storm.xml @@ -2,20 +2,20 @@ diff --git a/resources/orm-factory.meta-storm.xml b/resources/orm-factory.meta-storm.xml index d6ad4a98..1b78d67d 100644 --- a/resources/orm-factory.meta-storm.xml +++ b/resources/orm-factory.meta-storm.xml @@ -2,33 +2,33 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/resources/orm-iterator.meta-storm.xml b/resources/orm-iterator.meta-storm.xml index 15fc38ae..ca4167b5 100644 --- a/resources/orm-iterator.meta-storm.xml +++ b/resources/orm-iterator.meta-storm.xml @@ -2,13 +2,13 @@ - - + + - - + + diff --git a/resources/orm-schema.meta-storm.xml b/resources/orm-schema.meta-storm.xml index e69ca8ab..2a266449 100644 --- a/resources/orm-schema.meta-storm.xml +++ b/resources/orm-schema.meta-storm.xml @@ -2,33 +2,33 @@ - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/resources/orm-services.meta-storm.xml b/resources/orm-services.meta-storm.xml index 1e5e77c9..8bbae3c1 100644 --- a/resources/orm-services.meta-storm.xml +++ b/resources/orm-services.meta-storm.xml @@ -2,43 +2,43 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + diff --git a/resources/orm.meta-storm.xml b/resources/orm.meta-storm.xml index b2261fad..0884bc60 100644 --- a/resources/orm.meta-storm.xml +++ b/resources/orm.meta-storm.xml @@ -2,23 +2,23 @@ - - + + - - + + - - + + - - + + diff --git a/resources/relations.meta-storm.xml b/resources/relations.meta-storm.xml index 3df2cc11..7fd218fb 100644 --- a/resources/relations.meta-storm.xml +++ b/resources/relations.meta-storm.xml @@ -2,51 +2,51 @@ - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - + From 040fc52c496bfc51c4a9f0255c93e18b07ae04b8 Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Tue, 7 Jan 2025 18:13:30 +0400 Subject: [PATCH 4/5] meta storm metadata: remove files related to ORM package --- resources/orm-factory.meta-storm.xml | 34 --------------------- resources/orm-iterator.meta-storm.xml | 14 --------- resources/orm-schema.meta-storm.xml | 34 --------------------- resources/orm-services.meta-storm.xml | 44 --------------------------- resources/orm.meta-storm.xml | 24 --------------- 5 files changed, 150 deletions(-) delete mode 100644 resources/orm-factory.meta-storm.xml delete mode 100644 resources/orm-iterator.meta-storm.xml delete mode 100644 resources/orm-schema.meta-storm.xml delete mode 100644 resources/orm-services.meta-storm.xml delete mode 100644 resources/orm.meta-storm.xml diff --git a/resources/orm-factory.meta-storm.xml b/resources/orm-factory.meta-storm.xml deleted file mode 100644 index 1b78d67d..00000000 --- a/resources/orm-factory.meta-storm.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/orm-iterator.meta-storm.xml b/resources/orm-iterator.meta-storm.xml deleted file mode 100644 index ca4167b5..00000000 --- a/resources/orm-iterator.meta-storm.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/resources/orm-schema.meta-storm.xml b/resources/orm-schema.meta-storm.xml deleted file mode 100644 index 2a266449..00000000 --- a/resources/orm-schema.meta-storm.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/orm-services.meta-storm.xml b/resources/orm-services.meta-storm.xml deleted file mode 100644 index 8bbae3c1..00000000 --- a/resources/orm-services.meta-storm.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/resources/orm.meta-storm.xml b/resources/orm.meta-storm.xml deleted file mode 100644 index 0884bc60..00000000 --- a/resources/orm.meta-storm.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - From db590fe78c3f6e14b14aef710dc39bc76fa0f69e Mon Sep 17 00:00:00 2001 From: roxblnfk Date: Wed, 8 Jan 2025 15:54:45 +0400 Subject: [PATCH 5/5] Update ORM version --- composer.json | 2 +- resources/collections.meta-storm.xml | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/composer.json b/composer.json index b40a0438..3707ea55 100644 --- 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/collections.meta-storm.xml b/resources/collections.meta-storm.xml index e5873b86..1d83bd1d 100644 --- a/resources/collections.meta-storm.xml +++ b/resources/collections.meta-storm.xml @@ -14,9 +14,5 @@ name="cycle/orm:entity-embeddable-class" class="\Cycle\Annotated\Annotation\Embeddable" /> -