From e48de21a2fecd498b9406efa41b670a0642d5a56 Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Mon, 22 Feb 2021 14:42:25 +0100
Subject: [PATCH] [framework-bundle/5.3] Merge per-env settings

---
 symfony/framework-bundle/5.3/config/packages/framework.yaml | 6 ++++++
 .../5.3/config/packages/test/framework.yaml                 | 4 ----
 .../framework-bundle/5.3/config/routes/dev/framework.yaml   | 3 ---
 symfony/framework-bundle/5.3/config/routes/framework.yaml   | 4 ++++
 4 files changed, 10 insertions(+), 7 deletions(-)
 delete mode 100644 symfony/framework-bundle/5.3/config/packages/test/framework.yaml
 delete mode 100644 symfony/framework-bundle/5.3/config/routes/dev/framework.yaml
 create mode 100644 symfony/framework-bundle/5.3/config/routes/framework.yaml

diff --git a/symfony/framework-bundle/5.3/config/packages/framework.yaml b/symfony/framework-bundle/5.3/config/packages/framework.yaml
index a5614574..47e64d0a 100644
--- a/symfony/framework-bundle/5.3/config/packages/framework.yaml
+++ b/symfony/framework-bundle/5.3/config/packages/framework.yaml
@@ -15,3 +15,9 @@ framework:
     #fragments: true
     php_errors:
         log: true
+
+when@test:
+    framework:
+        test: true
+        session:
+            storage_factory_id: session.storage.factory.mock_file
diff --git a/symfony/framework-bundle/5.3/config/packages/test/framework.yaml b/symfony/framework-bundle/5.3/config/packages/test/framework.yaml
deleted file mode 100644
index ee44ae54..00000000
--- a/symfony/framework-bundle/5.3/config/packages/test/framework.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-framework:
-    test: true
-    session:
-        storage_factory_id: session.storage.factory.mock_file
diff --git a/symfony/framework-bundle/5.3/config/routes/dev/framework.yaml b/symfony/framework-bundle/5.3/config/routes/dev/framework.yaml
deleted file mode 100644
index bcbbf13d..00000000
--- a/symfony/framework-bundle/5.3/config/routes/dev/framework.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-_errors:
-    resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
-    prefix: /_error
diff --git a/symfony/framework-bundle/5.3/config/routes/framework.yaml b/symfony/framework-bundle/5.3/config/routes/framework.yaml
new file mode 100644
index 00000000..0fc74bba
--- /dev/null
+++ b/symfony/framework-bundle/5.3/config/routes/framework.yaml
@@ -0,0 +1,4 @@
+when@dev:
+    _errors:
+        resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+        prefix: /_error