Merge branch '1.9' into 1.10

* 1.9:
  [Maintenance] Replace dbal conflict with explicit requirement

CONFLICTS.md

@@ -28,29 +28,6 @@ references related issues.
 
    References: https://github.com/Sylius/Sylius/issues/11970, https://github.com/symfony/symfony/issues/38861
 
-   - `doctrine/dbal:^3`:
-   
-   Doctrine column type `json_array` has been removed creating error during a
-   doctrine migration
-   
-   ```
-   Error:  Migration Sylius\Bundle\CoreBundle\Migrations\Version20201130071338
-   failed during Execution.
-
-   In Exception.php line 125:
-
-   Unknown column type "json_array" requested. Any Doctrine type that you use   
-   has to be registered with \Doctrine\DBAL\Types\Type::addType(). You can get  
-   a list of all the known types with \Doctrine\DBAL\Types\Type::getTypesMap(  
-   ). If this error occurs during database introspection then you might have f  
-   orgotten to register all database types for a Doctrine Type. Use AbstractPl  
-   atform#registerDoctrineTypeMapping() or have your custom types implement Ty  
-   pe#getMappedDatabaseTypes(). If the type name is empty you might have a pro  
-   blem with the cache or forgot some mapping information.
-   ```
-   
-   References: https://github.com/Sylius/Sylius/issues/13211
-
  - `symfony/property-info:4.4.22|5.2.7`:
 
    These versions of Symfony PropertyInfo Component introduce a bug with resolving wrong namespace for some translation entities 

composer.json

@@ -28,6 +28,7 @@
         "babdev/pagerfanta-bundle": "^2.5",
         "behat/transliterator": "^1.3",
         "doctrine/collections": "^1.6",
+        "doctrine/dbal": "^2.7",
         "doctrine/doctrine-bundle": "^1.12 || ^2.0",
         "doctrine/doctrine-migrations-bundle": "^3.0.1",
         "doctrine/inflector": "^1.4 || ^2.0",
@@ -158,7 +159,6 @@
         "sylius/user-bundle": "self.version"
     },
     "conflict": {
-        "doctrine/dbal": "^3",
         "doctrine/doctrine-bundle": "2.3.0",
         "doctrine/orm": "^2.10.0",
         "jms/serializer-bundle": "3.9.0",