Update doctrine persistence to remove deprecation

doctrine · Jan 7, 2020 · 57185bb · 57185bb
1 parent 2bd35a9
commit 57185bb
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 14 deletions.
diff --git a/composer.json b/composer.json
@@ -25,7 +25,7 @@
         "doctrine/dbal": "^2.10.0",
         "doctrine/event-manager": "^1.1",
         "doctrine/instantiator": "^1.3",
-        "doctrine/persistence": "^1.2",
+        "doctrine/persistence": "^1.3",
         "symfony/console": "^3.0|^4.0|^5.0"
     },
     "require-dev": {

diff --git a/composer.lock b/composer.lock
diff --git a/lib/Doctrine/ORM/Decorator/EntityManagerDecorator.php b/lib/Doctrine/ORM/Decorator/EntityManagerDecorator.php
@@ -21,7 +21,7 @@
 
 use Doctrine\ORM\Query\ResultSetMapping;
 use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\Common\Persistence\ObjectManagerDecorator;
+use Doctrine\Persistence\ObjectManagerDecorator;
 
 /**
  * Base class for EntityManager decorators

diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php
@@ -801,8 +801,8 @@ public function testCommitThrowOptimisticLockExceptionWhenConnectionCommitReturn
             ->setConstructorArgs([[], new DriverMock()])
             ->setMethods(['commit'])
             ->getMock();
-        $this->_emMock = EntityManagerMock::create($this->_connectionMock, null, $this->eventManager);
-        $this->_unitOfWork = new UnitOfWorkMock($this->_emMock);
+        $this->_emMock         = EntityManagerMock::create($this->_connectionMock, null, $this->eventManager);
+        $this->_unitOfWork     = new UnitOfWorkMock($this->_emMock);
         $this->_emMock->setUnitOfWork($this->_unitOfWork);
 
         $this->_connectionMock->method('commit')->willReturn(false);