bug #13215 Add conflict with doctrine/dbal ^3 to avoid missing `json_…

…array` doctrine type error (Prometee)

This PR was merged into the 1.9 branch.

Discussion
----------

| Q               | A
| --------------- | -----
| Branch?         | 1.9, 1.10
| Bug fix?        | yes
| New feature?    | no
| BC breaks?      | no
| Deprecations?   | no
| Related tickets | fixes #13211
| License         | MIT

See #13211 and #13214 for more details about the `json_array` type error.

Commits
-------

4466a76 Add conflict with doctrine/dba ^3 to avoid missing json_array type error
b7b7095 Merge branch '1.9' into constraint-doctrine-dbal

CONFLICTS.md

@@ -54,6 +54,29 @@ references related issues.
 
    References: https://github.com/vimeo/psalm/issues/4961
 
+   - `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 
@@ -70,3 +93,4 @@ references related issues.
   `Gedmo\Exception\UnexpectedValueException: Root cannot be changed manually, change parent instead in vendor/gedmo/doctrine-extensions/src/Tree/Strategy/ORM/Nested.php:145`
 
   References: https://github.com/doctrine-extensions/DoctrineExtensions/issues/2155
+

composer.json

@@ -161,6 +161,7 @@
     },
     "conflict": {
         "api-platform/core": "^2.6",
+        "doctrine/dbal": "^3",
         "doctrine/doctrine-bundle": "2.3.0",
         "doctrine/orm": "^2.10.0",
         "jms/serializer-bundle": "3.9.0",