From b8500712d0f656905a09a90c0d49785443391670 Mon Sep 17 00:00:00 2001 From: Svyatoslav Varpikhovsky Date: Tue, 22 Aug 2023 09:19:56 +0300 Subject: [PATCH 1/4] Check CI propel --- composer.json | 2 +- composer.lock | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index e0604656d5..def98e1868 100644 --- a/composer.json +++ b/composer.json @@ -910,7 +910,7 @@ "spryker/products-rest-api": "^2.14.0", "spryker/products-rest-api-extension": "^1.0.0", "spryker/propel": "^3.31.2", - "spryker/propel-orm": "^1.0.0", + "spryker/propel-orm": "dev-backport/1.18.1 as 1.18.1", "spryker/propel-orm-extension": "^1.0.0", "spryker/propel-query-builder": "^0.3.0", "spryker/propel-replication-cache": "^1.0.0", diff --git a/composer.lock b/composer.lock index bfb8415ff7..35c81d141d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a8322d084c93520800047a7cf2aa84b7", + "content-hash": "b29b7db0001c4d0de764aafabdd7bbd3", "packages": [ { "name": "async-aws/core", @@ -54277,21 +54277,21 @@ }, { "name": "spryker/propel-orm", - "version": "1.19.0", + "version": "dev-backport/1.18.1", "source": { "type": "git", "url": "https://github.com/spryker/propel-orm.git", - "reference": "aeb6819ff5fc80fb6d6447c9abc7f11c911eb1d8" + "reference": "39f14f7f88147805e58cc41ccc50d14fc25a4783" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/propel-orm/zipball/aeb6819ff5fc80fb6d6447c9abc7f11c911eb1d8", - "reference": "aeb6819ff5fc80fb6d6447c9abc7f11c911eb1d8", + "url": "https://api.github.com/repos/spryker/propel-orm/zipball/39f14f7f88147805e58cc41ccc50d14fc25a4783", + "reference": "39f14f7f88147805e58cc41ccc50d14fc25a4783", "shasum": "" }, "require": { "php": ">=8.0", - "propel/propel": "2.0.0-beta3", + "propel/propel": "2.0.0-beta1 || 2.0.0-beta2 || 2.0.0-beta3", "spryker/config": "^3.0.0", "spryker/error-handler": "^2.0.0", "spryker/kernel": "^3.67.0", @@ -54321,9 +54321,9 @@ ], "description": "PropelOrm module", "support": { - "source": "https://github.com/spryker/propel-orm/tree/1.19.0" + "source": "https://github.com/spryker/propel-orm/tree/backport/1.18.1" }, - "time": "2023-04-18T11:16:52+00:00" + "time": "2023-08-17T15:43:46+00:00" }, { "name": "spryker/propel-orm-extension", @@ -77184,9 +77184,17 @@ "time": "2022-06-03T18:03:27+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "spryker/propel-orm", + "version": "dev-backport/1.18.1", + "alias": "1.18.1", + "alias_normalized": "1.18.1.0" + } + ], "minimum-stability": "dev", "stability-flags": { + "spryker/propel-orm": 20, "jetbrains/phpstorm-stubs": 20, "spryker/code-sniffer": 20, "spryker/docker-chromedriver": 20, From 8ba27a26d5044ddee4c3fdc83a22391128f14d8a Mon Sep 17 00:00:00 2001 From: Svyatoslav Varpikhovsky Date: Tue, 22 Aug 2023 09:42:04 +0300 Subject: [PATCH 2/4] Check ci spryker/propel-orm and propel/propel 2 beta2 --- composer.json | 1 + composer.lock | 19 +++++++++---------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index def98e1868..3965fa53a2 100644 --- a/composer.json +++ b/composer.json @@ -911,6 +911,7 @@ "spryker/products-rest-api-extension": "^1.0.0", "spryker/propel": "^3.31.2", "spryker/propel-orm": "dev-backport/1.18.1 as 1.18.1", + "propel/propel": "2.0.0-beta2", "spryker/propel-orm-extension": "^1.0.0", "spryker/propel-query-builder": "^0.3.0", "spryker/propel-replication-cache": "^1.0.0", diff --git a/composer.lock b/composer.lock index 35c81d141d..3dc9aad03c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "b29b7db0001c4d0de764aafabdd7bbd3", + "content-hash": "e1f2272277addf4564fda6ded421d3b3", "packages": [ { "name": "async-aws/core", @@ -5054,20 +5054,20 @@ }, { "name": "propel/propel", - "version": "2.0.0-beta3", + "version": "2.0.0-beta2", "source": { "type": "git", "url": "https://github.com/propelorm/Propel2.git", - "reference": "011aaa77d09fd5357f17b60fa3c5ba488c1690ae" + "reference": "8618bbd7c4614e507d1755a0513c66282633787b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel2/zipball/011aaa77d09fd5357f17b60fa3c5ba488c1690ae", - "reference": "011aaa77d09fd5357f17b60fa3c5ba488c1690ae", + "url": "https://api.github.com/repos/propelorm/Propel2/zipball/8618bbd7c4614e507d1755a0513c66282633787b", + "reference": "8618bbd7c4614e507d1755a0513c66282633787b", "shasum": "" }, "require": { - "php": ">=7.4", + "php": ">=7.4 || >=8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/config": "^4.4.0 || ^5.0.0 || ^6.0.0", "symfony/console": "^4.4.0 || ^5.0.0 || ^6.0.0", @@ -5080,9 +5080,8 @@ "require-dev": { "ext-json": "*", "ext-pdo": "*", - "ext-xml": "*", "mikey179/vfsstream": "^1.6", - "monolog/monolog": "^1.3 || ^2.3 || ^3.0", + "monolog/monolog": "^1.3 || ^2.3", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^9.5.0", "psalm/phar": "^4.23", @@ -5124,9 +5123,9 @@ ], "support": { "issues": "https://github.com/propelorm/Propel2/issues", - "source": "https://github.com/propelorm/Propel2/tree/2.0.0-beta3" + "source": "https://github.com/propelorm/Propel2/tree/2.0.0-beta2" }, - "time": "2023-01-25T14:47:29+00:00" + "time": "2022-06-29T13:20:03+00:00" }, { "name": "psr/cache", From 3882df4c5d76bf455845e5924119acf4531ed208 Mon Sep 17 00:00:00 2001 From: Svyatoslav Varpikhovsky Date: Tue, 22 Aug 2023 10:16:03 +0300 Subject: [PATCH 3/4] Check CI for spryker/propel-orm 1.17.1 and propel/propel 2.0.0 beta2 --- composer.json | 2 +- composer.lock | 51 +++++++++++++++++++++++++-------------------------- 2 files changed, 26 insertions(+), 27 deletions(-) diff --git a/composer.json b/composer.json index 3965fa53a2..64ef90f8a0 100644 --- a/composer.json +++ b/composer.json @@ -910,7 +910,7 @@ "spryker/products-rest-api": "^2.14.0", "spryker/products-rest-api-extension": "^1.0.0", "spryker/propel": "^3.31.2", - "spryker/propel-orm": "dev-backport/1.18.1 as 1.18.1", + "spryker/propel-orm": "dev-backport/1.17.1 as 1.17.1", "propel/propel": "2.0.0-beta2", "spryker/propel-orm-extension": "^1.0.0", "spryker/propel-query-builder": "^0.3.0", diff --git a/composer.lock b/composer.lock index 3dc9aad03c..dc15e7fbc5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "e1f2272277addf4564fda6ded421d3b3", + "content-hash": "fdcb595ea844c7cc2625eed69bf2dcbb", "packages": [ { "name": "async-aws/core", @@ -54214,16 +54214,16 @@ }, { "name": "spryker/propel", - "version": "3.38.0", + "version": "3.35.1", "source": { "type": "git", "url": "https://github.com/spryker/propel.git", - "reference": "26b4e6b523f8411b86fb59e02f80016111e63529" + "reference": "4344220e600c9d35ff766bc90415f65f11e6846a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/propel/zipball/26b4e6b523f8411b86fb59e02f80016111e63529", - "reference": "26b4e6b523f8411b86fb59e02f80016111e63529", + "url": "https://api.github.com/repos/spryker/propel/zipball/4344220e600c9d35ff766bc90415f65f11e6846a", + "reference": "4344220e600c9d35ff766bc90415f65f11e6846a", "shasum": "" }, "require": { @@ -54234,7 +54234,7 @@ "spryker/kernel": "^3.48.0", "spryker/log": "^3.0.0", "spryker/monolog": "^2.0.0", - "spryker/propel-orm": "^1.18.0", + "spryker/propel-orm": "^1.16.0", "spryker/symfony": "^3.0.0", "spryker/transfer": "^3.12.0", "spryker/util-encoding": "^2.0.0", @@ -54242,7 +54242,6 @@ }, "require-dev": { "spryker/code-sniffer": "*", - "spryker/console": "*", "spryker/container": "*", "spryker/laminas": "*", "spryker/silex": "*", @@ -54270,27 +54269,27 @@ ], "description": "Propel module", "support": { - "source": "https://github.com/spryker/propel/tree/3.38.0" + "source": "https://github.com/spryker/propel/tree/3.35.1" }, - "time": "2023-04-18T12:08:37+00:00" + "time": "2022-11-11T07:06:41+00:00" }, { "name": "spryker/propel-orm", - "version": "dev-backport/1.18.1", + "version": "dev-backport/1.17.1", "source": { "type": "git", "url": "https://github.com/spryker/propel-orm.git", - "reference": "39f14f7f88147805e58cc41ccc50d14fc25a4783" + "reference": "49f3573528c75c523c5c5fefc092a85543ce2264" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/propel-orm/zipball/39f14f7f88147805e58cc41ccc50d14fc25a4783", - "reference": "39f14f7f88147805e58cc41ccc50d14fc25a4783", + "url": "https://api.github.com/repos/spryker/propel-orm/zipball/49f3573528c75c523c5c5fefc092a85543ce2264", + "reference": "49f3573528c75c523c5c5fefc092a85543ce2264", "shasum": "" }, "require": { - "php": ">=8.0", - "propel/propel": "2.0.0-beta1 || 2.0.0-beta2 || 2.0.0-beta3", + "php": ">=7.4", + "propel/propel": "2.0.0-beta1 || 2.0.0-beta2", "spryker/config": "^3.0.0", "spryker/error-handler": "^2.0.0", "spryker/kernel": "^3.67.0", @@ -54320,9 +54319,9 @@ ], "description": "PropelOrm module", "support": { - "source": "https://github.com/spryker/propel-orm/tree/backport/1.18.1" + "source": "https://github.com/spryker/propel-orm/tree/backport/1.17.1" }, - "time": "2023-08-17T15:43:46+00:00" + "time": "2023-08-17T15:43:22+00:00" }, { "name": "spryker/propel-orm-extension", @@ -63348,16 +63347,16 @@ }, { "name": "spryker/store", - "version": "1.22.0", + "version": "1.23.0", "source": { "type": "git", "url": "https://github.com/spryker/store.git", - "reference": "b8f1d7c27a1f6cb41ad693bbae71f79bc58fde3f" + "reference": "4cae3bcb065468ea0d32ea3a2e4cb8c624d56205" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/store/zipball/b8f1d7c27a1f6cb41ad693bbae71f79bc58fde3f", - "reference": "b8f1d7c27a1f6cb41ad693bbae71f79bc58fde3f", + "url": "https://api.github.com/repos/spryker/store/zipball/4cae3bcb065468ea0d32ea3a2e4cb8c624d56205", + "reference": "4cae3bcb065468ea0d32ea3a2e4cb8c624d56205", "shasum": "" }, "require": { @@ -63407,9 +63406,9 @@ ], "description": "Store module", "support": { - "source": "https://github.com/spryker/store/tree/1.22.0" + "source": "https://github.com/spryker/store/tree/1.23.0" }, - "time": "2023-08-11T07:36:13+00:00" + "time": "2023-08-21T15:35:01+00:00" }, { "name": "spryker/store-context-gui", @@ -77186,9 +77185,9 @@ "aliases": [ { "package": "spryker/propel-orm", - "version": "dev-backport/1.18.1", - "alias": "1.18.1", - "alias_normalized": "1.18.1.0" + "version": "dev-backport/1.17.1", + "alias": "1.17.1", + "alias_normalized": "1.17.1.0" } ], "minimum-stability": "dev", From 594081f4e0f491dfafce1ecee1fb829532321c88 Mon Sep 17 00:00:00 2001 From: Svyatoslav Varpikhovsky Date: Wed, 30 Aug 2023 18:02:36 +0300 Subject: [PATCH 4/4] Updated compsoer.lock --- composer.lock | 60 ++++++++++++++++++++++++++++----------------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/composer.lock b/composer.lock index 6b8e74e7af..f33d192da9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a11bcd3799aa6bbbb64dbec3df692c7f", + "content-hash": "32f9f89c3079534aba64e6dcaeaf01c5", "packages": [ { "name": "async-aws/core", @@ -5059,20 +5059,20 @@ }, { "name": "propel/propel", - "version": "2.0.0-beta3", + "version": "2.0.0-beta2", "source": { "type": "git", "url": "https://github.com/propelorm/Propel2.git", - "reference": "011aaa77d09fd5357f17b60fa3c5ba488c1690ae" + "reference": "8618bbd7c4614e507d1755a0513c66282633787b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/propelorm/Propel2/zipball/011aaa77d09fd5357f17b60fa3c5ba488c1690ae", - "reference": "011aaa77d09fd5357f17b60fa3c5ba488c1690ae", + "url": "https://api.github.com/repos/propelorm/Propel2/zipball/8618bbd7c4614e507d1755a0513c66282633787b", + "reference": "8618bbd7c4614e507d1755a0513c66282633787b", "shasum": "" }, "require": { - "php": ">=7.4", + "php": ">=7.4 || >=8.0", "psr/log": "^1.0 || ^2.0 || ^3.0", "symfony/config": "^4.4.0 || ^5.0.0 || ^6.0.0", "symfony/console": "^4.4.0 || ^5.0.0 || ^6.0.0", @@ -5085,9 +5085,8 @@ "require-dev": { "ext-json": "*", "ext-pdo": "*", - "ext-xml": "*", "mikey179/vfsstream": "^1.6", - "monolog/monolog": "^1.3 || ^2.3 || ^3.0", + "monolog/monolog": "^1.3 || ^2.3", "phpstan/phpstan": "^1.2", "phpunit/phpunit": "^9.5.0", "psalm/phar": "^4.23", @@ -5129,9 +5128,9 @@ ], "support": { "issues": "https://github.com/propelorm/Propel2/issues", - "source": "https://github.com/propelorm/Propel2/tree/2.0.0-beta3" + "source": "https://github.com/propelorm/Propel2/tree/2.0.0-beta2" }, - "time": "2023-01-25T14:47:29+00:00" + "time": "2022-06-29T13:20:03+00:00" }, { "name": "psr/cache", @@ -54413,16 +54412,16 @@ }, { "name": "spryker/propel", - "version": "3.38.0", + "version": "3.35.1", "source": { "type": "git", "url": "https://github.com/spryker/propel.git", - "reference": "26b4e6b523f8411b86fb59e02f80016111e63529" + "reference": "4344220e600c9d35ff766bc90415f65f11e6846a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/propel/zipball/26b4e6b523f8411b86fb59e02f80016111e63529", - "reference": "26b4e6b523f8411b86fb59e02f80016111e63529", + "url": "https://api.github.com/repos/spryker/propel/zipball/4344220e600c9d35ff766bc90415f65f11e6846a", + "reference": "4344220e600c9d35ff766bc90415f65f11e6846a", "shasum": "" }, "require": { @@ -54433,7 +54432,7 @@ "spryker/kernel": "^3.48.0", "spryker/log": "^3.0.0", "spryker/monolog": "^2.0.0", - "spryker/propel-orm": "^1.18.0", + "spryker/propel-orm": "^1.16.0", "spryker/symfony": "^3.0.0", "spryker/transfer": "^3.12.0", "spryker/util-encoding": "^2.0.0", @@ -54441,7 +54440,6 @@ }, "require-dev": { "spryker/code-sniffer": "*", - "spryker/console": "*", "spryker/container": "*", "spryker/laminas": "*", "spryker/silex": "*", @@ -54469,27 +54467,27 @@ ], "description": "Propel module", "support": { - "source": "https://github.com/spryker/propel/tree/3.38.0" + "source": "https://github.com/spryker/propel/tree/3.35.1" }, - "time": "2023-04-18T12:08:37+00:00" + "time": "2022-11-11T07:06:41+00:00" }, { "name": "spryker/propel-orm", - "version": "1.19.0", + "version": "dev-backport/1.17.1", "source": { "type": "git", "url": "https://github.com/spryker/propel-orm.git", - "reference": "aeb6819ff5fc80fb6d6447c9abc7f11c911eb1d8" + "reference": "5b02babf5d8a5af31fd117eaf646742ab68c41a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/propel-orm/zipball/aeb6819ff5fc80fb6d6447c9abc7f11c911eb1d8", - "reference": "aeb6819ff5fc80fb6d6447c9abc7f11c911eb1d8", + "url": "https://api.github.com/repos/spryker/propel-orm/zipball/5b02babf5d8a5af31fd117eaf646742ab68c41a7", + "reference": "5b02babf5d8a5af31fd117eaf646742ab68c41a7", "shasum": "" }, "require": { - "php": ">=8.0", - "propel/propel": "2.0.0-beta3", + "php": ">=7.4", + "propel/propel": "2.0.0-beta1 || 2.0.0-beta2", "spryker/config": "^3.0.0", "spryker/error-handler": "^2.0.0", "spryker/kernel": "^3.67.0", @@ -54519,9 +54517,9 @@ ], "description": "PropelOrm module", "support": { - "source": "https://github.com/spryker/propel-orm/tree/1.19.0" + "source": "https://github.com/spryker/propel-orm/tree/backport/1.17.1" }, - "time": "2023-04-18T11:16:52+00:00" + "time": "2023-08-24T19:06:19+00:00" }, { "name": "spryker/propel-orm-extension", @@ -77432,9 +77430,17 @@ "time": "2022-06-03T18:03:27+00:00" } ], - "aliases": [], + "aliases": [ + { + "package": "spryker/propel-orm", + "version": "dev-backport/1.17.1", + "alias": "1.17.1", + "alias_normalized": "1.17.1.0" + } + ], "minimum-stability": "dev", "stability-flags": { + "spryker/propel-orm": 20, "jetbrains/phpstorm-stubs": 20, "spryker/code-sniffer": 20, "spryker/docker-chromedriver": 20,