Merge branch '3.3.x' into 4.0.x

* 3.3.x: Drop DBAL 2 compat code (#11674) Update branch metadata (#11672)
doctrine · Oct 13, 2024 · 25066f8 · 25066f8
2 parents a0f5b4c + e9f3ca2
commit 25066f8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/.doctrine-project.json b/.doctrine-project.json
@@ -11,17 +11,23 @@
             "slug": "latest",
             "upcoming": true
         },
+        {
+            "name": "3.4",
+            "branchName": "3.4.x",
+            "slug": "3.4",
+            "upcoming": true
+        },
         {
             "name": "3.3",
             "branchName": "3.3.x",
             "slug": "3.3",
-            "upcoming": true
+            "current": true
         },
         {
             "name": "3.2",
             "branchName": "3.2.x",
             "slug": "3.2",
-            "current": true
+            "maintained": false
         },
         {
             "name": "3.1",

diff --git a/tests/Tests/ORM/Functional/Ticket/GH10747Test.php b/tests/Tests/ORM/Functional/Ticket/GH10747Test.php
@@ -17,7 +17,6 @@
 use Doctrine\Tests\OrmFunctionalTestCase;
 use PHPUnit\Framework\Attributes\Group;
 
-use function method_exists;
 use function str_replace;
 
 /**
@@ -135,23 +134,19 @@ public function __construct(GH10747Article $article, public string $name)
 
 class GH10747CustomIdObjectHashType extends DBALType
 {
-    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): mixed
+    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): string
     {
         return $value->id . '_test';
     }
 
-    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): mixed
+    public function convertToPHPValue(mixed $value, AbstractPlatform $platform): CustomIdObject
     {
         return new CustomIdObject(str_replace('_test', '', $value));
     }
 
-    public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform): string
+    public function getSQLDeclaration(array $column, AbstractPlatform $platform): string
     {
-        if (method_exists($platform, 'getStringTypeDeclarationSQL')) {
-            return $platform->getStringTypeDeclarationSQL($fieldDeclaration);
-        }
-
-        return $platform->getVarcharTypeDeclarationSQL($fieldDeclaration);
+        return $platform->getStringTypeDeclarationSQL($column);
     }
 
     public function getName(): string