From a04113f4101797e4b7552e874d126b2e011692cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sat, 17 May 2014 12:54:25 +0200 Subject: [PATCH 01/47] Add support for optimized contains --- .../Persister/AbstractEntityPersister.php | 5 ++- lib/Doctrine/ORM/LazyCriteriaCollection.php | 17 +++++++++- .../ORM/Persisters/BasicEntityPersister.php | 18 +++++++--- .../ORM/Persisters/EntityPersister.php | 6 ++-- .../ORM/Persisters/OneToManyPersister.php | 2 +- .../Tests/Mocks/EntityPersisterMock.php | 5 ++- .../EntityRepositoryCriteriaTest.php | 33 +++++++++++++++++++ 7 files changed, 75 insertions(+), 11 deletions(-) diff --git a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php index b95becba2..de0d9e7cf 100644 --- a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php @@ -190,8 +190,11 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} + * @param object $entity + * @param array $extraConditions + * @return bool */ - public function exists($entity, array $extraConditions = array()) + public function exists($entity, $extraConditions = array()) { if (empty($extraConditions)) { $key = new EntityCacheKey($this->class->rootEntityName, $this->class->getIdentifierValues($entity)); diff --git a/lib/Doctrine/ORM/LazyCriteriaCollection.php b/lib/Doctrine/ORM/LazyCriteriaCollection.php index bb1219696..dcd21419c 100644 --- a/lib/Doctrine/ORM/LazyCriteriaCollection.php +++ b/lib/Doctrine/ORM/LazyCriteriaCollection.php @@ -30,7 +30,7 @@ use Doctrine\ORM\Persisters\EntityPersister; * A lazy collection that allow a fast count when using criteria object * Once count gets executed once without collection being initialized, result * is cached and returned on subsequent calls until collection gets loaded, - * then returning the number of loaded results. + * then returning the number of loaded results. * * @since 2.5 * @author Guilherme Blanco @@ -82,6 +82,21 @@ class LazyCriteriaCollection extends AbstractLazyCollection implements Selectabl return $this->count = $this->entityPersister->count($this->criteria); } + /** + * Do an optimized search of an element + * + * @param object $element + * @return bool + */ + public function contains($element) + { + if ($this->isInitialized()) { + return $this->collection->contains($element); + } + + return $this->entityPersister->exists($element, $this->criteria); + } + /** * {@inheritDoc} */ diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index e7a74327c..e7c765901 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -1834,8 +1834,11 @@ class BasicEntityPersister implements EntityPersister /** * {@inheritdoc} + * @param object $entity + * @param array $extraConditions + * @return bool */ - public function exists($entity, array $extraConditions = array()) + public function exists($entity, $extraConditions = array()) { $criteria = $this->class->getIdentifierValues($entity); @@ -1843,7 +1846,7 @@ class BasicEntityPersister implements EntityPersister return false; } - if ($extraConditions) { + if (is_array($extraConditions)) { $criteria = array_merge($criteria, $extraConditions); } @@ -1853,12 +1856,19 @@ class BasicEntityPersister implements EntityPersister . $this->getLockTablesSql(null) . ' WHERE ' . $this->getSelectConditionSQL($criteria); + list($params) = $this->expandParameters($criteria); + + if ($extraConditions instanceof Criteria) { + $sql .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions); + list($criteriaParams, $values) = $this->expandCriteriaParameters($extraConditions); + + $params = array_merge($params, $criteriaParams); + } + if ($filterSql = $this->generateFilterConditionSQL($this->class, $alias)) { $sql .= ' AND ' . $filterSql; } - list($params) = $this->expandParameters($criteria); - return (bool) $this->conn->fetchColumn($sql, $params); } diff --git a/lib/Doctrine/ORM/Persisters/EntityPersister.php b/lib/Doctrine/ORM/Persisters/EntityPersister.php index 747ab5802..a3a33cd26 100644 --- a/lib/Doctrine/ORM/Persisters/EntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/EntityPersister.php @@ -319,10 +319,10 @@ interface EntityPersister /** * Checks whether the given managed entity exists in the database. * - * @param object $entity - * @param array $extraConditions + * @param object $entity + * @param array|Criteria $extraConditions * * @return boolean TRUE if the entity exists in the database, FALSE otherwise. */ - public function exists($entity, array $extraConditions = array()); + public function exists($entity, $extraConditions = array()); } diff --git a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php index c53df29d1..e9edcef52 100644 --- a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php @@ -168,7 +168,7 @@ class OneToManyPersister extends AbstractCollectionPersister return (bool) $this->conn->fetchColumn($sql, $params); } - + private function getJoinTableRestrictions(PersistentCollection $coll, $addFilters) { $mapping = $coll->getMapping(); diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 41b74607d..7b867888b 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -87,8 +87,11 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\BasicEntityPersister /** * {@inheritdoc} + * @param object $entity + * @param array $extraConditions + * @return bool|void */ - public function exists($entity, array $extraConditions = array()) + public function exists($entity, $extraConditions = array()) { $this->existsCalled = true; } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php index 345878849..6a626b3f4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryCriteriaTest.php @@ -21,6 +21,8 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\Tests\Models\Generic\DateTimeModel; use Doctrine\Common\Collections\Criteria; +use Doctrine\Tests\Models\Tweet\Tweet; +use Doctrine\Tests\Models\Tweet\User; /** * @author Josiah @@ -30,6 +32,7 @@ class EntityRepositoryCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { $this->useModelSet('generic'); + $this->useModelSet('tweet'); parent::setUp(); } @@ -165,4 +168,34 @@ class EntityRepositoryCriteriaTest extends \Doctrine\Tests\OrmFunctionalTestCase $date = $dates[0]; $this->assertTrue($dates->isInitialized()); } + + public function testCanContainsWithoutLoadingCollection() + { + $user = new User(); + $user->name = 'Marco'; + $this->_em->persist($user); + $this->_em->flush(); + + $tweet = new Tweet(); + $tweet->author = $user; + $tweet->content = 'Criteria is awesome'; + $this->_em->persist($tweet); + $this->_em->flush(); + + $this->_em->clear(); + + $criteria = new Criteria(); + $criteria->andWhere($criteria->expr()->contains('content', 'Criteria')); + + $user = $this->_em->find('Doctrine\Tests\Models\Tweet\User', $user->id); + $tweets = $user->tweets->matching($criteria); + + $this->assertInstanceOf('Doctrine\ORM\LazyCriteriaCollection', $tweets); + $this->assertFalse($tweets->isInitialized()); + + $tweets->contains($tweet); + $this->assertTrue($tweets->contains($tweet)); + + $this->assertFalse($tweets->isInitialized()); + } } From f52a512c592299815179fb8c744d71ef28b99c96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sat, 17 May 2014 12:57:39 +0200 Subject: [PATCH 02/47] Add UPGRADE note --- UPGRADE.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index cc1d07302..83c9ceff9 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,18 +1,24 @@ # Upgrade to 2.5 +## Minor BC BREAK: EntityPersister `exists` now supports Criteria object + +As of 2.5, `EntityPersister` interface supports a Criteria object as the `extraConditions` params. It +was previously typehinted to be an array, so if you implement your own persister, you need to modify +the signature. + ## Minor BC BREAK: Custom Hydrators API change -As of 2.5, `AbstractHydrator` does not enforce the usage of cache as part of +As of 2.5, `AbstractHydrator` does not enforce the usage of cache as part of API, and now provides you a clean API for column information through the method `hydrateColumnInfo($column)`. -Cache variable being passed around by reference is no longer needed since +Cache variable being passed around by reference is no longer needed since Hydrators are per query instantiated since Doctrine 2.4. ## Minor BC BREAK: Entity based ``EntityManager#clear()`` calls follow cascade detach -Whenever ``EntityManager#clear()`` method gets called with a given entity class -name, until 2.4, it was only detaching the specific requested entity. -As of 2.5, ``EntityManager`` will follow configured cascades, providing a better +Whenever ``EntityManager#clear()`` method gets called with a given entity class +name, until 2.4, it was only detaching the specific requested entity. +As of 2.5, ``EntityManager`` will follow configured cascades, providing a better memory management since associations will be garbage collected, optimizing resources consumption on long running jobs. From 239b862665a50cd65234e67ffb54497009a61b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sat, 17 May 2014 13:00:47 +0200 Subject: [PATCH 03/47] Add missing typehint --- lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php index de0d9e7cf..1a3e48ec5 100644 --- a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php @@ -190,8 +190,8 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} - * @param object $entity - * @param array $extraConditions + * @param object $entity + * @param array|Criteria $extraConditions * @return bool */ public function exists($entity, $extraConditions = array()) From ddfc951a0ea1aaf8bd92d946f58a6c908452325e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sat, 17 May 2014 14:33:15 +0200 Subject: [PATCH 04/47] Remove useless docblock --- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 3 --- tests/Doctrine/Tests/Mocks/EntityPersisterMock.php | 3 --- 2 files changed, 6 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index e7c765901..157d0c6fe 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -1834,9 +1834,6 @@ class BasicEntityPersister implements EntityPersister /** * {@inheritdoc} - * @param object $entity - * @param array $extraConditions - * @return bool */ public function exists($entity, $extraConditions = array()) { diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 7b867888b..3722da5f5 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -87,9 +87,6 @@ class EntityPersisterMock extends \Doctrine\ORM\Persisters\BasicEntityPersister /** * {@inheritdoc} - * @param object $entity - * @param array $extraConditions - * @return bool|void */ public function exists($entity, $extraConditions = array()) { From 8a8c6ea3a61159b1e38f697ff06d4243a5bc2900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sat, 17 May 2014 14:53:06 +0200 Subject: [PATCH 05/47] Remove extra phpdoc --- lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php index 1a3e48ec5..a9c9ed00c 100644 --- a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php @@ -190,9 +190,6 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} - * @param object $entity - * @param array|Criteria $extraConditions - * @return bool */ public function exists($entity, $extraConditions = array()) { From 9d7d73109012774c5deabca7ce61aad5fe074094 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sat, 17 May 2014 16:59:43 +0200 Subject: [PATCH 06/47] Remove BC notice --- UPGRADE.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/UPGRADE.md b/UPGRADE.md index 83c9ceff9..e266c7bf0 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,11 +1,5 @@ # Upgrade to 2.5 -## Minor BC BREAK: EntityPersister `exists` now supports Criteria object - -As of 2.5, `EntityPersister` interface supports a Criteria object as the `extraConditions` params. It -was previously typehinted to be an array, so if you implement your own persister, you need to modify -the signature. - ## Minor BC BREAK: Custom Hydrators API change As of 2.5, `AbstractHydrator` does not enforce the usage of cache as part of From 140dc92e5f4fa30ac23f941a9b9a09986f91790b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Gallego?= Date: Sun, 18 May 2014 12:47:59 +0200 Subject: [PATCH 07/47] Enforce Criteria --- .../ORM/Cache/Persister/AbstractEntityPersister.php | 4 ++-- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 8 ++------ lib/Doctrine/ORM/Persisters/EntityPersister.php | 6 +++--- lib/Doctrine/ORM/Persisters/OneToManyPersister.php | 5 +++-- tests/Doctrine/Tests/Mocks/EntityPersisterMock.php | 3 ++- .../ORM/Cache/Persister/AbstractEntityPersisterTest.php | 4 ++-- 6 files changed, 14 insertions(+), 16 deletions(-) diff --git a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php index a9c9ed00c..c051a38d0 100644 --- a/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php +++ b/lib/Doctrine/ORM/Cache/Persister/AbstractEntityPersister.php @@ -191,9 +191,9 @@ abstract class AbstractEntityPersister implements CachedEntityPersister /** * {@inheritdoc} */ - public function exists($entity, $extraConditions = array()) + public function exists($entity, Criteria $extraConditions = null) { - if (empty($extraConditions)) { + if (null === $extraConditions) { $key = new EntityCacheKey($this->class->rootEntityName, $this->class->getIdentifierValues($entity)); if ($this->region->contains($key)) { diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 157d0c6fe..4be7ee78e 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -1835,7 +1835,7 @@ class BasicEntityPersister implements EntityPersister /** * {@inheritdoc} */ - public function exists($entity, $extraConditions = array()) + public function exists($entity, Criteria $extraConditions = null) { $criteria = $this->class->getIdentifierValues($entity); @@ -1843,10 +1843,6 @@ class BasicEntityPersister implements EntityPersister return false; } - if (is_array($extraConditions)) { - $criteria = array_merge($criteria, $extraConditions); - } - $alias = $this->getSQLTableAlias($this->class->name); $sql = 'SELECT 1 ' @@ -1855,7 +1851,7 @@ class BasicEntityPersister implements EntityPersister list($params) = $this->expandParameters($criteria); - if ($extraConditions instanceof Criteria) { + if (null !== $extraConditions) { $sql .= ' AND ' . $this->getSelectConditionCriteriaSQL($extraConditions); list($criteriaParams, $values) = $this->expandCriteriaParameters($extraConditions); diff --git a/lib/Doctrine/ORM/Persisters/EntityPersister.php b/lib/Doctrine/ORM/Persisters/EntityPersister.php index a3a33cd26..bc2685852 100644 --- a/lib/Doctrine/ORM/Persisters/EntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/EntityPersister.php @@ -319,10 +319,10 @@ interface EntityPersister /** * Checks whether the given managed entity exists in the database. * - * @param object $entity - * @param array|Criteria $extraConditions + * @param object $entity + * @param Criteria|null $extraConditions * * @return boolean TRUE if the entity exists in the database, FALSE otherwise. */ - public function exists($entity, $extraConditions = array()); + public function exists($entity, Criteria $extraConditions = null); } diff --git a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php index e9edcef52..ef5703a6a 100644 --- a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php @@ -19,6 +19,7 @@ namespace Doctrine\ORM\Persisters; +use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\UnitOfWork; @@ -227,9 +228,9 @@ class OneToManyPersister extends AbstractCollectionPersister // only works with single id identifier entities. Will throw an // exception in Entity Persisters if that is not the case for the // 'mappedBy' field. - $id = current($uow->getEntityIdentifier($coll->getOwner())); + $criteria = new Criteria(Criteria::expr()->eq($mapping['mappedBy'], $coll->getOwner())); - return $persister->exists($element, array($mapping['mappedBy'] => $id)); + return $persister->exists($element, $criteria); } /** diff --git a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php index 3722da5f5..4df977729 100644 --- a/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityPersisterMock.php @@ -1,6 +1,7 @@ existsCalled = true; } diff --git a/tests/Doctrine/Tests/ORM/Cache/Persister/AbstractEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Cache/Persister/AbstractEntityPersisterTest.php index 4f81d0680..fcee102b9 100644 --- a/tests/Doctrine/Tests/ORM/Cache/Persister/AbstractEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/Persister/AbstractEntityPersisterTest.php @@ -433,8 +433,8 @@ abstract class AbstractEntityPersisterTest extends OrmTestCase $this->entityPersister->expects($this->once()) ->method('exists') - ->with($this->equalTo($entity), $this->equalTo(array())); + ->with($this->equalTo($entity), $this->equalTo(null)); - $this->assertNull($persister->exists($entity, array())); + $this->assertNull($persister->exists($entity)); } } From b400ad52ccacd253b4975ff5d67c63e5342b5180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Perrin?= Date: Tue, 27 May 2014 11:43:15 +0200 Subject: [PATCH 08/47] Add documentation for the `HIDDEN` keyword in DQL --- docs/en/reference/dql-doctrine-query-language.rst | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/en/reference/dql-doctrine-query-language.rst b/docs/en/reference/dql-doctrine-query-language.rst index aacd4d89b..e8348350e 100644 --- a/docs/en/reference/dql-doctrine-query-language.rst +++ b/docs/en/reference/dql-doctrine-query-language.rst @@ -302,6 +302,14 @@ With Arithmetic Expression in WHERE clause: $query = $em->createQuery('SELECT u FROM CmsUser u WHERE ((u.id + 5000) * u.id + 3) < 10000000'); $users = $query->getResult(); // array of ForumUser objects +Retrieve user entities with Arithmetic Expression in ORDER close, using the ``HIDDEN`` keyword: + +.. code-block:: php + + createQuery('SELECT u, u.posts_count + u.likes_count AS HIDDEN score FROM CmsUser u ORDER BY score'); + $users = $query->getResult(); // array of User objects + Using a LEFT JOIN to hydrate all user-ids and optionally associated article-ids: From 46ebb57b45de4bd1302e9c4a12aa455d39b51999 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 3 Jun 2014 21:41:26 +0200 Subject: [PATCH 09/47] Fix wrong version --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 0f7919ea9..96a71de18 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -908,7 +908,7 @@ class ClassMetadataInfo implements ClassMetadata public function newInstance() { if ($this->_prototype === null) { - if (PHP_VERSION_ID === 50428 || PHP_VERSION_ID === 50513) { + if (PHP_VERSION_ID === 50429 || PHP_VERSION_ID === 50513) { $this->_prototype = $this->reflClass->newInstanceWithoutConstructor(); } else { $this->_prototype = unserialize(sprintf('O:%d:"%s":0:{}', strlen($this->name), $this->name)); From daa90bf32dd4790561490af1788dc31253271df5 Mon Sep 17 00:00:00 2001 From: Rudolph Gottesheim Date: Wed, 4 Jun 2014 15:59:57 +0200 Subject: [PATCH 10/47] Fix typo in exception message --- lib/Doctrine/ORM/Mapping/MappingException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php index 0ac54595d..82d5a4585 100644 --- a/lib/Doctrine/ORM/Mapping/MappingException.php +++ b/lib/Doctrine/ORM/Mapping/MappingException.php @@ -655,7 +655,7 @@ class MappingException extends \Doctrine\ORM\ORMException */ public static function noInheritanceOnMappedSuperClass($className) { - return new self("Its not supported to define inheritance information on a mapped superclass '" . $className . "'."); + return new self("It is not supported to define inheritance information on a mapped superclass '" . $className . "'."); } /** From dcf8d6a86e36882335d392e6462ac3c0382219d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Thu, 5 Jun 2014 15:58:54 +0200 Subject: [PATCH 11/47] ignore case when checking for existing methods to avoid redeclaration on update --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 22 ++++++++--------- .../Tests/ORM/Tools/EntityGeneratorTest.php | 24 +++++++++++++++++++ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 80e67a7b1..83b738666 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -134,7 +134,7 @@ class EntityGenerator /** * Visibility of the field - * + * * @var string */ protected $fieldVisibility = 'private'; @@ -570,7 +570,7 @@ public function __construct() return 'namespace ' . $this->getNamespace($metadata) .';'; } } - + protected function generateEntityUse() { if ($this->generateAnnotations) { @@ -696,9 +696,9 @@ public function __construct() $inClass = true; } elseif ($token[0] == T_FUNCTION) { if ($tokens[$i+2][0] == T_STRING) { - $this->staticReflection[$lastSeenClass]['methods'][] = $tokens[$i+2][1]; + $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+2][1]); } elseif ($tokens[$i+2] == "&" && $tokens[$i+3][0] == T_STRING) { - $this->staticReflection[$lastSeenClass]['methods'][] = $tokens[$i+3][1]; + $this->staticReflection[$lastSeenClass]['methods'][] = strtolower($tokens[$i+3][1]); } } elseif (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i+2][0] != T_FUNCTION) { $this->staticReflection[$lastSeenClass]['properties'][] = substr($tokens[$i+2][1], 1); @@ -761,7 +761,7 @@ public function __construct() return ( isset($this->staticReflection[$metadata->name]) && - in_array($method, $this->staticReflection[$metadata->name]['methods']) + in_array(strtolower($method), $this->staticReflection[$metadata->name]['methods']) ); } @@ -1156,7 +1156,7 @@ public function __construct() if ($this->hasMethod($methodName, $metadata)) { return ''; } - $this->staticReflection[$metadata->name]['methods'][] = $methodName; + $this->staticReflection[$metadata->name]['methods'][] = strtolower($methodName); $var = sprintf('%sMethodTemplate', $type); $template = static::$$var; @@ -1445,11 +1445,11 @@ public function __construct() if (isset($fieldMapping['nullable'])) { $column[] = 'nullable=' . var_export($fieldMapping['nullable'], true); } - + if (isset($fieldMapping['unsigned']) && $fieldMapping['unsigned']) { $column[] = 'options={"unsigned"=true}'; } - + if (isset($fieldMapping['columnDefinition'])) { $column[] = 'columnDefinition="' . $fieldMapping['columnDefinition'] . '"'; } @@ -1571,15 +1571,15 @@ public function __construct() private function exportTableOptions(array $options) { $optionsStr = array(); - + foreach($options as $name => $option) { if (is_array($option)) { $optionsStr[] = '"' . $name . '"={' . $this->exportTableOptions($option) . '}'; } else { $optionsStr[] = '"' . $name . '"="' . (string) $option . '"'; - } + } } - + return implode(',', $optionsStr); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index fb6c0652f..143de62da 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -169,6 +169,30 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase $this->assertTrue($reflClass->getMethod('getTest')->isPublic(), "Check for public visibility of method 'getTest' failed."); } + /** + * @group DDC-3152 + */ + public function testDoesNotRegenerateExistingMethodsWithDifferentCase() + { + $metadata = $this->generateBookEntityFixture(); + + // Workaround to change existing fields case (just to simulate the use case) + $metadata->fieldMappings['status']['fieldName'] = 'STATUS'; + + // Should not throw a PHP fatal error + $this->_generator->writeEntityClass($metadata, $this->_tmpDir); + + $this->assertFileExists($this->_tmpDir . "/" . $this->_namespace . "/EntityGeneratorBook.php~"); + + $this->newInstance($metadata); + $reflClass = new \ReflectionClass($metadata->name); + + $this->assertTrue($reflClass->hasProperty('status')); + $this->assertTrue($reflClass->hasProperty('STATUS')); + $this->assertTrue($reflClass->hasMethod('getStatus')); + $this->assertTrue($reflClass->hasMethod('setStatus')); + } + /** * @group DDC-2121 */ From 32b24ba15586040a67988526896d91af555c69aa Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 7 Jun 2014 14:55:59 +0200 Subject: [PATCH 12/47] Fixed mismatch in expected exception message, see doctrine/doctrine2#1048 --- tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index 61a15056a..e7772f189 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -160,7 +160,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $factory->setEntityManager($em); $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', - "Its not supported to define inheritance information on a mapped ". + "It is not supported to define inheritance information on a mapped ". "superclass 'Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'."); $usingInvalidMsc = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\MappedSuperClassInheritence'); } From 50d7975fd602e3b97eb76ff8cdb42ff04f095b7d Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 7 Jun 2014 15:11:51 +0200 Subject: [PATCH 13/47] Allowing failures on hhvm-nightly, as the build chokes on composer installation for now (unrecognized console flags) --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index b1e0cb793..ebe4fb02c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,3 +38,5 @@ matrix: env: DB=pgsql # driver currently unsupported by HHVM - php: hhvm-nightly env: DB=mysqli # driver currently unsupported by HHVM + allow_failures: + - php: hhvm-nightly # hhvm-nightly currently chokes on composer installation From a5cf6417b3048aa6e1336e496556de453580b25f Mon Sep 17 00:00:00 2001 From: Andreas Flack Date: Thu, 12 Jun 2014 17:28:13 +0200 Subject: [PATCH 14/47] Add failing test for DDC-3160 --- .../ORM/Functional/Ticket/DDC3160Test.php | 70 +++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php new file mode 100644 index 000000000..6fe88e1ae --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php @@ -0,0 +1,70 @@ +useModelSet('cms'); + parent::setUp(); + } + + /** + * @group DDC-3160 + */ + public function testNoUpdateOnInsert() + { + $listener = new OnFlushListener(); + $this->_em->getEventManager()->addEventListener(Events::onFlush, $listener); + + $user = new CmsUser; + $user->username = 'romanb'; + $user->name = 'Roman'; + $user->status = 'Dev'; + + $this->_em->persist($user); + $this->_em->flush(); + + $this->_em->refresh($user); + + $this->assertEquals('romanc', $user->username); + $this->assertEquals(1, $listener->inserts); + $this->assertEquals(0, $listener->updates); + } +} + +class OnFlushListener +{ + public $inserts = 0; + public $updates = 0; + + public function onFlush(OnFlushEventArgs $args) + { + $em = $args->getEntityManager(); + $uow = $em->getUnitOfWork(); + + foreach ($uow->getScheduledEntityInsertions() as $entity) { + $this->inserts++; + if ($entity instanceof CmsUser) { + $entity->username = 'romanc'; + $cm = $em->getClassMetadata(get_class($entity)); + $uow->recomputeSingleEntityChangeSet($cm, $entity); + } + } + + foreach ($uow->getScheduledEntityUpdates() as $entity) { + $this->updates++; + } + } +} + From 3ff92f587f4348d2a903c5973b04d5aee94171f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Pr=C3=A9vot?= Date: Sat, 14 Jun 2014 23:08:54 -0400 Subject: [PATCH 15/47] Drop Unicode character It broke the LaTeX build. --- docs/en/reference/annotations-reference.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/reference/annotations-reference.rst b/docs/en/reference/annotations-reference.rst index 6eba97d55..c016b2b5e 100644 --- a/docs/en/reference/annotations-reference.rst +++ b/docs/en/reference/annotations-reference.rst @@ -612,7 +612,7 @@ Optional attributes: - **mappedBy**: This option specifies the property name on the targetEntity that is the owning side of this relation. It is a required attribute for the inverse side of a relationship. -- **inversedBy**: The inversedBy attribute designates the field in the +- **inversedBy**: The inversedBy attribute designates the field in the entity that is the inverse side of the relationship. - **cascade**: Cascade Option - **fetch**: One of LAZY, EXTRA_LAZY or EAGER @@ -786,7 +786,7 @@ Optional attributes: - **orphanRemoval**: Boolean that specifies if orphans, inverse OneToOne entities that are not connected to any owning instance, should be removed by Doctrine. Defaults to false. -- **inversedBy**: The inversedBy attribute designates the field in the +- **inversedBy**: The inversedBy attribute designates the field in the entity that is the inverse side of the relationship. Example: From 9a5fc496904c0683ecb8b96a946f828b6b923af9 Mon Sep 17 00:00:00 2001 From: Richard Shank Date: Mon, 16 Jun 2014 08:20:14 -0700 Subject: [PATCH 16/47] fix spacing for yaml example --- docs/en/reference/inheritance-mapping.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/en/reference/inheritance-mapping.rst b/docs/en/reference/inheritance-mapping.rst index b1fe43936..663c8901e 100644 --- a/docs/en/reference/inheritance-mapping.rst +++ b/docs/en/reference/inheritance-mapping.rst @@ -109,19 +109,19 @@ Example: .. code-block:: yaml - MyProject\Model\Person: - type: entity - inheritanceType: SINGLE_TABLE - discriminatorColumn: + MyProject\Model\Person: + type: entity + inheritanceType: SINGLE_TABLE + discriminatorColumn: name: discr type: string - discriminatorMap: + discriminatorMap: person: Person employee: Employee + + MyProject\Model\Employee: + type: entity - MyProject\Model\Employee: - type: entity - Things to note: From 7aa1c0a9078e33b201200acb024463cf611ec9b2 Mon Sep 17 00:00:00 2001 From: Ulf Date: Tue, 17 Jun 2014 14:45:59 +0200 Subject: [PATCH 17/47] Create DDC3170Test.php Added test for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170) --- .../ORM/Functional/Ticket/DDC3170Test.php | 110 ++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php new file mode 100644 index 000000000..591b0fd71 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -0,0 +1,110 @@ +_schemaTool->createSchema( + array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntityJoined'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductJoined'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170AbstractEntitySingleTable'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC3170ProductSingleTable'), + ) + ); + } + + /** + * Tests that the discriminator column is correctly read from the meta mappings when fetching a + * child from an inheritance mapped class. + * + * The simple object hydration maps the type field to a field alias like type2. This mapping needs + * to be considered when loading the discriminator column's value from the SQL result. + * + * {@see \Doctrine\ORM\Internal\Hydration\SimpleObjectHydrator::hydrateRowData()} + */ + public function testIssue() + { + // $this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); + + $productJoined = new DDC3170ProductJoined(); + $productSingleTable = new DDC3170ProductSingleTable(); + $this->_em->persist($productJoined); + $this->_em->persist($productSingleTable); + $this->_em->flush(); + $this->_em->clear(); + + try { + $this->_em->createQueryBuilder() + ->select('p') + ->from(__NAMESPACE__ . '\\DDC3170ProductJoined', 'p') + ->getQuery() + ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); + } catch (HydrationException $e) // Thrown by SimpleObjectHydrator + { + $this->fail('Failed correct mapping of discriminator column when using simple object hydration and class table inheritance'); + } + + try { + $this->_em->createQueryBuilder() + ->select('p') + ->from(__NAMESPACE__ . '\\DDC3170ProductSingleTable', 'p') + ->getQuery() + ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); + } catch (HydrationException $e) // Thrown by SimpleObjectHydrator + { + $this->fail('Failed correct mapping of discriminator column when using simple object hydration and single table inheritance'); + } + } +} + +/** + * @Entity + * @InheritanceType("JOINED") + * @DiscriminatorColumn(name="type", type="string") + * @DiscriminatorMap({"product" = "DDC3170ProductJoined"}) + */ +abstract class DDC3170AbstractEntityJoined +{ + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; +} + +/** + * @Entity + */ +class DDC3170ProductJoined extends DDC3170AbstractEntityJoined +{ +} + +/** + * @Entity + * @InheritanceType("SINGLE_TABLE") + * @DiscriminatorColumn(name="type", type="string") + * @DiscriminatorMap({"product" = "DDC3170ProductSingleTable"}) + */ +abstract class DDC3170AbstractEntitySingleTable +{ + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; +} + +/** + * @Entity + */ +class DDC3170ProductSingleTable extends DDC3170AbstractEntitySingleTable +{ +} From a7aa6342471d339930e66c374888cf93b823acf8 Mon Sep 17 00:00:00 2001 From: Ulf Date: Tue, 17 Jun 2014 14:51:19 +0200 Subject: [PATCH 18/47] Fixed mapping of discriminator column Added fix for [DDC-3170] (http://www.doctrine-project.org/jira/browse/DDC-3170). When querying a simple entity which uses single table- or class table inheritance using simple object hydration (``AbstractQuery::HYDRATE_SIMPLEOBJECT``), the mapped discriminator column was not retrieved correctly. If the column got an alias during result set mapping other than it's actual name (e.g. ``type34`` insteaad of ``type``) than this alias wasn't reverted when retrieving the discriminator column from the SQL result set. --- lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 124b099c7..ea2664291 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -75,6 +75,11 @@ class SimpleObjectHydrator extends AbstractHydrator if ($this->class->inheritanceType !== ClassMetadata::INHERITANCE_TYPE_NONE) { $discrColumnName = $this->_platform->getSQLResultCasing($this->class->discriminatorColumn['name']); + // Find mapped discriminator column from the result set. + if ($metaMappingDiscrColumnName = array_search($discrColumnName, $this->_rsm->metaMappings)) { + $discrColumnName = $metaMappingDiscrColumnName; + } + if ( ! isset($sqlResult[$discrColumnName])) { throw HydrationException::missingDiscriminatorColumn($entityName, $discrColumnName, key($this->_rsm->aliasMap)); } From fdca5d7584555771be7e40cbb917c8cfb7841ce6 Mon Sep 17 00:00:00 2001 From: FlorianLB Date: Thu, 19 Jun 2014 10:00:40 +0200 Subject: [PATCH 19/47] singularize variable name on add/remove methods for EntityGenerator --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 6 ++++-- tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 83b738666..e6680e53b 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -1149,8 +1149,10 @@ public function __construct() protected function generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null, $defaultValue = null) { $methodName = $type . Inflector::classify($fieldName); + $variableName = Inflector::camelize($fieldName); if (in_array($type, array("add", "remove"))) { $methodName = Inflector::singularize($methodName); + $variableName = Inflector::singularize($variableName); } if ($this->hasMethod($methodName, $metadata)) { @@ -1171,10 +1173,10 @@ public function __construct() } $replacements = array( - '' => ucfirst($type) . ' ' . $fieldName, + '' => ucfirst($type) . ' ' . $variableName, '' => $methodTypeHint, '' => $variableType, - '' => Inflector::camelize($fieldName), + '' => $variableName, '' => $methodName, '' => $fieldName, '' => ($defaultValue !== null ) ? (' = '.$defaultValue) : '', diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 143de62da..6394f6399 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -133,6 +133,14 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase $book->setName('Jonathan H. Wage'); $this->assertEquals('Jonathan H. Wage', $book->getName()); + $reflMethod = new \ReflectionMethod($metadata->name, 'addComment'); + $addCommentParameters = $reflMethod->getParameters(); + $this->assertEquals('comment', $addCommentParameters[0]->getName()); + + $reflMethod = new \ReflectionMethod($metadata->name, 'removeComment'); + $removeCommentParameters = $reflMethod->getParameters(); + $this->assertEquals('comment', $removeCommentParameters[0]->getName()); + $author = new EntityGeneratorAuthor(); $book->setAuthor($author); $this->assertEquals($author, $book->getAuthor()); From 391847d6274822d3bd3424818a18a03aa171044e Mon Sep 17 00:00:00 2001 From: Stefano Torresi Date: Thu, 19 Jun 2014 14:27:56 +0200 Subject: [PATCH 20/47] remove on-update from join-column --- doctrine-mapping.xsd | 1 - 1 file changed, 1 deletion(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index f7364b7f7..fea44a691 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -429,7 +429,6 @@ - From 7dfca09ff6c292622f85a4dfde708c360c5addfc Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Thu, 19 Jun 2014 15:53:11 +0200 Subject: [PATCH 21/47] Minor CS fixes (`use` statements compliant with PSR-2) --- tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index 09adb0617..c4c1f14a3 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -2,10 +2,9 @@ namespace Doctrine\Tests\ORM\Mapping; -use Doctrine\ORM\Mapping\ClassMetadata, - Doctrine\ORM\Mapping\ClassMetadataFactory, - Doctrine\ORM\Mapping\Driver\XmlDriver, - Doctrine\ORM\Mapping\Driver\YamlDriver; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\Mapping\Driver\XmlDriver; class XmlMappingDriverTest extends AbstractMappingDriverTest { From 59720370f9e986a831f17b8f7857c2ca6c315912 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Thu, 19 Jun 2014 15:53:37 +0200 Subject: [PATCH 22/47] Corrected FQCN reference in `@expectedException` --- tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index c4c1f14a3..d87b153dc 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -116,7 +116,7 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest /** * @group DDC-889 - * @expectedException Doctrine\Common\Persistence\Mapping\MappingException + * @expectedException \Doctrine\Common\Persistence\Mapping\MappingException * @expectedExceptionMessage Invalid mapping file 'Doctrine.Tests.Models.DDC889.DDC889Class.dcm.xml' for class 'Doctrine\Tests\Models\DDC889\DDC889Class'. */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() From e940ce1df6686558ae88db39fef574a4a1b80ea6 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Thu, 19 Jun 2014 15:54:43 +0200 Subject: [PATCH 23/47] Replacing `"` with `'` to avoid escaping warnings --- tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php index d87b153dc..f810e367d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/XmlMappingDriverTest.php @@ -23,9 +23,9 @@ class XmlMappingDriverTest extends AbstractMappingDriverTest $mappingDriver->loadMetadataForClass($className, $class); $expectedMap = array( - "foo" => "Doctrine\Tests\ORM\Mapping\CTIFoo", - "bar" => "Doctrine\Tests\ORM\Mapping\CTIBar", - "baz" => "Doctrine\Tests\ORM\Mapping\CTIBaz", + 'foo' => 'Doctrine\Tests\ORM\Mapping\CTIFoo', + 'bar' => 'Doctrine\Tests\ORM\Mapping\CTIBar', + 'baz' => 'Doctrine\Tests\ORM\Mapping\CTIBaz', ); $this->assertEquals(3, count($class->discriminatorMap)); From 19b5e87cab61cca563db80714b90baca82d014d3 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Thu, 19 Jun 2014 16:05:12 +0200 Subject: [PATCH 24/47] `on-update` is not supported anymore --- .../ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml index d7c5f2813..728425a71 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml @@ -54,7 +54,7 @@ - + From 247803715bd7e5ded75e25dbbb4eb2c5b7fbd2f2 Mon Sep 17 00:00:00 2001 From: Albert Volkman Date: Mon, 23 Jun 2014 09:53:27 -0400 Subject: [PATCH 25/47] Add fullstop and newline after property description. --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index e6680e53b..bf208e277 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -1173,7 +1173,7 @@ public function __construct() } $replacements = array( - '' => ucfirst($type) . ' ' . $variableName, + '' => ucfirst($type) . ' ' . $variableName . ".\n", '' => $methodTypeHint, '' => $variableType, '' => $variableName, From d5dd21dd794e1e5e3df899a84f7ded7b3208980a Mon Sep 17 00:00:00 2001 From: jkavalik Date: Tue, 24 Jun 2014 08:00:45 +0200 Subject: [PATCH 26/47] Fix typo in documentation --- docs/en/cookbook/resolve-target-entity-listener.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/cookbook/resolve-target-entity-listener.rst b/docs/en/cookbook/resolve-target-entity-listener.rst index 21c726bc3..161c26fa8 100644 --- a/docs/en/cookbook/resolve-target-entity-listener.rst +++ b/docs/en/cookbook/resolve-target-entity-listener.rst @@ -3,7 +3,7 @@ Keeping your Modules independent .. versionadded:: 2.2 -One of the goals of using modules is to create discreet units of functionality +One of the goals of using modules is to create discrete units of functionality that do not have many (if any) dependencies, allowing you to use that functionality in other applications without including unnecessary items. From ee5f465a2febd7986b839ebdea9ead0b0ef66cb3 Mon Sep 17 00:00:00 2001 From: Vasek Purchart Date: Thu, 26 Jun 2014 00:32:02 +0200 Subject: [PATCH 27/47] set namespace in setup only on CacheProvider instances --- lib/Doctrine/ORM/Tools/Setup.php | 5 ++++- tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 15 +++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/Setup.php b/lib/Doctrine/ORM/Tools/Setup.php index 11992a96e..79d4670ad 100644 --- a/lib/Doctrine/ORM/Tools/Setup.php +++ b/lib/Doctrine/ORM/Tools/Setup.php @@ -21,6 +21,7 @@ namespace Doctrine\ORM\Tools; use Doctrine\Common\ClassLoader; use Doctrine\Common\Cache\Cache; +use Doctrine\Common\Cache\CacheProvider; use Doctrine\Common\Cache\ArrayCache; use Doctrine\ORM\Configuration; use Doctrine\ORM\Mapping\Driver\XmlDriver; @@ -144,7 +145,9 @@ class Setup $cache = new ArrayCache(); } - $cache->setNamespace("dc2_" . md5($proxyDir) . "_"); // to avoid collisions + if ($cache instanceof CacheProvider) { + $cache->setNamespace("dc2_" . md5($proxyDir) . "_"); // to avoid collisions + } $config = new Configuration(); $config->setMetadataCacheImpl($cache); diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php index 3a6055f1e..20ad5ee0a 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -89,4 +89,19 @@ class SetupTest extends \Doctrine\Tests\OrmTestCase $this->assertSame($cache, $config->getMetadataCacheImpl()); $this->assertSame($cache, $config->getQueryCacheImpl()); } + + /** + * @group DDC-3190 + */ + public function testConfigureCacheCustomInstance() + { + $cache = $this->getMock('Doctrine\Common\Cache\Cache'); + $cache->expects($this->never())->method('setNamespace'); + + $config = Setup::createConfiguration(array(), true, $cache); + + $this->assertSame($cache, $config->getResultCacheImpl()); + $this->assertSame($cache, $config->getMetadataCacheImpl()); + $this->assertSame($cache, $config->getQueryCacheImpl()); + } } From 20f96cc9d35e23fc3bfcd1671878c18e0acea618 Mon Sep 17 00:00:00 2001 From: Eric GELOEN Date: Thu, 26 Jun 2014 18:08:39 +0200 Subject: [PATCH 28/47] [DDC-3179] Document postRemove limitation --- docs/en/reference/events.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/en/reference/events.rst b/docs/en/reference/events.rst index f315f66b1..0990315ec 100644 --- a/docs/en/reference/events.rst +++ b/docs/en/reference/events.rst @@ -191,6 +191,12 @@ the life-time of their registered entities. safe to access associations in a postLoad callback or event handler. +.. warning:: + + Note that the postRemove event or any events triggered after an entity removal + can receive an uninitializable proxy in case you have configured an entity to + cascade remove relations. In this case, you should load yourself the proxy in + the associated pre event. You can access the Event constants from the ``Events`` class in the ORM package. From 0dde8585c32832782532135cc5e3449a831f79ce Mon Sep 17 00:00:00 2001 From: Antonio Vilar Date: Fri, 27 Jun 2014 20:17:43 +0200 Subject: [PATCH 29/47] Fixed query cache id generation: added platform to hash --- lib/Doctrine/ORM/Query.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 212675e0e..c52a709db 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -682,8 +682,13 @@ final class Query extends AbstractQuery { ksort($this->_hints); + $platform = $this->getEntityManager() + ->getConnection() + ->getDatabasePlatform() + ->getName(); + return md5( - $this->getDql() . serialize($this->_hints) . + $this->getDql() . serialize($this->_hints) . $platform . ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . '&hydrationMode='.$this->_hydrationMode.'DOCTRINE_QUERY_CACHE_SALT' From 4e61ceb0df2038e92c42cc4c926d4358ed5719e2 Mon Sep 17 00:00:00 2001 From: Antonio Vilar Date: Fri, 27 Jun 2014 22:36:02 +0200 Subject: [PATCH 30/47] Added platform key --- lib/Doctrine/ORM/Query.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index c52a709db..02a1dc9eb 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -688,7 +688,8 @@ final class Query extends AbstractQuery ->getName(); return md5( - $this->getDql() . serialize($this->_hints) . $platform . + $this->getDql() . serialize($this->_hints) . + '&platform=' . $platform . ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . '&hydrationMode='.$this->_hydrationMode.'DOCTRINE_QUERY_CACHE_SALT' From 60cb01be1f5eec2e51390f88e10c4ae73497cf22 Mon Sep 17 00:00:00 2001 From: velosipedist Date: Sun, 29 Jun 2014 18:00:02 +0400 Subject: [PATCH 31/47] Fix switch non-uniform syntax --- lib/Doctrine/ORM/EntityManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index d075d418c..049ac0f72 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -425,7 +425,7 @@ use Doctrine\Common\Util\ClassUtils; break; case LockMode::NONE === $lockMode: - case LockMode::PESSIMISTIC_READ === $lockMode; + case LockMode::PESSIMISTIC_READ === $lockMode: case LockMode::PESSIMISTIC_WRITE === $lockMode: $persister = $unitOfWork->getEntityPersister($class->name); $persister->refresh($sortedId, $entity, $lockMode); From 65e7cc9143e818670cae6a7167c3c70736fa870a Mon Sep 17 00:00:00 2001 From: Justin Zimmerman Date: Thu, 26 Jun 2014 17:15:57 -0400 Subject: [PATCH 32/47] [DDC-3160] Change to fix that was implemented for DDC-2996. A fix for DDC-2996 was implemented that broke quite a few extensions. This commit is an attempt to fix the DDC-2996 bug without the adverse side effects seen in DDC-3160. Basically, if changes are detected that would cause a changeset to be made, but the entity is awaiting insertion, the code will not save the changeset nor flag the entity as awaiting updating in the Unit of Work. Some styling tweaks based on Pull Request guidelines. --- lib/Doctrine/ORM/UnitOfWork.php | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index c74329581..61a3c7ecc 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -943,12 +943,13 @@ class UnitOfWork implements PropertyChangedListener } if ($changeSet) { - $this->entityChangeSets[$oid] = (isset($this->entityChangeSets[$oid])) - ? array_merge($this->entityChangeSets[$oid], $changeSet) - : $changeSet; - + if (isset($this->entityChangeSets[$oid])) { + $this->entityChangeSets[$oid] = array_merge($this->entityChangeSets[$oid], $changeSet); + } else if ( ! isset($this->entityInsertions[$oid])) { + $this->entityChangeSets[$oid] = $changeSet; + $this->entityUpdates[$oid] = $entity; + } $this->originalEntityData[$oid] = $actualData; - $this->entityUpdates[$oid] = $entity; } } @@ -2405,12 +2406,12 @@ class UnitOfWork implements PropertyChangedListener } } else { $visited = array(); - + foreach ($this->identityMap as $className => $entities) { if ($className !== $entityName) { continue; } - + foreach ($entities as $entity) { $this->doDetach($entity, $visited, false); } @@ -2522,7 +2523,7 @@ class UnitOfWork implements PropertyChangedListener $id = array($class->identifier[0] => $id); } - + $idHash = implode(' ', $id); if (isset($this->identityMap[$class->rootEntityName][$idHash])) { From 6a4867512e0d361ad6894a286cb7803682154616 Mon Sep 17 00:00:00 2001 From: Justin Zimmerman Date: Fri, 4 Jul 2014 11:05:04 -0400 Subject: [PATCH 33/47] Fix test issues. --- .../Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php index 6fe88e1ae..c0ed69dd0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3160Test.php @@ -3,16 +3,16 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Tests\Models\CMS\CmsUser; -use Doctrine\Tests\Models\CMS\CmsPhonenumber; use Doctrine\ORM\Event\OnFlushEventArgs; use Doctrine\ORM\Events; +use Doctrine\Tests\OrmFunctionalTestCase; /** * FlushEventTest * * @author robo */ -class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC3160Test extends OrmFunctionalTestCase { protected function setUp() { $this->useModelSet('cms'); @@ -24,7 +24,7 @@ class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testNoUpdateOnInsert() { - $listener = new OnFlushListener(); + $listener = new DDC3160OnFlushListener(); $this->_em->getEventManager()->addEventListener(Events::onFlush, $listener); $user = new CmsUser; @@ -43,7 +43,7 @@ class FlushEventTest extends \Doctrine\Tests\OrmFunctionalTestCase } } -class OnFlushListener +class DDC3160OnFlushListener { public $inserts = 0; public $updates = 0; From c9901c9017c85dbf7fb0b9679d9c5dbb80247da2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Renan=20Gon=C3=A7alves?= Date: Mon, 7 Jul 2014 20:17:56 +0200 Subject: [PATCH 34/47] Removing Value Objects from limitations as per #835 --- docs/en/reference/limitations-and-known-issues.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/en/reference/limitations-and-known-issues.rst b/docs/en/reference/limitations-and-known-issues.rst index 7af037495..49976f12b 100644 --- a/docs/en/reference/limitations-and-known-issues.rst +++ b/docs/en/reference/limitations-and-known-issues.rst @@ -65,18 +65,6 @@ Where the ``attribute_name`` column contains the key and The feature request for persistence of primitive value arrays `is described in the DDC-298 ticket `_. -Value Objects -~~~~~~~~~~~~~ - -There is currently no native support value objects in Doctrine -other than for ``DateTime`` instances or if you serialize the -objects using ``serialize()/deserialize()`` which the DBAL Type -"object" supports. - -The feature request for full value-object support -`is described in the DDC-93 ticket `_. - - Cascade Merge with Bi-directional Associations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ From 45358bf5d0f09435747f7e9132da07f366494bd2 Mon Sep 17 00:00:00 2001 From: Daniel Sippel Date: Wed, 9 Jul 2014 16:39:44 +0200 Subject: [PATCH 35/47] possible fix for DDC-2021 --- lib/Doctrine/ORM/Query/SqlWalker.php | 2 +- .../Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 7164f441f..10e294a7a 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -1968,7 +1968,7 @@ class SqlWalker implements TreeWalker $this->parserResult->addParameterMapping($dqlParamKey, $this->sqlParamIndex++); } - $sqlParts[] = $targetTableAlias . '.' . $targetColumnName . ' = ' . $entitySql; + $sqlParts[] = $targetTableAlias . '.' . $targetColumnName . ' IN (' . $entitySql . ')'; } $sql .= implode(' AND ', $sqlParts); diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 207f37a69..33b414b6c 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -623,7 +623,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase $q->setParameter('param', $group); $this->assertEquals( - 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id = ?)', + 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id IN (?))', $q->getSql() ); } @@ -637,7 +637,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase $this->_em->getClassMetadata(get_class($person))->setIdentifierValues($person, array('id' => 101)); $q->setParameter('param', $person); $this->assertEquals( - 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c1_.car_id AS car_id_8 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id WHERE EXISTS (SELECT 1 FROM company_persons_friends c3_ INNER JOIN company_persons c4_ ON c3_.friend_id = c4_.id WHERE c3_.person_id = c0_.id AND c4_.id = ?)', + 'SELECT c0_.id AS id_0, c0_.name AS name_1, c1_.title AS title_2, c2_.salary AS salary_3, c2_.department AS department_4, c2_.startDate AS startDate_5, c0_.discr AS discr_6, c0_.spouse_id AS spouse_id_7, c1_.car_id AS car_id_8 FROM company_persons c0_ LEFT JOIN company_managers c1_ ON c0_.id = c1_.id LEFT JOIN company_employees c2_ ON c0_.id = c2_.id WHERE EXISTS (SELECT 1 FROM company_persons_friends c3_ INNER JOIN company_persons c4_ ON c3_.friend_id = c4_.id WHERE c3_.person_id = c0_.id AND c4_.id IN (?))', $q->getSql() ); } @@ -648,7 +648,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.email MEMBER OF u.groups'); $this->assertEquals( - 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id = c0_.email_id)', + 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id IN (c0_.email_id))', $q->getSql() ); } @@ -659,7 +659,7 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u MEMBER OF u.groups'); $this->assertEquals( - 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id = c0_.id)', + 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id IN (c0_.id))', $q->getSql() ); } From b31ba980763f76342aaa7a00df2da34ac5f441f3 Mon Sep 17 00:00:00 2001 From: Daniel Sippel Date: Thu, 10 Jul 2014 00:27:28 +0200 Subject: [PATCH 36/47] DDC-2021 add sql generation test --- .../ORM/Query/SelectSqlGenerationTest.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 33b414b6c..7433bcc12 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -628,6 +628,24 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase ); } + public function testSupportsMemberOfExpressionManyToManyParameterArray() + { + // "Get all users who are members of $group." + $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE :param MEMBER OF u.groups'); + $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); + + $group = new \Doctrine\Tests\Models\CMS\CmsGroup; + $group->id = 101; + $group2 = new \Doctrine\Tests\Models\CMS\CmsGroup; + $group2->id = 105; + $q->setParameter('param', array($group, $group2)); + + $this->assertEquals( + 'SELECT c0_.id AS id_0 FROM cms_users c0_ WHERE EXISTS (SELECT 1 FROM cms_users_groups c1_ INNER JOIN cms_groups c2_ ON c1_.group_id = c2_.id WHERE c1_.user_id = c0_.id AND c2_.id IN (?))', + $q->getSql() + ); + } + public function testSupportsMemberOfExpressionSelfReferencing() { // "Get all persons who have $person as a friend." From ae2235fd3c39baa8610ff2165b06719af4a20921 Mon Sep 17 00:00:00 2001 From: Daniel Sippel Date: Thu, 10 Jul 2014 00:32:24 +0200 Subject: [PATCH 37/47] DDC-2021 sql generation test: remove comment --- tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 7433bcc12..e886307f6 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -630,7 +630,6 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase public function testSupportsMemberOfExpressionManyToManyParameterArray() { - // "Get all users who are members of $group." $q = $this->_em->createQuery('SELECT u.id FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE :param MEMBER OF u.groups'); $q->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); From 38fcc66c16563b37ca5bc0641424c5151eaab05c Mon Sep 17 00:00:00 2001 From: Alexander Kurilo Date: Thu, 26 Jun 2014 16:42:50 +0300 Subject: [PATCH 38/47] Add missing type mapping Fixes DDC-3192 Refs DDC-2494 This is essentially a fix from DDC-2494 applied to SQLWalker. The issue: type was not converted to PHP value when the result is fetched by executing DQL query rather than using entity manager's findX(). Similar issue for BasicEntityPersister (which is used when em's findX is executed) was fixed in DDC-2494, but SQLWalker made the issue valid for any custom query. --- lib/Doctrine/ORM/Query/SqlWalker.php | 12 +- .../ORM/Functional/Ticket/DDC3192Test.php | 168 ++++++++++++++++++ 2 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 7164f441f..498ac791d 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -753,12 +753,20 @@ class SqlWalker implements TreeWalker $owningClass = (isset($assoc['inherited'])) ? $this->em->getClassMetadata($assoc['inherited']) : $class; $sqlTableAlias = $this->getSQLTableAlias($owningClass->getTableName(), $dqlAlias); - foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { + $targetClass = $this->em->getClassMetadata($assoc['targetEntity']); + + foreach ($assoc['targetToSourceKeyColumns'] as $targetColumn => $srcColumn) { $columnAlias = $this->getSQLColumnAlias($srcColumn); + $type = null; + $isIdentifier = (isset($assoc['id']) && $assoc['id'] === true); $sqlSelectExpressions[] = $sqlTableAlias . '.' . $srcColumn . ' AS ' . $columnAlias; - $this->rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn, (isset($assoc['id']) && $assoc['id'] === true)); + if (isset($targetClass->fieldNames[$targetColumn])) { + $type = $targetClass->fieldMappings[$targetClass->fieldNames[$targetColumn]]['type']; + } + + $this->rsm->addMetaResult($dqlAlias, $columnAlias, $srcColumn, $isIdentifier, $type); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php new file mode 100644 index 000000000..da6a8de1d --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3192Test.php @@ -0,0 +1,168 @@ +fail( + 'Type ddc3192_currency_code exists for testing DDC-3192 only, ' . + 'but it has already been registered for some reason' + ); + } + + Type::addType('ddc3192_currency_code', __NAMESPACE__ . '\DDC3192CurrencyCode'); + + $this->_schemaTool->createSchema(array( + $this->_em->getClassMetadata(DDC3192Currency::CLASSNAME), + $this->_em->getClassMetadata(DDC3192Transaction::CLASSNAME), + )); + } + + public function testIssue() + { + $currency = new DDC3192Currency('BYR'); + + $this->_em->persist($currency); + $this->_em->flush(); + + $amount = 50; + $transaction = new DDC3192Transaction($amount, $currency); + + $this->_em->persist($transaction); + $this->_em->flush(); + $this->_em->close(); + + $resultByPersister = $this->_em->find(DDC3192Transaction::CLASSNAME, $transaction->id); + + // This works: DDC2494 makes persister set type mapping info to ResultSetMapping + $this->assertEquals('BYR', $resultByPersister->currency->code); + + $this->_em->close(); + + $query = $this->_em->createQuery(); + $query->setDQL('SELECT t FROM ' . DDC3192Transaction::CLASSNAME . ' t WHERE t.id = ?1'); + $query->setParameter(1, $transaction->id); + + $resultByQuery = $query->getSingleResult(); + + // This is fixed here: before the fix it used to return 974. + // because unlike the BasicEntityPersister, SQLWalker doesn't set type info + $this->assertEquals('BYR', $resultByQuery->currency->code); + } +} + +/** + * @Table(name="ddc3192_currency") + * @Entity + */ +class DDC3192Currency +{ + const CLASSNAME = __CLASS__; + + /** + * @Id + * @Column(type="ddc3192_currency_code") + */ + public $code; + + /** + * @var \Doctrine\Common\Collections\Collection + * + * @OneToMany(targetEntity="DDC3192Transaction", mappedBy="currency") + */ + public $transactions; + + public function __construct($code) + { + $this->code = $code; + } +} + +/** + * @Table(name="ddc3192_transaction") + * @Entity + */ +class DDC3192Transaction +{ + const CLASSNAME = __CLASS__; + + /** + * @Id + * @GeneratedValue + * @Column(type="integer") + */ + public $id; + + /** + * @var int + * + * @Column(type="integer") + */ + public $amount; + + /** + * @var \Doctrine\Tests\ORM\Functional\Ticket\DDC3192Currency + * + * @ManyToOne(targetEntity="DDC3192Currency", inversedBy="transactions") + * @JoinColumn(name="currency_id", referencedColumnName="code", nullable=false) + */ + public $currency; + + public function __construct($amount, DDC3192Currency $currency) + { + $this->amount = $amount; + $this->currency = $currency; + } +} + +class DDC3192CurrencyCode extends Type +{ + private static $map = array( + 'BYR' => 974, + ); + + /** + * {@inheritdoc} + */ + public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform) + { + return $platform->getSmallIntTypeDeclarationSQL($fieldDeclaration); + } + + /** + * {@inheritdoc} + */ + public function convertToDatabaseValue($value, AbstractPlatform $platform) + { + return self::$map[$value]; + } + + /** + * {@inheritdoc} + */ + public function convertToPHPValue($value, AbstractPlatform $platform) + { + return array_search($value, self::$map); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return 'ddc3192_currency_code'; + } +} From b8ef3af982a5a92cdf34e48f5b9c97de712523aa Mon Sep 17 00:00:00 2001 From: flack Date: Mon, 28 Apr 2014 11:20:43 +0200 Subject: [PATCH 39/47] Small grammar fix The exception was reading ``` A detached entity was found during {removed|persisted} [entityName] ``` I changed the verbs to infinitive now. Alternatively, the text in ``ORMInvalidArgumentException::detachedEntityCannot`` could also be changed to read ``` Detached entity [entityName] cannot be {removed|persisted} ``` --- lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 61a3c7ecc..49180eb50 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1655,7 +1655,7 @@ class UnitOfWork implements PropertyChangedListener case self::STATE_DETACHED: // Can actually not happen right now since we assume STATE_NEW. - throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persist"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); @@ -1726,7 +1726,7 @@ class UnitOfWork implements PropertyChangedListener break; case self::STATE_DETACHED: - throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "remove"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); } From 0ade3aa62a8f86f23fad9260abcb00ea2c2fcf40 Mon Sep 17 00:00:00 2001 From: Andreas Flack Date: Mon, 28 Apr 2014 14:50:48 +0200 Subject: [PATCH 40/47] Improve phrasing on exception message instead of trying to fix callers --- lib/Doctrine/ORM/ORMInvalidArgumentException.php | 4 ++-- lib/Doctrine/ORM/UnitOfWork.php | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/ORMInvalidArgumentException.php b/lib/Doctrine/ORM/ORMInvalidArgumentException.php index cb5037679..adb0cd529 100644 --- a/lib/Doctrine/ORM/ORMInvalidArgumentException.php +++ b/lib/Doctrine/ORM/ORMInvalidArgumentException.php @@ -65,7 +65,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException static public function entityWithoutIdentity($className, $entity) { return new self( - "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . + "The given entity of type '" . $className . "' (".self::objToStr($entity).") has no identity/no " . "id values set. It cannot be added to the identity map." ); } @@ -154,7 +154,7 @@ class ORMInvalidArgumentException extends \InvalidArgumentException */ static public function detachedEntityCannot($entity, $operation) { - return new self("A detached entity was found during " . $operation . " " . self::objToStr($entity)); + return new self("Detached entity " . self::objToStr($entity) . " cannot be " . $operation); } /** diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 49180eb50..61a3c7ecc 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1655,7 +1655,7 @@ class UnitOfWork implements PropertyChangedListener case self::STATE_DETACHED: // Can actually not happen right now since we assume STATE_NEW. - throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persist"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "persisted"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); @@ -1726,7 +1726,7 @@ class UnitOfWork implements PropertyChangedListener break; case self::STATE_DETACHED: - throw ORMInvalidArgumentException::detachedEntityCannot($entity, "remove"); + throw ORMInvalidArgumentException::detachedEntityCannot($entity, "removed"); default: throw new UnexpectedValueException("Unexpected entity state: $entityState." . self::objToStr($entity)); } From ad10a18071f9f6b01a2ae56590695ddd54876786 Mon Sep 17 00:00:00 2001 From: Rhodri Pugh Date: Tue, 15 Jul 2014 13:17:22 +0100 Subject: [PATCH 41/47] added more informative error messages when invalid parameter count --- lib/Doctrine/ORM/Query.php | 8 ++++++-- lib/Doctrine/ORM/Query/QueryException.php | 18 ++++++++++++++++-- .../Tests/ORM/Functional/QueryTest.php | 16 ++++++++++++++-- 3 files changed, 36 insertions(+), 6 deletions(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 02a1dc9eb..6839b480d 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -287,9 +287,13 @@ final class Query extends AbstractQuery // Prepare parameters $paramMappings = $this->_parserResult->getParameterMappings(); + $paramCount = count($this->parameters); + $mappingCount = count($paramMappings); - if (count($paramMappings) != count($this->parameters)) { - throw QueryException::invalidParameterNumber(); + if ($paramCount > $mappingCount) { + throw QueryException::tooManyParameters($mappingCount, $paramCount); + } elseif ($paramCount < $mappingCount) { + throw QueryException::tooFewParameters($mappingCount, $paramCount); } // evict all cache for the entity region diff --git a/lib/Doctrine/ORM/Query/QueryException.php b/lib/Doctrine/ORM/Query/QueryException.php index da0d2d50c..f2fb61c71 100644 --- a/lib/Doctrine/ORM/Query/QueryException.php +++ b/lib/Doctrine/ORM/Query/QueryException.php @@ -93,11 +93,25 @@ class QueryException extends \Doctrine\ORM\ORMException } /** + * @param integer $expected + * @param integer $received + * * @return QueryException */ - public static function invalidParameterNumber() + public static function tooManyParameters($expected, $received) { - return new self("Invalid parameter number: number of bound variables does not match number of tokens"); + return new self('Too many parameters: the query defines ' . $expected . ' parameters and you bound ' . $received); + } + + /** + * @param integer $expected + * @param integer $received + * + * @return QueryException + */ + public static function tooFewParameters($expected, $received) + { + return new self('Too few parameters: the query defines ' . $expected . ' parameters but you only bound ' . $received); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 795deba19..2e6dbc3c6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -127,11 +127,11 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $user = $q->getSingleResult(); } - public function testMismatchingParamExpectedParamCount() + public function testTooManyParametersShouldThrowException() { $this->setExpectedException( "Doctrine\ORM\Query\QueryException", - "Invalid parameter number: number of bound variables does not match number of tokens" + "Too many parameters: the query defines 1 parameters and you bound 2" ); $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1'); @@ -141,6 +141,18 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $user = $q->getSingleResult(); } + public function testTooFewParametersShouldThrowException() + { + $this->setExpectedException( + "Doctrine\ORM\Query\QueryException", + "Too few parameters: the query defines 1 parameters but you only bound 0" + ); + + $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1'); + + $user = $q->getSingleResult(); + } + public function testInvalidInputParameterThrowsException() { $this->setExpectedException("Doctrine\ORM\Query\QueryException"); From 040c44529769102ddc58c31e9115bc2ed4e659bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Steve=20M=C3=BCller?= Date: Thu, 17 Jul 2014 11:21:19 +0200 Subject: [PATCH 42/47] add documentation about how to map column options --- docs/en/reference/annotations-reference.rst | 47 +++++++++++++--- docs/en/reference/php-mapping.rst | 30 ++++++++--- docs/en/reference/xml-mapping.rst | 60 +++++++++++++++------ docs/en/reference/yaml-mapping.rst | 8 +++ 4 files changed, 114 insertions(+), 31 deletions(-) diff --git a/docs/en/reference/annotations-reference.rst b/docs/en/reference/annotations-reference.rst index c016b2b5e..e3000ea10 100644 --- a/docs/en/reference/annotations-reference.rst +++ b/docs/en/reference/annotations-reference.rst @@ -109,6 +109,26 @@ Optional attributes: - **nullable**: Determines if NULL values allowed for this column. +- **options**: Array of additional options: + + - ``default``: The default value to set for the column if no value + is supplied. + + - ``unsigned``: Boolean value to determine if the column should + be capable of representing only non-negative integers + (applies only for integer column and might not be supported by + all vendors). + + - ``fixed``: Boolean value to determine if the specified length of + a string column should be fixed or varying (applies only for + string/binary column and might not be supported by all vendors). + + - ``comment``: The comment of the column in the schema (might not + be supported by all vendors). + + - ``customSchemaOptions``: Array of additional schema options + which are mostly vendor specific. + - **columnDefinition**: DDL SQL snippet that starts after the column name and specifies the complete (non-portable!) column definition. This attribute allows to make use of advanced RMDBS features. @@ -120,7 +140,12 @@ Optional attributes: attribute still handles the conversion between PHP and Database values. If you use this attribute on a column that is used for joins between tables you should also take a look at - :ref:`@JoinColumn `. + :ref:`@JoinColumn `. + +.. note:: + + For more detailed information on each attribute, please refer to + the DBAL ``Schema-Representation`` documentation. Examples: @@ -131,17 +156,27 @@ Examples: * @Column(type="string", length=32, unique=true, nullable=false) */ protected $username; - + /** * @Column(type="string", columnDefinition="CHAR(2) NOT NULL") */ protected $country; - + /** * @Column(type="decimal", precision=2, scale=1) */ protected $height; + /** + * @Column(type="string", length=2, options={"fixed":true, "comment":"Initial letters of first and last name"}) + */ + protected $initials; + + /** + * @Column(type="integer", name="login_count" nullable=false, options={"unsigned":true, "default":0}) + */ + protected $loginCount; + .. _annref_column_result: @ColumnResult @@ -222,7 +257,7 @@ Optional attributes: ~~~~~~~~~~~~~~~~~~~~~ The discriminator map is a required annotation on the -topmost/super class in an inheritance hierarchy. Its only argument is an +topmost/super class in an inheritance hierarchy. Its only argument is an array which defines which class should be saved under which name in the database. Keys are the database value and values are the classes, either as fully- or as unqualified class names @@ -447,7 +482,7 @@ Examples: { // ... } - + /** * @Entity * @InheritanceType("JOINED") @@ -640,7 +675,7 @@ Example: * ) */ private $groups; - + /** * Inverse Side * diff --git a/docs/en/reference/php-mapping.rst b/docs/en/reference/php-mapping.rst index 90f00d9bc..d7734ea12 100644 --- a/docs/en/reference/php-mapping.rst +++ b/docs/en/reference/php-mapping.rst @@ -27,7 +27,7 @@ to write a mapping file for it using the above configured mapField(array( 'id' => true, 'fieldName' => 'id', 'type' => 'integer' )); - + $metadata->mapField(array( 'fieldName' => 'username', - 'type' => 'string' + 'type' => 'string', + 'options' => array( + 'fixed' => true, + 'comment' => "User's login name" + ) + )); + + $metadata->mapField(array( + 'fieldName' => 'login_count', + 'type' => 'integer', + 'nullable' => false, + 'options' => array( + 'unsigned' => true, + 'default' => 0 + ) )); Now we can easily retrieve the populated ``ClassMetadata`` instance @@ -87,13 +101,13 @@ Now you just need to define a static function named mapField(array( @@ -101,7 +115,7 @@ Now you just need to define a static function named 'fieldName' => 'id', 'type' => 'integer' )); - + $metadata->mapField(array( 'fieldName' => 'username', 'type' => 'string' diff --git a/docs/en/reference/xml-mapping.rst b/docs/en/reference/xml-mapping.rst index dc1dd5fd7..6b2ced5bf 100644 --- a/docs/en/reference/xml-mapping.rst +++ b/docs/en/reference/xml-mapping.rst @@ -22,9 +22,9 @@ setup for the latest code in trunk. xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd"> - + ... - + The XML mapping document of a class is loaded on-demand the first @@ -108,37 +108,37 @@ of several common elements: xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping http://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd"> - + - + - + - + - + - + - + - + @@ -147,7 +147,7 @@ of several common elements: - + @@ -161,9 +161,9 @@ of several common elements: - + - + Be aware that class-names specified in the XML files should be @@ -224,12 +224,18 @@ entity. For the ID mapping you have to use the ```` element. .. code-block:: xml - + + + + + + + Required attributes: @@ -255,12 +261,32 @@ Optional attributes: works on fields with type integer or datetime. - scale - Scale of a decimal type. - precision - Precision of a decimal type. +- options - Array of additional options: + + - default - The default value to set for the column if no value + is supplied. + - unsigned - Boolean value to determine if the column should + be capable of representing only non-negative integers + (applies only for integer column and might not be supported by + all vendors). + - fixed - Boolean value to determine if the specified length of + a string column should be fixed or varying (applies only for + string/binary column and might not be supported by all vendors). + - comment - The comment of the column in the schema (might not + be supported by all vendors). + - customSchemaOptions - Array of additional schema options + which are mostly vendor specific. - column-definition - Optional alternative SQL representation for this column. This definition begin after the field-name and has to specify the complete column definition. Using this feature will turn this field dirty for Schema-Tool update commands at all times. +.. note:: + + For more detailed information on each attribute, please refer to + the DBAL ``Schema-Representation`` documentation. + Defining Identity and Generator Strategies ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -423,7 +449,7 @@ using the ```` element: .. code-block:: xml - + @@ -716,12 +742,12 @@ table you can use the ```` and .. code-block:: xml - + - + diff --git a/docs/en/reference/yaml-mapping.rst b/docs/en/reference/yaml-mapping.rst index dea597984..1f2e31d34 100644 --- a/docs/en/reference/yaml-mapping.rst +++ b/docs/en/reference/yaml-mapping.rst @@ -94,6 +94,14 @@ of several common elements: unique: true options: fixed: true + comment: User's email address + loginCount: + type: integer + column: login_count + nullable: false + options: + unsigned: true + default: 0 oneToOne: address: targetEntity: Address From 0ab2672872aefb42d20d3a519caf04aee773a4fc Mon Sep 17 00:00:00 2001 From: hartca Date: Fri, 18 Jul 2014 00:10:47 +0100 Subject: [PATCH 43/47] Update advanced-field-value-conversion-using-custom-mapping-types.rst --- ...vanced-field-value-conversion-using-custom-mapping-types.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/cookbook/advanced-field-value-conversion-using-custom-mapping-types.rst b/docs/en/cookbook/advanced-field-value-conversion-using-custom-mapping-types.rst index bc24cd308..e3884915c 100644 --- a/docs/en/cookbook/advanced-field-value-conversion-using-custom-mapping-types.rst +++ b/docs/en/cookbook/advanced-field-value-conversion-using-custom-mapping-types.rst @@ -232,7 +232,7 @@ Example usage // Setup custom mapping type use Doctrine\DBAL\Types\Type; - Type::addType('point', 'Geo\Types\Point'); + Type::addType('point', 'Geo\Types\PointType'); $em->getConnection()->getDatabasePlatform()->registerDoctrineTypeMapping('point', 'point'); // Store a Location object From 70fe21b30a6623685c924fc778b5522f62ae1b65 Mon Sep 17 00:00:00 2001 From: Jefersson Nathan Date: Wed, 23 Jul 2014 17:09:47 -0300 Subject: [PATCH 44/47] Remove the error control operator --- bin/doctrine.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/doctrine.php b/bin/doctrine.php index c73556284..438003245 100755 --- a/bin/doctrine.php +++ b/bin/doctrine.php @@ -20,7 +20,14 @@ use Symfony\Component\Console\Helper\HelperSet; use Doctrine\ORM\Tools\Console\ConsoleRunner; -(@include_once __DIR__ . '/../vendor/autoload.php') || @include_once __DIR__ . '/../../../autoload.php'; +$autoloadFiles = array(__DIR__ . '/../vendor/autoload.php', + __DIR__ . '/../vendor/autoload.php'); + +foreach ($autoloadFiles as $autoloadFile) { + if (file_exists($autoloadFile)) { + require_once $autoloadFile; + } +} $directories = array(getcwd(), getcwd() . DIRECTORY_SEPARATOR . 'config'); From a6a9c72a7557e58bd7c7cfb08399e4035a5c2ac6 Mon Sep 17 00:00:00 2001 From: Austin Morris Date: Thu, 24 Jul 2014 09:52:55 -0400 Subject: [PATCH 45/47] Fix the composer autoload paths for the doctrine CLT --- bin/doctrine.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/doctrine.php b/bin/doctrine.php index 438003245..842c5493f 100755 --- a/bin/doctrine.php +++ b/bin/doctrine.php @@ -21,7 +21,7 @@ use Symfony\Component\Console\Helper\HelperSet; use Doctrine\ORM\Tools\Console\ConsoleRunner; $autoloadFiles = array(__DIR__ . '/../vendor/autoload.php', - __DIR__ . '/../vendor/autoload.php'); + __DIR__ . '/../../../autoload.php'); foreach ($autoloadFiles as $autoloadFile) { if (file_exists($autoloadFile)) { From 1b9f42ae67d5f7a779524c08ccbead3033b1639a Mon Sep 17 00:00:00 2001 From: Jefersson Nathan Date: Wed, 30 Jul 2014 16:54:24 -0300 Subject: [PATCH 46/47] Use `null` comparation instead of `is_null()` --- tests/Doctrine/Tests/Mocks/EntityManagerMock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php index b27e96c4b..74f4efcf0 100644 --- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php @@ -86,13 +86,13 @@ class EntityManagerMock extends \Doctrine\ORM\EntityManager public static function create($conn, \Doctrine\ORM\Configuration $config = null, \Doctrine\Common\EventManager $eventManager = null) { - if (is_null($config)) { + if (null === $config) { $config = new \Doctrine\ORM\Configuration(); $config->setProxyDir(__DIR__ . '/../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver(array(), true)); } - if (is_null($eventManager)) { + if (null === $eventManager) { $eventManager = new \Doctrine\Common\EventManager(); } From 2d23c95c3fe3644fcee569724c65bb695adc31d1 Mon Sep 17 00:00:00 2001 From: Justin Date: Wed, 30 Jul 2014 15:00:35 -0700 Subject: [PATCH 47/47] Fix bulk insert code example Previous code example did not flush all entities when entity count was not a multiple of batch count. --- docs/en/reference/batch-processing.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/en/reference/batch-processing.rst b/docs/en/reference/batch-processing.rst index 77b4e1720..7a62aff00 100644 --- a/docs/en/reference/batch-processing.rst +++ b/docs/en/reference/batch-processing.rst @@ -42,6 +42,8 @@ internally but also mean more work during ``flush``. $em->clear(); // Detaches all objects from Doctrine! } } + $em->flush(); //Persist objects that did not make up an entire batch + $em->clear(); Bulk Updates ------------