From c75cdecbe8fb03894649b720e7303d4ac8e36b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <mail@jan-boehmer.de>
Date: Sat, 11 Feb 2023 22:27:51 +0100
Subject: [PATCH] Upgraded doctrine-bundle recipe

---
 config/packages/docker/doctrine.yaml | 20 ------------------
 config/packages/doctrine.yaml        | 31 ++++++++++++++++++++++++++--
 config/packages/prod/doctrine.yaml   | 20 ------------------
 config/packages/test/doctrine.yaml   |  4 ----
 symfony.lock                         |  4 ++--
 5 files changed, 31 insertions(+), 48 deletions(-)
 delete mode 100644 config/packages/docker/doctrine.yaml
 delete mode 100644 config/packages/prod/doctrine.yaml
 delete mode 100644 config/packages/test/doctrine.yaml

diff --git a/config/packages/docker/doctrine.yaml b/config/packages/docker/doctrine.yaml
deleted file mode 100644
index 513704c8..00000000
--- a/config/packages/docker/doctrine.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-doctrine:
-    orm:
-        auto_generate_proxy_classes: false
-        metadata_cache_driver:
-            type: pool
-            pool: doctrine.system_cache_pool
-        query_cache_driver:
-            type: pool
-            pool: doctrine.system_cache_pool
-        result_cache_driver:
-            type: pool
-            pool: doctrine.result_cache_pool
-
-framework:
-    cache:
-        pools:
-            doctrine.result_cache_pool:
-                adapter: cache.app
-            doctrine.system_cache_pool:
-                adapter: cache.system
\ No newline at end of file
diff --git a/config/packages/doctrine.yaml b/config/packages/doctrine.yaml
index bc31bb8f..20c1001e 100644
--- a/config/packages/doctrine.yaml
+++ b/config/packages/doctrine.yaml
@@ -4,7 +4,6 @@ doctrine:
 
         # IMPORTANT: You MUST configure your server version,
         # either here or in the DATABASE_URL env var (see .env file)
-        #server_version: '5.7'
 
         types:
             datetime:
@@ -33,4 +32,32 @@ doctrine:
         dql:
             string_functions:
                 regexp: DoctrineExtensions\Query\Mysql\Regexp
-                ifnull: DoctrineExtensions\Query\Mysql\IfNull
\ No newline at end of file
+                ifnull: DoctrineExtensions\Query\Mysql\IfNull
+
+when@test:
+    doctrine:
+        dbal:
+            # "TEST_TOKEN" is typically set by ParaTest
+            dbname_suffix: '_test%env(default::TEST_TOKEN)%'
+
+when@prod: &prod
+    doctrine:
+        orm:
+            auto_generate_proxy_classes: false
+            proxy_dir: '%kernel.build_dir%/doctrine/orm/Proxies'
+            query_cache_driver:
+                type: pool
+                pool: doctrine.system_cache_pool
+            result_cache_driver:
+                type: pool
+                pool: doctrine.result_cache_pool
+
+    framework:
+        cache:
+            pools:
+                doctrine.result_cache_pool:
+                    adapter: cache.app
+                doctrine.system_cache_pool:
+                    adapter: cache.system
+
+when@docker: *prod
diff --git a/config/packages/prod/doctrine.yaml b/config/packages/prod/doctrine.yaml
deleted file mode 100644
index 084f59a0..00000000
--- a/config/packages/prod/doctrine.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-doctrine:
-    orm:
-        auto_generate_proxy_classes: false
-        metadata_cache_driver:
-            type: pool
-            pool: doctrine.system_cache_pool
-        query_cache_driver:
-            type: pool
-            pool: doctrine.system_cache_pool
-        result_cache_driver:
-            type: pool
-            pool: doctrine.result_cache_pool
-
-framework:
-    cache:
-        pools:
-            doctrine.result_cache_pool:
-                adapter: cache.app
-            doctrine.system_cache_pool:
-                adapter: cache.system
diff --git a/config/packages/test/doctrine.yaml b/config/packages/test/doctrine.yaml
deleted file mode 100644
index 34c2ebcc..00000000
--- a/config/packages/test/doctrine.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-doctrine:
-    dbal:
-        # "TEST_TOKEN" is typically set by ParaTest
-        dbname_suffix: '_test%env(default::TEST_TOKEN)%'
diff --git a/symfony.lock b/symfony.lock
index 5734c5a6..edb7d4f0 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -75,12 +75,12 @@
         "version": "v0.5.3"
     },
     "doctrine/doctrine-bundle": {
-        "version": "2.7",
+        "version": "2.8",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
             "version": "2.4",
-            "ref": "da713d006953b90d1c085c1be480ecdd6c4a95e0"
+            "ref": "013b823e7fee65890b23e40f31e6667a1ac519ac"
         },
         "files": [
             "config/packages/doctrine.yaml",