Skip to content

Commit

Permalink
Merge branch '4.1' of https://github.com/coreshop/CoreShop into 4.1
Browse files Browse the repository at this point in the history 
* '4.1' of https://github.com/coreshop/CoreShop:
  [Composer] make dev-master 4.1
  [Registry] require registry 4.1 in all bundles
  Update src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php
  Update CartController - remove Argument Injection
  • Loading branch information
@dpfaffenbauer
dpfaffenbauer committed Jan 7, 2025
2 parents 3cd7aff + 448de1c commit 71589b2
Show file tree
Hide file tree
Showing 66 changed files with 79 additions and 79 deletions.
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/AddressBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ClassDefinitionPatchBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ConfigurationBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/CoreBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/CurrencyBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/CustomerBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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');

Expand All @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/FrontendBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/IndexBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -56,7 +56,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
},
"pimcore": {
"bundles": [
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/InventoryBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/LocaleBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/MenuBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/MessengerBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
},
"pimcore": {
"bundles": [
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/MoneyBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/NotificationBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -50,7 +50,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/OptimisticEntityLockBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/OrderBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -58,7 +58,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/PaymentBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/PayumBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/PayumPaymentBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/PimcoreBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/ProductBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -52,7 +52,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/ProductQuantityPriceRulesBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/ResourceBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -66,7 +66,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/RuleBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/SEOBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/SequenceBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/ShippingBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -53,7 +53,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/StorageListBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
}
}
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/StoreBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/TaxationBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
2 changes: 1 addition & 1 deletion src/CoreShop/Bundle/TestBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
4 changes: 2 additions & 2 deletions src/CoreShop/Bundle/ThemeBundle/composer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -50,7 +50,7 @@
"prefer-stable": true,
"extra": {
"branch-alias": {
"dev-master": "4.0-dev"
"dev-master": "4.1-dev"
}
},
"config": {
Expand Down
Loading

0 comments on commit 71589b2

Please sign in to comment.