Merge branch '1.10'

* 1.10: Fix Doctrine config Update phpstan/phpstan requirement from 0.12.86 to 0.12.88 Update phpstan/phpstan-doctrine requirement from 0.12.33 to 0.12.38
Sylius · Jun 2, 2021 · 1a8f97a · 1a8f97a
2 parents ba244da + 7d3d70e
commit 1a8f97a
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 28 deletions.
diff --git a/composer.json b/composer.json
@@ -49,8 +49,8 @@
         "lchrusciel/api-test-case": "^5.0",
         "phpspec/phpspec": "^7.0",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "0.12.86",
-        "phpstan/phpstan-doctrine": "0.12.33",
+        "phpstan/phpstan": "0.12.88",
+        "phpstan/phpstan-doctrine": "0.12.38",
         "phpstan/phpstan-webmozart-assert": "0.12.12",
         "phpunit/phpunit": "^8.5",
         "stripe/stripe-php": "^6.43",

diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
@@ -14,11 +14,13 @@ doctrine:
         url: '%env(resolve:DATABASE_URL)%'
     orm:
         auto_generate_proxy_classes: '%kernel.debug%'
-        auto_mapping: true
-        mappings:
-            App:
-                is_bundle: false
-                type: annotation
-                dir: '%kernel.project_dir%/src/Entity'
-                prefix: 'App\Entity'
-                alias: App
+        entity_managers:
+            default:
+                auto_mapping: true
+                mappings:
+                    App:
+                        is_bundle: false
+                        type: annotation
+                        dir: '%kernel.project_dir%/src/Entity'
+                        prefix: 'App\Entity'
+                        alias: App
diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml
@@ -1,14 +1,16 @@
 doctrine:
     orm:
-        metadata_cache_driver:
-            type: service
-            id: doctrine.system_cache_provider
-        query_cache_driver:
-            type: service
-            id: doctrine.system_cache_provider
-        result_cache_driver:
-            type: service
-            id: doctrine.result_cache_provider
+        entity_managers:
+            default:
+                metadata_cache_driver:
+                    type: service
+                    id: doctrine.system_cache_provider
+                query_cache_driver:
+                    type: service
+                    id: doctrine.system_cache_provider
+                result_cache_driver:
+                    type: service
+                    id: doctrine.result_cache_provider
 
 services:
     doctrine.result_cache_provider:

diff --git a/config/packages/test_cached/doctrine.yaml b/config/packages/test_cached/doctrine.yaml
@@ -1,14 +1,16 @@
 doctrine:
     orm:
-        metadata_cache_driver:
-            type: service
-            id: doctrine.system_cache_provider
-        query_cache_driver:
-            type: service
-            id: doctrine.system_cache_provider
-        result_cache_driver:
-            type: service
-            id: doctrine.result_cache_provider
+        entity_managers:
+            default:
+                metadata_cache_driver:
+                    type: service
+                    id: doctrine.system_cache_provider
+                query_cache_driver:
+                    type: service
+                    id: doctrine.system_cache_provider
+                result_cache_driver:
+                    type: service
+                    id: doctrine.result_cache_provider
 
 services:
     doctrine.result_cache_provider: