From dd8db1acd2022820a8b2fc177d83b05ea0df9adc Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Fri, 5 Dec 2014 15:50:21 +0100 Subject: [PATCH] DDC-3427 - s/EntityManager/EntityManagerInterface in relevant tests about identifier generation --- tests/Doctrine/Tests/Mocks/SequenceMock.php | 4 ++-- tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php | 4 ++-- .../Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php | 6 ++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/SequenceMock.php b/tests/Doctrine/Tests/Mocks/SequenceMock.php index 4f5123004..db73051d2 100644 --- a/tests/Doctrine/Tests/Mocks/SequenceMock.php +++ b/tests/Doctrine/Tests/Mocks/SequenceMock.php @@ -2,7 +2,7 @@ namespace Doctrine\Tests\Mocks; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; /** * Mock class for SequenceGenerator. @@ -17,7 +17,7 @@ class SequenceMock extends \Doctrine\ORM\Id\SequenceGenerator /** * {@inheritdoc} */ - public function generate(EntityManager $em, $entity) + public function generate(EntityManagerInterface $em, $entity) { return $this->_sequenceNumber++; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php index 0283e6457..a55eba14e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php @@ -2,7 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; -use Doctrine\ORM\EntityManager; +use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\Id\AbstractIdGenerator; use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Mapping\Driver\StaticPHPDriver; @@ -97,7 +97,7 @@ class DDC2415ChildEntity extends DDC2415ParentEntity class DDC2415Generator extends AbstractIdGenerator { - public function generate(EntityManager $em, $entity) + public function generate(EntityManagerInterface $em, $entity) { return md5($entity->getName()); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index 54d2c9eac..394b737a5 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -10,6 +10,8 @@ use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\DriverMock; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Common\EventManager; +use Doctrine\ORM\EntityManagerInterface; +use Doctrine\ORM\Id\AbstractIdGenerator; use Doctrine\ORM\Mapping\ClassMetadataFactory; class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase @@ -410,9 +412,9 @@ class TestEntity1 private $association; } -class CustomIdGenerator extends \Doctrine\ORM\Id\AbstractIdGenerator +class CustomIdGenerator extends AbstractIdGenerator { - public function generate(\Doctrine\ORM\EntityManager $em, $entity) + public function generate(EntityManagerInterface $em, $entity) { } }