Upgrade all dependencies to versions supporting Symfony 5

.gitignore

@@ -40,6 +40,7 @@
 
 ###> phpunit/phpunit ###
 /phpunit.xml
+/.phpunit.result.cache
 ###< phpunit/phpunit ###
 
 ###> lexik/jwt-authentication-bundle ###

CONFLICTS.md

@@ -3,12 +3,6 @@
 This document explains why certain conflicts were added to `composer.json` and
 refereneces related issues.
 
- - `doctrine/inflector:^1.4`:
-
-   Inflector 1.4 changes pluralization of `taxon` from `taxons` (used in Sylius) to `taxa`.
-
-   References: https://github.com/doctrine/inflector/issues/147
-
  - `symfony/doctrine-bridge:4.4.16`:
 
    This version of Doctrine Bridge introduces a bug that causes an issue related to `ChannelPricing` mapping.

UPGRADE-1.9.md

@@ -1,5 +1,7 @@
 # UPGRADE FROM `v1.8.X` TO `v1.9.0`
 
+### New API
+
 1. Add new parameters, new access control configuration and reorder it:
 
     ```diff
@@ -17,19 +19,25 @@
 
 1. Unified API registration path in shop has been changed from `/new-api/shop/register` to `/new-api/shop/customers/`. 
 
-1. Identifier needed to retrieve a product in shop API endpoint (`/new-api/shop/products/{id}`) has been changed 
-from `slug` to `code`. 
+1. Identifier needed to retrieve a product in shop API endpoint (`/new-api/shop/products/{id}`) has been changed from `slug` to `code`. 
+
+### Data migrations
 
-1. The `CoreBundle/Migrations/Version20201208105207.php` migration was added which extends existing adjustments with additional details(context). Depending on the type of adjustment, additionally defined information are:
- * Taxation details (percentage and relation to tax rate)
- * Shipping details (shipping relation)
- * Taxation for shipping (combined details of percentage and shipping relation)
+1. The `CoreBundle/Migrations/Version20201208105207.php` migration was added which extends existing adjustments with additional details (context). 
+
+    Depending on the type of adjustment, additionally defined information are:
+
+        * Taxation details (percentage and relation to tax rate)
+        * Shipping details (shipping relation)
+        * Taxation for shipping (combined details of percentage and shipping relation)
 
- This data is fetched based on two assumptions:
- * Order level taxes relates to shipping only (default Sylius behaviour)
- * Tax rate name has not change since the time, the first order has been placed
+    This data is fetched based on two assumptions:
+
+        * Order level taxes relates to shipping only (default Sylius behaviour)
+        * Tax rate name has not changed since the time, the first order has been placed
 
- If these are not true, please adjust migration accordingly to your need. To exclude following migration from execution run following code: 
+    If these are not true, please adjust migration accordingly to your need. To exclude following migration from execution run following code: 
+
     ```
     bin/console doctrine:migrations:version 'CoreBundle/Migrations/Version20201208105207' --add
     ```
@@ -40,3 +48,47 @@ from `slug` to `code`.
     -       use Sylius\Component\Order\Model\Adjustment as BaseAdjustment;
     +       use Sylius\Component\Core\Model\Adjustment as BaseAdjustment;
     ```
