Merge pull request #9737 from morozov/dbal-4-compatibility

Improve compatibility with DBAL 4 for MySQL, MariaDB and PostgreSQL
doctrine · May 7, 2022 · 636712a · 636712a
2 parents e6bda4a + 0aa91c7
commit 636712a
Show file tree

Hide file tree

Showing 174 changed files with 312 additions and 279 deletions.
diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
@@ -208,7 +208,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
                         [
                             'name' => isset($discrColumn['name']) ? (string) $discrColumn['name'] : null,
                             'type' => isset($discrColumn['type']) ? (string) $discrColumn['type'] : 'string',
-                            'length' => isset($discrColumn['length']) ? (string) $discrColumn['length'] : 255,
+                            'length' => isset($discrColumn['length']) ? (int) $discrColumn['length'] : 255,
                             'columnDefinition' => isset($discrColumn['column-definition']) ? (string) $discrColumn['column-definition'] : null,
                         ]
                     );
@@ -383,7 +383,7 @@ public function loadMetadataForClass($className, PersistenceClassMetadata $metad
             }
 
             if (isset($idElement['length'])) {
-                $mapping['length'] = (string) $idElement['length'];
+                $mapping['length'] = (int) $idElement['length'];
             }
 
             if (isset($idElement['column'])) {

diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -726,9 +726,11 @@ private function gatherRelationJoinColumns(
 
                 $columnOptions += $this->gatherColumnOptions($fieldMapping);
 
-                if ($fieldMapping['type'] === 'string' && isset($fieldMapping['length'])) {
+                if (isset($fieldMapping['length'])) {
                     $columnOptions['length'] = $fieldMapping['length'];
-                } elseif ($fieldMapping['type'] === 'decimal') {
+                }
+
+                if ($fieldMapping['type'] === 'decimal') {
                     $columnOptions['scale']     = $fieldMapping['scale'];
                     $columnOptions['precision'] = $fieldMapping['precision'];
                 }

diff --git a/tests/Doctrine/Tests/Models/CMS/CmsComment.php b/tests/Doctrine/Tests/Models/CMS/CmsComment.php
@@ -34,7 +34,7 @@ class CmsComment
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $text;
 

diff --git a/tests/Doctrine/Tests/Models/Cache/Action.php b/tests/Doctrine/Tests/Models/Cache/Action.php
@@ -22,7 +22,7 @@ class Action
     /**
      * @var string
      * @Id
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @GeneratedValue(strategy="NONE")
      */
     public $name;

diff --git a/tests/Doctrine/Tests/Models/Cache/Token.php b/tests/Doctrine/Tests/Models/Cache/Token.php
@@ -31,7 +31,7 @@ class Token
     /**
      * @var string
      * @Id
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $token;
 

diff --git a/tests/Doctrine/Tests/Models/Company/CompanyAuction.php b/tests/Doctrine/Tests/Models/Company/CompanyAuction.php
@@ -16,7 +16,7 @@ class CompanyAuction extends CompanyEvent
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     private $data;
 

diff --git a/tests/Doctrine/Tests/Models/Company/CompanyContract.php b/tests/Doctrine/Tests/Models/Company/CompanyContract.php
@@ -33,7 +33,7 @@
  * @Entity
  * @Table(name="company_contracts")
  * @InheritanceType("SINGLE_TABLE")
- * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorColumn(name="discr", type="string", length=255)
  * @EntityListeners({"CompanyContractListener"})
  * @DiscriminatorMap({
  *     "fix"       = "CompanyFixContract",

diff --git a/tests/Doctrine/Tests/Models/Company/CompanyEvent.php b/tests/Doctrine/Tests/Models/Company/CompanyEvent.php
@@ -19,7 +19,7 @@
  * @Entity
  * @Table(name="company_events")
  * @InheritanceType("JOINED")
- * @DiscriminatorColumn(name="event_type", type="string")
+ * @DiscriminatorColumn(name="event_type", type="string", length=255)
  * @DiscriminatorMap({"auction"="CompanyAuction", "raffle"="CompanyRaffle"})
  */
 abstract class CompanyEvent

diff --git a/tests/Doctrine/Tests/Models/Company/CompanyPerson.php b/tests/Doctrine/Tests/Models/Company/CompanyPerson.php
@@ -32,7 +32,7 @@
  * @Entity
  * @Table(name="company_persons")
  * @InheritanceType("JOINED")
- * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorColumn(name="discr", type="string", length=255)
  * @DiscriminatorMap({
  *      "person"    = "CompanyPerson",
  *      "manager"   = "CompanyManager",

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedChildClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedChildClass.php
@@ -15,13 +15,13 @@ class JoinedChildClass extends JoinedRootClass
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $extension = 'ext';
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     private $additionalId = 'additional';

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedDerivedChildClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedDerivedChildClass.php
@@ -17,13 +17,13 @@ class JoinedDerivedChildClass extends JoinedDerivedRootClass
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $extension = 'ext';
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     private $additionalId = 'additional';

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedDerivedIdentityClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedDerivedIdentityClass.php
@@ -18,7 +18,7 @@ class JoinedDerivedIdentityClass
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     protected $id = 'part-0';

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedDerivedRootClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedDerivedRootClass.php
@@ -17,7 +17,7 @@
  * @Entity
  * @Table(name = "joined_derived_root")
  * @InheritanceType("JOINED")
- * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorColumn(name="discr", type="string", length=255)
  * @DiscriminatorMap({"child" = "JoinedDerivedChildClass", "root" = "JoinedDerivedRootClass"})
  */
 class JoinedDerivedRootClass
@@ -34,7 +34,7 @@ class JoinedDerivedRootClass
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     protected $keyPart2 = 'part-2';

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedRootClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/JoinedRootClass.php
@@ -21,14 +21,14 @@ class JoinedRootClass
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     protected $keyPart1 = 'part-1';
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     protected $keyPart2 = 'part-2';

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/SingleChildClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/SingleChildClass.php
@@ -15,13 +15,13 @@ class SingleChildClass extends SingleRootClass
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $extension = 'ext';
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     private $additionalId = 'additional';

diff --git a/tests/Doctrine/Tests/Models/CompositeKeyInheritance/SingleRootClass.php b/tests/Doctrine/Tests/Models/CompositeKeyInheritance/SingleRootClass.php
@@ -14,21 +14,21 @@
 /**
  * @Entity
  * @InheritanceType("SINGLE_TABLE")
- * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorColumn(name="discr", type="string", length=255)
  * @DiscriminatorMap({"child" = "SingleChildClass", "root" = "SingleRootClass"})
  */
 class SingleRootClass
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     protected $keyPart1 = 'part-1';
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      * @Id
      */
     protected $keyPart2 = 'part-2';

diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeChild.php
@@ -19,7 +19,7 @@ class CustomIdObjectTypeChild
 {
     /**
      * @Id
-     * @Column(type="CustomIdObject")
+     * @Column(type="CustomIdObject", length=255)
      * @var CustomIdObject
      */
     public $id;

diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php b/tests/Doctrine/Tests/Models/CustomType/CustomIdObjectTypeParent.php
@@ -21,7 +21,7 @@ class CustomIdObjectTypeParent
 {
     /**
      * @Id
-     * @Column(type="CustomIdObject")
+     * @Column(type="CustomIdObject", length=255)
      * @var CustomIdObject
      */
     public $id;

diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomTypeChild.php b/tests/Doctrine/Tests/Models/CustomType/CustomTypeChild.php
@@ -26,7 +26,7 @@ class CustomTypeChild
 
     /**
      * @var string
-     * @Column(type="upper_case_string")
+     * @Column(type="upper_case_string", length=255)
      */
     public $lowerCaseString = 'foo';
 }
diff --git a/tests/Doctrine/Tests/Models/CustomType/CustomTypeUpperCase.php b/tests/Doctrine/Tests/Models/CustomType/CustomTypeUpperCase.php
@@ -26,13 +26,13 @@ class CustomTypeUpperCase
 
     /**
      * @var string
-     * @Column(type="upper_case_string")
+     * @Column(type="upper_case_string", length=255)
      */
     public $lowerCaseString;
 
     /**
      * @var string
-     * @Column(type="upper_case_string", name="named_lower_case_string", nullable = true)
+     * @Column(type="upper_case_string", length=255, name="named_lower_case_string", nullable = true)
      */
     public $namedLowerCaseString;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Editor.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Editor.php
@@ -31,7 +31,7 @@ class DDC117Editor
 
     /**
      * @var string|null
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $name;
 

diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Reference.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Reference.php
@@ -34,7 +34,7 @@ class DDC117Reference
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     private $description;
 

diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Translation.php
@@ -30,13 +30,13 @@ class DDC117Translation
     /**
      * @var string
      * @Id
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     private $language;
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     private $title;
 

diff --git a/tests/Doctrine/Tests/Models/DDC1590/DDC1590User.php b/tests/Doctrine/Tests/Models/DDC1590/DDC1590User.php
@@ -17,7 +17,7 @@ class DDC1590User extends DDC1590Entity
 {
     /**
      * @var string
-     * @Column(type="string", length=255)
+     * @Column(type="string", length=255, length=255)
      */
     protected $name;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872Bar.php
@@ -16,7 +16,7 @@ class DDC1872Bar
     /**
      * @var string
      * @Id
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     private $id;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php b/tests/Doctrine/Tests/Models/DDC1872/DDC1872ExampleTrait.php
@@ -14,7 +14,7 @@ trait DDC1872ExampleTrait
     /**
      * @var string
      * @Id
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     private $id;
 

diff --git a/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php b/tests/Doctrine/Tests/Models/DDC2504/DDC2504RootClass.php
@@ -16,7 +16,7 @@
 /**
  * @Entity
  * @InheritanceType("JOINED")
- * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorColumn(name="discr", type="string", length=255)
  * @DiscriminatorMap({
  *     "root"  = "DDC2504RootClass",
  *     "child" = "DDC2504ChildClass"

diff --git a/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php b/tests/Doctrine/Tests/Models/DDC3597/DDC3597Root.php
@@ -21,7 +21,7 @@
  *
  * @Entity
  * @InheritanceType("JOINED")
- * @DiscriminatorColumn(name="discriminator", type="string")
+ * @DiscriminatorColumn(name="discriminator", type="string", length=255)
  * @DiscriminatorMap({ "image" = "DDC3597Image"})
  * @HasLifecycleCallbacks
  */

diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Child.php
@@ -27,7 +27,7 @@ class DDC3699Child extends DDC3699Parent
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $childField;
 

diff --git a/tests/Doctrine/Tests/Models/DDC3699/DDC3699Parent.php b/tests/Doctrine/Tests/Models/DDC3699/DDC3699Parent.php
@@ -12,7 +12,7 @@ abstract class DDC3699Parent
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     public $parentField;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC3899/DDC3899Contract.php b/tests/Doctrine/Tests/Models/DDC3899/DDC3899Contract.php
@@ -17,7 +17,7 @@
  * @Entity
  * @Table(name="dc3899_contracts")
  * @InheritanceType("SINGLE_TABLE")
- * @DiscriminatorColumn(name="discr", type="string")
+ * @DiscriminatorColumn(name="discr", type="string", length=255)
  * @DiscriminatorMap({
  *     "fix"       = "DDC3899FixContract",
  *     "flexible"  = "DDC3899FlexContract"

diff --git a/tests/Doctrine/Tests/Models/DDC753/DDC753EntityWithCustomRepository.php b/tests/Doctrine/Tests/Models/DDC753/DDC753EntityWithCustomRepository.php
@@ -24,7 +24,7 @@ class DDC753EntityWithCustomRepository
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     protected $name;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC753/DDC753EntityWithDefaultCustomRepository.php b/tests/Doctrine/Tests/Models/DDC753/DDC753EntityWithDefaultCustomRepository.php
@@ -24,7 +24,7 @@ class DDC753EntityWithDefaultCustomRepository
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     protected $name;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC753/DDC753EntityWithInvalidRepository.php b/tests/Doctrine/Tests/Models/DDC753/DDC753EntityWithInvalidRepository.php
@@ -24,7 +24,7 @@ class DDC753EntityWithInvalidRepository
 
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     protected $name;
 }
diff --git a/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php b/tests/Doctrine/Tests/Models/DDC869/DDC869ChequePayment.php
@@ -17,7 +17,7 @@ class DDC869ChequePayment extends DDC869Payment
 {
     /**
      * @var string
-     * @Column(type="string")
+     * @Column(type="string", length=255)
      */
     #[ORM\Column(type: 'string')]
     protected $serialNumber;