[Composer] Bump Sylius to v2.0.0-BETA.1 + minor improvements (#1057)

Sylius · Oct 31, 2024 · 741bd90 · 741bd90
2 parents 69a42e5 + 8d8ed6c
commit 741bd90
Show file tree

Hide file tree

Showing 11 changed files with 123 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -26,35 +26,35 @@
     ],
     "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"
     },
     "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",
@@ -78,7 +78,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-main": "1.13-dev"
+            "dev-main": "2.0-dev"
         },
         "symfony": {
             "allow-contrib": false,
@@ -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": "*"
     }
 }
diff --git 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" }
 
@@ -124,6 +124,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 +177,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 +189,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 +220,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/config/packages/test/sylius_admin.yaml 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
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../test/sylius_admin.yaml" }
diff --git a/src/Entity/Payment/PaymentRequest.php b/src/Entity/Payment/PaymentRequest.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Payment;
+
+use Doctrine\ORM\Mapping as ORM;
+use Sylius\Component\Payment\Model\PaymentRequest as BasePaymentRequest;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_payment_request')]
+class PaymentRequest extends BasePaymentRequest
+{
+}
diff --git a/src/Entity/Promotion/CatalogPromotion.php b/src/Entity/Promotion/CatalogPromotion.php
@@ -6,9 +6,14 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Sylius\Component\Core\Model\CatalogPromotion as BaseCatalogPromotion;
+use Sylius\Component\Promotion\Model\CatalogPromotionTranslationInterface;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'sylius_catalog_promotion')]
 class CatalogPromotion extends BaseCatalogPromotion
 {
+    protected function createTranslation(): CatalogPromotionTranslationInterface
+    {
+        return new CatalogPromotionTranslation();
+    }
 }
diff --git a/src/Entity/Promotion/CatalogPromotionTranslation.php b/src/Entity/Promotion/CatalogPromotionTranslation.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Promotion;
+
+use Doctrine\ORM\Mapping as ORM;
+use Sylius\Component\Promotion\Model\CatalogPromotionTranslation as BaseCatalogPromotionTranslation;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_catalog_promotion_translation')]
+class CatalogPromotionTranslation extends BaseCatalogPromotionTranslation
+{
+}
diff --git a/src/Entity/Promotion/Promotion.php b/src/Entity/Promotion/Promotion.php
@@ -6,9 +6,14 @@
 
 use Doctrine\ORM\Mapping as ORM;
 use Sylius\Component\Core\Model\Promotion as BasePromotion;
+use Sylius\Component\Promotion\Model\PromotionTranslationInterface;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'sylius_promotion')]
 class Promotion extends BasePromotion
 {
+    protected function createTranslation(): PromotionTranslationInterface
+    {
+        return new PromotionTranslation();
+    }
 }
diff --git a/src/Entity/Promotion/PromotionTranslation.php b/src/Entity/Promotion/PromotionTranslation.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Promotion;
+
+use Doctrine\ORM\Mapping as ORM;
+use Sylius\Component\Promotion\Model\PromotionTranslation as BasePromotionTranslation;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_promotion_translation')]
+class PromotionTranslation extends BasePromotionTranslation
+{
+}
diff --git a/src/Entity/Shipping/ShippingMethodRule.php b/src/Entity/Shipping/ShippingMethodRule.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Entity\Shipping;
+
+use Doctrine\ORM\Mapping as ORM;
+use Sylius\Component\Shipping\Model\ShippingMethodRule as BaseShippingMethodRule;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'sylius_shipping_method_rule')]
+class ShippingMethodRule extends BaseShippingMethodRule
+{
+}
diff --git 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"
     },
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: "../test/sylius_admin.yaml" }