Merge pull request #333 from greg0ire/address-persistence-deprecations

Address deprecations from persistence
doctrine · Jan 4, 2020 · 89594f4 · 89594f4
2 parents 608a35a + b7532e4
commit 89594f4
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -9,8 +9,8 @@ by implementing the [`Doctrine\Common\DataFixtures\FixtureInterface`](lib/Doctri
 ```php
 namespace MyDataFixtures;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\DataFixtures\FixtureInterface;
+use Doctrine\Persistence\ObjectManager;
 
 class UserFixtureLoader implements FixtureInterface
 {
@@ -82,7 +82,7 @@ a relation. Here is an example fixtures for **Role** and **User** relation
 namespace MyDataFixtures;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class UserRoleDataLoader extends AbstractFixture
 {
@@ -110,7 +110,7 @@ And the **User** data loading fixture:
 namespace MyDataFixtures;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class UserDataLoader extends AbstractFixture
 {
@@ -145,7 +145,7 @@ namespace MyDataFixtures;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class MyFixture extends AbstractFixture implements OrderedFixtureInterface
 {
@@ -168,7 +168,7 @@ namespace MyDataFixtures;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
 use Doctrine\Common\DataFixtures\DependentFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class MyFixture extends AbstractFixture implements DependentFixtureInterface
 {

diff --git a/composer.json b/composer.json
@@ -15,7 +15,8 @@
     ],
     "require": {
         "php": "^7.2",
-        "doctrine/common": "^2.11"
+        "doctrine/common": "^2.11",
+        "doctrine/persistence": "^1.3.3"
     },
     "conflict": {
         "doctrine/phpcr-odm": "<1.3.0"
@@ -25,7 +26,7 @@
         "doctrine/coding-standard": "^6.0",
         "doctrine/dbal": "^2.5.4",
         "doctrine/mongodb-odm": "^1.3.0",
-        "doctrine/orm": "^2.5.4",
+        "doctrine/orm": "^2.7.0",
         "phpunit/phpunit": "^7.0"
     },
     "suggest": {

diff --git a/lib/Doctrine/Common/DataFixtures/Executor/AbstractExecutor.php b/lib/Doctrine/Common/DataFixtures/Executor/AbstractExecutor.php
@@ -9,9 +9,10 @@
 use Doctrine\Common\DataFixtures\Purger\PurgerInterface;
 use Doctrine\Common\DataFixtures\ReferenceRepository;
 use Doctrine\Common\DataFixtures\SharedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Exception;
 use function get_class;
+use function interface_exists;
 use function sprintf;
 
 /**
@@ -139,3 +140,5 @@ public function purge()
      */
     abstract public function execute(array $fixtures, $append = false);
 }
+
+interface_exists(ObjectManager::class);
diff --git a/lib/Doctrine/Common/DataFixtures/FixtureInterface.php b/lib/Doctrine/Common/DataFixtures/FixtureInterface.php
@@ -4,7 +4,8 @@
 
 namespace Doctrine\Common\DataFixtures;
 
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
+use function interface_exists;
 
 /**
  * Interface contract for fixture classes to implement.
@@ -16,3 +17,5 @@ interface FixtureInterface
      */
     public function load(ObjectManager $manager);
 }
+
+interface_exists(ObjectManager::class);
diff --git a/lib/Doctrine/Common/DataFixtures/ReferenceRepository.php b/lib/Doctrine/Common/DataFixtures/ReferenceRepository.php
@@ -5,8 +5,8 @@
 namespace Doctrine\Common\DataFixtures;
 
 use BadMethodCallException;
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\ODM\PHPCR\DocumentManager as PhpcrDocumentManager;
+use Doctrine\Persistence\ObjectManager;
 use OutOfBoundsException;
 use function array_key_exists;
 use function array_keys;

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/DependentFixtureTest.php b/tests/Doctrine/Tests/Common/DataFixtures/DependentFixtureTest.php
@@ -9,7 +9,7 @@
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\Loader;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use InvalidArgumentException;
 use RuntimeException;
 use function array_search;

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/FixtureTest.php b/tests/Doctrine/Tests/Common/DataFixtures/FixtureTest.php
@@ -5,7 +5,7 @@
 namespace Doctrine\Tests\Common\DataFixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 /**
  * Test Fixture interface.

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/OrderedFixtureTest.php b/tests/Doctrine/Tests/Common/DataFixtures/OrderedFixtureTest.php
@@ -7,7 +7,7 @@
 use Doctrine\Common\DataFixtures\FixtureInterface;
 use Doctrine\Common\DataFixtures\Loader;
 use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 /**
  * Test Fixture ordering.

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/Purger/ORMPurgerTest.php b/tests/Doctrine/Tests/Common/DataFixtures/Purger/ORMPurgerTest.php
@@ -26,7 +26,7 @@ public function testGetAssociationTables()
         $method   = $class->getMethod('getAssociationTables');
         $method->setAccessible(true);
         $associationTables = $method->invokeArgs($purger, [[$metadata], $platform]);
-        $this->assertEquals($associationTables[0], 'readers.author_reader');
+        $this->assertEquals($associationTables[0], 'readers__author_reader');
     }
 
     public function testGetAssociationTablesQuoted()

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/ReferenceRepositoryTest.php b/tests/Doctrine/Tests/Common/DataFixtures/ReferenceRepositoryTest.php
@@ -7,11 +7,11 @@
 use BadMethodCallException;
 use Doctrine\Common\DataFixtures\Event\Listener\ORMReferenceListener;
 use Doctrine\Common\DataFixtures\ReferenceRepository;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Proxy\Proxy;
 use Doctrine\ORM\Tools\SchemaTool;
 use Doctrine\ORM\UnitOfWork;
+use Doctrine\Persistence\Mapping\ClassMetadata;
 use Doctrine\Tests\Common\DataFixtures\TestEntity\Role;
 use OutOfBoundsException;
 use Prophecy\Prophecy\ProphecyInterface;

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/MyFixture1.php b/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/MyFixture1.php
@@ -5,7 +5,7 @@
 namespace TestFixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class MyFixture1 implements FixtureInterface
 {

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/MyFixture2.php b/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/MyFixture2.php
@@ -5,7 +5,7 @@
 namespace TestFixtures;
 
 use Doctrine\Common\DataFixtures\FixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 
 class MyFixture2 implements FixtureInterface
 {

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/RoleFixture.php b/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/RoleFixture.php
@@ -6,7 +6,7 @@
 
 use Doctrine\Common\DataFixtures\ReferenceRepository;
 use Doctrine\Common\DataFixtures\SharedFixtureInterface;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Doctrine\Tests\Common\DataFixtures\TestEntity\Role;
 
 class RoleFixture implements SharedFixtureInterface

diff --git a/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/UserFixture.php b/tests/Doctrine/Tests/Common/DataFixtures/TestFixtures/UserFixture.php
@@ -5,7 +5,7 @@
 namespace Doctrine\Tests\Common\DataFixtures\TestFixtures;
 
 use Doctrine\Common\DataFixtures\AbstractFixture;
-use Doctrine\Common\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectManager;
 use Doctrine\Tests\Common\DataFixtures\TestEntity\User;
 
 class UserFixture extends AbstractFixture