From 422fd00729902df4a562f17bdf27c0633376e4c8 Mon Sep 17 00:00:00 2001 From: Markus Steiner <159416431+steinerCors@users.noreply.github.com> Date: Wed, 30 Oct 2024 08:00:37 +0100 Subject: [PATCH 1/4] Update CartController - remove Argument Injection --- .../Bundle/FrontendBundle/Controller/CartController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php index 10d8ea4466..cccb5d9daf 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php @@ -62,7 +62,7 @@ class CartController extends FrontendController { - public function widgetAction(Request $request, ShopperContextInterface $shopperContext): Response +public function widgetAction(Request $request): Response { $multiCartEnabled = $this->getParameter('coreshop.storage_list.multi_list.order'); @@ -73,7 +73,7 @@ public function widgetAction(Request $request, ShopperContextInterface $shopperC if ($multiCartEnabled) { $form = $this->container->get('form.factory')->createNamed('coreshop', CartListType::class, ['list' => $this->getCart()], [ - 'context' => $shopperContext->getContext(), + 'context' => $this->container->get(ShopperContextInterface::class)->getContext(), ]); $params['form'] = $form->createView(); From f26ef4ed74dac954aff016fbd21b68932b6b3e36 Mon Sep 17 00:00:00 2001 From: Dominik Date: Wed, 30 Oct 2024 14:52:42 +0100 Subject: [PATCH 2/4] Update src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php Co-authored-by: Jacob Dreesen --- .../Bundle/FrontendBundle/Controller/CartController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php b/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php index cccb5d9daf..6e6b0af474 100644 --- a/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php +++ b/src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php @@ -62,7 +62,7 @@ class CartController extends FrontendController { -public function widgetAction(Request $request): Response + public function widgetAction(Request $request): Response { $multiCartEnabled = $this->getParameter('coreshop.storage_list.multi_list.order'); From 126f558808360dda7a70f75362713de42d558e57 Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Fri, 8 Nov 2024 08:11:26 +0100 Subject: [PATCH 3/4] [Registry] require registry 4.1 in all bundles --- src/CoreShop/Bundle/IndexBundle/composer.json | 2 +- src/CoreShop/Bundle/MenuBundle/composer.json | 2 +- src/CoreShop/Bundle/NotificationBundle/composer.json | 2 +- src/CoreShop/Bundle/OrderBundle/composer.json | 2 +- src/CoreShop/Bundle/PimcoreBundle/composer.json | 2 +- src/CoreShop/Bundle/ProductBundle/composer.json | 2 +- src/CoreShop/Bundle/ResourceBundle/composer.json | 2 +- src/CoreShop/Bundle/RuleBundle/composer.json | 2 +- src/CoreShop/Bundle/ShippingBundle/composer.json | 2 +- src/CoreShop/Bundle/ThemeBundle/composer.json | 2 +- src/CoreShop/Bundle/TrackingBundle/composer.json | 2 +- src/CoreShop/Bundle/WorkflowBundle/composer.json | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/CoreShop/Bundle/IndexBundle/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json index 114e3553a9..07305d5ede 100644 --- a/src/CoreShop/Bundle/IndexBundle/composer.json +++ b/src/CoreShop/Bundle/IndexBundle/composer.json @@ -25,7 +25,7 @@ ], "require": { "coreshop/index": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/resource-bundle": "^4.0", "coreshop/menu-bundle": "^4.0", "pimcore/pimcore": "^11.0" diff --git a/src/CoreShop/Bundle/MenuBundle/composer.json b/src/CoreShop/Bundle/MenuBundle/composer.json index a561e14b82..b6f23f6cbc 100644 --- a/src/CoreShop/Bundle/MenuBundle/composer.json +++ b/src/CoreShop/Bundle/MenuBundle/composer.json @@ -24,7 +24,7 @@ } ], "require": { - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/pimcore-bundle": "^4.0", "knplabs/knp-menu-bundle": "^3.1", "pimcore/pimcore": "^11.0" diff --git a/src/CoreShop/Bundle/NotificationBundle/composer.json b/src/CoreShop/Bundle/NotificationBundle/composer.json index c4bfeca16e..dcfbfbf8ad 100644 --- a/src/CoreShop/Bundle/NotificationBundle/composer.json +++ b/src/CoreShop/Bundle/NotificationBundle/composer.json @@ -25,7 +25,7 @@ ], "require": { "coreshop/notification": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/rule-bundle": "^4.0", "coreshop/messenger-bundle": "^4.0", "pimcore/pimcore": "^11.0" diff --git a/src/CoreShop/Bundle/OrderBundle/composer.json b/src/CoreShop/Bundle/OrderBundle/composer.json index 7a0a97abf4..86787679d4 100644 --- a/src/CoreShop/Bundle/OrderBundle/composer.json +++ b/src/CoreShop/Bundle/OrderBundle/composer.json @@ -28,7 +28,7 @@ "coreshop/currency-bundle": "^4.0", "coreshop/customer-bundle": "^4.0", "coreshop/payment-bundle": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/rule-bundle": "^4.0", "coreshop/store-bundle": "^4.0", "coreshop/storage-list-bundle": "^4.0", diff --git a/src/CoreShop/Bundle/PimcoreBundle/composer.json b/src/CoreShop/Bundle/PimcoreBundle/composer.json index 456fc980d0..e4f2de686f 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/composer.json +++ b/src/CoreShop/Bundle/PimcoreBundle/composer.json @@ -25,7 +25,7 @@ ], "require": { "coreshop/pimcore": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "pimcore/pimcore": "^11.0", "pimcore/admin-ui-classic-bundle": "^1.0" }, diff --git a/src/CoreShop/Bundle/ProductBundle/composer.json b/src/CoreShop/Bundle/ProductBundle/composer.json index 8f705e726f..1dc0da100e 100644 --- a/src/CoreShop/Bundle/ProductBundle/composer.json +++ b/src/CoreShop/Bundle/ProductBundle/composer.json @@ -25,7 +25,7 @@ ], "require": { "coreshop/product": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/rule-bundle": "^4.0", "coreshop/currency-bundle": "^4.0", "coreshop/resource-bundle": "^4.0", diff --git a/src/CoreShop/Bundle/ResourceBundle/composer.json b/src/CoreShop/Bundle/ResourceBundle/composer.json index 3cc89f60a9..485cc71b98 100644 --- a/src/CoreShop/Bundle/ResourceBundle/composer.json +++ b/src/CoreShop/Bundle/ResourceBundle/composer.json @@ -31,7 +31,7 @@ "coreshop/pimcore-bundle": "^4.0", "coreshop/locale-bundle": "^4.0", "coreshop/optimistic-entity-lock-bundle": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/resource": "^4.0", "symfony/config": "^6.3", "symfony/expression-language": "^6.3", diff --git a/src/CoreShop/Bundle/RuleBundle/composer.json b/src/CoreShop/Bundle/RuleBundle/composer.json index dbc5bf4518..4673bfe1a0 100644 --- a/src/CoreShop/Bundle/RuleBundle/composer.json +++ b/src/CoreShop/Bundle/RuleBundle/composer.json @@ -25,7 +25,7 @@ ], "require": { "coreshop/rule": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/resource-bundle": "^4.0", "pimcore/pimcore": "^11.0" }, diff --git a/src/CoreShop/Bundle/ShippingBundle/composer.json b/src/CoreShop/Bundle/ShippingBundle/composer.json index 407b0db849..d81887a0d0 100644 --- a/src/CoreShop/Bundle/ShippingBundle/composer.json +++ b/src/CoreShop/Bundle/ShippingBundle/composer.json @@ -25,7 +25,7 @@ ], "require": { "coreshop/shipping": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/address-bundle": "^4.0", "coreshop/rule-bundle": "^4.0", "coreshop/resource-bundle": "^4.0", diff --git a/src/CoreShop/Bundle/ThemeBundle/composer.json b/src/CoreShop/Bundle/ThemeBundle/composer.json index cadc851288..34f929d0cb 100644 --- a/src/CoreShop/Bundle/ThemeBundle/composer.json +++ b/src/CoreShop/Bundle/ThemeBundle/composer.json @@ -24,7 +24,7 @@ } ], "require": { - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/pimcore-bundle": "^4.0", "sylius/theme-bundle": "^2.2", "pimcore/pimcore": "^11.0", diff --git a/src/CoreShop/Bundle/TrackingBundle/composer.json b/src/CoreShop/Bundle/TrackingBundle/composer.json index fc3899631d..28c14f7a94 100644 --- a/src/CoreShop/Bundle/TrackingBundle/composer.json +++ b/src/CoreShop/Bundle/TrackingBundle/composer.json @@ -24,7 +24,7 @@ } ], "require": { - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "coreshop/tracking": "^4.0", "coreshop/pimcore-bundle": "^4.0", "pimcore/pimcore": "^11.0", diff --git a/src/CoreShop/Bundle/WorkflowBundle/composer.json b/src/CoreShop/Bundle/WorkflowBundle/composer.json index f78a592601..ff8806a8b1 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/composer.json +++ b/src/CoreShop/Bundle/WorkflowBundle/composer.json @@ -31,7 +31,7 @@ ], "require": { "coreshop/pimcore": "^4.0", - "coreshop/registry": "^4.0", + "coreshop/registry": "^4.1", "symfony/config": "^6.3", "symfony/workflow": "^6.3", "symfony/yaml": "^6.3", From 7fbd72bee381061146e3ec955e6e7f949af4603c Mon Sep 17 00:00:00 2001 From: Dominik Pfaffenbauer Date: Fri, 8 Nov 2024 08:19:05 +0100 Subject: [PATCH 4/4] [Composer] make dev-master 4.1 --- src/CoreShop/Bundle/AddressBundle/composer.json | 2 +- src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json | 2 +- src/CoreShop/Bundle/ConfigurationBundle/composer.json | 2 +- src/CoreShop/Bundle/CoreBundle/composer.json | 2 +- src/CoreShop/Bundle/CurrencyBundle/composer.json | 2 +- src/CoreShop/Bundle/CustomerBundle/composer.json | 2 +- src/CoreShop/Bundle/FrontendBundle/composer.json | 2 +- src/CoreShop/Bundle/IndexBundle/composer.json | 2 +- src/CoreShop/Bundle/InventoryBundle/composer.json | 2 +- src/CoreShop/Bundle/LocaleBundle/composer.json | 2 +- src/CoreShop/Bundle/MenuBundle/composer.json | 2 +- src/CoreShop/Bundle/MessengerBundle/composer.json | 2 +- src/CoreShop/Bundle/MoneyBundle/composer.json | 2 +- src/CoreShop/Bundle/NotificationBundle/composer.json | 2 +- src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json | 2 +- src/CoreShop/Bundle/OrderBundle/composer.json | 2 +- src/CoreShop/Bundle/PaymentBundle/composer.json | 2 +- src/CoreShop/Bundle/PayumBundle/composer.json | 2 +- src/CoreShop/Bundle/PayumPaymentBundle/composer.json | 2 +- src/CoreShop/Bundle/PimcoreBundle/composer.json | 2 +- src/CoreShop/Bundle/ProductBundle/composer.json | 2 +- .../Bundle/ProductQuantityPriceRulesBundle/composer.json | 2 +- src/CoreShop/Bundle/ResourceBundle/composer.json | 2 +- src/CoreShop/Bundle/RuleBundle/composer.json | 2 +- src/CoreShop/Bundle/SEOBundle/composer.json | 2 +- src/CoreShop/Bundle/SequenceBundle/composer.json | 2 +- src/CoreShop/Bundle/ShippingBundle/composer.json | 2 +- src/CoreShop/Bundle/StorageListBundle/composer.json | 2 +- src/CoreShop/Bundle/StoreBundle/composer.json | 2 +- src/CoreShop/Bundle/TaxationBundle/composer.json | 2 +- src/CoreShop/Bundle/TestBundle/composer.json | 2 +- src/CoreShop/Bundle/ThemeBundle/composer.json | 2 +- src/CoreShop/Bundle/TrackingBundle/composer.json | 2 +- src/CoreShop/Bundle/UserBundle/composer.json | 2 +- src/CoreShop/Bundle/VariantBundle/composer.json | 2 +- src/CoreShop/Bundle/WishlistBundle/composer.json | 2 +- src/CoreShop/Bundle/WorkflowBundle/composer.json | 2 +- src/CoreShop/Component/Address/composer.json | 2 +- src/CoreShop/Component/Configuration/composer.json | 2 +- src/CoreShop/Component/Core/composer.json | 2 +- src/CoreShop/Component/Currency/composer.json | 2 +- src/CoreShop/Component/Customer/composer.json | 2 +- src/CoreShop/Component/Index/composer.json | 2 +- src/CoreShop/Component/Inventory/composer.json | 2 +- src/CoreShop/Component/Locale/composer.json | 2 +- src/CoreShop/Component/Notification/composer.json | 2 +- src/CoreShop/Component/Order/composer.json | 2 +- src/CoreShop/Component/Payment/composer.json | 2 +- src/CoreShop/Component/PayumPayment/composer.json | 2 +- src/CoreShop/Component/Pimcore/composer.json | 2 +- src/CoreShop/Component/Product/composer.json | 2 +- src/CoreShop/Component/ProductQuantityPriceRules/composer.json | 2 +- src/CoreShop/Component/Registry/composer.json | 2 +- src/CoreShop/Component/Resource/composer.json | 2 +- src/CoreShop/Component/Rule/composer.json | 2 +- src/CoreShop/Component/SEO/composer.json | 2 +- src/CoreShop/Component/Sequence/composer.json | 2 +- src/CoreShop/Component/Shipping/composer.json | 2 +- src/CoreShop/Component/StorageList/composer.json | 2 +- src/CoreShop/Component/Store/composer.json | 2 +- src/CoreShop/Component/Taxation/composer.json | 2 +- src/CoreShop/Component/Tracking/composer.json | 2 +- src/CoreShop/Component/User/composer.json | 2 +- src/CoreShop/Component/Variant/composer.json | 2 +- src/CoreShop/Component/Wishlist/composer.json | 2 +- 65 files changed, 65 insertions(+), 65 deletions(-) diff --git a/src/CoreShop/Bundle/AddressBundle/composer.json b/src/CoreShop/Bundle/AddressBundle/composer.json index 1cb2449633..539bf0c997 100755 --- a/src/CoreShop/Bundle/AddressBundle/composer.json +++ b/src/CoreShop/Bundle/AddressBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json index a061d32a2f..4ea183af54 100644 --- a/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json +++ b/src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ConfigurationBundle/composer.json b/src/CoreShop/Bundle/ConfigurationBundle/composer.json index ab8ff8089e..37433616a0 100644 --- a/src/CoreShop/Bundle/ConfigurationBundle/composer.json +++ b/src/CoreShop/Bundle/ConfigurationBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/CoreBundle/composer.json b/src/CoreShop/Bundle/CoreBundle/composer.json index 59cadefb55..02c53ad8e5 100644 --- a/src/CoreShop/Bundle/CoreBundle/composer.json +++ b/src/CoreShop/Bundle/CoreBundle/composer.json @@ -80,7 +80,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/CurrencyBundle/composer.json b/src/CoreShop/Bundle/CurrencyBundle/composer.json index 4060e432fe..62b7e9b8ae 100644 --- a/src/CoreShop/Bundle/CurrencyBundle/composer.json +++ b/src/CoreShop/Bundle/CurrencyBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/CustomerBundle/composer.json b/src/CoreShop/Bundle/CustomerBundle/composer.json index fd25978fcb..7e97daa459 100644 --- a/src/CoreShop/Bundle/CustomerBundle/composer.json +++ b/src/CoreShop/Bundle/CustomerBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/FrontendBundle/composer.json b/src/CoreShop/Bundle/FrontendBundle/composer.json index 5d841815e2..69af3ba2b6 100644 --- a/src/CoreShop/Bundle/FrontendBundle/composer.json +++ b/src/CoreShop/Bundle/FrontendBundle/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/IndexBundle/composer.json b/src/CoreShop/Bundle/IndexBundle/composer.json index 07305d5ede..cbb884c2a1 100644 --- a/src/CoreShop/Bundle/IndexBundle/composer.json +++ b/src/CoreShop/Bundle/IndexBundle/composer.json @@ -56,7 +56,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" }, "pimcore": { "bundles": [ diff --git a/src/CoreShop/Bundle/InventoryBundle/composer.json b/src/CoreShop/Bundle/InventoryBundle/composer.json index 86affdd3a1..c195c87fbb 100644 --- a/src/CoreShop/Bundle/InventoryBundle/composer.json +++ b/src/CoreShop/Bundle/InventoryBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/LocaleBundle/composer.json b/src/CoreShop/Bundle/LocaleBundle/composer.json index 70b90309ca..3b6b809564 100644 --- a/src/CoreShop/Bundle/LocaleBundle/composer.json +++ b/src/CoreShop/Bundle/LocaleBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/MenuBundle/composer.json b/src/CoreShop/Bundle/MenuBundle/composer.json index b6f23f6cbc..7b421d1b81 100644 --- a/src/CoreShop/Bundle/MenuBundle/composer.json +++ b/src/CoreShop/Bundle/MenuBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/MessengerBundle/composer.json b/src/CoreShop/Bundle/MessengerBundle/composer.json index 47e9b0fb21..ea8163e760 100644 --- a/src/CoreShop/Bundle/MessengerBundle/composer.json +++ b/src/CoreShop/Bundle/MessengerBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" }, "pimcore": { "bundles": [ diff --git a/src/CoreShop/Bundle/MoneyBundle/composer.json b/src/CoreShop/Bundle/MoneyBundle/composer.json index fb413f720f..f986e98d81 100644 --- a/src/CoreShop/Bundle/MoneyBundle/composer.json +++ b/src/CoreShop/Bundle/MoneyBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/NotificationBundle/composer.json b/src/CoreShop/Bundle/NotificationBundle/composer.json index dcfbfbf8ad..e3560ace42 100644 --- a/src/CoreShop/Bundle/NotificationBundle/composer.json +++ b/src/CoreShop/Bundle/NotificationBundle/composer.json @@ -50,7 +50,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json b/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json index d2457590ec..bd3e635eb4 100644 --- a/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json +++ b/src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json @@ -46,7 +46,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/OrderBundle/composer.json b/src/CoreShop/Bundle/OrderBundle/composer.json index 86787679d4..c800016481 100644 --- a/src/CoreShop/Bundle/OrderBundle/composer.json +++ b/src/CoreShop/Bundle/OrderBundle/composer.json @@ -58,7 +58,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/PaymentBundle/composer.json b/src/CoreShop/Bundle/PaymentBundle/composer.json index 3b55fc02ca..a9f594b929 100644 --- a/src/CoreShop/Bundle/PaymentBundle/composer.json +++ b/src/CoreShop/Bundle/PaymentBundle/composer.json @@ -51,7 +51,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/PayumBundle/composer.json b/src/CoreShop/Bundle/PayumBundle/composer.json index a18c4dfd87..6f553d0f1c 100644 --- a/src/CoreShop/Bundle/PayumBundle/composer.json +++ b/src/CoreShop/Bundle/PayumBundle/composer.json @@ -56,7 +56,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/PayumPaymentBundle/composer.json b/src/CoreShop/Bundle/PayumPaymentBundle/composer.json index 111e35c445..792cc8fd2f 100644 --- a/src/CoreShop/Bundle/PayumPaymentBundle/composer.json +++ b/src/CoreShop/Bundle/PayumPaymentBundle/composer.json @@ -50,7 +50,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/PimcoreBundle/composer.json b/src/CoreShop/Bundle/PimcoreBundle/composer.json index e4f2de686f..6c13eef5ef 100644 --- a/src/CoreShop/Bundle/PimcoreBundle/composer.json +++ b/src/CoreShop/Bundle/PimcoreBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ProductBundle/composer.json b/src/CoreShop/Bundle/ProductBundle/composer.json index 1dc0da100e..0b22558076 100644 --- a/src/CoreShop/Bundle/ProductBundle/composer.json +++ b/src/CoreShop/Bundle/ProductBundle/composer.json @@ -52,7 +52,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json index 14cc0f16e9..3b2a9d581c 100644 --- a/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json +++ b/src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json @@ -55,7 +55,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ResourceBundle/composer.json b/src/CoreShop/Bundle/ResourceBundle/composer.json index 485cc71b98..9fc8b967fe 100644 --- a/src/CoreShop/Bundle/ResourceBundle/composer.json +++ b/src/CoreShop/Bundle/ResourceBundle/composer.json @@ -66,7 +66,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/RuleBundle/composer.json b/src/CoreShop/Bundle/RuleBundle/composer.json index 4673bfe1a0..b53be1dc43 100644 --- a/src/CoreShop/Bundle/RuleBundle/composer.json +++ b/src/CoreShop/Bundle/RuleBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/SEOBundle/composer.json b/src/CoreShop/Bundle/SEOBundle/composer.json index 65623e392c..1c91a60635 100644 --- a/src/CoreShop/Bundle/SEOBundle/composer.json +++ b/src/CoreShop/Bundle/SEOBundle/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/SequenceBundle/composer.json b/src/CoreShop/Bundle/SequenceBundle/composer.json index abfdb77003..63dafefca7 100644 --- a/src/CoreShop/Bundle/SequenceBundle/composer.json +++ b/src/CoreShop/Bundle/SequenceBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ShippingBundle/composer.json b/src/CoreShop/Bundle/ShippingBundle/composer.json index d81887a0d0..b71cc62428 100644 --- a/src/CoreShop/Bundle/ShippingBundle/composer.json +++ b/src/CoreShop/Bundle/ShippingBundle/composer.json @@ -53,7 +53,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/StorageListBundle/composer.json b/src/CoreShop/Bundle/StorageListBundle/composer.json index 6e65e467e3..0cb6e272c3 100644 --- a/src/CoreShop/Bundle/StorageListBundle/composer.json +++ b/src/CoreShop/Bundle/StorageListBundle/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } } } diff --git a/src/CoreShop/Bundle/StoreBundle/composer.json b/src/CoreShop/Bundle/StoreBundle/composer.json index 29e89b7727..df03c27837 100644 --- a/src/CoreShop/Bundle/StoreBundle/composer.json +++ b/src/CoreShop/Bundle/StoreBundle/composer.json @@ -50,7 +50,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/TaxationBundle/composer.json b/src/CoreShop/Bundle/TaxationBundle/composer.json index 71c5e08e36..7cf957c7b5 100644 --- a/src/CoreShop/Bundle/TaxationBundle/composer.json +++ b/src/CoreShop/Bundle/TaxationBundle/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/TestBundle/composer.json b/src/CoreShop/Bundle/TestBundle/composer.json index 4ab560c5b6..176327fecb 100644 --- a/src/CoreShop/Bundle/TestBundle/composer.json +++ b/src/CoreShop/Bundle/TestBundle/composer.json @@ -61,7 +61,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/ThemeBundle/composer.json b/src/CoreShop/Bundle/ThemeBundle/composer.json index 34f929d0cb..86c00a4552 100644 --- a/src/CoreShop/Bundle/ThemeBundle/composer.json +++ b/src/CoreShop/Bundle/ThemeBundle/composer.json @@ -50,7 +50,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/TrackingBundle/composer.json b/src/CoreShop/Bundle/TrackingBundle/composer.json index 28c14f7a94..d9eacdb972 100644 --- a/src/CoreShop/Bundle/TrackingBundle/composer.json +++ b/src/CoreShop/Bundle/TrackingBundle/composer.json @@ -50,7 +50,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/UserBundle/composer.json b/src/CoreShop/Bundle/UserBundle/composer.json index 5bd76cf880..f788be38bd 100644 --- a/src/CoreShop/Bundle/UserBundle/composer.json +++ b/src/CoreShop/Bundle/UserBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/VariantBundle/composer.json b/src/CoreShop/Bundle/VariantBundle/composer.json index 3836a251aa..d4b0928b07 100644 --- a/src/CoreShop/Bundle/VariantBundle/composer.json +++ b/src/CoreShop/Bundle/VariantBundle/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Bundle/WishlistBundle/composer.json b/src/CoreShop/Bundle/WishlistBundle/composer.json index 6f29b328ca..a10cffae6d 100644 --- a/src/CoreShop/Bundle/WishlistBundle/composer.json +++ b/src/CoreShop/Bundle/WishlistBundle/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } } } diff --git a/src/CoreShop/Bundle/WorkflowBundle/composer.json b/src/CoreShop/Bundle/WorkflowBundle/composer.json index ff8806a8b1..4d49ef8406 100644 --- a/src/CoreShop/Bundle/WorkflowBundle/composer.json +++ b/src/CoreShop/Bundle/WorkflowBundle/composer.json @@ -57,7 +57,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Address/composer.json b/src/CoreShop/Component/Address/composer.json index 81870935ca..fe6cd6fa5a 100644 --- a/src/CoreShop/Component/Address/composer.json +++ b/src/CoreShop/Component/Address/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Configuration/composer.json b/src/CoreShop/Component/Configuration/composer.json index 5fc65a1a96..ab3d42c37d 100644 --- a/src/CoreShop/Component/Configuration/composer.json +++ b/src/CoreShop/Component/Configuration/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Core/composer.json b/src/CoreShop/Component/Core/composer.json index 082f5a36bb..f857c6dd74 100644 --- a/src/CoreShop/Component/Core/composer.json +++ b/src/CoreShop/Component/Core/composer.json @@ -68,7 +68,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Currency/composer.json b/src/CoreShop/Component/Currency/composer.json index 6771566f31..1935c2fc60 100644 --- a/src/CoreShop/Component/Currency/composer.json +++ b/src/CoreShop/Component/Currency/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Customer/composer.json b/src/CoreShop/Component/Customer/composer.json index eca218b904..edca5c2ac3 100644 --- a/src/CoreShop/Component/Customer/composer.json +++ b/src/CoreShop/Component/Customer/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Index/composer.json b/src/CoreShop/Component/Index/composer.json index 7caed54bc5..0170278bfc 100644 --- a/src/CoreShop/Component/Index/composer.json +++ b/src/CoreShop/Component/Index/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Inventory/composer.json b/src/CoreShop/Component/Inventory/composer.json index 342a93559d..e8a6b41a7f 100644 --- a/src/CoreShop/Component/Inventory/composer.json +++ b/src/CoreShop/Component/Inventory/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Locale/composer.json b/src/CoreShop/Component/Locale/composer.json index 05f0217dbb..d0e9f67416 100644 --- a/src/CoreShop/Component/Locale/composer.json +++ b/src/CoreShop/Component/Locale/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Notification/composer.json b/src/CoreShop/Component/Notification/composer.json index 141ade3f89..2200a299b5 100644 --- a/src/CoreShop/Component/Notification/composer.json +++ b/src/CoreShop/Component/Notification/composer.json @@ -50,7 +50,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Order/composer.json b/src/CoreShop/Component/Order/composer.json index a9d645e239..ca98783e68 100644 --- a/src/CoreShop/Component/Order/composer.json +++ b/src/CoreShop/Component/Order/composer.json @@ -60,7 +60,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Payment/composer.json b/src/CoreShop/Component/Payment/composer.json index 7fb7487cec..833b0a4cf1 100644 --- a/src/CoreShop/Component/Payment/composer.json +++ b/src/CoreShop/Component/Payment/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/PayumPayment/composer.json b/src/CoreShop/Component/PayumPayment/composer.json index 37ba29dba4..bc2fe6a87f 100644 --- a/src/CoreShop/Component/PayumPayment/composer.json +++ b/src/CoreShop/Component/PayumPayment/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Pimcore/composer.json b/src/CoreShop/Component/Pimcore/composer.json index a0fa255d3c..a4f6d31617 100644 --- a/src/CoreShop/Component/Pimcore/composer.json +++ b/src/CoreShop/Component/Pimcore/composer.json @@ -52,7 +52,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Product/composer.json b/src/CoreShop/Component/Product/composer.json index b4cd3d6c45..dc096515c4 100644 --- a/src/CoreShop/Component/Product/composer.json +++ b/src/CoreShop/Component/Product/composer.json @@ -51,7 +51,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/ProductQuantityPriceRules/composer.json b/src/CoreShop/Component/ProductQuantityPriceRules/composer.json index 3193d30d5b..b666b39b13 100644 --- a/src/CoreShop/Component/ProductQuantityPriceRules/composer.json +++ b/src/CoreShop/Component/ProductQuantityPriceRules/composer.json @@ -55,7 +55,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Registry/composer.json b/src/CoreShop/Component/Registry/composer.json index 7b9706447a..bd742b15c0 100644 --- a/src/CoreShop/Component/Registry/composer.json +++ b/src/CoreShop/Component/Registry/composer.json @@ -46,7 +46,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Resource/composer.json b/src/CoreShop/Component/Resource/composer.json index 63570e2684..0a13486013 100644 --- a/src/CoreShop/Component/Resource/composer.json +++ b/src/CoreShop/Component/Resource/composer.json @@ -52,7 +52,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Rule/composer.json b/src/CoreShop/Component/Rule/composer.json index 8457566803..ca6d043e22 100644 --- a/src/CoreShop/Component/Rule/composer.json +++ b/src/CoreShop/Component/Rule/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/SEO/composer.json b/src/CoreShop/Component/SEO/composer.json index e426731cb9..cd0f29785d 100644 --- a/src/CoreShop/Component/SEO/composer.json +++ b/src/CoreShop/Component/SEO/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Sequence/composer.json b/src/CoreShop/Component/Sequence/composer.json index 0e4dc40b40..c9166e1b4e 100644 --- a/src/CoreShop/Component/Sequence/composer.json +++ b/src/CoreShop/Component/Sequence/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Shipping/composer.json b/src/CoreShop/Component/Shipping/composer.json index cf87253362..2c12d364a1 100644 --- a/src/CoreShop/Component/Shipping/composer.json +++ b/src/CoreShop/Component/Shipping/composer.json @@ -52,7 +52,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/StorageList/composer.json b/src/CoreShop/Component/StorageList/composer.json index abfe1e8340..db6ec32088 100644 --- a/src/CoreShop/Component/StorageList/composer.json +++ b/src/CoreShop/Component/StorageList/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Store/composer.json b/src/CoreShop/Component/Store/composer.json index 80f3f890ac..70ca251252 100644 --- a/src/CoreShop/Component/Store/composer.json +++ b/src/CoreShop/Component/Store/composer.json @@ -49,7 +49,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Taxation/composer.json b/src/CoreShop/Component/Taxation/composer.json index 04a2989930..83b47473f8 100644 --- a/src/CoreShop/Component/Taxation/composer.json +++ b/src/CoreShop/Component/Taxation/composer.json @@ -47,7 +47,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Tracking/composer.json b/src/CoreShop/Component/Tracking/composer.json index 0d64a84fbf..deab22f6cb 100644 --- a/src/CoreShop/Component/Tracking/composer.json +++ b/src/CoreShop/Component/Tracking/composer.json @@ -46,7 +46,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/User/composer.json b/src/CoreShop/Component/User/composer.json index 55fb22cd0c..30b689b6b9 100644 --- a/src/CoreShop/Component/User/composer.json +++ b/src/CoreShop/Component/User/composer.json @@ -48,7 +48,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Variant/composer.json b/src/CoreShop/Component/Variant/composer.json index d5d81030ca..8f599fae8e 100644 --- a/src/CoreShop/Component/Variant/composer.json +++ b/src/CoreShop/Component/Variant/composer.json @@ -46,7 +46,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } }, "config": { diff --git a/src/CoreShop/Component/Wishlist/composer.json b/src/CoreShop/Component/Wishlist/composer.json index 12c1de32b0..f2c46061c2 100644 --- a/src/CoreShop/Component/Wishlist/composer.json +++ b/src/CoreShop/Component/Wishlist/composer.json @@ -53,7 +53,7 @@ "prefer-stable": true, "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "4.1-dev" } } }