From 23d37114ff9776bdd840a07893d26756bf10be7a Mon Sep 17 00:00:00 2001 From: Adrien LUCAS Date: Wed, 20 Jun 2018 14:22:29 +0200 Subject: [PATCH 1/5] [Doc] Fix typos --- docs/book/customers/addresses/address_book.rst | 2 +- docs/book/customers/customer_and_shopuser.rst | 2 +- docs/book/orders/adjustments.rst | 2 +- docs/book/orders/coupons.rst | 6 +++--- docs/book/orders/payments.rst | 2 +- docs/book/orders/promotions.rst | 2 +- docs/book/orders/shipments.rst | 10 +++++----- docs/book/products/inventory.rst | 4 ++-- docs/book/products/pricing.rst | 2 +- docs/book/products/search.rst | 6 +++--- docs/book/products/taxons.rst | 8 ++++---- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/docs/book/customers/addresses/address_book.rst b/docs/book/customers/addresses/address_book.rst index 82f18efa975..60f58564da0 100644 --- a/docs/book/customers/addresses/address_book.rst +++ b/docs/book/customers/addresses/address_book.rst @@ -21,7 +21,7 @@ On the Customer entity we are holding a collection of addresses: */ protected $addresses; -We can operate on it as usually - by adding and removing objects. +We can operate on it as usual - by adding and removing objects. Besides the Customer entity has a **default address** field that is the default address used both for shipping and billing, the one that will be filling the form fields by default. diff --git a/docs/book/customers/customer_and_shopuser.rst b/docs/book/customers/customer_and_shopuser.rst index 44e1b934925..a0887c953dd 100644 --- a/docs/book/customers/customer_and_shopuser.rst +++ b/docs/book/customers/customer_and_shopuser.rst @@ -17,7 +17,7 @@ or that have somehow provided us their e-mail. How to create a Customer programmatically? '''''''''''''''''''''''''''''''''''''''''' -As usually, use a factory. The only required field for the Customer entity is ``email``, provide it before adding it to the repository. +As usual, use a factory. The only required field for the Customer entity is ``email``, provide it before adding it to the repository. .. code-block:: php diff --git a/docs/book/orders/adjustments.rst b/docs/book/orders/adjustments.rst index b4013ba632d..97ef07b5666 100644 --- a/docs/book/orders/adjustments.rst +++ b/docs/book/orders/adjustments.rst @@ -26,7 +26,7 @@ How to create an Adjustment programmatically? The Adjustments alone are a bit useless. They should be created alongside Orders. -As usually get a factory and create an adjustment. +As usual, get a factory and create an adjustment. Then give it a ``type`` - you can find all the available types on the `AdjustmentInterface `_. The adjustment needs also the ``amount`` - which is the amount of money that will be **added to the orders total**. diff --git a/docs/book/orders/coupons.rst b/docs/book/orders/coupons.rst index 57373a24584..3b3b02984e4 100644 --- a/docs/book/orders/coupons.rst +++ b/docs/book/orders/coupons.rst @@ -61,12 +61,12 @@ Now create an PromotionAction that will take place after applying this promotion $this->container->get('sylius.repository.promotion')->add($promotion); -Finally to see the effects of your promotion with couponyou need to **apply a coupon on the Order**. +Finally to see the effects of your promotion with coupon you need to **apply a coupon on the Order**. How to apply a coupon to an Order? ---------------------------------- -To apply you promotion with coupon that gives 100% discount on the shipping costs +To apply your promotion with coupon that gives 100% discount on the shipping costs you need an order that has shipments. Set your promotion coupon on that order - this is what happens when a customer provides a coupon code during checkout. @@ -83,7 +83,7 @@ Promotion Coupon Generator Making up new codes might become difficult if you would like to prepare a lot of coupons at once. That is why Sylius provides a service that generates random codes for you - `CouponGenerator `_. -In its **PromotionCouponGeneratorInstruction** you can define the amount of coupons that will be generated, length of their codes, expiration date and usage limit. +In its **PromotionCouponGeneratorInstruction** you can define the amount of coupons that will be generated, the length of their codes, expiration date and usage limit. .. code-block:: php diff --git a/docs/book/orders/payments.rst b/docs/book/orders/payments.rst index d4889a33e3e..b616255b5de 100644 --- a/docs/book/orders/payments.rst +++ b/docs/book/orders/payments.rst @@ -81,7 +81,7 @@ Gateway is configured for each payment method separately using the payment metho How to create a PaymentMethod programmatically? ''''''''''''''''''''''''''''''''''''''''''''''' -As usually, use a factory to create a new PaymentMethod and give it a unique code. +As usual, use a factory to create a new PaymentMethod and give it a unique code. .. code-block:: php diff --git a/docs/book/orders/promotions.rst b/docs/book/orders/promotions.rst index 71b2de488d4..942a084c8da 100644 --- a/docs/book/orders/promotions.rst +++ b/docs/book/orders/promotions.rst @@ -18,7 +18,7 @@ and **priority** that is useful for them, because the exclusive promotion should How to create a Promotion programmatically? ------------------------------------------- -Just as usually, use a factory. The promotion needs a ``code`` and a ``name``. +Just as usual, use a factory. The promotion needs a ``code`` and a ``name``. .. code-block:: php diff --git a/docs/book/orders/shipments.rst b/docs/book/orders/shipments.rst index 9f3962f886e..351ca1a75d3 100644 --- a/docs/book/orders/shipments.rst +++ b/docs/book/orders/shipments.rst @@ -4,7 +4,7 @@ Shipments ========= -A **Shipment** is a representation of a shipping request for an Order. Sylius supports multiple shipments per one Order. +A **Shipment** is a representation of a shipping request for an Order. Sylius can attach multiple shipments to each single Order. How is a Shipment created for an Order? ''''''''''''''''''''''''''''''''''''''' @@ -16,7 +16,7 @@ How is a Shipment created for an Order? The Shipment State Machine -------------------------- -A Shipment that is attached to an Order will have its own state machine with such states available: +A Shipment that is attached to an Order will have its own state machine with the following states available: ``cart``, ``ready``, ``cancelled``, ``shipped``. The allowed transitions between these states are: @@ -46,8 +46,8 @@ Shipping Methods How to create a ShippingMethod programmatically? '''''''''''''''''''''''''''''''''''''''''''''''' -As usually use a factory to create a new ShippingMethod. Give it a ``code``, set a desired shipping calculator and set a ``zone``. -It need also a configuration, for instance of the amount (cost). +As usual use a factory to create a new ShippingMethod. Give it a ``code``, set a desired shipping calculator and set a ``zone``. +It also need a configuration, for instance of the amount (cost). At the end add it to the system using a repository. .. code-block:: php @@ -110,7 +110,7 @@ The already defined calculators in Sylius are described as constants in the ProductVariant Configuration ---------------------------- -In order to be able to calculate shipping costs basing on the volume and weight of products in an order +In order to be able to calculate shipping costs based on the volume and weight of products in an order the ProductVariant has the ``depth``, ``width``, ``height`` and ``weight`` fields. Shipment complete events diff --git a/docs/book/products/inventory.rst b/docs/book/products/inventory.rst index 41e07796338..e11df0c146a 100644 --- a/docs/book/products/inventory.rst +++ b/docs/book/products/inventory.rst @@ -12,7 +12,7 @@ InventoryUnit InventoryUnit has a relation to a `Stockable `_ on it, in case of Sylius Core it will be a relation to the **ProductVariant** that implements the StockableInterface on the **OrderItemUnit** that implements the InventoryUnitInterface. -It represents a physical unit of the product variant that is in the magazine. +It represents a physical unit of the product variant that is in the shop. Inventory On Hold ----------------- @@ -27,7 +27,7 @@ Putting inventory items ``onHold`` is a way of reserving them before the custome Availability Checker -------------------- -There is a service that will help you checking the availability of items in the inventory +There is a service that will help you check the availability of items in the inventory - `AvailabilityChecker `_. It has two methods ``isStockAvailable`` (is there at least one item available) and ``isStockSufficient`` (is there a given amount of items available). diff --git a/docs/book/products/pricing.rst b/docs/book/products/pricing.rst index 0278264ef7b..50f1c49c33c 100644 --- a/docs/book/products/pricing.rst +++ b/docs/book/products/pricing.rst @@ -28,7 +28,7 @@ Each currency defined in the system should have an ExchangeRate configured. **ExchangeRate** is a separate entity that holds a relation between two currencies and specifies their exchange rate. -Exchange rates are used for viewing the *approximate* price in a currency different form the base currency of a channel. +Exchange rates are used for viewing the *approximate* price in a currency different from the base currency of a channel. Learn more ---------- diff --git a/docs/book/products/search.rst b/docs/book/products/search.rst index 5ec0c1ea82d..2a45adf5b29 100644 --- a/docs/book/products/search.rst +++ b/docs/book/products/search.rst @@ -4,13 +4,13 @@ Search ====== -Having a products search functionality in an eCommerce system is a very popular usecase. +Having a products search functionality in an eCommerce system is a very popular use case. Sylius provides a products search functionality that is a grid filter. Grid filters ------------ -For simple usecases of products search use the **filters of grids**. +For simple use cases of products search use the **filters of grids**. For example, the shop's categories each have a ``search`` filter in the products grid: .. code-block:: yaml @@ -25,7 +25,7 @@ For example, the shop's categories each have a ``search`` filter in the products form_options: type: contains -It searches by product names that contain a string that the user typed in the search bar. +It searches by product names that contains a string that the user typed in the search bar. The search bar looks like below: diff --git a/docs/book/products/taxons.rst b/docs/book/products/taxons.rst index 8aa5930e96b..17fbbd3b03d 100644 --- a/docs/book/products/taxons.rst +++ b/docs/book/products/taxons.rst @@ -5,7 +5,7 @@ Taxons ====== We understand Taxons in Sylius as you would normally define categories. -Sylius gives you a possibility to categorize your products in a very flexible way, which is one of the most vital funtionalities +Sylius gives you a possibility to categorize your products in a very flexible way, which is one of the most vital functionalities of the modern e-commerce systems. The Taxons system in Sylius works in a hierarchical way. Let's see exemplary categories trees: @@ -107,10 +107,10 @@ In order to categorize products you will need to assign your taxons to them - vi What is the mainTaxon of a Product? ----------------------------------- -The product entity in Sylius core has a field ``mainTaxon``. On its basis for instance the breadcrumbs are generated. -But also you can use it for your own logic, like for instance links generation. +The product entity in Sylius core has a field ``mainTaxon``. This field is used, for instance, for breadcrumbs generation. +But you can also use it for your own logic, like for instance links generation. -To have it on your product you need to use the ``setMainTaxon()`` method. +To set it on your product you need to use the ``setMainTaxon()`` method. Learn more ---------- From 9a807beeb4bd93e919586de7a7ba8e9662ca1b7d Mon Sep 17 00:00:00 2001 From: Mateusz Zalewski Date: Mon, 11 Jun 2018 10:50:33 +0200 Subject: [PATCH 2/5] Add label for issues/pr's that should not be staled --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index 1bafeae9437..2518387c18d 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -3,6 +3,7 @@ daysUntilClose: 7 exemptLabels: - Bug - Critical + - Do not stale staleLabel: Stale markComment: > This issue has been automatically marked as stale because it has not had any From 21433ef18180fd282e8a45a7fe94c2160fc82ccb Mon Sep 17 00:00:00 2001 From: Grzegorz Sadowski Date: Fri, 29 Jun 2018 13:30:45 +0200 Subject: [PATCH 3/5] [Admin] Add missing form parameter to sonata form events --- .../AdminBundle/Resources/views/Crud/Create/_content.html.twig | 2 +- .../AdminBundle/Resources/views/Crud/Update/_content.html.twig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig index 9a8708fe1b3..6d9fe7614ef 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Create/_content.html.twig @@ -6,7 +6,7 @@ {{ form_widget(form) }} {% endif %} - {{ sonata_block_render_event(event_prefix ~ '.form', {'resource': resource}) }} + {{ sonata_block_render_event(event_prefix ~ '.form', {'resource': resource, 'form': form}) }} {% include '@SyliusUi/Form/Buttons/_create.html.twig' with {'paths': {'cancel': path(configuration.getRouteName('index'), configuration.vars.route.parameters|default({}))}} %} diff --git a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig index c44682bab14..c94ed5463ac 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig +++ b/src/Sylius/Bundle/AdminBundle/Resources/views/Crud/Update/_content.html.twig @@ -7,7 +7,7 @@ {{ form_widget(form) }} {% endif %} - {{ sonata_block_render_event(event_prefix ~ '.form', {'resource': resource}) }} + {{ sonata_block_render_event(event_prefix ~ '.form', {'resource': resource, 'form': form}) }} {% include '@SyliusUi/Form/Buttons/_update.html.twig' with {'paths': {'cancel': path(configuration.getRouteName('index'), configuration.vars.route.parameters|default({}))}} %} {{ form_row(form._token) }} From cf27043f70e69e60cf06fa6b7f500e3ccb1c35f6 Mon Sep 17 00:00:00 2001 From: Vladimir Reznichenko Date: Sun, 1 Jul 2018 09:28:36 +0200 Subject: [PATCH 4/5] Php Inspections (EA Ultimate): minor code tweaks --- .../Context/Api/Admin/ManagingProductVariantsContext.php | 4 +--- src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php | 4 +--- src/Sylius/Behat/Context/Setup/ProductContext.php | 2 +- src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php | 2 +- .../Context/Ui/Shop/Checkout/CheckoutAddressingContext.php | 2 +- src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php | 2 +- src/Sylius/Behat/Page/Admin/Order/UpdatePage.php | 2 +- src/Sylius/Behat/Page/SymfonyPage.php | 2 +- src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php | 2 +- .../Bundle/ThemeBundle/Loader/CircularDependencyChecker.php | 2 +- .../Component/Core/Test/Services/DefaultChannelFactory.php | 2 +- src/Sylius/Component/Promotion/Model/Promotion.php | 2 +- 12 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php index 6c1df7c29ca..08ba31a4e59 100644 --- a/src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php +++ b/src/Sylius/Behat/Context/Api/Admin/ManagingProductVariantsContext.php @@ -85,9 +85,7 @@ public function iShouldSeeTheProductVariantNamedAnd(...$names) */ public function iShouldSeeTheProductVariantLabeledAs($label) { - $itemsLabels = array_map(function ($item) { - return $item['descriptor']; - }, $this->getJSONResponse()); + $itemsLabels = array_column($this->getJSONResponse(), 'descriptor'); Assert::oneOf($label, $itemsLabels, 'Expected "%s" to be on the list, found: %s.'); } diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php index 9ac0ed53899..bf48b5c5373 100644 --- a/src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php +++ b/src/Sylius/Behat/Context/Api/Admin/ManagingTaxonsContext.php @@ -97,9 +97,7 @@ public function iShouldSeeTaxonsInTheList($number) public function iShouldSeeTheTaxonNamedAnd(...$expectedTaxonNames) { $response = json_decode($this->client->getResponse()->getContent(), true); - $taxonNames = array_map(function ($item) { - return $item['name']; - }, $response); + $taxonNames = array_column($response, 'name'); Assert::allOneOf($taxonNames, $expectedTaxonNames); } diff --git a/src/Sylius/Behat/Context/Setup/ProductContext.php b/src/Sylius/Behat/Context/Setup/ProductContext.php index db4e1de9737..3e9b953068c 100644 --- a/src/Sylius/Behat/Context/Setup/ProductContext.php +++ b/src/Sylius/Behat/Context/Setup/ProductContext.php @@ -342,7 +342,7 @@ public function theProductHasVariantPricedAt( $productVariantName, $price, StringInflector::nameToUppercaseCode($productVariantName), - (null !== $channel) ? $channel : $this->sharedStorage->get('channel') + $channel ?? $this->sharedStorage->get('channel') ); } diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php index 16d1fe45549..877ff10c0c2 100644 --- a/src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php +++ b/src/Sylius/Behat/Context/Ui/Admin/ManagingOrdersContext.php @@ -848,7 +848,7 @@ public function iShouldNotSeeInformationAboutShipments() */ private function assertElementValidationMessage($type, $element, $expectedMessage) { - $element = sprintf('%s_%s', $type, implode('_', explode(' ', $element))); + $element = sprintf('%s_%s', $type, str_replace(' ', '_', $element)); Assert::true($this->updatePage->checkValidationMessageFor($element, $expectedMessage)); } } diff --git a/src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php b/src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php index 988698c2c89..7d9f961ee60 100644 --- a/src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php +++ b/src/Sylius/Behat/Context/Ui/Shop/Checkout/CheckoutAddressingContext.php @@ -412,7 +412,7 @@ private function createDefaultAddress() */ private function assertElementValidationMessage($type, $element, $expectedMessage) { - $element = sprintf('%s_%s', $type, implode('_', explode(' ', $element))); + $element = sprintf('%s_%s', $type, str_replace(' ', '_', $element)); Assert::true($this->addressPage->checkValidationMessageFor($element, $expectedMessage)); } } diff --git a/src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php b/src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php index 841db0130e9..2dff0d2f87a 100644 --- a/src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php +++ b/src/Sylius/Behat/Page/Admin/Channel/UpdatePage.php @@ -75,7 +75,7 @@ public function isCurrencyChosen($currencyCode) */ public function chooseDefaultTaxZone($taxZone) { - $this->getDocument()->selectFieldOption('Default tax zone', (null === $taxZone) ? '' : $taxZone); + $this->getDocument()->selectFieldOption('Default tax zone', $taxZone ?? ''); } /** diff --git a/src/Sylius/Behat/Page/Admin/Order/UpdatePage.php b/src/Sylius/Behat/Page/Admin/Order/UpdatePage.php index 119f24a5303..301c439d973 100644 --- a/src/Sylius/Behat/Page/Admin/Order/UpdatePage.php +++ b/src/Sylius/Behat/Page/Admin/Order/UpdatePage.php @@ -113,7 +113,7 @@ private function specifyElementValue($elementName, $value) */ private function chooseCountry($country, $addressType) { - $this->getElement($addressType . '_country')->selectOption((null !== $country) ? $country : 'Select'); + $this->getElement($addressType . '_country')->selectOption($country ?? 'Select'); } /** diff --git a/src/Sylius/Behat/Page/SymfonyPage.php b/src/Sylius/Behat/Page/SymfonyPage.php index a03c192af9b..320461d5b7d 100644 --- a/src/Sylius/Behat/Page/SymfonyPage.php +++ b/src/Sylius/Behat/Page/SymfonyPage.php @@ -60,7 +60,7 @@ protected function getUrl(array $urlParameters = []) $replace[sprintf('?%s=%s', $key, $value)] = ''; } - $path = str_replace(array_keys($replace), array_values($replace), $path); + $path = str_replace(array_keys($replace), $replace, $path); return $this->makePathAbsolute($path); } diff --git a/src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php b/src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php index c920809ff44..c5969e8c0c7 100644 --- a/src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php +++ b/src/Sylius/Bundle/ShopBundle/Router/LocaleStrippingRouter.php @@ -113,6 +113,6 @@ private function removeUnusedQueryArgument(string $url, string $key, string $val sprintf('?%s=%s', $key, $value) => '', ]; - return str_replace(array_keys($replace), array_values($replace), $url); + return str_replace(array_keys($replace), $replace, $url); } } diff --git a/src/Sylius/Bundle/ThemeBundle/Loader/CircularDependencyChecker.php b/src/Sylius/Bundle/ThemeBundle/Loader/CircularDependencyChecker.php index 0e7f0b851ce..3e78f99618d 100644 --- a/src/Sylius/Bundle/ThemeBundle/Loader/CircularDependencyChecker.php +++ b/src/Sylius/Bundle/ThemeBundle/Loader/CircularDependencyChecker.php @@ -26,7 +26,7 @@ public function check(ThemeInterface $theme, array $previousThemes = []): void return; } - $previousThemes = array_merge($previousThemes, [$theme]); + $previousThemes[] = $theme; foreach ($theme->getParents() as $parent) { if (in_array($parent, $previousThemes, true)) { throw new CircularDependencyFoundException(array_merge($previousThemes, [$parent])); diff --git a/src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php b/src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php index 96c8db3bee5..77d9bab292a 100644 --- a/src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php +++ b/src/Sylius/Component/Core/Test/Services/DefaultChannelFactory.php @@ -123,7 +123,7 @@ public function create(?string $code = null, ?string $name = null, ?string $curr */ private function provideCurrency(?string $currencyCode): CurrencyInterface { - $currencyCode = (null !== $currencyCode) ? $currencyCode : self::DEFAULT_CHANNEL_CURRENCY; + $currencyCode = $currencyCode ?? self::DEFAULT_CHANNEL_CURRENCY; /** @var CurrencyInterface $currency */ $currency = $this->currencyRepository->findOneBy(['code' => $currencyCode]); diff --git a/src/Sylius/Component/Promotion/Model/Promotion.php b/src/Sylius/Component/Promotion/Model/Promotion.php index a4f83892810..4ac658d1559 100644 --- a/src/Sylius/Component/Promotion/Model/Promotion.php +++ b/src/Sylius/Component/Promotion/Model/Promotion.php @@ -173,7 +173,7 @@ public function getPriority(): int */ public function setPriority(?int $priority): void { - $this->priority = null === $priority ? -1 : $priority; + $this->priority = $priority ?? -1; } /** From b05aeef5897fb034afc594bec47b21a7e5f44db8 Mon Sep 17 00:00:00 2001 From: Kamil Kokot Date: Sun, 1 Jul 2018 18:37:50 +0200 Subject: [PATCH 5/5] Require Symfony 4.1.1 and remove hotfixes for 4.1.0 --- composer.json | 2 +- .../Bundle/AddressingBundle/composer.json | 10 ++++---- .../Bundle/AdminApiBundle/composer.json | 8 +++--- .../config/routing/product_variant.yml | 2 -- .../config/routing/promotion_coupon.yml | 2 -- src/Sylius/Bundle/AdminBundle/composer.json | 4 +-- .../Bundle/AttributeBundle/composer.json | 8 +++--- src/Sylius/Bundle/ChannelBundle/composer.json | 8 +++--- .../Bundle/CoreBundle/Application/Kernel.php | 25 +------------------ src/Sylius/Bundle/CoreBundle/composer.json | 4 +-- .../Bundle/CurrencyBundle/composer.json | 10 ++++---- .../Bundle/CustomerBundle/composer.json | 8 +++--- .../Bundle/FixturesBundle/composer.json | 16 ++++++------ src/Sylius/Bundle/GridBundle/composer.json | 18 ++++++------- .../Bundle/InventoryBundle/composer.json | 10 ++++---- src/Sylius/Bundle/LocaleBundle/composer.json | 8 +++--- src/Sylius/Bundle/MailerBundle/composer.json | 10 ++++---- src/Sylius/Bundle/MoneyBundle/composer.json | 12 ++++----- src/Sylius/Bundle/OrderBundle/composer.json | 12 ++++----- src/Sylius/Bundle/PaymentBundle/composer.json | 6 ++--- src/Sylius/Bundle/PayumBundle/composer.json | 2 +- src/Sylius/Bundle/ProductBundle/composer.json | 10 ++++---- .../Bundle/PromotionBundle/composer.json | 10 ++++---- .../Bundle/ResourceBundle/composer.json | 20 +++++++-------- .../ResourceBundle/test/app/AppKernel.php | 22 +--------------- src/Sylius/Bundle/ReviewBundle/composer.json | 12 ++++----- .../Bundle/ShippingBundle/composer.json | 10 ++++---- src/Sylius/Bundle/ShopBundle/composer.json | 4 +-- .../Bundle/TaxationBundle/composer.json | 8 +++--- .../Bundle/TaxonomyBundle/composer.json | 4 +-- src/Sylius/Bundle/ThemeBundle/composer.json | 6 ++--- src/Sylius/Bundle/UiBundle/composer.json | 10 ++++---- src/Sylius/Bundle/UserBundle/composer.json | 6 ++--- src/Sylius/Component/Addressing/composer.json | 2 +- src/Sylius/Component/Attribute/composer.json | 2 +- src/Sylius/Component/Channel/composer.json | 4 +-- src/Sylius/Component/Core/composer.json | 2 +- src/Sylius/Component/Currency/composer.json | 2 +- src/Sylius/Component/Grid/composer.json | 2 +- src/Sylius/Component/Locale/composer.json | 2 +- src/Sylius/Component/Resource/composer.json | 4 +-- src/Sylius/Component/Shipping/composer.json | 2 +- src/Sylius/Component/User/composer.json | 2 +- 43 files changed, 142 insertions(+), 189 deletions(-) diff --git a/composer.json b/composer.json index d6a5ee186e9..06b9a01e391 100644 --- a/composer.json +++ b/composer.json @@ -58,7 +58,7 @@ "symfony/polyfill-intl-icu": "^1.3", "symfony/polyfill-mbstring": "^1.3", "symfony/swiftmailer-bundle": "^3.0", - "symfony/symfony": "^3.4|^4.1", + "symfony/symfony": "^3.4|^4.1.1", "symfony/thanks": "^1.0", "twig/extensions": "^1.4", "twig/twig": "^2.0", diff --git a/src/Sylius/Bundle/AddressingBundle/composer.json b/src/Sylius/Bundle/AddressingBundle/composer.json index 9cef04b0104..92561d5684a 100644 --- a/src/Sylius/Bundle/AddressingBundle/composer.json +++ b/src/Sylius/Bundle/AddressingBundle/composer.json @@ -25,16 +25,16 @@ "stof/doctrine-extensions-bundle": "^1.2", "sylius/addressing": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", "phpunit/phpunit": "^6.5", - "symfony/browser-kit": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "conflict": { diff --git a/src/Sylius/Bundle/AdminApiBundle/composer.json b/src/Sylius/Bundle/AdminApiBundle/composer.json index 50afa084f51..550cd85a348 100644 --- a/src/Sylius/Bundle/AdminApiBundle/composer.json +++ b/src/Sylius/Bundle/AdminApiBundle/composer.json @@ -24,15 +24,15 @@ "friendsofsymfony/oauth-server-bundle": "^1.6", "sylius/core-bundle": "^1.2", - "symfony/form": "^3.4|^4.1", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1" + "symfony/form": "^3.4|^4.1.1", + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "twig/twig": "^2.0" }, "config": { diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml index 5a0c6890cf8..f3f186f89e0 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_variant.yml @@ -97,8 +97,6 @@ sylius_admin_product_variant_delete: arguments: id: $id productId: $productId - requirements: - id: '\d+' # Hotfix for https://github.com/symfony/symfony/issues/27512, will be removed after Symfony ^4.1.1 is required. sylius_admin_product_variant_generate: path: /generate diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml index 8b730c427b1..929b03b1190 100644 --- a/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml +++ b/src/Sylius/Bundle/AdminBundle/Resources/config/routing/promotion_coupon.yml @@ -102,5 +102,3 @@ sylius_admin_promotion_coupon_delete: section: admin redirect: referer permission: true - requirements: - id: '\d+' # Hotfix for https://github.com/symfony/symfony/issues/27512, will be removed after Symfony ^4.1.1 is required. diff --git a/src/Sylius/Bundle/AdminBundle/composer.json b/src/Sylius/Bundle/AdminBundle/composer.json index 7f9b55a026d..7680b13191d 100644 --- a/src/Sylius/Bundle/AdminBundle/composer.json +++ b/src/Sylius/Bundle/AdminBundle/composer.json @@ -25,12 +25,12 @@ "sonata-project/intl-bundle": "^2.2", "sylius/core-bundle": "^1.2", "sylius/ui-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1.1" }, "conflict": { "twig/twig": "^1.0" diff --git a/src/Sylius/Bundle/AttributeBundle/composer.json b/src/Sylius/Bundle/AttributeBundle/composer.json index e4374ee39fd..3ffe0f7f7ad 100644 --- a/src/Sylius/Bundle/AttributeBundle/composer.json +++ b/src/Sylius/Bundle/AttributeBundle/composer.json @@ -27,15 +27,15 @@ "stof/doctrine-extensions-bundle": "^1.2", "sylius/attribute": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/ChannelBundle/composer.json b/src/Sylius/Bundle/ChannelBundle/composer.json index 1e8e03e7ed0..0833eb92463 100644 --- a/src/Sylius/Bundle/ChannelBundle/composer.json +++ b/src/Sylius/Bundle/ChannelBundle/composer.json @@ -24,7 +24,7 @@ "sylius/channel": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "matthiasnoback/symfony-dependency-injection-test": "^2.0", @@ -32,9 +32,9 @@ "phpunit/phpunit": "^6.5", "twig/twig": "^2.0", "doctrine/orm": "^2.5", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php index 98301b7e6f5..65a2a9b11fd 100644 --- a/src/Sylius/Bundle/CoreBundle/Application/Kernel.php +++ b/src/Sylius/Bundle/CoreBundle/Application/Kernel.php @@ -17,10 +17,8 @@ use Symfony\Component\Config\Loader\DelegatingLoader; use Symfony\Component\Config\Loader\LoaderInterface; use Symfony\Component\Config\Loader\LoaderResolver; -use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\DependencyInjection\ContainerInterface; -use Symfony\Component\DependencyInjection\Exception\ServiceNotFoundException; use Symfony\Component\DependencyInjection\Loader\ClosureLoader; use Symfony\Component\DependencyInjection\Loader\DirectoryLoader; use Symfony\Component\DependencyInjection\Loader\IniFileLoader; @@ -31,7 +29,7 @@ use Symfony\Component\HttpKernel\Kernel as HttpKernel; use Webmozart\Assert\Assert; -class Kernel extends HttpKernel implements CompilerPassInterface +class Kernel extends HttpKernel { public const VERSION = '1.2.1-DEV'; public const VERSION_ID = '10201'; @@ -110,27 +108,6 @@ public function registerBundles(): array return $bundles; } - /** - * Hotfix for https://github.com/symfony/symfony/issues/27494, will be removed after Symfony ^4.1.1 is required. - * - * @internal - */ - public function process(ContainerBuilder $container): void - { - if (HttpKernel::VERSION_ID !== 40100) { - return; - } - - try { - $clientDefinition = $container->findDefinition('test.client'); - - if (count($clientDefinition->getArguments()) >= 5) { - $clientDefinition->replaceArgument(4, null); - } - } catch (ServiceNotFoundException $exception) { - } - } - /** * {@inheritdoc} */ diff --git a/src/Sylius/Bundle/CoreBundle/composer.json b/src/Sylius/Bundle/CoreBundle/composer.json index 5b5a81d8728..e83f9cc26de 100644 --- a/src/Sylius/Bundle/CoreBundle/composer.json +++ b/src/Sylius/Bundle/CoreBundle/composer.json @@ -49,7 +49,7 @@ "sylius/theme-bundle": "^1.2", "sylius/user-bundle": "^1.2", "sylius-labs/association-hydrator": "^1.1", - "symfony/framework-bundle": "^3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1.1", "winzou/state-machine-bundle": "^0.3", "liip/imagine-bundle": "^2.0" }, @@ -59,7 +59,7 @@ "matthiasnoback/symfony-dependency-injection-test": "^2.0", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1.1" }, "conflict": { "twig/twig": "^1.0" diff --git a/src/Sylius/Bundle/CurrencyBundle/composer.json b/src/Sylius/Bundle/CurrencyBundle/composer.json index 589860dccb5..ff4a65406cd 100644 --- a/src/Sylius/Bundle/CurrencyBundle/composer.json +++ b/src/Sylius/Bundle/CurrencyBundle/composer.json @@ -24,17 +24,17 @@ "sylius/currency": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "twig/twig": "^2.0", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "conflict": { diff --git a/src/Sylius/Bundle/CustomerBundle/composer.json b/src/Sylius/Bundle/CustomerBundle/composer.json index 1595c7d3663..ecbc723e022 100644 --- a/src/Sylius/Bundle/CustomerBundle/composer.json +++ b/src/Sylius/Bundle/CustomerBundle/composer.json @@ -37,15 +37,15 @@ "doctrine/orm": "^2.5", "sylius/customer": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1.1", "webmozart/assert": "^1.0" }, "require-dev": { "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/FixturesBundle/composer.json b/src/Sylius/Bundle/FixturesBundle/composer.json index 0e33e86a325..15c42955389 100644 --- a/src/Sylius/Bundle/FixturesBundle/composer.json +++ b/src/Sylius/Bundle/FixturesBundle/composer.json @@ -24,8 +24,8 @@ "doctrine/data-fixtures": "^1.2", "monolog/monolog": "^1.8", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/monolog-bridge": "^3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/monolog-bridge": "^3.4|^4.1.1", "webmozart/assert": "^1.0", "zendframework/zend-stdlib": "^3.0" }, @@ -37,12 +37,12 @@ "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "twig/twig": "^2.0", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1", - "symfony/translation": "^3.4|^4.1", - "symfony/twig-bundle": "^3.4|^4.1", - "symfony/security-csrf": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1", + "symfony/translation": "^3.4|^4.1.1", + "symfony/twig-bundle": "^3.4|^4.1.1", + "symfony/security-csrf": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/GridBundle/composer.json b/src/Sylius/Bundle/GridBundle/composer.json index 93d3c0c33bd..2453c746bdf 100644 --- a/src/Sylius/Bundle/GridBundle/composer.json +++ b/src/Sylius/Bundle/GridBundle/composer.json @@ -23,9 +23,9 @@ "php": "^7.1", "sylius/grid": "^1.2", - "symfony/form": "^3.4|^4.1", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1" + "symfony/form": "^3.4|^4.1.1", + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1" }, "require-dev": { "akeneo/phpspec-skip-example-extension": "^3.0", @@ -40,12 +40,12 @@ "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/proxy-manager-bridge": "^3.4|^4.1", - "symfony/security-csrf": "^3.4|^4.1", - "symfony/twig-bundle": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/proxy-manager-bridge": "^3.4|^4.1.1", + "symfony/security-csrf": "^3.4|^4.1.1", + "symfony/twig-bundle": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", "twig/twig": "^2.0" }, "conflict": { diff --git a/src/Sylius/Bundle/InventoryBundle/composer.json b/src/Sylius/Bundle/InventoryBundle/composer.json index 3f0ac885340..153648dfb51 100644 --- a/src/Sylius/Bundle/InventoryBundle/composer.json +++ b/src/Sylius/Bundle/InventoryBundle/composer.json @@ -24,17 +24,17 @@ "sylius/inventory": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "twig/twig": "^2.0", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "conflict": { diff --git a/src/Sylius/Bundle/LocaleBundle/composer.json b/src/Sylius/Bundle/LocaleBundle/composer.json index c111fc246c6..95e19c3c345 100644 --- a/src/Sylius/Bundle/LocaleBundle/composer.json +++ b/src/Sylius/Bundle/LocaleBundle/composer.json @@ -24,8 +24,8 @@ "sylius/locale": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", @@ -33,8 +33,8 @@ "phpunit/phpunit": "^6.5", "twig/twig": "^2.0", "ocramius/proxy-manager": "^2.0", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "conflict": { diff --git a/src/Sylius/Bundle/MailerBundle/composer.json b/src/Sylius/Bundle/MailerBundle/composer.json index ca6174bd6ab..cb2d144ed42 100644 --- a/src/Sylius/Bundle/MailerBundle/composer.json +++ b/src/Sylius/Bundle/MailerBundle/composer.json @@ -23,17 +23,17 @@ "php": "^7.1", "sylius/mailer": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "symfony/swiftmailer-bundle": "^3.1", - "symfony/templating": "^3.4|^4.1", - "symfony/twig-bundle": "^3.4|^4.1" + "symfony/templating": "^3.4|^4.1.1", + "symfony/twig-bundle": "^3.4|^4.1.1" }, "config": { "bin-dir": "bin" diff --git a/src/Sylius/Bundle/MoneyBundle/composer.json b/src/Sylius/Bundle/MoneyBundle/composer.json index e306b813165..c8a5704f6b4 100644 --- a/src/Sylius/Bundle/MoneyBundle/composer.json +++ b/src/Sylius/Bundle/MoneyBundle/composer.json @@ -23,9 +23,9 @@ "php": "^7.1", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/intl": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/intl": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1", "webmozart/assert": "^1.0" }, "require-dev": { @@ -34,9 +34,9 @@ "phpunit/phpunit": "^6.5", "twig/twig": "^2.0", "sylius/currency-bundle": "^1.2", - "symfony/form": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "conflict": { diff --git a/src/Sylius/Bundle/OrderBundle/composer.json b/src/Sylius/Bundle/OrderBundle/composer.json index 667657f4a31..2a2001bf94c 100644 --- a/src/Sylius/Bundle/OrderBundle/composer.json +++ b/src/Sylius/Bundle/OrderBundle/composer.json @@ -26,8 +26,8 @@ "sylius/money-bundle": "^1.2", "sylius/order": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", @@ -35,10 +35,10 @@ "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "polishsymfonycommunity/symfony-mocker-container": "^1.0", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1" + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1" }, "conflict": { "twig/twig": "^1.0" diff --git a/src/Sylius/Bundle/PaymentBundle/composer.json b/src/Sylius/Bundle/PaymentBundle/composer.json index 5693a00c313..c3fdf7aa3f0 100644 --- a/src/Sylius/Bundle/PaymentBundle/composer.json +++ b/src/Sylius/Bundle/PaymentBundle/composer.json @@ -24,15 +24,15 @@ "sylius/payment": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "sylius/locale-bundle": "^1.2", "phpunit/phpunit": "^6.5", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/PayumBundle/composer.json b/src/Sylius/Bundle/PayumBundle/composer.json index 3cb5e07a57b..df171129056 100644 --- a/src/Sylius/Bundle/PayumBundle/composer.json +++ b/src/Sylius/Bundle/PayumBundle/composer.json @@ -37,7 +37,7 @@ }, "require-dev": { "phpspec/phpspec": "^4.0", - "symfony/dependency-injection": "^3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1.1" }, "config": { "bin-dir": "bin" diff --git a/src/Sylius/Bundle/ProductBundle/composer.json b/src/Sylius/Bundle/ProductBundle/composer.json index 6874b2ba010..6c78b91dade 100644 --- a/src/Sylius/Bundle/ProductBundle/composer.json +++ b/src/Sylius/Bundle/ProductBundle/composer.json @@ -27,16 +27,16 @@ "sylius/product": "^1.2", "sylius/locale-bundle": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/form": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/PromotionBundle/composer.json b/src/Sylius/Bundle/PromotionBundle/composer.json index a2c2a387e40..a90285f7fde 100644 --- a/src/Sylius/Bundle/PromotionBundle/composer.json +++ b/src/Sylius/Bundle/PromotionBundle/composer.json @@ -27,17 +27,17 @@ "sylius/promotion": "^1.2", "sylius/registry": "^1.2", "sylius/resource-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "matthiasnoback/symfony-dependency-injection-test": "^2.0", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/form": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/ResourceBundle/composer.json b/src/Sylius/Bundle/ResourceBundle/composer.json index 9f35bab45e9..ac7a01c9544 100644 --- a/src/Sylius/Bundle/ResourceBundle/composer.json +++ b/src/Sylius/Bundle/ResourceBundle/composer.json @@ -28,15 +28,15 @@ "stof/doctrine-extensions-bundle": "^1.2", "sylius/registry": "^1.2", "sylius/resource": "^1.2", - "symfony/config": "^3.4|^4.1", - "symfony/expression-language": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/security-csrf": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1", - "symfony/twig-bundle": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", - "symfony/yaml": "^3.4|^4.1", + "symfony/config": "^3.4|^4.1.1", + "symfony/expression-language": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/security-csrf": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1", + "symfony/twig-bundle": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", + "symfony/yaml": "^3.4|^4.1.1", "white-october/pagerfanta-bundle": "^1.0", "willdurand/hateoas-bundle": "^1.2", "winzou/state-machine-bundle": "^0.3" @@ -53,7 +53,7 @@ "phpunit/phpunit": "^6.5", "sylius/grid-bundle": "^1.2", "sylius/locale": "^1.2", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "twig/twig": "^2.0" }, "suggest": { diff --git a/src/Sylius/Bundle/ResourceBundle/test/app/AppKernel.php b/src/Sylius/Bundle/ResourceBundle/test/app/AppKernel.php index ecd1f34b407..6f1ebeeb411 100644 --- a/src/Sylius/Bundle/ResourceBundle/test/app/AppKernel.php +++ b/src/Sylius/Bundle/ResourceBundle/test/app/AppKernel.php @@ -21,11 +21,9 @@ use PSS\SymfonyMockerContainer\DependencyInjection\MockerContainer; use Symfony\Component\Config\Loader\LoaderInterface; -use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface; -use Symfony\Component\DependencyInjection\ContainerBuilder; use Symfony\Component\HttpKernel\Kernel; -class AppKernel extends Kernel implements CompilerPassInterface +class AppKernel extends Kernel { /** * {@inheritdoc} @@ -56,24 +54,6 @@ public function registerContainerConfiguration(LoaderInterface $loader) $loader->load(__DIR__ . '/config/config.yml'); } - /** - * Hotfix for https://github.com/symfony/symfony/issues/27494 - * - * @internal - */ - public function process(ContainerBuilder $container): void - { - if ($this->environment !== 'test') { - return; - } - - $clientDefinition = $container->findDefinition('test.client'); - - if (count($clientDefinition->getArguments()) >= 5) { - $clientDefinition->replaceArgument(4, null); - } - } - /** * {@inheritdoc} */ diff --git a/src/Sylius/Bundle/ReviewBundle/composer.json b/src/Sylius/Bundle/ReviewBundle/composer.json index 29845ca9ac5..e30a07e7724 100644 --- a/src/Sylius/Bundle/ReviewBundle/composer.json +++ b/src/Sylius/Bundle/ReviewBundle/composer.json @@ -39,16 +39,16 @@ "sylius/resource-bundle": "^1.2", "sylius/review": "^1.2", "sylius/user-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/form": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/security-bundle": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/security-bundle": "^3.4|^4.1.1", "symfony/swiftmailer-bundle": "^3.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, diff --git a/src/Sylius/Bundle/ShippingBundle/composer.json b/src/Sylius/Bundle/ShippingBundle/composer.json index 94db09e7454..e6a0cbf893e 100644 --- a/src/Sylius/Bundle/ShippingBundle/composer.json +++ b/src/Sylius/Bundle/ShippingBundle/composer.json @@ -26,16 +26,16 @@ "sylius/money-bundle": "^1.2", "sylius/resource-bundle": "^1.2", "sylius/shipping": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", "doctrine/orm": "^2.5", - "symfony/form": "^3.4|^4.1", - "symfony/validator": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/validator": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/ShopBundle/composer.json b/src/Sylius/Bundle/ShopBundle/composer.json index 1e75a0d56db..105c635c940 100644 --- a/src/Sylius/Bundle/ShopBundle/composer.json +++ b/src/Sylius/Bundle/ShopBundle/composer.json @@ -31,14 +31,14 @@ "sonata-project/intl-bundle": "^2.2", "sylius/core-bundle": "^1.2", "sylius/ui-bundle": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "matthiasnoback/symfony-config-test": "^3.0", "matthiasnoback/symfony-dependency-injection-test": "^2.0", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1.1" }, "config": { "bin-dir": "bin" diff --git a/src/Sylius/Bundle/TaxationBundle/composer.json b/src/Sylius/Bundle/TaxationBundle/composer.json index b9af5099db3..604d1546466 100644 --- a/src/Sylius/Bundle/TaxationBundle/composer.json +++ b/src/Sylius/Bundle/TaxationBundle/composer.json @@ -26,15 +26,15 @@ "sylius/registry": "^1.2", "sylius/resource-bundle": "^1.2", "sylius/taxation": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpunit/phpunit": "^6.5", "phpspec/phpspec": "^4.0", - "symfony/form": "^3.4|^4.1", - "symfony/browser-kit": "^3.4|^4.1", - "symfony/dependency-injection": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/browser-kit": "^3.4|^4.1.1", + "symfony/dependency-injection": "^3.4|^4.1.1", "polishsymfonycommunity/symfony-mocker-container": "^1.0" }, "config": { diff --git a/src/Sylius/Bundle/TaxonomyBundle/composer.json b/src/Sylius/Bundle/TaxonomyBundle/composer.json index 373817d6b20..a747d0c57fe 100644 --- a/src/Sylius/Bundle/TaxonomyBundle/composer.json +++ b/src/Sylius/Bundle/TaxonomyBundle/composer.json @@ -25,13 +25,13 @@ "stof/doctrine-extensions-bundle": "^1.2", "sylius/resource-bundle": "^1.2", "sylius/taxonomy": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1" }, "require-dev": { "doctrine/orm": "^2.5", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1.1" }, "config": { "bin-dir": "bin" diff --git a/src/Sylius/Bundle/ThemeBundle/composer.json b/src/Sylius/Bundle/ThemeBundle/composer.json index 890b4c5cd11..f4f2a134518 100644 --- a/src/Sylius/Bundle/ThemeBundle/composer.json +++ b/src/Sylius/Bundle/ThemeBundle/composer.json @@ -23,7 +23,7 @@ "php": "^7.1", "doctrine/common": "^2.5", - "symfony/symfony": "^3.4|^4.1", + "symfony/symfony": "^3.4|^4.1.1", "zendframework/zend-hydrator": "^2.2" }, "require-dev": { @@ -34,8 +34,8 @@ "phpunit/phpunit": "^6.5", "sylius/registry": "^1.2", "twig/twig": "^2.0", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/twig-bundle": "^3.4|^4.1" + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/twig-bundle": "^3.4|^4.1.1" }, "conflict": { "twig/twig": "^1.0" diff --git a/src/Sylius/Bundle/UiBundle/composer.json b/src/Sylius/Bundle/UiBundle/composer.json index 1370ef5c893..2b70d18362f 100644 --- a/src/Sylius/Bundle/UiBundle/composer.json +++ b/src/Sylius/Bundle/UiBundle/composer.json @@ -25,14 +25,14 @@ "doctrine/collections": "^1.3", "knplabs/knp-menu-bundle": "^2.1", "sonata-project/block-bundle": "^3.3", - "symfony/framework-bundle": "^3.4|^4.1", - "symfony/security": "^3.4|^4.1", - "symfony/templating": "^3.4|^4.1" + "symfony/framework-bundle": "^3.4|^4.1.1", + "symfony/security": "^3.4|^4.1.1", + "symfony/templating": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/form": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/form": "^3.4|^4.1.1", "twig/twig": "^2.0" }, "conflict": { diff --git a/src/Sylius/Bundle/UserBundle/composer.json b/src/Sylius/Bundle/UserBundle/composer.json index d46f8948756..4b5aca4f401 100644 --- a/src/Sylius/Bundle/UserBundle/composer.json +++ b/src/Sylius/Bundle/UserBundle/composer.json @@ -38,7 +38,7 @@ "sylius/mailer-bundle": "^1.2", "sylius/resource-bundle": "^1.2", "sylius/user": "^1.2", - "symfony/framework-bundle": "^3.4|^4.1", + "symfony/framework-bundle": "^3.4|^4.1.1", "webmozart/assert": "^1.0" }, "require-dev": { @@ -46,8 +46,8 @@ "php-http/guzzle6-adapter": "^1.1", "phpspec/phpspec": "^4.0", "phpunit/phpunit": "^6.5", - "symfony/dependency-injection": "^3.4|^4.1", - "symfony/security-bundle": "^3.4|^4.1", + "symfony/dependency-injection": "^3.4|^4.1.1", + "symfony/security-bundle": "^3.4|^4.1.1", "symfony/swiftmailer-bundle": "^3.1" }, "suggest": { diff --git a/src/Sylius/Component/Addressing/composer.json b/src/Sylius/Component/Addressing/composer.json index e86607abe61..c499f4081f2 100644 --- a/src/Sylius/Component/Addressing/composer.json +++ b/src/Sylius/Component/Addressing/composer.json @@ -24,7 +24,7 @@ "sylius/registry": "^1.2", "sylius/resource": "^1.2", - "symfony/intl": "^3.4|^4.1" + "symfony/intl": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0" diff --git a/src/Sylius/Component/Attribute/composer.json b/src/Sylius/Component/Attribute/composer.json index 9b847e1c818..06f06c746f4 100644 --- a/src/Sylius/Component/Attribute/composer.json +++ b/src/Sylius/Component/Attribute/composer.json @@ -25,7 +25,7 @@ "doctrine/collections": "^1.3", "sylius/registry": "^1.2", "sylius/resource": "^1.2", - "symfony/validator": "^3.4|^4.1" + "symfony/validator": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0" diff --git a/src/Sylius/Component/Channel/composer.json b/src/Sylius/Component/Channel/composer.json index 18080e4b286..34020193c7f 100644 --- a/src/Sylius/Component/Channel/composer.json +++ b/src/Sylius/Component/Channel/composer.json @@ -23,8 +23,8 @@ "php": "^7.1", "sylius/resource": "^1.2", - "symfony/form": "^3.4|^4.1", - "symfony/http-foundation": "^3.4|^4.1", + "symfony/form": "^3.4|^4.1.1", + "symfony/http-foundation": "^3.4|^4.1.1", "zendframework/zend-stdlib": "^3.1" }, "require-dev": { diff --git a/src/Sylius/Component/Core/composer.json b/src/Sylius/Component/Core/composer.json index b93baa3eb2d..e33f00b4bb8 100644 --- a/src/Sylius/Component/Core/composer.json +++ b/src/Sylius/Component/Core/composer.json @@ -48,7 +48,7 @@ }, "require-dev": { "phpspec/phpspec": "^4.0", - "symfony/property-access": "^3.4|^4.1" + "symfony/property-access": "^3.4|^4.1.1" }, "config": { "bin-dir": "bin" diff --git a/src/Sylius/Component/Currency/composer.json b/src/Sylius/Component/Currency/composer.json index 7ed66495996..932d1a8cfe3 100644 --- a/src/Sylius/Component/Currency/composer.json +++ b/src/Sylius/Component/Currency/composer.json @@ -23,7 +23,7 @@ "php": "^7.1", "sylius/resource": "^1.2", - "symfony/intl": "^3.4|^4.1", + "symfony/intl": "^3.4|^4.1.1", "zendframework/zend-stdlib": "^3.1" }, "require-dev": { diff --git a/src/Sylius/Component/Grid/composer.json b/src/Sylius/Component/Grid/composer.json index 2b3256b25f7..553bd972f80 100644 --- a/src/Sylius/Component/Grid/composer.json +++ b/src/Sylius/Component/Grid/composer.json @@ -27,7 +27,7 @@ }, "require-dev": { "phpspec/phpspec": "^4.0", - "symfony/property-access": "^3.4|^4.1" + "symfony/property-access": "^3.4|^4.1.1" }, "config": { "bin-dir": "bin" diff --git a/src/Sylius/Component/Locale/composer.json b/src/Sylius/Component/Locale/composer.json index aa0837500d5..edd4f56157a 100644 --- a/src/Sylius/Component/Locale/composer.json +++ b/src/Sylius/Component/Locale/composer.json @@ -23,7 +23,7 @@ "php": "^7.1", "sylius/resource": "^1.2", - "symfony/intl": "^3.4|^4.1", + "symfony/intl": "^3.4|^4.1.1", "zendframework/zend-stdlib": "^3.1" }, "require-dev": { diff --git a/src/Sylius/Component/Resource/composer.json b/src/Sylius/Component/Resource/composer.json index 8a4e38f20de..3e3cc4b5191 100644 --- a/src/Sylius/Component/Resource/composer.json +++ b/src/Sylius/Component/Resource/composer.json @@ -24,8 +24,8 @@ "doctrine/common": "^2.6", "gedmo/doctrine-extensions": "^2.4", - "symfony/event-dispatcher": "^3.4|^4.1", - "symfony/property-access": "^3.4|^4.1", + "symfony/event-dispatcher": "^3.4|^4.1.1", + "symfony/property-access": "^3.4|^4.1.1", "winzou/state-machine": "^0.3", "pagerfanta/pagerfanta": "^1.0" }, diff --git a/src/Sylius/Component/Shipping/composer.json b/src/Sylius/Component/Shipping/composer.json index 1c47d864dde..9682566d1bd 100644 --- a/src/Sylius/Component/Shipping/composer.json +++ b/src/Sylius/Component/Shipping/composer.json @@ -24,7 +24,7 @@ "sylius/resource": "^1.2", "sylius/registry": "^1.2", - "symfony/options-resolver": "^3.4|^4.1" + "symfony/options-resolver": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0" diff --git a/src/Sylius/Component/User/composer.json b/src/Sylius/Component/User/composer.json index a0d6ea02a75..feb49839609 100644 --- a/src/Sylius/Component/User/composer.json +++ b/src/Sylius/Component/User/composer.json @@ -33,7 +33,7 @@ "doctrine/collections": "^1.1", "sylius/resource": "^1.2", "symfony/polyfill-mbstring": "^1.6", - "symfony/security": "^3.4|^4.1" + "symfony/security": "^3.4|^4.1.1" }, "require-dev": { "phpspec/phpspec": "^4.0"