diff --git a/composer.json b/composer.json index 0f5b13bb0c..2a3d9bd117 100644 --- a/composer.json +++ b/composer.json @@ -914,7 +914,8 @@ "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", + "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 6b8e74e7af..0a18620598 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": "7e9acb0e01bce0ab3f4f94f20506e840", "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", @@ -54475,21 +54474,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": "1ffee553d42b419f1a4057148514a8f02725469b" }, "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/1ffee553d42b419f1a4057148514a8f02725469b", + "reference": "1ffee553d42b419f1a4057148514a8f02725469b", "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", @@ -54519,9 +54518,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-24T19:19:07+00:00" }, { "name": "spryker/propel-orm-extension", @@ -77432,9 +77431,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,