ISSUE-188: Fixed deprecated Doctrine\Common\Persistence\ObjectManager

Author: raymondschouten

composer.json

@@ -13,15 +13,16 @@
         "symfony/form": "5.0.*"
     },
     "require-dev": {
-        "doctrine/common": "^2.4",
-        "doctrine/orm": "^2.4",
+        "doctrine/orm": "^2.7",
         "phpunit/phpunit": "^8.5"
     },
     "suggest": {
         "darkwebdesign/symfony-addon-pack": "All Symfony add-ons bundled together",
-        "doctrine/common": "Required for EntityToIdentifierTransformer",
         "doctrine/orm": "Required for EntityToIdentifierTransformer"
     },
+    "conflict": {
+        "doctrine/orm": "<2.7"
+    },
     "autoload": {
         "psr-4": {
             "DarkWebDesign\\SymfonyAddonTransformers\\": "src/"

src/EntityToIdentifierTransformer.php

@@ -22,14 +22,14 @@
 
 namespace DarkWebDesign\SymfonyAddonTransformers;
 
-use Doctrine\Common\Persistence\ObjectManager;
 use Doctrine\Common\Util\ClassUtils;
+use Doctrine\Persistence\ObjectManager;
 use Symfony\Component\Form\DataTransformerInterface;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 use Symfony\Component\Form\Exception\TransformationFailedException;
 
 if (!interface_exists(ObjectManager::class)) {
-    throw new \LogicException('You cannot use "DarkWebDesign\SymfonyAddonTransformers\EntityToIdentifierTransformer" as the "doctrine/persistence" package is not installed. Try running "composer require doctrine/persistence:^1.0".');
+    throw new \LogicException('You cannot use "DarkWebDesign\SymfonyAddonTransformers\EntityToIdentifierTransformer" as the "doctrine/orm" package is not installed. Try running "composer require doctrine/orm".');
 }
 
 /**
@@ -90,7 +90,7 @@ public function transform($value)
         }
 
         if (!class_exists(ClassUtils::class)) {
-            throw new \LogicException(sprintf('You cannot use "%s" as the "doctrine/common" package is not installed. Try running "composer require doctrine/common".', __CLASS__));
+            throw new \LogicException(sprintf('You cannot use "%s" as the "doctrine/orm" package is not installed. Try running "composer require doctrine/orm".', __CLASS__));
         }
 
         $className = ClassUtils::getClass($value);

tests/EntityToIdentifierTransformerTest.php

@@ -27,9 +27,9 @@
 use DarkWebDesign\SymfonyAddonTransformers\Tests\Models\City;
 use DarkWebDesign\SymfonyAddonTransformers\Tests\Models\Employee;
 use DarkWebDesign\SymfonyAddonTransformers\Tests\Models\PointOfInterest;
-use Doctrine\Common\Persistence\Mapping\ClassMetadata;
-use Doctrine\Common\Persistence\ObjectManager;
-use Doctrine\Common\Persistence\ObjectRepository;
+use Doctrine\Persistence\Mapping\ClassMetadata;
+use Doctrine\Persistence\ObjectManager;
+use Doctrine\Persistence\ObjectRepository;
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\Form\Exception\InvalidArgumentException;
 use Symfony\Component\Form\Exception\TransformationFailedException;
@@ -45,13 +45,13 @@ class EntityToIdentifierTransformerTest extends TestCase
     /** @var int */
     private $identifier;
 
-    /** @var \Doctrine\Common\Persistence\ObjectManager|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var \Doctrine\Persistence\ObjectManager|\PHPUnit\Framework\MockObject\MockObject */
     private $entityManager;
 
-    /** @var \Doctrine\Common\Persistence\ObjectRepository|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var \Doctrine\Persistence\ObjectRepository|\PHPUnit\Framework\MockObject\MockObject */
     private $repository;
 
-    /** @var \Doctrine\Common\Persistence\Mapping\ClassMetadata|\PHPUnit\Framework\MockObject\MockObject */
+    /** @var \Doctrine\Persistence\Mapping\ClassMetadata|\PHPUnit\Framework\MockObject\MockObject */
     private $metadata;
 
     protected function setUp(): void