Merge branch '6.3' into 6.4

xabbuh · xabbuh · commit 36c718a5493a · 2023-11-21T09:45:57.000+01:00
* 6.3:
  name exception being caught as it is accessed in the catch block
  fix tests
  name exception being caught as it is accessed in the catch block
diff --git a/src/Symfony/Component/Cache/Adapter/PdoAdapter.php b/src/Symfony/Component/Cache/Adapter/PdoAdapter.php
@@ -285,7 +285,7 @@ protected function doSave(array $values, int $lifetime): array|bool
         $lifetime = $lifetime ?: null;
         try {
             $stmt = $conn->prepare($sql);
-        } catch (\PDOException) {
+        } catch (\PDOException $e) {
             if ($this->isTableMissing($e) && (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true))) {
                 $this->createTable();
             }
@@ -320,7 +320,7 @@ protected function doSave(array $values, int $lifetime): array|bool
         foreach ($values as $id => $data) {
             try {
                 $stmt->execute();
-            } catch (\PDOException) {
+            } catch (\PDOException $e) {
                 if ($this->isTableMissing($e) && (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true))) {
                     $this->createTable();
                 }
diff --git a/src/Symfony/Component/Lock/Store/PdoStore.php b/src/Symfony/Component/Lock/Store/PdoStore.php
@@ -94,7 +94,7 @@ public function save(Key $key)
         $conn = $this->getConnection();
         try {
             $stmt = $conn->prepare($sql);
-        } catch (\PDOException) {
+        } catch (\PDOException $e) {
             if ($this->isTableMissing($e) && (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true))) {
                 $this->createTable();
             }
@@ -106,7 +106,7 @@ public function save(Key $key)
 
         try {
             $stmt->execute();
-        } catch (\PDOException) {
+        } catch (\PDOException $e) {
             if ($this->isTableMissing($e) && (!$conn->inTransaction() || \in_array($this->driver, ['pgsql', 'sqlite', 'sqlsrv'], true))) {
                 $this->createTable();
 
diff --git a/src/Symfony/Component/Serializer/Tests/SerializerTest.php b/src/Symfony/Component/Serializer/Tests/SerializerTest.php
@@ -1053,15 +1053,6 @@ public function testCollectDenormalizationErrors(?ClassMetadataFactory $classMet
                 'useMessageForUser' => false,
                 'message' => 'The type of the "something" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\Php74FullWithTypedConstructor" must be one of "float" ("string" given).',
             ],
-            [
-                'currentType' => 'string',
-                'expectedTypes' => [
-                    'float',
-                ],
-                'path' => 'php74FullWithTypedConstructor.something',
-                'useMessageForUser' => false,
-                'message' => 'The type of the "something" attribute for class "Symfony\Component\Serializer\Tests\Fixtures\Php74FullWithTypedConstructor" must be one of "float" ("string" given).',
-            ],
             [
                 'currentType' => 'string',
                 'expectedTypes' => [
