Merge pull request #9767 from greg0ire/3.0.x

Merge 2.13.x up into 3.0.x
doctrine · May 18, 2022 · bb1fdcf · bb1fdcf
2 parents c8735de + b91825b
commit bb1fdcf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 28 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -1,5 +1,10 @@
 # Upgrade to 3.0
 
+## BC BREAK: Remove StaticPHPDriver
+
+Use `Doctrine\Persistence\Mapping\Driver\StaticPHPDriver` from
+`doctrine/persistence` instead.
+
 ## BC BREAK: `UnderscoreNamingStrategy` is number aware only
 
 The second argument to `UnderscoreNamingStrategy::__construct()` was dropped,

diff --git a/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php b/lib/Doctrine/ORM/Mapping/Driver/StaticPHPDriver.php
diff --git a/lib/Doctrine/ORM/Mapping/NamingStrategy.php b/lib/Doctrine/ORM/Mapping/NamingStrategy.php
@@ -46,7 +46,7 @@ public function referenceColumnName(): string;
     /**
      * Returns a join column name for a property.
      */
-    public function joinColumnName(string $propertyName/*, $className = null */): string;
+    public function joinColumnName(string $propertyName/*, string $className */): string;
 
     /**
      * Returns a join table name.

diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
@@ -7,7 +7,7 @@
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Id\AbstractIdGenerator;
 use Doctrine\ORM\Mapping\ClassMetadata;
-use Doctrine\ORM\Mapping\Driver\StaticPHPDriver;
+use Doctrine\Persistence\Mapping\Driver\StaticPHPDriver;
 use Doctrine\Tests\OrmFunctionalTestCase;
 
 use function md5;

diff --git a/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php b/tests/Doctrine/Tests/ORM/Mapping/NamingStrategyTest.php
@@ -140,18 +140,18 @@ public static function dataJoinColumnName(): array
     {
         return [
             // DefaultNamingStrategy
-            [self::defaultNaming(), 'someColumn_id', 'someColumn', null],
-            [self::defaultNaming(), 'some_column_id', 'some_column', null],
-            [self::defaultNaming(), 'base64Encoded_id', 'base64Encoded', null],
-            [self::defaultNaming(), 'base64_encoded_id', 'base64_encoded', null],
+            [self::defaultNaming(), 'someColumn_id', 'someColumn', 'Some\Class'],
+            [self::defaultNaming(), 'some_column_id', 'some_column', 'Some\Class'],
+            [self::defaultNaming(), 'base64Encoded_id', 'base64Encoded', 'Some\Class'],
+            [self::defaultNaming(), 'base64_encoded_id', 'base64_encoded', 'Some\Class'],
 
             // UnderscoreNamingStrategy
-            [self::underscoreNamingLower(), 'some_column_id', 'someColumn', null],
-            [self::underscoreNamingLower(), 'base64_encoded_id', 'base64Encoded', null],
-            [self::underscoreNamingLower(), 'base64encoded_id', 'base64encoded', null],
-            [self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', null],
-            [self::underscoreNamingUpper(), 'BASE64_ENCODED_ID', 'base64Encoded', null],
-            [self::underscoreNamingUpper(), 'BASE64ENCODED_ID', 'base64encoded', null],
+            [self::underscoreNamingLower(), 'some_column_id', 'someColumn', 'Some\Class'],
+            [self::underscoreNamingLower(), 'base64_encoded_id', 'base64Encoded', 'Some\Class'],
+            [self::underscoreNamingLower(), 'base64encoded_id', 'base64encoded', 'Some\Class'],
+            [self::underscoreNamingUpper(), 'SOME_COLUMN_ID', 'someColumn', 'Some\Class'],
+            [self::underscoreNamingUpper(), 'BASE64_ENCODED_ID', 'base64Encoded', 'Some\Class'],
+            [self::underscoreNamingUpper(), 'BASE64ENCODED_ID', 'base64encoded', 'Some\Class'],
 
             // JoinColumnClassNamingStrategy
             [new JoinColumnClassNamingStrategy(), 'classname_someColumn_id', 'someColumn', 'Some\ClassName'],