From e894d85b31eff89f11ce150c7a40c488f3934d02 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Wed, 30 Oct 2024 15:03:29 +0100 Subject: [PATCH 1/6] [Composer] Bump Sylius to v2.0.0-BETA.1 --- composer.json | 4 ++-- symfony.lock | 14 ++++++++++++++ 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 80dcd59e62..74bc70dd5e 100644 --- a/composer.json +++ b/composer.json @@ -26,7 +26,7 @@ ], "require": { "php": "^8.2", - "sylius/sylius": "2.0.x-dev", + "sylius/sylius": "v2.0.0-beta.1", "symfony/dotenv": "^6.4 || ^7.1", "symfony/flex": "^2.4", "symfony/runtime": "^6.4 || ^7.1" @@ -78,7 +78,7 @@ }, "extra": { "branch-alias": { - "dev-main": "1.13-dev" + "dev-main": "2.0-dev" }, "symfony": { "allow-contrib": false, diff --git a/symfony.lock b/symfony.lock index b0104c37f2..d88ac6c48a 100644 --- a/symfony.lock +++ b/symfony.lock @@ -13,6 +13,20 @@ "src/ApiResource/.gitignore" ] }, + "api-platform/symfony": { + "version": "4.0", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "4.0", + "ref": "e9952e9f393c2d048f10a78f272cd35e807d972b" + }, + "files": [ + "config/packages/api_platform.yaml", + "config/routes/api_platform.yaml", + "src/ApiResource/.gitignore" + ] + }, "babdev/pagerfanta-bundle": { "version": "v4.4.0" }, From 5ccc7d5afee69fc7c7ed2a47021bf3c4a7b1385c Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Wed, 30 Oct 2024 15:03:54 +0100 Subject: [PATCH 2/6] [Composer] Bump dev dependencies --- composer.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/composer.json b/composer.json index 74bc70dd5e..d89b111450 100644 --- a/composer.json +++ b/composer.json @@ -32,29 +32,29 @@ "symfony/runtime": "^6.4 || ^7.1" }, "require-dev": { - "behat/behat": "^3.7", - "behat/mink-selenium2-driver": "^1.4", + "behat/behat": "^3.14", + "behat/mink-selenium2-driver": "^1.7", "dbrekelmans/bdi": "^1.3", - "dmore/behat-chrome-extension": "^1.3", - "dmore/chrome-mink-driver": "^2.7", - "friends-of-behat/mink": "^1.8", - "friends-of-behat/mink-browserkit-driver": "^1.4", - "friends-of-behat/mink-debug-extension": "^2.0", - "friends-of-behat/mink-extension": "^2.4", + "dmore/behat-chrome-extension": "^1.4", + "dmore/chrome-mink-driver": "^2.9", + "friends-of-behat/mink": "^1.11", + "friends-of-behat/mink-browserkit-driver": "^1.6", + "friends-of-behat/mink-debug-extension": "^2.1", + "friends-of-behat/mink-extension": "^2.7", "friends-of-behat/page-object-extension": "^0.3", - "friends-of-behat/suite-settings-extension": "^1.0", - "friends-of-behat/symfony-extension": "^2.1", - "friends-of-behat/variadic-extension": "^1.3", - "lchrusciel/api-test-case": "^5.0", + "friends-of-behat/suite-settings-extension": "^1.1", + "friends-of-behat/symfony-extension": "^2.6", + "friends-of-behat/variadic-extension": "^1.6", + "lchrusciel/api-test-case": "^5.3", "nyholm/psr7": "^1.8", - "phpstan/extension-installer": "^1.0", - "phpstan/phpstan": "^1.8.4", - "phpstan/phpstan-doctrine": "^1.3.2", - "phpstan/phpstan-webmozart-assert": "^1.1", + "phpstan/extension-installer": "^1.4", + "phpstan/phpstan": "^1.12", + "phpstan/phpstan-doctrine": "^1.5", + "phpstan/phpstan-webmozart-assert": "^1.2", "phpunit/phpunit": "^10.5", "robertfausk/behat-panther-extension": "^1.1", - "sylius-labs/coding-standard": "^4.0", - "sylius-labs/suite-tags-extension": "^0.2", + "sylius-labs/coding-standard": "^4.4", + "sylius-labs/suite-tags-extension": "~0.2", "sylius/sylius-rector": "^2.0", "symfony/browser-kit": "^6.4 || ^7.1", "symfony/debug-bundle": "^6.4 || ^7.1", From 73bdb0287d1a02f41503b17467b82e8ea9802400 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Wed, 30 Oct 2024 15:17:04 +0100 Subject: [PATCH 3/6] [Composer] Update replace section --- composer.json | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index d89b111450..856adfc6c5 100644 --- a/composer.json +++ b/composer.json @@ -130,14 +130,12 @@ "symfony/polyfill-intl-idn": "*", "symfony/polyfill-intl-normalizer": "*", "symfony/polyfill-mbstring": "*", - "symfony/polyfill-php54": "*", - "symfony/polyfill-php55": "*", - "symfony/polyfill-php56": "*", - "symfony/polyfill-php70": "*", - "symfony/polyfill-php71": "*", "symfony/polyfill-php72": "*", "symfony/polyfill-php73": "*", "symfony/polyfill-php74": "*", - "symfony/polyfill-php80": "*" + "symfony/polyfill-php80": "*", + "symfony/polyfill-php81": "*", + "symfony/polyfill-php82": "*", + "symfony/polyfill-php83": "*" } } From 095425acf23ef13ce8e84d6a389a9f25071ad220 Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Wed, 30 Oct 2024 15:40:40 +0100 Subject: [PATCH 4/6] Add missing entities --- config/packages/_sylius.yaml | 22 +++++++++++++++++-- src/Entity/Channel/ShopBillingData.php | 14 ++++++++++++ src/Entity/Payment/PaymentRequest.php | 14 ++++++++++++ src/Entity/Promotion/CatalogPromotion.php | 5 +++++ .../Promotion/CatalogPromotionTranslation.php | 14 ++++++++++++ src/Entity/Promotion/Promotion.php | 5 +++++ src/Entity/Promotion/PromotionTranslation.php | 14 ++++++++++++ src/Entity/Shipping/ShippingMethodRule.php | 14 ++++++++++++ src/Entity/User/AvatarImage.php | 14 ++++++++++++ 9 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 src/Entity/Channel/ShopBillingData.php create mode 100644 src/Entity/Payment/PaymentRequest.php create mode 100644 src/Entity/Promotion/CatalogPromotionTranslation.php create mode 100644 src/Entity/Promotion/PromotionTranslation.php create mode 100644 src/Entity/Shipping/ShippingMethodRule.php create mode 100644 src/Entity/User/AvatarImage.php diff --git a/config/packages/_sylius.yaml b/config/packages/_sylius.yaml index 66ed44c81c..0ca2590d4f 100644 --- a/config/packages/_sylius.yaml +++ b/config/packages/_sylius.yaml @@ -1,9 +1,9 @@ imports: - { resource: "@SyliusCoreBundle/Resources/config/app/config.yml" } + - { resource: "@SyliusPayumBundle/Resources/config/app/config.yaml" } - { resource: "@SyliusAdminBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" } - { resource: "@SyliusShopBundle/Resources/config/app/config.yml" } - - { resource: "@SyliusPayumBundle/Resources/config/app/config.yaml" } + - { resource: "@SyliusApiBundle/Resources/config/app/config.yaml" } - { resource: "../parameters.yaml" } @@ -52,6 +52,9 @@ sylius_channel: model: App\Entity\Channel\Channel sylius_core: resources: + avatar_image: + classes: + model: App\Entity\User\AvatarImage product_image: classes: model: App\Entity\Product\ProductImage @@ -70,6 +73,9 @@ sylius_core: channel_pricing_log_entry: classes: model: App\Entity\Channel\ChannelPricingLogEntry + shop_billing_data: + classes: + model: App\Entity\Channel\ShopBillingData sylius_currency: resources: @@ -124,6 +130,9 @@ sylius_payment: payment: classes: model: App\Entity\Payment\Payment + payment_request: + classes: + model: App\Entity\Payment\PaymentRequest gateway_config: classes: model: App\Entity\Payment\GatewayConfig @@ -174,6 +183,9 @@ sylius_promotion: catalog_promotion: classes: model: App\Entity\Promotion\CatalogPromotion + translation: + classes: + model: App\Entity\Promotion\CatalogPromotionTranslation catalog_promotion_action: classes: model: App\Entity\Promotion\CatalogPromotionAction @@ -183,6 +195,9 @@ sylius_promotion: promotion: classes: model: App\Entity\Promotion\Promotion + translation: + classes: + model: App\Entity\Promotion\PromotionTranslation promotion_rule: classes: model: App\Entity\Promotion\PromotionRule @@ -211,6 +226,9 @@ sylius_shipping: translation: classes: model: App\Entity\Shipping\ShippingMethodTranslation + shipping_method_rule: + classes: + model: App\Entity\Shipping\ShippingMethodRule shipping_category: classes: model: App\Entity\Shipping\ShippingCategory diff --git a/src/Entity/Channel/ShopBillingData.php b/src/Entity/Channel/ShopBillingData.php new file mode 100644 index 0000000000..cce1ef94a4 --- /dev/null +++ b/src/Entity/Channel/ShopBillingData.php @@ -0,0 +1,14 @@ + Date: Wed, 30 Oct 2024 20:46:22 +0100 Subject: [PATCH 5/6] Revert adding ShopBillingData and AvatarImage because of Behats --- config/packages/_sylius.yaml | 6 ------ src/Entity/Channel/ShopBillingData.php | 14 -------------- src/Entity/User/AvatarImage.php | 14 -------------- 3 files changed, 34 deletions(-) delete mode 100644 src/Entity/Channel/ShopBillingData.php delete mode 100644 src/Entity/User/AvatarImage.php diff --git a/config/packages/_sylius.yaml b/config/packages/_sylius.yaml index 0ca2590d4f..839fe4d60c 100644 --- a/config/packages/_sylius.yaml +++ b/config/packages/_sylius.yaml @@ -52,9 +52,6 @@ sylius_channel: model: App\Entity\Channel\Channel sylius_core: resources: - avatar_image: - classes: - model: App\Entity\User\AvatarImage product_image: classes: model: App\Entity\Product\ProductImage @@ -73,9 +70,6 @@ sylius_core: channel_pricing_log_entry: classes: model: App\Entity\Channel\ChannelPricingLogEntry - shop_billing_data: - classes: - model: App\Entity\Channel\ShopBillingData sylius_currency: resources: diff --git a/src/Entity/Channel/ShopBillingData.php b/src/Entity/Channel/ShopBillingData.php deleted file mode 100644 index cce1ef94a4..0000000000 --- a/src/Entity/Channel/ShopBillingData.php +++ /dev/null @@ -1,14 +0,0 @@ - Date: Thu, 31 Oct 2024 07:22:17 +0100 Subject: [PATCH 6/6] [Admin] Disable hub notifications in test env --- config/packages/test/sylius_admin.yaml | 3 +++ config/packages/test_cached/sylius_admin.yaml | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 config/packages/test/sylius_admin.yaml create mode 100644 config/packages/test_cached/sylius_admin.yaml diff --git a/config/packages/test/sylius_admin.yaml b/config/packages/test/sylius_admin.yaml new file mode 100644 index 0000000000..ef785df5f5 --- /dev/null +++ b/config/packages/test/sylius_admin.yaml @@ -0,0 +1,3 @@ +sylius_admin: + notifications: + hub_enabled: false diff --git a/config/packages/test_cached/sylius_admin.yaml b/config/packages/test_cached/sylius_admin.yaml new file mode 100644 index 0000000000..11140b7384 --- /dev/null +++ b/config/packages/test_cached/sylius_admin.yaml @@ -0,0 +1,2 @@ +imports: + - { resource: "../test/sylius_admin.yaml" }