+
+### Package upgrades
+
+1. We've removed the support for Symfony's Templating compenent (which is removed in Symfony 5). 
+
+    * Remove `templating` from framework's configration:
+
+        ```diff
+        # config/packages/framework.yaml
+
+        framework:
+            # ...
+        -    templating: { engines: ["twig"] }
+        ```
+
+    * Replace any usages of `Symfony\Bundle\FrameworkBundle\Templating\EngineInterface` with `Twig\Environment`.
+
+        Inject `twig` service into your controllers instead of `templating`.
+
+        `$templating->renderResponse(...)` might be replaced with `new Response($twig->render(...))`.
+
+1. We've upgraded Sylius' ResourceBundle and GridBundle packages which forced us to upgrade major versions of our dependencies.
+
+    Please follow [ResourceBundle's upgrade instructions](https://github.com/Sylius/SyliusResourceBundle/blob/master/UPGRADE.md#from-16x-to-17x).
+
+    Apart from that, JMS Serializer major version upgrade requires to replace `array` type to `iterable` when serializing Doctrine Collections.
+
+    Due to FOS Rest Bundle major version upgrade, the JSON error responses might have changed. If your tests stop passing,
+    you can bring back old behaviour by overriding `error.json.twig` and `exception.json.twig` templates. You can check
+    how we've done that in Sylius by looking into vendor code in `templates/bundles/TwigBundle/Exception/` directory. 
+
+1. We've replaced deprecated Doctrine Persistence API with the new one.
+
+    Replace `Doctrine\Common\Persistence` namespace in your codebase to `Doctrine\Persistence`.
+
+1. We've removed DoctrineCacheBundle from our required packages while upgrading to the next major version of DoctrineBundle (v2).
+
+1. We've upgraded SyliusThemeBundle to the next major version (v2.1).
+
+    Please follow [SyliusThemeBundle's upgrade instructions](https://github.com/Sylius/SyliusThemeBundle/blob/master/UPGRADE.md).
+
+1. We've replaced deprecated Symfony Translator API with the new one.
+
+    Replace `Symfony\Component\Translation\TranslatorInterface` with `Symfony\Contracts\Translation\TranslatorInterface` in your codebase.

composer.json

@@ -24,20 +24,21 @@
         "ext-fileinfo": "*",
         "ext-gd": "*",
         "api-platform/core": "^2.5",
+        "babdev/pagerfanta-bundle": "^2.5",
         "behat/transliterator": "^1.3",
         "doctrine/collections": "^1.6",
         "doctrine/doctrine-bundle": "^1.12 || ^2.0",
-        "doctrine/doctrine-cache-bundle": "^1.4",
         "doctrine/doctrine-migrations-bundle": "^3.0",
+        "doctrine/inflector": "^1.4 || ^2.0",
         "doctrine/migrations": "^3.0",
         "doctrine/orm": "^2.7",
         "egulias/email-validator": "^2.1",
         "fakerphp/faker": "^1.9",
         "friendsofphp/proxy-manager-lts": "^1.0",
-        "friendsofsymfony/oauth-server-bundle": "^1.6",
-        "friendsofsymfony/rest-bundle": "^2.7",
+        "friendsofsymfony/oauth-server-bundle": "^1.6 || >2.0.0-alpha.0 ^2.0@dev",
+        "friendsofsymfony/rest-bundle": "^3.0",
         "gedmo/doctrine-extensions": "^2.4.12",
-        "jms/serializer-bundle": "^2.4",
+        "jms/serializer-bundle": "^3.5",
         "knplabs/gaufrette": "^0.8",
         "knplabs/knp-gaufrette-bundle": "^0.7",
         "knplabs/knp-menu": "^3.1",
@@ -55,14 +56,14 @@
         "sylius-labs/association-hydrator": "^1.1",
         "sylius-labs/doctrine-migrations-extra-bundle": "^0.1.3",
         "sylius/fixtures-bundle": "^1.6.1",
-        "sylius/grid": "^1.7.5",
-        "sylius/grid-bundle": "^1.7.5",
+        "sylius/grid": "^1.8",
+        "sylius/grid-bundle": "^1.8",
         "sylius/mailer": "^1.5",
         "sylius/mailer-bundle": "^1.5",
         "sylius/registry": "^1.5",
-        "sylius/resource": "1.6.*",
-        "sylius/resource-bundle": "1.6.*",
-        "sylius/theme-bundle": "^1.5",
+        "sylius/resource": "^1.7",
+        "sylius/resource-bundle": "^1.7",
+        "sylius/theme-bundle": "^2.1",
         "symfony/asset": "^4.4",
         "symfony/config": "^4.4",
         "symfony/console": "^4.4",
@@ -105,10 +106,9 @@
         "twig/intl-extra": "^2.12",
         "twig/twig": "^2.12",
         "webmozart/assert": "^1.9",
-        "white-october/pagerfanta-bundle": "^1.3",
-        "willdurand/hateoas": "^2.12",
-        "willdurand/hateoas-bundle": "^1.4",
-        "winzou/state-machine-bundle": "^0.3",
+        "willdurand/hateoas": "^3.0",
+        "willdurand/hateoas-bundle": "^2.0",
+        "winzou/state-machine-bundle": "^0.5",
         "zendframework/zend-hydrator": "^2.4",
         "zendframework/zend-stdlib": "^3.2"
     },
@@ -155,7 +155,6 @@
         "sylius/user-bundle": "self.version"
     },
     "conflict": {
-        "doctrine/inflector": "^1.4",
         "symfony/doctrine-bridge": "4.4.16",
         "symfony/polyfill-mbstring": "1.22.0"
     },

