RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-24 17:03:56 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/abstract-id-generator-revert-bc-break'

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-16 18:53:36 +01:00
commit 655394d433
11 changed files with 31 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UPGRADE.md
View File

@ -7,7 +7,6 @@ an ``EntityManagerInterface`` instead.
If you are extending any of the following classes, then you need to check following If you are extending any of the following classes, then you need to check following
signatures: signatures:
- ``Doctrine\ORM\Id\AbstractIdGenerator#generate(EntityManagerInterface $em, $entity)``
- ``Doctrine\ORM\Tools\DebugUnitOfWorkListener#dumpIdentityMap(EntityManagerInterface $em)`` - ``Doctrine\ORM\Tools\DebugUnitOfWorkListener#dumpIdentityMap(EntityManagerInterface $em)``
- ``Doctrine\ORM\Mapping\ClassMetadataFactory#setEntityManager(EntityManagerInterface $em)`` - ``Doctrine\ORM\Mapping\ClassMetadataFactory#setEntityManager(EntityManagerInterface $em)``

7
lib/Doctrine/ORM/Id/AbstractIdGenerator.php
View File

@ -19,19 +19,18 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
abstract class AbstractIdGenerator abstract class AbstractIdGenerator
{ {
/** /**
* Generates an identifier for an entity. * Generates an identifier for an entity.
* *
* @param EntityManagerInterface $em * @param EntityManager|EntityManager $em
* @param \Doctrine\ORM\Mapping\Entity $entity * @param \Doctrine\ORM\Mapping\Entity $entity
*
* @return mixed * @return mixed
*/ */
abstract public function generate(EntityManagerInterface $em, $entity); abstract public function generate(EntityManager $em, $entity);
/** /**
* Gets whether this generator is a post-insert generator which means that * Gets whether this generator is a post-insert generator which means that

5
lib/Doctrine/ORM/Id/AssignedGenerator.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
use Doctrine\ORM\ORMException; use Doctrine\ORM\ORMException;
/** /**
@ -40,7 +40,8 @@ class AssignedGenerator extends AbstractIdGenerator
* *
* @throws \Doctrine\ORM\ORMException * @throws \Doctrine\ORM\ORMException
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(
EntityManager $em, $entity)
{ {
$class = $em->getClassMetadata(get_class($entity)); $class = $em->getClassMetadata(get_class($entity));
$idFields = $class->getIdentifierFieldNames(); $idFields = $class->getIdentifierFieldNames();

4
lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
/** /**
* Id generator that obtains IDs from special "identity" columns. These are columns * Id generator that obtains IDs from special "identity" columns. These are columns
@ -50,7 +50,7 @@ class BigIntegerIdentityGenerator extends AbstractIdGenerator
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(EntityManager $em, $entity)
{ {
return (string) $em->getConnection()->lastInsertId($this->sequenceName); return (string) $em->getConnection()->lastInsertId($this->sequenceName);
} }

5
lib/Doctrine/ORM/Id/IdentityGenerator.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
/** /**
* Id generator that obtains IDs from special "identity" columns. These are columns * Id generator that obtains IDs from special "identity" columns. These are columns
@ -50,7 +50,8 @@ class IdentityGenerator extends AbstractIdGenerator
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(
EntityManager $em, $entity)
{ {
return (int)$em->getConnection()->lastInsertId($this->sequenceName); return (int)$em->getConnection()->lastInsertId($this->sequenceName);
} }

4
lib/Doctrine/ORM/Id/SequenceGenerator.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
use Serializable; use Serializable;
/** /**
@ -69,7 +69,7 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(EntityManager $em, $entity)
{ {
if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) { if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) {
// Allocate new values // Allocate new values

5
lib/Doctrine/ORM/Id/TableGenerator.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
/** /**
* Id generator that uses a single-row database table and a hi/lo algorithm. * Id generator that uses a single-row database table and a hi/lo algorithm.
@ -72,7 +72,8 @@ class TableGenerator extends AbstractIdGenerator
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(
EntityManager $em, $entity)
{ {
if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) { if ($this->_maxValue === null || $this->_nextValue == $this->_maxValue) {
// Allocate new values // Allocate new values

4
lib/Doctrine/ORM/Id/UuidGenerator.php
View File

@ -19,7 +19,7 @@
namespace Doctrine\ORM\Id; namespace Doctrine\ORM\Id;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
/** /**
* Represents an ID generator that uses the database UUID expression * Represents an ID generator that uses the database UUID expression
@ -32,7 +32,7 @@ class UuidGenerator extends AbstractIdGenerator
/** /**
* {@inheritDoc} * {@inheritDoc}
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(EntityManager $em, $entity)
{ {
$conn = $em->getConnection(); $conn = $em->getConnection();
$sql = 'SELECT ' . $conn->getDatabasePlatform()->getGuidExpression(); $sql = 'SELECT ' . $conn->getDatabasePlatform()->getGuidExpression();

4
tests/Doctrine/Tests/Mocks/SequenceMock.php
View File

@ -2,7 +2,7 @@
namespace Doctrine\Tests\Mocks; namespace Doctrine\Tests\Mocks;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
/** /**
* Mock class for SequenceGenerator. * Mock class for SequenceGenerator.
@ -17,7 +17,7 @@ class SequenceMock extends \Doctrine\ORM\Id\SequenceGenerator
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function generate(EntityManagerInterface $em, $entity) public function generate(EntityManager $em, $entity)
{ {
return $this->_sequenceNumber++; return $this->_sequenceNumber++;
} }

4
tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2415Test.php
View File

@ -2,7 +2,7 @@
namespace Doctrine\Tests\ORM\Functional\Ticket; namespace Doctrine\Tests\ORM\Functional\Ticket;
use Doctrine\ORM\EntityManagerInterface; use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Id\AbstractIdGenerator; use Doctrine\ORM\Id\AbstractIdGenerator;
use Doctrine\ORM\Mapping\ClassMetadataInfo; use Doctrine\ORM\Mapping\ClassMetadataInfo;
use Doctrine\ORM\Mapping\Driver\StaticPHPDriver; use Doctrine\ORM\Mapping\Driver\StaticPHPDriver;
@ -97,7 +97,7 @@ class DDC2415ChildEntity extends DDC2415ParentEntity
class DDC2415Generator extends AbstractIdGenerator class DDC2415Generator extends AbstractIdGenerator
{ {
public function generate(EntityManagerInterface $em, $entity) public function generate(EntityManager $em, $entity)
{ {
return md5($entity->getName()); return md5($entity->getName());
} }

18
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php
View File

@ -2,17 +2,17 @@
namespace Doctrine\Tests\ORM\Mapping; namespace Doctrine\Tests\ORM\Mapping;
use Doctrine\Common\EventManager;
use Doctrine\ORM\EntityManager;
use Doctrine\ORM\Event\OnClassMetadataNotFoundEventArgs; use Doctrine\ORM\Event\OnClassMetadataNotFoundEventArgs;
use Doctrine\ORM\Events; use Doctrine\ORM\Events;
use Doctrine\Tests\Mocks\MetadataDriverMock; use Doctrine\ORM\Id\AbstractIdGenerator;
use Doctrine\Tests\Mocks\EntityManagerMock; use Doctrine\ORM\Mapping\ClassMetadata;
use Doctrine\ORM\Mapping\ClassMetadataFactory;
use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\ConnectionMock;
use Doctrine\Tests\Mocks\DriverMock; use Doctrine\Tests\Mocks\DriverMock;
use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\Mocks\EntityManagerMock;
use Doctrine\Common\EventManager; use Doctrine\Tests\Mocks\MetadataDriverMock;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Id\AbstractIdGenerator;
use Doctrine\ORM\Mapping\ClassMetadataFactory;
class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
{ {
@ -367,7 +367,7 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase
{ {
$classMetadataFactory = new ClassMetadataFactory(); $classMetadataFactory = new ClassMetadataFactory();
/* @var $entityManager \Doctrine\ORM\EntityManager */ /* @var $entityManager EntityManager */
$entityManager = $this->getMock('Doctrine\\ORM\\EntityManagerInterface'); $entityManager = $this->getMock('Doctrine\\ORM\\EntityManagerInterface');
$classMetadataFactory->setEntityManager($entityManager); $classMetadataFactory->setEntityManager($entityManager);
@ -414,7 +414,7 @@ class TestEntity1
class CustomIdGenerator extends AbstractIdGenerator class CustomIdGenerator extends AbstractIdGenerator
{ {
public function generate(EntityManagerInterface $em, $entity) public function generate(EntityManager $em, $entity)
{ {
} }
} }