diff --git a/composer.json b/composer.json index 80dcd59e62..856adfc6c5 100644 --- 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 index 66ed44c81c..839fe4d60c 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" } @@ -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 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" } diff --git a/src/Entity/Payment/PaymentRequest.php b/src/Entity/Payment/PaymentRequest.php new file mode 100644 index 0000000000..74eb667d1b --- /dev/null +++ b/src/Entity/Payment/PaymentRequest.php @@ -0,0 +1,14 @@ +