config/bundles.php

@@ -7,7 +7,6 @@
     Symfony\Bundle\SwiftmailerBundle\SwiftmailerBundle::class => ['all' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
-    Doctrine\Bundle\DoctrineCacheBundle\DoctrineCacheBundle::class => ['all' => true],
     Sylius\Bundle\OrderBundle\SyliusOrderBundle::class => ['all' => true],
     Sylius\Bundle\MoneyBundle\SyliusMoneyBundle::class => ['all' => true],
     Sylius\Bundle\CurrencyBundle\SyliusCurrencyBundle::class => ['all' => true],
@@ -40,7 +39,7 @@
     Liip\ImagineBundle\LiipImagineBundle::class => ['all' => true],
     Payum\Bundle\PayumBundle\PayumBundle::class => ['all' => true],
     Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle::class => ['all' => true],
-    WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle::class => ['all' => true],
+    BabDev\PagerfantaBundle\BabDevPagerfantaBundle::class => ['all' => true],
     Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle::class => ['all' => true],
     Sylius\Bundle\FixturesBundle\SyliusFixturesBundle::class => ['all' => true],
     Sylius\Bundle\PayumBundle\SyliusPayumBundle::class => ['all' => true],

config/packages/dev/jms_serializer.yaml

@@ -1,6 +1,11 @@
 jms_serializer:
     visitors:
-        json:
+        json_serialization:
+            options:
+                - JSON_PRETTY_PRINT
+                - JSON_UNESCAPED_SLASHES
+                - JSON_PRESERVE_ZERO_FRACTION
+        json_deserialization:
             options:
                 - JSON_PRETTY_PRINT
                 - JSON_UNESCAPED_SLASHES

config/packages/framework.yaml

@@ -2,6 +2,5 @@ framework:
     secret: '%env(APP_SECRET)%'
     form: true
     csrf_protection: true
-    templating: { engines: ["twig"] }
     session:
         handler_id: ~

config/packages/jms_serializer.yaml

@@ -1,4 +1,4 @@
 jms_serializer:
     visitors:
-        xml:
+        xml_serialization:
             format_output: '%kernel.debug%'

config/packages/prod/jms_serializer.yaml

@@ -1,6 +1,10 @@
 jms_serializer:
     visitors:
-        json:
+        json_serialization:
+            options:
+                - JSON_UNESCAPED_SLASHES
+                - JSON_PRESERVE_ZERO_FRACTION
+        json_deserialization:
             options:
                 - JSON_UNESCAPED_SLASHES
                 - JSON_PRESERVE_ZERO_FRACTION

docs/components_and_bundles/bundles/SyliusAddressingBundle/installation.rst

@@ -43,9 +43,9 @@ Don't worry, everything was automatically installed via Composer.
         $bundles = array(
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
 
             new Sylius\Bundle\AddressingBundle\SyliusAddressingBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),

docs/components_and_bundles/bundles/SyliusAttributeBundle/installation.rst

@@ -43,9 +43,9 @@ Don't worry, everything was automatically installed via Composer.
         $bundles = array(
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new Sylius\Bundle\AttributeBundle\SyliusAttributeBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
 

docs/components_and_bundles/bundles/SyliusCustomerBundle/installation.rst

@@ -42,9 +42,9 @@ Don't worry, everything was automatically installed via Composer.
     {
         $bundles = array(
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),

docs/components_and_bundles/bundles/SyliusOrderBundle/installation.rst

@@ -43,9 +43,9 @@ Don't worry, everything was automatically installed via Composer.
         $bundles = array(
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle()
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
 
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
             new Sylius\Bundle\MoneyBundle\SyliusMoneyBundle(),

docs/components_and_bundles/bundles/SyliusProductBundle/installation.rst

@@ -42,9 +42,9 @@ Don't worry, everything was automatically installed via Composer.
     {
         $bundles = array(
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new Sylius\Bundle\ProductBundle\SyliusProductBundle(),
             new Sylius\Bundle\AttributeBundle\SyliusAttributeBundle(),

docs/components_and_bundles/bundles/SyliusPromotionBundle/installation.rst

@@ -42,9 +42,9 @@ Don't worry, everything was automatically installed via Composer.
     {
         $bundles = array(
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
             new Sylius\Bundle\PromotionBundle\SyliusPromotionBundle(),

docs/components_and_bundles/bundles/SyliusShippingBundle/installation.rst

@@ -43,9 +43,9 @@ Don't worry, everything was automatically installed via Composer.
         $bundles = array(
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new Sylius\Bundle\ShippingBundle\SyliusShippingBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
 

docs/components_and_bundles/bundles/SyliusTaxationBundle/installation.rst

@@ -43,9 +43,9 @@ Don't worry, everything was automatically installed via Composer.
         $bundles = array(
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new Sylius\Bundle\TaxationBundle\SyliusTaxationBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
 

docs/components_and_bundles/bundles/SyliusTaxonomyBundle/installation.rst

@@ -46,9 +46,9 @@ Don't worry, everything was automatically installed via Composer.
         $bundles = array(
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new Sylius\Bundle\TaxonomyBundle\SyliusTaxonomyBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),
 

docs/components_and_bundles/bundles/SyliusUserBundle/installation.rst

@@ -42,9 +42,9 @@ Don't worry, everything was automatically installed via Composer.
     {
         $bundles = array(
             new FOS\RestBundle\FOSRestBundle(),
-            new JMS\SerializerBundle\JMSSerializerBundle($this),
+            new JMS\SerializerBundle\JMSSerializerBundle(),
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
-            new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(),
+            new BabDev\PagerfantaBundle\BabDevPagerfantaBundle(),
             new Bazinga\Bundle\HateoasBundle\BazingaHateoasBundle(),
             new winzou\Bundle\StateMachineBundle\winzouStateMachineBundle(),
             new Sylius\Bundle\ResourceBundle\SyliusResourceBundle(),

psalm.xml

@@ -86,10 +86,6 @@
 
         <DeprecatedClass>
             <errorLevel type="info">
-                <referencedClass name="Doctrine\Common\Persistence\ManagerRegistry" />
-                <referencedClass name="Doctrine\Common\Persistence\Mapping\ClassMetadata" />
-                <referencedClass name="Doctrine\Common\Persistence\ObjectManager" />
-                <referencedClass name="Doctrine\Common\Persistence\ObjectRepository" />
                 <referencedClass name="Payum\Core\Action\GatewayAwareAction" />
                 <referencedClass name="Payum\Core\Security\GenericTokenFactoryInterface" />
                 <referencedClass name="Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface" />
@@ -101,22 +97,17 @@
                 <referencedClass name="Symfony\Component\Intl\ResourceBundle\LocaleBundleInterface" />
                 <referencedClass name="Symfony\Component\Intl\ResourceBundle\RegionBundleInterface" />
                 <referencedClass name="Symfony\Component\Security\Core\Role\Role" />
-                <referencedClass name="Symfony\Component\Translation\TranslatorInterface" />
                 <referencedClass name="Symfony\Bundle\WebServerBundle\WebServerBundle" />
             </errorLevel>
         </DeprecatedClass>
         <DeprecatedInterface>
             <errorLevel type="info">
-                <referencedClass name="Doctrine\Common\Persistence\ObjectManager" />
-                <referencedClass name="Doctrine\Common\Persistence\ObjectRepository" />
                 <referencedClass name="Sylius\Component\Core\Calculator\ProductVariantPriceCalculatorInterface" />
                 <referencedClass name="Symfony\Component\Security\Core\User\AdvancedUserInterface" />
             </errorLevel>
         </DeprecatedInterface>
         <DeprecatedMethod>
             <errorLevel type="info">
-                <referencedMethod name="FOS\RestBundle\View\View::setTemplate" />
-                <referencedMethod name="FOS\RestBundle\View\View::setTemplateVar" />
                 <referencedMethod name="Payum\Core\Model\GatewayConfigInterface::setFactoryName" />
                 <referencedMethod name="Symfony\Component\EventDispatcher\Event::stopPropagation" />
                 <referencedMethod name="Symfony\Component\HttpKernel\Kernel::getRootDir" />

src/Sylius/Behat/Context/Domain/CartContext.php

@@ -14,7 +14,7 @@
 namespace Sylius\Behat\Context\Domain;
 
 use Behat\Behat\Context\Context;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Sylius\Component\Core\Model\OrderInterface;
 use Sylius\Component\Order\Remover\ExpiredCartsRemoverInterface;
 use Webmozart\Assert\Assert;