From 97c8f02bd2bd42ab8a0087a400e427e414095ecf Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Mon, 7 Aug 2023 16:20:23 +0200
Subject: [PATCH 1/4] add missing default-doctrine-dbal-provider cache pool
 attribute to XSD

---
 Resources/config/schema/symfony-1.0.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
index 3a1a9a6d7..857c3c57f 100644
--- a/Resources/config/schema/symfony-1.0.xsd
+++ b/Resources/config/schema/symfony-1.0.xsd
@@ -290,6 +290,7 @@
             <xsd:element name="default-psr6-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-redis-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-memcached-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
+            <xsd:element name="default-doctrine-dbal-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-pdo-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>

From b84ebb25405c7334976b5791bfbbe0e50f4e472c Mon Sep 17 00:00:00 2001
From: Christian Flothmann <christian.flothmann@qossmic.com>
Date: Tue, 8 Aug 2023 13:21:07 +0200
Subject: [PATCH 2/4] change default doctrine DBAL provider to XML attribute

---
 Resources/config/schema/symfony-1.0.xsd | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
index 857c3c57f..29f64dad9 100644
--- a/Resources/config/schema/symfony-1.0.xsd
+++ b/Resources/config/schema/symfony-1.0.xsd
@@ -290,7 +290,6 @@
             <xsd:element name="default-psr6-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-redis-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-memcached-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
-            <xsd:element name="default-doctrine-dbal-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="default-pdo-provider" type="xsd:string" minOccurs="0" maxOccurs="1" />
             <xsd:element name="pool" type="cache_pool" minOccurs="0" maxOccurs="unbounded" />
         </xsd:sequence>
@@ -302,6 +301,7 @@
         <xsd:attribute name="default-redis-provider" type="xsd:string" />
         <xsd:attribute name="default-memcached-provider" type="xsd:string" />
         <xsd:attribute name="default-pdo-provider" type="xsd:string" />
+        <xsd:attribute name="default-doctrine-dbal-provider" type="xsd:string" />
         <xsd:attribute name="prefix-seed" type="xsd:string" />
     </xsd:complexType>
 

From ae49509569fd2bc365c2c04735304755c3d9267d Mon Sep 17 00:00:00 2001
From: "hubert.lenoir" <hubert.lenoir@sensiolabs.com>
Date: Wed, 9 Aug 2023 16:21:20 +0200
Subject: [PATCH 3/4] [FrameworkBundle] Fix xsd handle-all-throwables

---
 Resources/config/schema/symfony-1.0.xsd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Resources/config/schema/symfony-1.0.xsd b/Resources/config/schema/symfony-1.0.xsd
index 2cc47238c..324c41b3e 100644
--- a/Resources/config/schema/symfony-1.0.xsd
+++ b/Resources/config/schema/symfony-1.0.xsd
@@ -49,6 +49,7 @@
         </xsd:choice>
 
         <xsd:attribute name="http-method-override" type="xsd:boolean" />
+        <xsd:attribute name="handle-all-throwables" type="xsd:boolean" />
         <xsd:attribute name="trust-x-sendfile-type-header" type="xsd:boolean" />
         <xsd:attribute name="ide" type="xsd:string" />
         <xsd:attribute name="secret" type="xsd:string" />

From f822f54ff05cd88878910b4559f66c12176d952c Mon Sep 17 00:00:00 2001
From: Antoine Lamirault <lamiraultantoine@gmail.com>
Date: Wed, 16 Aug 2023 20:04:38 +0200
Subject: [PATCH 4/4] [FrameworkBundle] Remove unused test file

---
 .../php/legacy_translator_enabled_locales.php | 19 -------------------
 .../Fixtures/php/serializer_legacy_cache.php  |  9 ---------
 .../xml/legacy_translator_enabled_locales.xml | 17 -----------------
 .../Fixtures/xml/serializer_legacy_cache.xml  | 11 -----------
 .../Fixtures/yml/serializer_legacy_cache.yml  |  5 -----
 5 files changed, 61 deletions(-)
 delete mode 100644 Tests/DependencyInjection/Fixtures/php/legacy_translator_enabled_locales.php
 delete mode 100644 Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
 delete mode 100644 Tests/DependencyInjection/Fixtures/xml/legacy_translator_enabled_locales.xml
 delete mode 100644 Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
 delete mode 100644 Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml

diff --git a/Tests/DependencyInjection/Fixtures/php/legacy_translator_enabled_locales.php b/Tests/DependencyInjection/Fixtures/php/legacy_translator_enabled_locales.php
deleted file mode 100644
index 46acfce8c..000000000
--- a/Tests/DependencyInjection/Fixtures/php/legacy_translator_enabled_locales.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-
-$container->loadFromExtension('framework', [
-    'http_method_override' => false,
-    'secret' => 's3cr3t',
-    'default_locale' => 'fr',
-    'router' => [
-        'resource' => '%kernel.project_dir%/config/routing.xml',
-        'type' => 'xml',
-        'utf8' => true,
-    ],
-    'translator' => [
-        'enabled' => true,
-        'fallback' => 'fr',
-        'paths' => ['%kernel.project_dir%/Fixtures/translations'],
-        'cache_dir' => '%kernel.cache_dir%/translations',
-        'enabled_locales' => ['fr', 'en'],
-    ],
-]);
diff --git a/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php b/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
deleted file mode 100644
index 6695d9f79..000000000
--- a/Tests/DependencyInjection/Fixtures/php/serializer_legacy_cache.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-$container->loadFromExtension('framework', [
-    'http_method_override' => false,
-    'serializer' => [
-        'enabled' => true,
-        'cache' => 'foo',
-    ],
-]);
diff --git a/Tests/DependencyInjection/Fixtures/xml/legacy_translator_enabled_locales.xml b/Tests/DependencyInjection/Fixtures/xml/legacy_translator_enabled_locales.xml
deleted file mode 100644
index 91139d9d0..000000000
--- a/Tests/DependencyInjection/Fixtures/xml/legacy_translator_enabled_locales.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" ?>
-
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:framework="http://symfony.com/schema/dic/symfony"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
-                        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-    <framework:config secret="s3cr3t" ide="file%%link%%format" default-locale="fr" http-method-override="false">
-        <framework:router resource="%kernel.project_dir%/config/routing.xml" type="xml" utf8="true" />
-        <framework:translator enabled="true" fallback="fr" logging="true" cache-dir="%kernel.cache_dir%/translations">
-            <framework:path>%kernel.project_dir%/Fixtures/translations</framework:path>
-            <framework:enabled-locale>fr</framework:enabled-locale>
-            <framework:enabled-locale>en</framework:enabled-locale>
-        </framework:translator>
-    </framework:config>
-</container>
diff --git a/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml b/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
deleted file mode 100644
index 9296670bb..000000000
--- a/Tests/DependencyInjection/Fixtures/xml/serializer_legacy_cache.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<container xmlns="http://symfony.com/schema/dic/services"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:framework="http://symfony.com/schema/dic/symfony"
-    xsi:schemaLocation="http://symfony.com/schema/dic/services https://symfony.com/schema/dic/services/services-1.0.xsd
-        http://symfony.com/schema/dic/symfony https://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
-
-    <framework:config http-method-override="false">
-        <framework:serializer enabled="true" cache="foo"/>
-    </framework:config>
-</container>
diff --git a/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml b/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml
deleted file mode 100644
index 5fd44373f..000000000
--- a/Tests/DependencyInjection/Fixtures/yml/serializer_legacy_cache.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-framework:
-    http_method_override: false
-    serializer:
-        enabled: true
-        cache: foo