From 262ae7c942ae1afa046b95958ed44a2a18f4ddbf Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 20 May 2011 16:36:43 +0200 Subject: [PATCH 001/220] Implemented tableName -> className and columnName -> fieldName mapping in DatabaseDriver. --- .../ORM/Mapping/Driver/DatabaseDriver.php | 95 ++++++++++++++++--- 1 file changed, 84 insertions(+), 11 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index 7f92df162..d41553152 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -55,7 +55,17 @@ class DatabaseDriver implements Driver * @var array */ private $manyToManyTables = array(); - + + /** + * @var array + */ + private $classNamesForTables = array(); + + /** + * @var array + */ + private $fieldNamesForColumns = array(); + /** * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading * docblock annotations. @@ -78,7 +88,7 @@ class DatabaseDriver implements Driver { $this->tables = $this->manyToManyTables = $this->classToTableNames = array(); foreach ($entityTables AS $table) { - $className = Inflector::classify(strtolower($table->getName())); + $className = $this->_getClassNameForTable($table->getName()); $this->classToTableNames[$className] = $table->getName(); $this->tables[$table->getName()] = $table; } @@ -120,7 +130,7 @@ class DatabaseDriver implements Driver } else { // lower-casing is necessary because of Oracle Uppercase Tablenames, // assumption is lower-case + underscore separated. - $className = Inflector::classify(strtolower($tableName)); + $className = $this->_getClassNameForTable($tableName); $this->tables[$tableName] = $table; $this->classToTableNames[$className] = $tableName; } @@ -172,7 +182,7 @@ class DatabaseDriver implements Driver continue; } - $fieldMapping['fieldName'] = Inflector::camelize(strtolower($column->getName())); + $fieldMapping['fieldName'] = $this->_getFieldNameForColumn($tableName, $column->getName(), false); $fieldMapping['columnName'] = $column->getName(); $fieldMapping['type'] = strtolower((string) $column->getType()); @@ -226,10 +236,10 @@ class DatabaseDriver implements Driver $localColumn = current($myFk->getColumns()); $associationMapping = array(); - $associationMapping['fieldName'] = Inflector::camelize(str_replace('_id', '', strtolower(current($otherFk->getColumns())))); - $associationMapping['targetEntity'] = Inflector::classify(strtolower($otherFk->getForeignTableName())); + $associationMapping['fieldName'] = $this->_getFieldNameForColumn($manyTable->getName(), current($otherFk->getColumns()), true); + $associationMapping['targetEntity'] = $this->_getClassNameForTable($otherFk->getForeignTableName()); if (current($manyTable->getColumns())->getName() == $localColumn) { - $associationMapping['inversedBy'] = Inflector::camelize(str_replace('_id', '', strtolower(current($myFk->getColumns())))); + $associationMapping['inversedBy'] = $this->_getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); $associationMapping['joinTable'] = array( 'name' => strtolower($manyTable->getName()), 'joinColumns' => array(), @@ -254,7 +264,7 @@ class DatabaseDriver implements Driver ); } } else { - $associationMapping['mappedBy'] = Inflector::camelize(str_replace('_id', '', strtolower(current($myFk->getColumns())))); + $associationMapping['mappedBy'] = $this->_getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); } $metadata->mapManyToMany($associationMapping); break; @@ -269,8 +279,8 @@ class DatabaseDriver implements Driver $localColumn = current($cols); $associationMapping = array(); - $associationMapping['fieldName'] = Inflector::camelize(str_replace('_id', '', strtolower($localColumn))); - $associationMapping['targetEntity'] = Inflector::classify($foreignTable); + $associationMapping['fieldName'] = $this->_getFieldNameForColumn($tableName, $localColumn, true); + $associationMapping['targetEntity'] = $this->_getClassNameForTable($foreignTable); for ($i = 0; $i < count($cols); $i++) { $associationMapping['joinColumns'][] = array( @@ -303,4 +313,67 @@ class DatabaseDriver implements Driver return array_keys($this->classToTableNames); } -} \ No newline at end of file + + /** + * Set class name for a table. + * + * @param string $tableName + * @param string $className + * @return void + */ + public function setClassNameForTable($tableName, $className) + { + $this->classNamesForTables[$tableName] = $className; + } + + /** + * Set field name for a column on a specific table. + * + * @param string $tableName + * @param string $columnName + * @param string $fieldName + * @return void + */ + public function setFieldNameForColumn($tableName, $columnName, $fieldName) + { + $this->fieldNamesForColumns[$tableName][$columnName] = $fieldName; + } + + /** + * Return the mapped class name for a table if it exists. Otherwise return "classified" version. + * + * @param string $tableName + * @return string + */ + private function _getClassNameForTable($tableName) + { + if (isset($this->classNamesForTables[$tableName])) { + return $this->classNamesForTables[$tableName]; + } + + return Inflector::classify(strtolower($tableName)); + } + + /** + * Return the mapped field name for a column, if it exists. Otherwise return camelized version. + * + * @param string $tableName + * @param string $columnName + * @param boolean $fk Whether the column is a foreignkey or not. + * @return string + */ + private function _getFieldNameForColumn($tableName, $columnName, $fk = false) + { + if (isset($this->fieldNamesForColumns[$tableName]) && isset($this->fieldNamesForColumns[$tableName][$columnName])) { + return $this->fieldNamesForColumns[$tableName][$columnName]; + } + + $columnName = strtolower($columnName); + + // Replace _id if it is a foreignkey column + if ($fk) { + $columnName = str_replace('_id', '', $columnName); + } + return Inflector::camelize($columnName); + } +} From cec62db2d8c6428fc1bd161bac2e221c35d3c79e Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 20 May 2011 16:53:35 +0200 Subject: [PATCH 002/220] Removed _ prefix from private functions. --- .../ORM/Mapping/Driver/DatabaseDriver.php | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index d41553152..2805d5a21 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -88,7 +88,7 @@ class DatabaseDriver implements Driver { $this->tables = $this->manyToManyTables = $this->classToTableNames = array(); foreach ($entityTables AS $table) { - $className = $this->_getClassNameForTable($table->getName()); + $className = $this->getClassNameForTable($table->getName()); $this->classToTableNames[$className] = $table->getName(); $this->tables[$table->getName()] = $table; } @@ -130,7 +130,7 @@ class DatabaseDriver implements Driver } else { // lower-casing is necessary because of Oracle Uppercase Tablenames, // assumption is lower-case + underscore separated. - $className = $this->_getClassNameForTable($tableName); + $className = $this->getClassNameForTable($tableName); $this->tables[$tableName] = $table; $this->classToTableNames[$className] = $tableName; } @@ -182,7 +182,7 @@ class DatabaseDriver implements Driver continue; } - $fieldMapping['fieldName'] = $this->_getFieldNameForColumn($tableName, $column->getName(), false); + $fieldMapping['fieldName'] = $this->getFieldNameForColumn($tableName, $column->getName(), false); $fieldMapping['columnName'] = $column->getName(); $fieldMapping['type'] = strtolower((string) $column->getType()); @@ -236,10 +236,10 @@ class DatabaseDriver implements Driver $localColumn = current($myFk->getColumns()); $associationMapping = array(); - $associationMapping['fieldName'] = $this->_getFieldNameForColumn($manyTable->getName(), current($otherFk->getColumns()), true); - $associationMapping['targetEntity'] = $this->_getClassNameForTable($otherFk->getForeignTableName()); + $associationMapping['fieldName'] = $this->getFieldNameForColumn($manyTable->getName(), current($otherFk->getColumns()), true); + $associationMapping['targetEntity'] = $this->getClassNameForTable($otherFk->getForeignTableName()); if (current($manyTable->getColumns())->getName() == $localColumn) { - $associationMapping['inversedBy'] = $this->_getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); + $associationMapping['inversedBy'] = $this->getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); $associationMapping['joinTable'] = array( 'name' => strtolower($manyTable->getName()), 'joinColumns' => array(), @@ -264,7 +264,7 @@ class DatabaseDriver implements Driver ); } } else { - $associationMapping['mappedBy'] = $this->_getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); + $associationMapping['mappedBy'] = $this->getFieldNameForColumn($manyTable->getName(), current($myFk->getColumns()), true); } $metadata->mapManyToMany($associationMapping); break; @@ -279,8 +279,8 @@ class DatabaseDriver implements Driver $localColumn = current($cols); $associationMapping = array(); - $associationMapping['fieldName'] = $this->_getFieldNameForColumn($tableName, $localColumn, true); - $associationMapping['targetEntity'] = $this->_getClassNameForTable($foreignTable); + $associationMapping['fieldName'] = $this->getFieldNameForColumn($tableName, $localColumn, true); + $associationMapping['targetEntity'] = $this->getClassNameForTable($foreignTable); for ($i = 0; $i < count($cols); $i++) { $associationMapping['joinColumns'][] = array( @@ -345,7 +345,7 @@ class DatabaseDriver implements Driver * @param string $tableName * @return string */ - private function _getClassNameForTable($tableName) + private function getClassNameForTable($tableName) { if (isset($this->classNamesForTables[$tableName])) { return $this->classNamesForTables[$tableName]; @@ -362,7 +362,7 @@ class DatabaseDriver implements Driver * @param boolean $fk Whether the column is a foreignkey or not. * @return string */ - private function _getFieldNameForColumn($tableName, $columnName, $fk = false) + private function getFieldNameForColumn($tableName, $columnName, $fk = false) { if (isset($this->fieldNamesForColumns[$tableName]) && isset($this->fieldNamesForColumns[$tableName][$columnName])) { return $this->fieldNamesForColumns[$tableName][$columnName]; From 0bb09373727793f9cf89846a1c03dcf9e19913ae Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Fri, 20 May 2011 21:13:25 +0200 Subject: [PATCH 003/220] Started UPGRADE_TO_2_1 document --- UPGRADE_TO_2_1 | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 UPGRADE_TO_2_1 diff --git a/UPGRADE_TO_2_1 b/UPGRADE_TO_2_1 new file mode 100644 index 000000000..bfb759ec7 --- /dev/null +++ b/UPGRADE_TO_2_1 @@ -0,0 +1,6 @@ +This document details all the possible changes that you should investigate when updating +your project from Doctrine 2.0.x to 2.1 + +## Interface for EntityRepository + +The EntityRepository now has an interface Doctrine\Common\Persistence\ObjectRepository. This means that your classes that override EntityRepository and extend find(), findOneBy() or findBy() must be adjusted to follow this interface. From 6d724ad9ffd5dcbff6ea4c3a1e961430474b2a82 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Wed, 25 May 2011 00:26:20 +0200 Subject: [PATCH 004/220] Make ORM forward compatible with new Doctrine Annotations library version 2.1 --- lib/Doctrine/ORM/Configuration.php | 18 +++++++--- lib/vendor/doctrine-common | 2 +- .../Tests/Mocks/EntityManagerMock.php | 2 +- .../ORM/Mapping/AnnotationDriverTest.php | 5 +-- .../ORM/Mapping/ClassMetadataFactoryTest.php | 5 +-- .../Tests/ORM/Mapping/DriverChainTest.php | 7 ++-- .../Tests/ORM/Tools/EntityGeneratorTest.php | 8 ++--- .../AbstractClassMetadataExporterTest.php | 2 +- tests/Doctrine/Tests/OrmTestCase.php | 35 +++++++++++++++++++ 9 files changed, 58 insertions(+), 26 deletions(-) diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 999d0c84c..f2268bfe9 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -20,7 +20,8 @@ namespace Doctrine\ORM; use Doctrine\Common\Cache\Cache, - Doctrine\ORM\Mapping\Driver\Driver; + Doctrine\ORM\Mapping\Driver\Driver, + Doctrine\Common\Cache\ArrayCache; /** * Configuration container for all configuration options of Doctrine. @@ -120,9 +121,18 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function newDefaultAnnotationDriver($paths = array()) { - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); - $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); - + if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); + $reader->setIgnoreNotImportedAnnotations(true); + $reader->setEnableParsePhpImports(false); + $reader = new \Doctrine\Common\Annotations\CachedReader( + new \Doctrine\Common\Annotations\IndexedReader($reader), new ArrayCache() + ); + } else { + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); + } return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, (array)$paths); } diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index ea434bbea..f87ee1be5 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit ea434bbea37e067aa52272816c6dcda5ff826154 +Subproject commit f87ee1be5113a4a594827731dd1f5647cfc288fc diff --git a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php index 4006ebda7..edf220a42 100644 --- a/tests/Doctrine/Tests/Mocks/EntityManagerMock.php +++ b/tests/Doctrine/Tests/Mocks/EntityManagerMock.php @@ -78,7 +78,7 @@ class EntityManagerMock extends \Doctrine\ORM\EntityManager $config = new \Doctrine\ORM\Configuration(); $config->setProxyDir(__DIR__ . '/../Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); - $config->setMetadataDriverImpl(\Doctrine\ORM\Mapping\Driver\AnnotationDriver::create()); + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver()); } if (is_null($eventManager)) { $eventManager = new \Doctrine\Common\EventManager(); diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index f02401975..be8a9bc43 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -99,10 +99,7 @@ class AnnotationDriverTest extends AbstractMappingDriverTest protected function _loadDriver() { - $cache = new \Doctrine\Common\Cache\ArrayCache(); - $reader = new \Doctrine\Common\Annotations\AnnotationReader($cache); - $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); - return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader); + return $this->createAnnotationDriver(); } protected function _ensureIsLoaded($entityClassName) diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php index 72a49a701..dbb82f054 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataFactoryTest.php @@ -67,10 +67,7 @@ class ClassMetadataFactoryTest extends \Doctrine\Tests\OrmTestCase { require_once __DIR__."/../../Models/Global/GlobalNamespaceModel.php"; - $reader = new \Doctrine\Common\Annotations\AnnotationReader(new \Doctrine\Common\Cache\ArrayCache); - $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); - $metadataDriver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader); - $metadataDriver->addPaths(array(__DIR__ . '/../../Models/Global/')); + $metadataDriver = $this->createAnnotationDriver(array(__DIR__ . '/../../Models/Global/')); $entityManager = $this->_createEntityManager($metadataDriver); diff --git a/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php b/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php index d218aaf8f..dc8bc695d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/DriverChainTest.php @@ -81,12 +81,9 @@ class DriverChainTest extends \Doctrine\Tests\OrmTestCase * @group DDC-706 */ public function testIsTransient() - { - $reader = new \Doctrine\Common\Annotations\AnnotationReader(new \Doctrine\Common\Cache\ArrayCache()); - $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); - + { $chain = new DriverChain(); - $chain->addDriver(new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, array()), 'Doctrine\Tests\Models\CMS'); + $chain->addDriver($this->createAnnotationDriver(), 'Doctrine\Tests\Models\CMS'); $this->assertTrue($chain->isTransient('stdClass'), "stdClass isTransient"); $this->assertFalse($chain->isTransient('Doctrine\Tests\Models\CMS\CmsUser'), "CmsUser is not Transient"); diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index d7cd56132..698219e24 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -166,9 +166,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase $book = $this->newInstance($metadata); $cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name); - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); - $reader->setDefaultAnnotationNamespace("Doctrine\\ORM\\Mapping\\"); - $driver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader); + $driver = $this->createAnnotationDriver(); $driver->loadMetadataForClass($cm->name, $cm); $this->assertEquals($cm->columnNames, $metadata->columnNames); @@ -188,9 +186,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase $book = $this->newInstance($metadata); $cm = new \Doctrine\ORM\Mapping\ClassMetadata($metadata->name); - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); - $reader->setAnnotationNamespaceAlias("Doctrine\\ORM\\Mapping\\", "orm"); - $driver = new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader); + $driver = $this->createAnnotationDriver(array(), 'orm'); $driver->loadMetadataForClass($cm->name, $cm); $this->assertEquals($cm->columnNames, $metadata->columnNames); diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 4a85918d6..850fb76ba 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -78,7 +78,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest $class = 'Doctrine\ORM\Mapping\Driver\\' . $driverName; if ($type === 'annotation') { - $driver = $class::create($path); + $driver = $this->createAnnotationDriver(array($path)); } else { $driver = new $class($path); } diff --git a/tests/Doctrine/Tests/OrmTestCase.php b/tests/Doctrine/Tests/OrmTestCase.php index 3991d5b6d..ff8b7f649 100644 --- a/tests/Doctrine/Tests/OrmTestCase.php +++ b/tests/Doctrine/Tests/OrmTestCase.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests; +use Doctrine\Common\Cache\ArrayCache; + /** * Base testcase class for all ORM testcases. */ @@ -12,6 +14,39 @@ abstract class OrmTestCase extends DoctrineTestCase /** The query cache that is shared between all ORM tests (except functional tests). */ private static $_queryCacheImpl = null; + /** + * @param array $paths + * @return \Doctrine\Common\Annotations\AnnotationReader + */ + protected function createAnnotationDriver($paths = array(), $alias = null) + { + if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0', '>=')) { + $reader = new \Doctrine\Common\Annotations\CachedReader( + new \Doctrine\Common\Annotations\AnnotationReader(), new ArrayCache() + ); + } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + $reader->setIgnoreNotImportedAnnotations(true); + $reader->setEnableParsePhpImports(false); + if ($alias) { + $reader->setAnnotationNamespaceAlias('Doctrine\ORM\Mapping\\', $alias); + } else { + $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); + } + $reader = new \Doctrine\Common\Annotations\CachedReader( + new \Doctrine\Common\Annotations\IndexedReader($reader), new ArrayCache() + ); + } else { + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + if ($alias) { + $reader->setAnnotationNamespaceAlias('Doctrine\ORM\Mapping\\', $alias); + } else { + $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); + } + } + return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, (array)$paths); + } + /** * Creates an EntityManager for testing purposes. * From a0d79b03e7c7070ab00df2c9ca6fe9b98439de64 Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Sun, 22 May 2011 22:10:13 +0200 Subject: [PATCH 005/220] [AnnotationDriver] compatibility with Doctrine Common 3.x --- .../ORM/Mapping/Driver/AnnotationDriver.php | 38 ++++++++++++++++--- 1 file changed, 33 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index 22e6d4d7e..cbf06fe7b 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -62,13 +62,13 @@ class AnnotationDriver implements Driver * @param array */ protected $_classNames; - + /** * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading * docblock annotations. - * + * * @param AnnotationReader $reader The AnnotationReader to use, duck-typed. - * @param string|array $paths One or multiple paths where mapping classes can be found. + * @param string|array $paths One or multiple paths where mapping classes can be found. */ public function __construct($reader, $paths = null) { @@ -77,7 +77,7 @@ class AnnotationDriver implements Driver $this->addPaths((array) $paths); } } - + /** * Append lookup paths to metadata driver. * @@ -128,6 +128,13 @@ class AnnotationDriver implements Driver $classAnnotations = $this->_reader->getClassAnnotations($class); + // Compatibility with Doctrine Common 3.x + if ($classAnnotations && is_int(key($classAnnotations))) { + foreach ($classAnnotations as $annot) { + $classAnnotations[get_class($annot)] = $annot; + } + } + // Evaluate Entity annotation if (isset($classAnnotations['Doctrine\ORM\Mapping\Entity'])) { $entityAnnot = $classAnnotations['Doctrine\ORM\Mapping\Entity']; @@ -397,6 +404,13 @@ class AnnotationDriver implements Driver if ($method->isPublic() && $method->getDeclaringClass()->getName() == $class->name) { $annotations = $this->_reader->getMethodAnnotations($method); + // Compatibility with Doctrine Common 3.x + if ($annotations && is_int(key($annotations))) { + foreach ($annotations as $annot) { + $annotations[get_class($annot)] = $annot; + } + } + if (isset($annotations['Doctrine\ORM\Mapping\PrePersist'])) { $metadata->addLifecycleCallback($method->getName(), \Doctrine\ORM\Events::prePersist); } @@ -442,6 +456,20 @@ class AnnotationDriver implements Driver { $classAnnotations = $this->_reader->getClassAnnotations(new \ReflectionClass($className)); + // Compatibility with Doctrine Common 3.x + if ($classAnnotations && is_int(key($classAnnotations))) { + foreach ($classAnnotations as $annot) { + if ($annot instanceof \Doctrine\ORM\Mapping\Entity) { + return false; + } + if ($annot instanceof \Doctrine\ORM\Mapping\MappedSuperclass) { + return false; + } + } + + return true; + } + return ! isset($classAnnotations['Doctrine\ORM\Mapping\Entity']) && ! isset($classAnnotations['Doctrine\ORM\Mapping\MappedSuperclass']); } @@ -500,7 +528,7 @@ class AnnotationDriver implements Driver /** * Factory method for the Annotation Driver - * + * * @param array|string $paths * @param AnnotationReader $reader * @return AnnotationDriver From 3adbf0de39ac483cdb2509e312ce4fd06b80897a Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Wed, 25 May 2011 00:35:57 +0200 Subject: [PATCH 006/220] Add forward compatibility with Doctrine Common 3.0 --- lib/Doctrine/ORM/Configuration.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index f2268bfe9..4ea7809b3 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -121,7 +121,10 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function newDefaultAnnotationDriver($paths = array()) { - if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { + if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) { + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache()); + } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { $reader = new \Doctrine\Common\Annotations\AnnotationReader(); $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); $reader->setIgnoreNotImportedAnnotations(true); From 693fc090b5bfd97c2cab97d6a327162c8d4364c1 Mon Sep 17 00:00:00 2001 From: Christophe Coevoet Date: Wed, 25 May 2011 12:35:54 +0200 Subject: [PATCH 007/220] Updated the EntityGenerator to be compatible with Common 3.0.x --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 36 ++++++++++++++-------- 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 80998b82a..4221c9db7 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -91,6 +91,8 @@ class EntityGenerator +use Doctrine\ORM\Mapping as ORM; + { @@ -146,11 +148,18 @@ public function () } '; + public function __construct() + { + if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) { + $this->_annotationsPrefix = 'ORM\\'; + } + } + /** * Generate and write entity classes for the given array of ClassMetadataInfo instances * * @param array $metadatas - * @param string $outputDirectory + * @param string $outputDirectory * @return void */ public function generate(array $metadatas, $outputDirectory) @@ -164,7 +173,7 @@ public function () * Generated and write entity class to disk for the given ClassMetadataInfo instance * * @param ClassMetadataInfo $metadata - * @param string $outputDirectory + * @param string $outputDirectory * @return void */ public function writeEntityClass(ClassMetadataInfo $metadata, $outputDirectory) @@ -201,7 +210,7 @@ public function () /** * Generate a PHP5 Doctrine 2 entity class from the given ClassMetadataInfo instance * - * @param ClassMetadataInfo $metadata + * @param ClassMetadataInfo $metadata * @return string $code */ public function generateEntityClass(ClassMetadataInfo $metadata) @@ -227,8 +236,8 @@ public function () /** * Generate the updated code for the given ClassMetadataInfo and entity at path * - * @param ClassMetadataInfo $metadata - * @param string $path + * @param ClassMetadataInfo $metadata + * @param string $path * @return string $code; */ public function generateUpdatedEntityClass(ClassMetadataInfo $metadata, $path) @@ -245,7 +254,7 @@ public function () /** * Set the number of spaces the exported class should have * - * @param integer $numSpaces + * @param integer $numSpaces * @return void */ public function setNumSpaces($numSpaces) @@ -257,7 +266,7 @@ public function () /** * Set the extension to use when writing php files to disk * - * @param string $extension + * @param string $extension * @return void */ public function setExtension($extension) @@ -278,7 +287,7 @@ public function () /** * Set whether or not to generate annotations for the entity * - * @param bool $bool + * @param bool $bool * @return void */ public function setGenerateAnnotations($bool) @@ -293,13 +302,16 @@ public function () */ public function setAnnotationPrefix($prefix) { + if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) { + return; + } $this->_annotationsPrefix = $prefix; } /** * Set whether or not to try and update the entity if it already exists * - * @param bool $bool + * @param bool $bool * @return void */ public function setUpdateEntityIfExists($bool) @@ -407,7 +419,7 @@ public function () $tokens = token_get_all($src); $lastSeenNamespace = ""; $lastSeenClass = false; - + $inNamespace = false; $inClass = false; for ($i = 0; $i < count($tokens); $i++) { @@ -808,7 +820,7 @@ public function () if ($associationMapping['isCascadeMerge']) $cascades[] = '"merge"'; if ($associationMapping['isCascadeRefresh']) $cascades[] = '"refresh"'; - $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}'; + $typeOptions[] = 'cascade={' . implode(',', $cascades) . '}'; } if (isset($associationMapping['orphanRemoval']) && $associationMapping['orphanRemoval']) { @@ -862,7 +874,7 @@ public function () $lines[] = $this->_spaces . ' * @' . $this->_annotationsPrefix . 'OrderBy({'; foreach ($associationMapping['orderBy'] as $name => $direction) { - $lines[] = $this->_spaces . ' * "' . $name . '"="' . $direction . '",'; + $lines[] = $this->_spaces . ' * "' . $name . '"="' . $direction . '",'; } $lines[count($lines) - 1] = substr($lines[count($lines) - 1], 0, strlen($lines[count($lines) - 1]) - 1); From 93521217a6a35347dee82d6ee0bf665ecf314d6d Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Thu, 26 May 2011 02:18:29 -0300 Subject: [PATCH 008/220] Moved getQuoted* from ClassMetadata to ClassMetadataInfo, since SchemaTool relies on them, making impossible to work with DisconnectedClassMetadataFactory. --- lib/Doctrine/ORM/Mapping/ClassMetadata.php | 42 ------------------ .../ORM/Mapping/ClassMetadataInfo.php | 43 ++++++++++++++++++- 2 files changed, 42 insertions(+), 43 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadata.php b/lib/Doctrine/ORM/Mapping/ClassMetadata.php index 4ec0ede53..bbabc2fe0 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadata.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadata.php @@ -205,48 +205,6 @@ class ClassMetadata extends ClassMetadataInfo $this->reflFields[$sourceFieldName] = $refProp; } - /** - * Gets the (possibly quoted) column name of a mapped field for safe use - * in an SQL statement. - * - * @param string $field - * @param AbstractPlatform $platform - * @return string - */ - public function getQuotedColumnName($field, $platform) - { - return isset($this->fieldMappings[$field]['quoted']) ? - $platform->quoteIdentifier($this->fieldMappings[$field]['columnName']) : - $this->fieldMappings[$field]['columnName']; - } - - /** - * Gets the (possibly quoted) primary table name of this class for safe use - * in an SQL statement. - * - * @param AbstractPlatform $platform - * @return string - */ - public function getQuotedTableName($platform) - { - return isset($this->table['quoted']) ? - $platform->quoteIdentifier($this->table['name']) : - $this->table['name']; - } - - /** - * Gets the (possibly quoted) name of the join table. - * - * @param AbstractPlatform $platform - * @return string - */ - public function getQuotedJoinTableName(array $assoc, $platform) - { - return isset($assoc['joinTable']['quoted']) - ? $platform->quoteIdentifier($assoc['joinTable']['name']) - : $assoc['joinTable']['name']; - } - /** * Creates a string representation of this instance. * diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index eb6863859..8a95b82db 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -335,7 +335,6 @@ class ClassMetadataInfo implements ClassMetadata * uniqueConstraints => array * * @var array - * @todo Rename to just $table */ public $table; @@ -1888,4 +1887,46 @@ class ClassMetadataInfo implements ClassMetadata { return $this->name; } + + /** + * Gets the (possibly quoted) column name of a mapped field for safe use + * in an SQL statement. + * + * @param string $field + * @param AbstractPlatform $platform + * @return string + */ + public function getQuotedColumnName($field, $platform) + { + return isset($this->fieldMappings[$field]['quoted']) ? + $platform->quoteIdentifier($this->fieldMappings[$field]['columnName']) : + $this->fieldMappings[$field]['columnName']; + } + + /** + * Gets the (possibly quoted) primary table name of this class for safe use + * in an SQL statement. + * + * @param AbstractPlatform $platform + * @return string + */ + public function getQuotedTableName($platform) + { + return isset($this->table['quoted']) ? + $platform->quoteIdentifier($this->table['name']) : + $this->table['name']; + } + + /** + * Gets the (possibly quoted) name of the join table. + * + * @param AbstractPlatform $platform + * @return string + */ + public function getQuotedJoinTableName(array $assoc, $platform) + { + return isset($assoc['joinTable']['quoted']) + ? $platform->quoteIdentifier($assoc['joinTable']['name']) + : $assoc['joinTable']['name']; + } } From bb873826ca4f53e02086cdb7f49913592d6afec3 Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Fri, 27 May 2011 08:41:31 +0200 Subject: [PATCH 009/220] Fixing Notice: Undefined index: orderBy in ...Doctrine/ORM/Tools/Export/Driver/YamlExporter --- .../ORM/Tools/Export/Driver/YamlExporter.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 1cc699610..d5c1efd8a 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -43,7 +43,7 @@ class YamlExporter extends AbstractExporter * * TODO: Should this code be pulled out in to a toArray() method in ClassMetadata * - * @param ClassMetadataInfo $metadata + * @param ClassMetadataInfo $metadata * @return mixed $exported */ public function exportClassMetadata(ClassMetadataInfo $metadata) @@ -84,9 +84,9 @@ class YamlExporter extends AbstractExporter if (isset($metadata->table['uniqueConstraints'])) { $array['uniqueConstraints'] = $metadata->table['uniqueConstraints']; } - + $fieldMappings = $metadata->fieldMappings; - + $ids = array(); foreach ($fieldMappings as $name => $fieldMapping) { $fieldMapping['column'] = $fieldMapping['columnName']; @@ -94,7 +94,7 @@ class YamlExporter extends AbstractExporter $fieldMapping['columnName'], $fieldMapping['fieldName'] ); - + if ($fieldMapping['column'] == $name) { unset($fieldMapping['column']); } @@ -111,7 +111,7 @@ class YamlExporter extends AbstractExporter if ($idGeneratorType = $this->_getIdGeneratorTypeString($metadata->generatorType)) { $ids[$metadata->getSingleIdentifierFieldName()]['generator']['strategy'] = $this->_getIdGeneratorTypeString($metadata->generatorType); } - + if ($ids) { $array['fields'] = $ids; } @@ -145,7 +145,7 @@ class YamlExporter extends AbstractExporter 'targetEntity' => $associationMapping['targetEntity'], 'cascade' => $cascade, ); - + if ($associationMapping['type'] & ClassMetadataInfo::TO_ONE) { $joinColumns = $associationMapping['joinColumns']; $newJoinColumns = array(); @@ -164,7 +164,7 @@ class YamlExporter extends AbstractExporter 'joinColumns' => $newJoinColumns, 'orphanRemoval' => $associationMapping['orphanRemoval'], ); - + $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); $array['oneToOne'][$name] = $associationMappingArray; } else if ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_MANY) { @@ -172,7 +172,7 @@ class YamlExporter extends AbstractExporter 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'orphanRemoval' => $associationMapping['orphanRemoval'], - 'orderBy' => $associationMapping['orderBy'] + 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null ); $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); @@ -182,9 +182,9 @@ class YamlExporter extends AbstractExporter 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], 'joinTable' => $associationMapping['joinTable'], - 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null + 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null ); - + $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); $array['manyToMany'][$name] = $associationMappingArray; } From 23540c17f182143f391ef6c1a4d495a81bb26a67 Mon Sep 17 00:00:00 2001 From: chesteroni Date: Sat, 28 May 2011 20:57:19 -0700 Subject: [PATCH 010/220] Added checking for existing indexes in associatation mapping array. --- .../ORM/Tools/Export/Driver/PhpExporter.php | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php index 005b18a7a..900fb5bda 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/PhpExporter.php @@ -120,22 +120,30 @@ class PhpExporter extends AbstractExporter $associationMappingArray = array_merge($associationMappingArray, $oneToOneMappingArray); } else if ($associationMapping['type'] == ClassMetadataInfo::ONE_TO_MANY) { - $method = 'mapOneToMany'; - $oneToManyMappingArray = array( - 'mappedBy' => $associationMapping['mappedBy'], - 'orphanRemoval' => $associationMapping['orphanRemoval'], - 'orderBy' => $associationMapping['orderBy'] + $method = 'mapOneToMany'; + $potentialAssociationMappingIndexes = array( + 'mappedBy', + 'orphanRemoval', + 'orderBy', ); - + foreach ($potentialAssociationMappingIndexes as $index) { + if (isset($associationMapping[$index])) { + $oneToManyMappingArray[$index] = $associationMapping[$index]; + } + } $associationMappingArray = array_merge($associationMappingArray, $oneToManyMappingArray); } else if ($associationMapping['type'] == ClassMetadataInfo::MANY_TO_MANY) { - $method = 'mapManyToMany'; - $manyToManyMappingArray = array( - 'mappedBy' => $associationMapping['mappedBy'], - 'joinTable' => $associationMapping['joinTable'], - 'orderBy' => $associationMapping['orderBy'] + $method = 'mapManyToMany'; + $potentialAssociationMappingIndexes = array( + 'mappedBy', + 'joinTable', + 'orderBy', ); - + foreach ($potentialAssociationMappingIndexes as $index) { + if (isset($associationMapping[$index])) { + $manyToManyMappingArray[$index] = $associationMapping[$index]; + } + } $associationMappingArray = array_merge($associationMappingArray, $manyToManyMappingArray); } From 7ee8dc4e44e3a761b8dab23a18ded74c9f10d7a3 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 2 Jun 2011 21:45:03 +0200 Subject: [PATCH 011/220] DDC-1179 - Make it possible to specify a namespace when mapping with --from-database --- .../ORM/Mapping/Driver/DatabaseDriver.php | 22 +++++++++++++++++-- .../Console/Command/ConvertMappingCommand.php | 18 +++++++++++---- 2 files changed, 34 insertions(+), 6 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index 2805d5a21..0ee1060c7 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -66,6 +66,13 @@ class DatabaseDriver implements Driver */ private $fieldNamesForColumns = array(); + /** + * The namespace for the generated entities. + * + * @var string + */ + private $namespace; + /** * Initializes a new AnnotationDriver that uses the given AnnotationReader for reading * docblock annotations. @@ -348,10 +355,10 @@ class DatabaseDriver implements Driver private function getClassNameForTable($tableName) { if (isset($this->classNamesForTables[$tableName])) { - return $this->classNamesForTables[$tableName]; + return $this->namespace . $this->classNamesForTables[$tableName]; } - return Inflector::classify(strtolower($tableName)); + return $this->namespace . Inflector::classify(strtolower($tableName)); } /** @@ -376,4 +383,15 @@ class DatabaseDriver implements Driver } return Inflector::camelize($columnName); } + + /** + * Set the namespace for the generated entities. + * + * @param string $namespace + * @return void + */ + public function setNamespace($namespace) + { + $this->namespace = $namespace; + } } diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php index 8c1a8fea1..d694999e4 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php @@ -78,6 +78,10 @@ class ConvertMappingCommand extends Console\Command\Command 'num-spaces', null, InputOption::VALUE_OPTIONAL, 'Defines the number of indentation spaces', 4 ), + new InputOption( + 'namespace', null, InputOption::VALUE_OPTIONAL, + 'Defines a namespace for the generated entity classes, if converted from database.' + ), )) ->setHelp(<<getHelper('em')->getEntityManager(); if ($input->getOption('from-database') === true) { - $em->getConfiguration()->setMetadataDriverImpl( - new \Doctrine\ORM\Mapping\Driver\DatabaseDriver( - $em->getConnection()->getSchemaManager() - ) + $databaseDriver = new \Doctrine\ORM\Mapping\Driver\DatabaseDriver( + $em->getConnection()->getSchemaManager() ); + + $em->getConfiguration()->setMetadataDriverImpl( + $databaseDriver + ); + + if (($namespace = $input->getOption('namespace')) !== null) { + $databaseDriver->setNamespace($namespace); + } } $cmf = new DisconnectedClassMetadataFactory(); From bf0775fbb6ab3e0a2f8288f3dff81228badba0f1 Mon Sep 17 00:00:00 2001 From: Miha Vrhovnik Date: Fri, 3 Jun 2011 09:12:32 +0200 Subject: [PATCH 012/220] Add extension points into the xml schema --- doctrine-mapping.xsd | 94 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 4 deletions(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index 6216d75dc..126f30290 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -17,11 +17,18 @@ + + - + + + + + + @@ -30,7 +37,9 @@ + + @@ -46,24 +55,32 @@ + + + + + + + + @@ -81,6 +98,7 @@ + @@ -89,11 +107,17 @@ + - + + + + + + @@ -139,6 +163,9 @@ + + + @@ -149,76 +176,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -226,32 +291,43 @@ + + + + + + + - - + + + + + + @@ -266,6 +342,7 @@ + @@ -273,12 +350,14 @@ + + @@ -286,6 +365,7 @@ + @@ -294,13 +374,16 @@ + + + @@ -309,7 +392,9 @@ + + @@ -317,6 +402,7 @@ + From 79643e32ed3f3a6679428b5d6dc152e70fed5c13 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 3 Jun 2011 07:58:49 -0500 Subject: [PATCH 013/220] [Tools][Console] Refactoring the UpdateCommand There are two basic changes: 1) Changed --force and --dump-sql from options to a single argument. Prior, you couldn't pass both options simultaneously anyways, so making them an argument is more accurate. 2) Changed the language and formatting of the task to be more user-friendly. --- .../Command/SchemaTool/UpdateCommand.php | 88 ++++++++++++------- 1 file changed, 55 insertions(+), 33 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php index 195f5efef..a163b6f84 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php @@ -28,7 +28,8 @@ use Symfony\Component\Console\Input\InputArgument, Doctrine\ORM\Tools\SchemaTool; /** - * Command to update the database schema for a set of classes based on their mappings. + * Command to generate the SQL needed to update the database schema to match + * the current mapping information. * * @license http://www.opensource.org/licenses/lgpl-license.php LGPL * @link www.doctrine-project.org @@ -38,6 +39,7 @@ use Symfony\Component\Console\Input\InputArgument, * @author Guilherme Blanco * @author Jonathan Wage * @author Roman Borschel + * @author Ryan Weaver */ class UpdateCommand extends AbstractCommand { @@ -49,26 +51,39 @@ class UpdateCommand extends AbstractCommand $this ->setName('orm:schema-tool:update') ->setDescription( - 'Processes the schema and either update the database schema of EntityManager Storage Connection or generate the SQL output.' + 'Executes (or dumps) the SQL needed to update the database schema to match the current mapping metadata.' ) ->setDefinition(array( + new InputArgument( + 'action', InputArgument::OPTIONAL, + 'Either "execute" (execute the SQL) or "dump-sql" (dump the SQL to the screen). If not specified, nothing is done.' + ), new InputOption( 'complete', null, InputOption::VALUE_NONE, 'If defined, all assets of the database which are not relevant to the current metadata will be dropped.' ), - new InputOption( - 'dump-sql', null, InputOption::VALUE_NONE, - 'Instead of try to apply generated SQLs into EntityManager Storage Connection, output them.' - ), - new InputOption( - 'force', null, InputOption::VALUE_NONE, - "Don't ask for the incremental update of the database, but force the operation to run." - ), - )) - ->setHelp(<<getFullName(); + $this->setHelp(<<$fullName command generates the SQL needed to +synchronize the database schema with the current mapping metadata of the +default entity manager. + +For example, if you add metadata for a new column to an entity, this command +would generate and output the SQL needed to add the new column to the database: + +$fullName dump-sql + +Alternatively, you can execute the generated queries: + +$fullName execute + +Finally, be aware that if the --complete option is passed, this +task will drop all database assets (e.g. tables, etc) that are *not* described +by the current metadata. In other words, without this option, this task leaves +untouched any "extra" tables that exist in the database, but which aren't +described by any metadata. EOT ); } @@ -78,26 +93,33 @@ EOT // Defining if update is complete or not (--complete not defined means $saveMode = true) $saveMode = ($input->getOption('complete') !== true); - if ($input->getOption('dump-sql') === true) { - $sqls = $schemaTool->getUpdateSchemaSql($metadatas, $saveMode); - $output->write(implode(';' . PHP_EOL, $sqls) . PHP_EOL); - } else if ($input->getOption('force') === true) { - $output->write('Updating database schema...' . PHP_EOL); + $sqls = $schemaTool->getUpdateSchemaSql($metadatas, $saveMode); + if (0 == count($sqls)) { + $output->writeln('Nothing to update - your database is already in sync with the current entity metadata.'); + + return; + } + + $action = $input->getArgument('action'); + if ('execute' == $action) { + $output->writeln('Updating database schema...'); $schemaTool->updateSchema($metadatas, $saveMode); - $output->write('Database schema updated successfully!' . PHP_EOL); + $output->writeln(sprintf('Database schema updated successfully! "%s" queries were executed', count($sqls))); + } else if ('dump-sql' == $action) { + $output->writeln(implode(';' . PHP_EOL, $sqls)); + } else if (null === $action) { + $output->writeln('ATTENTION: This operation should not be executed in a production environment.'); + $output->writeln(' Use the incremental update to detect changes during development and use'); + $output->writeln(' the SQL DDL provided to manually update your database in production.'); + $output->writeln(''); + + $output->writeln(sprintf('The Schema-Tool would execute "%s" queries to update the database.', count($sqls))); + $output->writeln('Please run the operation by passing an argument to this command:'); + + $output->writeln(sprintf(' %s execute to execute the command', $this->getFullName())); + $output->writeln(sprintf(' %s dump-sql to dump the SQL statements to the screen', $this->getFullName())); } else { - $output->write('ATTENTION: This operation should not be executed in a production environment.' . PHP_EOL); - $output->write('Use the incremental update to detect changes during development and use' . PHP_EOL); - $output->write('this SQL DDL to manually update your database in production.' . PHP_EOL . PHP_EOL); - - $sqls = $schemaTool->getUpdateSchemaSql($metadatas, $saveMode); - - if (count($sqls)) { - $output->write('Schema-Tool would execute ' . count($sqls) . ' queries to update the database.' . PHP_EOL); - $output->write('Please run the operation with --force to execute these queries or use --dump-sql to see them.' . PHP_EOL); - } else { - $output->write('Nothing to update. The database is in sync with the current entity metadata.' . PHP_EOL); - } + throw new \InvalidArgumentException(sprintf('The first argument - if specified - should be either "execute" or "dump-sql" ("%s" given).', $action)); } } } From 64687409155f5e547b2611db1eed4948fba847f9 Mon Sep 17 00:00:00 2001 From: Ryan Weaver Date: Fri, 3 Jun 2011 15:09:18 -0500 Subject: [PATCH 014/220] [Tools][Console] Reworking changes to be more backwards compatible This keeps the --dump-sql and --force options, but adds an exception if you try to use them both (which previously, only dumped the SQL but didn't tell you that it was *not* in fact also executing the queries). One additional change is the introduction of a `$name` property, which was the only way that a parent task could allow a child task to override the task's name early enough that the task's overridden name is taken to account when the parent class references it for its help message. --- .../Command/SchemaTool/UpdateCommand.php | 44 ++++++++++++------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php index a163b6f84..ea43f770b 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php @@ -43,25 +43,32 @@ use Symfony\Component\Console\Input\InputArgument, */ class UpdateCommand extends AbstractCommand { + protected $name = 'orm:schema-tool:update'; + /** * @see Console\Command\Command */ protected function configure() { $this - ->setName('orm:schema-tool:update') + ->setName($this->name) ->setDescription( 'Executes (or dumps) the SQL needed to update the database schema to match the current mapping metadata.' ) ->setDefinition(array( - new InputArgument( - 'action', InputArgument::OPTIONAL, - 'Either "execute" (execute the SQL) or "dump-sql" (dump the SQL to the screen). If not specified, nothing is done.' - ), new InputOption( 'complete', null, InputOption::VALUE_NONE, 'If defined, all assets of the database which are not relevant to the current metadata will be dropped.' ), + + new InputOption( + 'dump-sql', null, InputOption::VALUE_NONE, + 'Dumps the generated SQL statements to the screen (does not execute them).' + ), + new InputOption( + 'force', null, InputOption::VALUE_NONE, + 'Causes the generated SQL statements to be physically executed against your database.' + ), )); $fullName = $this->getFullName(); @@ -73,11 +80,11 @@ default entity manager. For example, if you add metadata for a new column to an entity, this command would generate and output the SQL needed to add the new column to the database: -$fullName dump-sql +$fullName --dump-sql Alternatively, you can execute the generated queries: -$fullName execute +$fullName --force Finally, be aware that if the --complete option is passed, this task will drop all database assets (e.g. tables, etc) that are *not* described @@ -100,26 +107,29 @@ EOT return; } - $action = $input->getArgument('action'); - if ('execute' == $action) { + $dumpSql = (true === $input->getOption('dump-sql')); + $force = (true === $input->getOption('force')); + if ($dumpSql && $force) { + throw new \InvalidArgumentException('You can pass either the --dump-sql or the --force option (but not both simultaneously).'); + } + + if ($dumpSql) { + $output->writeln(implode(';' . PHP_EOL, $sqls)); + } else if ($force) { $output->writeln('Updating database schema...'); $schemaTool->updateSchema($metadatas, $saveMode); $output->writeln(sprintf('Database schema updated successfully! "%s" queries were executed', count($sqls))); - } else if ('dump-sql' == $action) { - $output->writeln(implode(';' . PHP_EOL, $sqls)); - } else if (null === $action) { + } else { $output->writeln('ATTENTION: This operation should not be executed in a production environment.'); $output->writeln(' Use the incremental update to detect changes during development and use'); $output->writeln(' the SQL DDL provided to manually update your database in production.'); $output->writeln(''); $output->writeln(sprintf('The Schema-Tool would execute "%s" queries to update the database.', count($sqls))); - $output->writeln('Please run the operation by passing an argument to this command:'); + $output->writeln('Please run the operation by passing one of the following options:'); - $output->writeln(sprintf(' %s execute to execute the command', $this->getFullName())); - $output->writeln(sprintf(' %s dump-sql to dump the SQL statements to the screen', $this->getFullName())); - } else { - throw new \InvalidArgumentException(sprintf('The first argument - if specified - should be either "execute" or "dump-sql" ("%s" given).', $action)); + $output->writeln(sprintf(' %s --force to execute the command', $this->getFullName())); + $output->writeln(sprintf(' %s --dump-sql to dump the SQL statements to the screen', $this->getFullName())); } } } From 86c3744b8c2b2a85d7c33000ab200e7d99adb577 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Sun, 5 Jun 2011 08:03:41 +0200 Subject: [PATCH 015/220] Made orm:convert-mapping command more configurable (allow to change the extension of the generated files for instance) --- .../Tools/Console/Command/ConvertMappingCommand.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php index 8c1a8fea1..1522277fc 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertMappingCommand.php @@ -137,8 +137,7 @@ EOT $toType = strtolower($input->getArgument('to-type')); - $cme = new ClassMetadataExporter(); - $exporter = $cme->getExporter($toType, $destPath); + $exporter = $this->getExporter($toType, $destPath); $exporter->setOverwriteExistingFiles( ($input->getOption('force') !== false) ); if ($toType == 'annotation') { @@ -167,4 +166,11 @@ EOT $output->write('No Metadata Classes to process.' . PHP_EOL); } } + + protected function getExporter($toType, $destPath) + { + $cme = new ClassMetadataExporter(); + + return $cme->getExporter($toType, $destPath); + } } From 875912bffda24fc909bd8d8ecafede992c5ff9d9 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 08:44:38 +0200 Subject: [PATCH 016/220] DDC-733 - Add UnitOfWork::initializeObject() method. --- lib/Doctrine/ORM/Proxy/ProxyFactory.php | 5 ++-- lib/Doctrine/ORM/UnitOfWork.php | 23 ++++++++++++++++++- .../ManyToManyBasicAssociationTest.php | 15 ++++++++++++ .../ORM/Functional/ReferenceProxyTest.php | 15 ++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php index 23186d7aa..52a4791a9 100644 --- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php +++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php @@ -269,7 +269,8 @@ class extends \ implements \Doctrine\ORM\Proxy\Proxy $this->_entityPersister = $entityPersister; $this->_identifier = $identifier; } - private function __load() + /** @private */ + public function __load() { if (!$this->__isInitialized__ && $this->_entityPersister) { $this->__isInitialized__ = true; @@ -279,7 +280,7 @@ class extends \ implements \Doctrine\ORM\Proxy\Proxy unset($this->_entityPersister, $this->_identifier); } } - + public function __sleep() diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 90d3117e3..aa5309a7c 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -2335,7 +2335,28 @@ class UnitOfWork implements PropertyChangedListener { return $this->collectionUpdates; } - + + /** + * Helper method to initialize a lazy loading proxy or persistent collection. + * + * @param object + * @return void + */ + public function initializeObject($obj) + { + if ($obj instanceof Proxy) { + $obj->__load(); + } else if ($obj instanceof PersistentCollection) { + $obj->initialize(); + } + } + + /** + * Helper method to show an object as string. + * + * @param object $obj + * @return string + */ private static function objToStr($obj) { return method_exists($obj, '__toString') ? (string)$obj : get_class($obj).'@'.spl_object_hash($obj); diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index 62ba0c08a..c537b4c5f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -342,4 +342,19 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa $this->assertEquals('Developers_New1', $user->groups[0]->name); $this->assertEquals('Developers_New2', $user->groups[1]->name); } + + /** + * @group DDC-733 + */ + public function testInitializePersistentCollection() + { + $user = $this->addCmsUserGblancoWithGroups(2); + $this->_em->clear(); + + $user = $this->_em->find(get_class($user), $user->id); + + $this->assertFalse($user->groups->isInitialized(), "Pre-condition: lazy collection"); + $this->_em->getUnitOfWork()->initializeObject($user->groups); + $this->assertTrue($user->groups->isInitialized(), "Collection should be initialized after calling UnitOfWork::initializeObject()"); + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php index 3e66e0b12..9fcb90a5e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php @@ -97,4 +97,19 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertTrue($clone->isCloned); $this->assertFalse($entity->isCloned); } + + /** + * @group DDC-733 + */ + public function testInitializeProxy() + { + $id = $this->createProduct(); + + /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ + $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + + $this->assertFalse($entity->__isInitialized__, "Pre-Condition: Object is unitialized proxy."); + $this->_em->getUnitOfWork()->initializeObject($entity); + $this->assertTrue($entity->__isInitialized__, "Should be initialized after called UnitOfWork::initializeObject()"); + } } From acaf08d4b751f1fc9772de5c0e0c5d8371722f17 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 09:59:16 +0200 Subject: [PATCH 017/220] DDC-1193 - Fix bug with cascade remove and proxy classes. --- .../ORM/Persisters/BasicEntityPersister.php | 4 +- lib/Doctrine/ORM/UnitOfWork.php | 20 +++- .../ORM/Functional/Ticket/DDC1193Test.php | 93 +++++++++++++++++++ 3 files changed, 111 insertions(+), 6 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 5ce7080c2..a14528ecd 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -563,7 +563,7 @@ class BasicEntityPersister * @todo Check identity map? loadById method? Try to guess whether $criteria is the id? */ public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0) - { + { $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode); list($params, $types) = $this->expandParameters($criteria); $stmt = $this->_conn->executeQuery($sql, $params, $types); @@ -577,7 +577,7 @@ class BasicEntityPersister } else { $hydrator = $this->_em->newHydrator(Query::HYDRATE_SIMPLEOBJECT); } - $entities = $hydrator->hydrateAll($stmt, $this->_rsm, $hints); + $entities = $hydrator->hydrateAll($stmt, $this->_rsm, $hints); return $entities ? $entities[0] : null; } diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index aa5309a7c..99152a652 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1290,6 +1290,10 @@ class UnitOfWork implements PropertyChangedListener } $visited[$oid] = $entity; // mark visited + + // Cascade first, because scheduleForDelete() removes the entity from the identity map, which + // can cause problems when a lazy proxy has to be initialized for the cascade operation. + $this->cascadeRemove($entity, $visited); $class = $this->em->getClassMetadata(get_class($entity)); $entityState = $this->getEntityState($entity); @@ -1313,7 +1317,6 @@ class UnitOfWork implements PropertyChangedListener throw new UnexpectedValueException("Unexpected entity state: $entityState."); } - $this->cascadeRemove($entity, $visited); } /** @@ -1674,6 +1677,11 @@ class UnitOfWork implements PropertyChangedListener if ( ! $assoc['isCascadePersist']) { continue; } + + if ($entity instanceof Proxy && !$entity->__isInitialized__) { + $entity->__load(); + } + $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity); if (($relatedEntities instanceof Collection || is_array($relatedEntities))) { if ($relatedEntities instanceof PersistentCollection) { @@ -1702,7 +1710,11 @@ class UnitOfWork implements PropertyChangedListener if ( ! $assoc['isCascadeRemove']) { continue; } - //TODO: If $entity instanceof Proxy => Initialize ? + + if ($entity instanceof Proxy) { + $entity->__load(); + } + $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity); if ($relatedEntities instanceof Collection || is_array($relatedEntities)) { // If its a PersistentCollection initialization is intended! No unwrap! @@ -1865,8 +1877,8 @@ class UnitOfWork implements PropertyChangedListener } $id = array($class->identifier[0] => $idHash); } - - if (isset($this->identityMap[$class->rootEntityName][$idHash])) { + + if (isset($this->identityMap[$class->rootEntityName][$idHash])) { $entity = $this->identityMap[$class->rootEntityName][$idHash]; $oid = spl_object_hash($entity); if ($entity instanceof Proxy && ! $entity->__isInitialized__) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php new file mode 100644 index 000000000..3ddf37e70 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1193Test.php @@ -0,0 +1,93 @@ +_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); + $this->_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Company'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Person'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1193Account') + )); + } + + /** + * @group DDC-1193 + */ + public function testIssue() + { + $company = new DDC1193Company(); + $person = new DDC1193Person(); + $account = new DDC1193Account(); + + $person->account = $account; + $person->company = $company; + + $company->member = $person; + + $this->_em->persist($company); + + $this->_em->flush(); + + $companyId = $company->id; + $accountId = $account->id; + $this->_em->clear(); + + $company = $this->_em->find(get_class($company), $companyId); + + $this->assertTrue($this->_em->getUnitOfWork()->isInIdentityMap($company), "Company is in identity map."); + $this->assertFalse($company->member->__isInitialized__, "Pre-Condition"); + $this->assertTrue($this->_em->getUnitOfWork()->isInIdentityMap($company->member), "Member is in identity map."); + + $this->_em->remove($company); + $this->_em->flush(); + + $this->assertEquals(count($this->_em->getRepository(get_class($account))->findAll()), 0); + } +} + +/** @Entity */ +class DDC1193Company { + /** + * @Id @Column(type="integer") + * @GeneratedValue + */ + public $id; + + /** @OneToOne(targetEntity="DDC1193Person", cascade={"persist", "remove"}) */ + public $member; + +} + +/** @Entity */ +class DDC1193Person { + /** + * @Id @Column(type="integer") + * @GeneratedValue + */ + public $id; + + /** + * @OneToOne(targetEntity="DDC1193Account", cascade={"persist", "remove"}) + */ + public $account; +} + +/** @Entity */ +class DDC1193Account { + /** + * @Id @Column(type="integer") + * @GeneratedValue + */ + public $id; + +} + + From bda4165bf82073b13754375c5b3932d4c9878b12 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 10:02:57 +0200 Subject: [PATCH 018/220] DDC-1193 - Fix previous commit. --- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 4 ++-- lib/Doctrine/ORM/UnitOfWork.php | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index a14528ecd..5ce7080c2 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -563,7 +563,7 @@ class BasicEntityPersister * @todo Check identity map? loadById method? Try to guess whether $criteria is the id? */ public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0) - { + { $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode); list($params, $types) = $this->expandParameters($criteria); $stmt = $this->_conn->executeQuery($sql, $params, $types); @@ -577,7 +577,7 @@ class BasicEntityPersister } else { $hydrator = $this->_em->newHydrator(Query::HYDRATE_SIMPLEOBJECT); } - $entities = $hydrator->hydrateAll($stmt, $this->_rsm, $hints); + $entities = $hydrator->hydrateAll($stmt, $this->_rsm, $hints); return $entities ? $entities[0] : null; } diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 99152a652..6d9c756b4 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1678,10 +1678,6 @@ class UnitOfWork implements PropertyChangedListener continue; } - if ($entity instanceof Proxy && !$entity->__isInitialized__) { - $entity->__load(); - } - $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity); if (($relatedEntities instanceof Collection || is_array($relatedEntities))) { if ($relatedEntities instanceof PersistentCollection) { @@ -1711,7 +1707,7 @@ class UnitOfWork implements PropertyChangedListener continue; } - if ($entity instanceof Proxy) { + if ($entity instanceof Proxy && !$entity->__isInitialized__) { $entity->__load(); } From 1038a866a49e6d140d1e1670d8836dd6ceb0f3e0 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 10:48:21 +0200 Subject: [PATCH 019/220] DDC-1194 - Improve error handling for DQL INSTANCE OF --- lib/Doctrine/ORM/Query/QueryException.php | 6 +++++ lib/Doctrine/ORM/Query/SqlWalker.php | 4 ++++ .../ORM/Query/SelectSqlGenerationTest.php | 22 +++++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/lib/Doctrine/ORM/Query/QueryException.php b/lib/Doctrine/ORM/Query/QueryException.php index aafe1e9d7..39dc42505 100644 --- a/lib/Doctrine/ORM/Query/QueryException.php +++ b/lib/Doctrine/ORM/Query/QueryException.php @@ -135,4 +135,10 @@ class QueryException extends \Doctrine\ORM\ORMException "in the query." ); } + + public static function instanceOfUnrelatedClass($className, $rootClass) + { + return new self("Cannot check if a child of '" . $rootClass . "' is instanceof '" . $className . "', " . + "inheritance hierachy exists between these two classes."); + } } \ No newline at end of file diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 611cd0a1d..270131ea2 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -1657,6 +1657,10 @@ class SqlWalker implements TreeWalker $sql .= $this->_conn->quote($class->discriminatorValue); } else { $discrMap = array_flip($class->discriminatorMap); + if (!isset($discrMap[$entityClassName])) { + throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName); + } + $sql .= $this->_conn->quote($discrMap[$entityClassName]); } diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 2d0101e03..6652ad67a 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -383,6 +383,28 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr = 'employee'" ); } + + /** + * @group DDC-1194 + */ + public function testSupportsInstanceOfExpressionsInWherePartPrefixedSlash() + { + $this->assertSqlGeneration( + "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF \Doctrine\Tests\Models\Company\CompanyEmployee", + "SELECT c0_.id AS id0, c0_.name AS name1, c0_.discr AS discr2 FROM company_persons c0_ WHERE c0_.discr = 'employee'" + ); + } + + /** + * @group DDC-1194 + */ + public function testSupportsInstanceOfExpressionsInWherePartWithUnrelatedClass() + { + $this->assertInvalidSqlGeneration( + "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF \Doctrine\Tests\Models\CMS\CmsUser", + "Doctrine\ORM\Query\QueryException" + ); + } public function testSupportsInstanceOfExpressionsInWherePartInDeeperLevel() { From 70d756d59c209b2e447b80aed1584d0921d5b65c Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 12:54:29 +0200 Subject: [PATCH 020/220] DDC-1184 - Improve error handling in AssignedIdGenerator --- lib/Doctrine/ORM/Id/AssignedGenerator.php | 10 +++++++++- lib/Doctrine/ORM/ORMException.php | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/lib/Doctrine/ORM/Id/AssignedGenerator.php index 00aeaaa03..63c6e5418 100644 --- a/lib/Doctrine/ORM/Id/AssignedGenerator.php +++ b/lib/Doctrine/ORM/Id/AssignedGenerator.php @@ -47,9 +47,13 @@ class AssignedGenerator extends AbstractIdGenerator if ($class->isIdentifierComposite) { $idFields = $class->getIdentifierFieldNames(); foreach ($idFields as $idField) { - $value = $class->getReflectionProperty($idField)->getValue($entity); + $value = $class->reflFields[$idField]->getValue($entity); if (isset($value)) { if (is_object($value)) { + if (!$em->getUnitOfWork()->isInIdentityMap($value)) { + throw ORMException::entityMissingForeignAssignedId($entity, $value); + } + // NOTE: Single Columns as associated identifiers only allowed - this constraint it is enforced. $identifier[$idField] = current($em->getUnitOfWork()->getEntityIdentifier($value)); } else { @@ -64,6 +68,10 @@ class AssignedGenerator extends AbstractIdGenerator $value = $class->reflFields[$idField]->getValue($entity); if (isset($value)) { if (is_object($value)) { + if (!$em->getUnitOfWork()->isInIdentityMap($value)) { + throw ORMException::entityMissingForeignAssignedId($entity, $value); + } + // NOTE: Single Columns as associated identifiers only allowed - this constraint it is enforced. $identifier[$idField] = current($em->getUnitOfWork()->getEntityIdentifier($value)); } else { diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php index c84dec41e..0825ae87d 100644 --- a/lib/Doctrine/ORM/ORMException.php +++ b/lib/Doctrine/ORM/ORMException.php @@ -34,10 +34,25 @@ class ORMException extends Exception return new self("It's a requirement to specify a Metadata Driver and pass it ". "to Doctrine\ORM\Configuration::setMetadataDriverImpl()."); } + + public static function entityMissingForeignAssignedId($entity, $relatedEntity) + { + return new self( + "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntityClass) . ", " . + "however this entity has no ientity itself. You have to call EntityManager#persist() on the related entity " . + "and make sure it an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " . + "of Post Insert ID Generation (such as MySQL Auto-Increment or PostgreSQL SERIAL) this means you have to call " . + "EntityManager#flush() between both persist operations." + ); + } public static function entityMissingAssignedId($entity) { - return new self("Entity of type " . get_class($entity) . " is missing an assigned ID."); + return new self("Entity of type " . get_class($entity) . " is missing an assigned ID. " . + "The identifier generation strategy for this entity requires the ID field to be populated before ". + "EntityManager#persist() is called. If you want automatically generated identifiers instead " . + "you need to adjust the metadata mapping accordingly." + ); } public static function unrecognizedField($field) From ddb647f39fb2dca09bd9a299bc2357ac5a730c79 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 13:34:07 +0200 Subject: [PATCH 021/220] DDC-1173 - Fix bug when calling UnitOfWork::clearEntityChangeSet() in listener --- lib/Doctrine/ORM/UnitOfWork.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 6d9c756b4..8a3d582f7 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -759,7 +759,9 @@ class UnitOfWork implements PropertyChangedListener ); } - $persister->update($entity); + if ($this->entityChangeSets[$oid]) { + $persister->update($entity); + } unset($this->entityUpdates[$oid]); if ($hasPostUpdateLifecycleCallbacks) { @@ -2263,7 +2265,7 @@ class UnitOfWork implements PropertyChangedListener */ public function clearEntityChangeSet($oid) { - unset($this->entityChangeSets[$oid]); + $this->entityChangeSets[$oid] = array(); } /* PropertyChangedListener implementation */ From d3ab9b51fad3b99b13c257d43a513a1c02b62b95 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 13:57:44 +0200 Subject: [PATCH 022/220] DDC-1181 - Add test that verifies cascade remove works for entities with foreign identifiers --- .../ORM/Functional/Ticket/DDC1181Test.php | 101 ++++++++++++++++++ 1 file changed, 101 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php new file mode 100644 index 000000000..225353034 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php @@ -0,0 +1,101 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Hotel'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Booking'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1181Room'), + )); + } + + /** + * @group DDC-1181 + */ + public function testIssue() + { + $hotel = new DDC1181Hotel(); + $room1 = new DDC1181Room(); + $room2 = new DDC1181Room(); + + $this->_em->persist($hotel); + $this->_em->persist($room1); + $this->_em->persist($room2); + $this->_em->flush(); + + $booking1 = new DDC1181Booking; + $booking1->hotel = $hotel; + $booking1->room = $room1; + $booking2 = new DDC1181Booking; + $booking2->hotel = $hotel; + $booking2->room = $room2; + $hotel->bookings[] = $booking1; + $hotel->bookings[] = $booking2; + + $this->_em->persist($booking1); + $this->_em->persist($booking2); + $this->_em->flush(); + + $this->_em->remove($hotel); + $this->_em->flush(); + } +} + +/** + * @Entity + */ +class DDC1181Hotel +{ + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; + + /** + * @oneToMany(targetEntity="DDC1181Booking", mappedBy="hotel", cascade={"remove"}) + * @var Booking[] + */ + public $bookings; + +} + +/** + * @Entity + */ +class DDC1181Booking +{ + /** + * @var Hotel + * + * @Id + * @ManyToOne(targetEntity="DDC1181Hotel", inversedBy="bookings") + * @JoinColumns({ + * @JoinColumn(name="hotel_id", referencedColumnName="id") + * }) + */ + public $hotel; + /** + * @var Room + * + * @Id + * @ManyToOne(targetEntity="DDC1181Room") + * @JoinColumns({ + * @JoinColumn(name="room_id", referencedColumnName="id") + * }) + */ + public $room; +} + +/** + * @Entity + */ +class DDC1181Room +{ + /** @Id @Column(type="integer") @GeneratedValue */ + public $id; +} \ No newline at end of file From d17d0f5452b527ed8027c339f2d99214032272b0 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 14:49:54 +0200 Subject: [PATCH 023/220] DDC-1192 - Fix notice in XmlDriver, removed unnecessary code. --- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index a42d449e6..b41710b4b 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -356,9 +356,6 @@ class XmlDriver extends AbstractFileDriver $joinColumns[] = $this->_getJoinColumnMapping($manyToOneElement->{'join-column'}); } else if (isset($manyToOneElement->{'join-columns'})) { foreach ($manyToOneElement->{'join-columns'}->{'join-column'} as $joinColumnElement) { - if (!isset($joinColumnElement['name'])) { - $joinColumnElement['name'] = $name; - } $joinColumns[] = $this->_getJoinColumnMapping($joinColumnElement); } } From 22826ac10db1eaf1422c306edd11898d08cb9085 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 15:00:49 +0200 Subject: [PATCH 024/220] DDC-1156 - Do not throw exception for mapped superclass in middle of inheritance hierachy anymore. --- .../ORM/Mapping/ClassMetadataFactory.php | 3 +- .../ORM/Mapping/AnnotationDriverTest.php | 46 +++++++++++++++++++ 2 files changed, 48 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index cd7a6da68..506f99763 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -325,7 +325,8 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface if (!$class->discriminatorColumn) { throw MappingException::missingDiscriminatorColumn($class->name); } - } else if ($class->isMappedSuperclass && (count($class->discriminatorMap) || $class->discriminatorColumn)) { + } else if ($class->isMappedSuperclass && $class->name == $class->rootEntityName && (count($class->discriminatorMap) || $class->discriminatorColumn)) { + // second condition is necessary for mapped superclasses in the middle of an inheritance hierachy throw MappingException::noInheritanceOnMappedSuperClass($class->name); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index be8a9bc43..e946a2628 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -184,6 +184,21 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\AnnotationParent'); $this->assertEquals(array("postLoad" => array("postLoad"), "preUpdate" => array("preUpdate")), $cm->lifecycleCallbacks); } + + /** + * @group DDC-1156 + */ + public function testMappedSuperclassInMiddleOfInheritanceHierachy() + { + $annotationDriver = $this->_loadDriver(); + + $em = $this->_getTestEntityManager(); + $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); + $factory = new \Doctrine\ORM\Mapping\ClassMetadataFactory(); + $factory->setEntityManager($em); + + $cm = $factory->getMetadataFor('Doctrine\Tests\ORM\Mapping\ChildEntity'); + } } /** @@ -264,4 +279,35 @@ class AnnotationParent class AnnotationChild extends AnnotationParent { +} + +/** + * @Entity + * @InheritanceType("SINGLE_TABLE") + * @DiscriminatorMap({"s"="SuperEntity", "c"="ChildEntity"}) + */ +class SuperEntity +{ + /** @Id @Column(type="string") */ + private $id; +} + +/** + * @MappedSuperclass + */ +class MiddleMappedSuperclass extends SuperEntity +{ + /** @Column(type="string") */ + private $name; +} + +/** + * @Entity + */ +class ChildEntity extends MiddleMappedSuperclass +{ + /** + * @Column(type="string") + */ + private $text; } \ No newline at end of file From 4371e8fab0f56cff469e57f6bbf44ef48dce5778 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 16:20:41 +0200 Subject: [PATCH 025/220] DDC-1163 - Fix nasty bug with inheritance in UnitOfWork::executeUpdates() and executeRemovals() --- lib/Doctrine/ORM/UnitOfWork.php | 4 +- .../ORM/Functional/ReferenceProxyTest.php | 18 ++ .../ORM/Functional/Ticket/DDC1163Test.php | 215 ++++++++++++++++++ 3 files changed, 235 insertions(+), 2 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 8a3d582f7..e53f38c52 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -746,7 +746,7 @@ class UnitOfWork implements PropertyChangedListener $hasPostUpdateListeners = $this->evm->hasListeners(Events::postUpdate); foreach ($this->entityUpdates as $oid => $entity) { - if (get_class($entity) == $className || $entity instanceof Proxy && $entity instanceof $className) { + if (get_class($entity) == $className || $entity instanceof Proxy && get_parent_class($entity) == $className) { if ($hasPreUpdateLifecycleCallbacks) { $class->invokeLifecycleCallbacks(Events::preUpdate, $entity); @@ -788,7 +788,7 @@ class UnitOfWork implements PropertyChangedListener $hasListeners = $this->evm->hasListeners(Events::postRemove); foreach ($this->entityDeletions as $oid => $entity) { - if (get_class($entity) == $className || $entity instanceof Proxy && $entity instanceof $className) { + if (get_class($entity) == $className || $entity instanceof Proxy && get_parent_class($entity) == $className) { $persister->delete($entity); unset( $this->entityDeletions[$oid], diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php index 9fcb90a5e..3b6e1f546 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php @@ -112,4 +112,22 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->getUnitOfWork()->initializeObject($entity); $this->assertTrue($entity->__isInitialized__, "Should be initialized after called UnitOfWork::initializeObject()"); } + + /** + * @group DDC-1163 + */ + public function testInitializeChangeAndFlushProxy() + { + $id = $this->createProduct(); + + /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ + $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + $entity->setName('Doctrine 2 Cookbook'); + + $this->_em->flush(); + $this->_em->clear(); + + $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + $this->assertEquals('Doctrine 2 Cookbook', $entity->getName()); + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php new file mode 100644 index 000000000..7142ff211 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1163Test.php @@ -0,0 +1,215 @@ +_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); + $this->_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Product'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163SpecialProduct'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163ProxyHolder'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1163Tag'), + )); + } + + public function testIssue() + { + $this->createSpecialProductAndProxyHolderReferencingIt(); + $this->_em->clear(); + + $this->createProxyForSpecialProduct(); + + $this->setPropertyAndAssignTagToSpecialProduct(); + + // fails + $this->_em->flush(); + } + + private function createSpecialProductAndProxyHolderReferencingIt() + { + $specialProduct = new DDC1163SpecialProduct(); + $this->_em->persist($specialProduct); + + $proxyHolder = new DDC1163ProxyHolder(); + $this->_em->persist($proxyHolder); + + $proxyHolder->setSpecialProduct($specialProduct); + + $this->_em->flush(); + + $this->productId = $specialProduct->getId(); + $this->proxyHolderId = $proxyHolder->getId(); + } + + /** + * We want Doctrine to instantiate a lazy-load proxy for the previously created + * 'SpecialProduct' and register it. + * + * When Doctrine loads the 'ProxyHolder', it will do just that because the 'ProxyHolder' + * references the 'SpecialProduct'. + */ + private function createProxyForSpecialProduct() + { + /* @var $proxyHolder ProxyHolder */ + $proxyHolder = $this->_em->find(__NAMESPACE__ . '\\DDC1163ProxyHolder', $this->proxyHolderId); + + $this->assertInstanceOf(__NAMESPACE__.'\\DDC1163SpecialProduct', $proxyHolder->getSpecialProduct()); + } + + private function setPropertyAndAssignTagToSpecialProduct() + { + /* @var $specialProduct SpecialProduct */ + $specialProduct = $this->_em->find(__NAMESPACE__ . '\\DDC1163SpecialProduct', $this->productId); + + $this->assertInstanceOf(__NAMESPACE__.'\\DDC1163SpecialProduct', $specialProduct); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $specialProduct); + + $specialProduct->setSubclassProperty('foobar'); + + // this screams violation of law of demeter ;) + $this->assertEquals( + __NAMESPACE__.'\\DDC1163SpecialProduct', + $this->_em->getUnitOfWork()->getEntityPersister(get_class($specialProduct))->getClassMetadata()->name + ); + + $tag = new DDC1163Tag('Foo'); + $this->_em->persist($tag); + $tag->setProduct($specialProduct); + } +} + +/** + * @Entity + */ +class DDC1163ProxyHolder +{ + + /** + * @var int + * @Column(name="id", type="integer") + * @Id + * @GeneratedValue(strategy="AUTO") + */ + private $id; + /** + * @var SpecialProduct + * @OneToOne(targetEntity="DDC1163SpecialProduct") + */ + private $specialProduct; + + public function getId() + { + return $this->id; + } + + public function setSpecialProduct(DDC1163SpecialProduct $specialProduct) + { + $this->specialProduct = $specialProduct; + } + + public function getSpecialProduct() + { + return $this->specialProduct; + } + +} + +/** + * @Entity + * @InheritanceType("JOINED") + * @DiscriminatorColumn(name="type", type="string") + * @DiscriminatorMap({"special" = "DDC1163SpecialProduct"}) + */ +abstract class DDC1163Product +{ + + /** + * @var int + * @Column(name="id", type="integer") + * @Id + * @GeneratedValue(strategy="AUTO") + */ + protected $id; + + public function getId() + { + return $this->id; + } + +} + +/** + * @Entity + */ +class DDC1163SpecialProduct extends DDC1163Product +{ + + /** + * @var string + * @Column(name="subclass_property", type="string", nullable=true) + */ + private $subclassProperty; + + /** + * @param string $value + */ + public function setSubclassProperty($value) + { + $this->subclassProperty = $value; + } + +} + +/** + * @Entity + */ +class DDC1163Tag +{ + + /** + * @var int + * @Column(name="id", type="integer") + * @Id + * @GeneratedValue(strategy="AUTO") + */ + private $id; + /** + * @var string + * @Column(name="name", type="string") + */ + private $name; + /** + * @var Product + * @ManyToOne(targetEntity="DDC1163Product", inversedBy="tags") + * @JoinColumns({ + * @JoinColumn(name="product_id", referencedColumnName="id") + * }) + */ + private $product; + + /** + * @param string $name + */ + public function __construct($name) + { + $this->name = $name; + } + + /** + * @param Product $product + */ + public function setProduct(DDC1163Product $product) + { + $this->product = $product; + } + +} \ No newline at end of file From a4cbb23fc8612587d1886e4c3e7d62d72457a297 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 5 Jun 2011 17:21:37 +0200 Subject: [PATCH 026/220] Slight adjustment to build.xml --- build.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build.xml b/build.xml index 320b593ed..e4c138ef6 100644 --- a/build.xml +++ b/build.xml @@ -232,6 +232,7 @@ + bin Doctrine/Common/ Doctrine/DBAL/ Doctrine/ORM/ @@ -254,6 +255,7 @@ + bin Doctrine/Common/ Doctrine/DBAL/ Doctrine/ORM/ From 3cdb4e007d6e15c011bb00ced8606d1c9303ee29 Mon Sep 17 00:00:00 2001 From: NicoB Date: Tue, 7 Jun 2011 18:55:52 +0700 Subject: [PATCH 027/220] joinTable can be undefined because ManyToMAny generation is bidirectional with inverse sides --- lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index d5c1efd8a..669e76ce4 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -181,7 +181,7 @@ class YamlExporter extends AbstractExporter $manyToManyMappingArray = array( 'mappedBy' => $associationMapping['mappedBy'], 'inversedBy' => $associationMapping['inversedBy'], - 'joinTable' => $associationMapping['joinTable'], + 'joinTable' => isset($associationMapping['joinTable']) ? $associationMapping['joinTable'] : null, 'orderBy' => isset($associationMapping['orderBy']) ? $associationMapping['orderBy'] : null ); From 1f6b49d2364576d36c515c785b9c7a0e4b8c3bc8 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Thu, 9 Jun 2011 15:42:40 -0300 Subject: [PATCH 028/220] Added getRootEntities to QueryBuilder. --- lib/Doctrine/ORM/QueryBuilder.php | 37 ++++++++++++++++++- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 9 +++++ 2 files changed, 44 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index 10eaebbe2..b67a550d8 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -240,7 +240,7 @@ class QueryBuilder } /** - * Gets the root alias of the query. This is the first entity alias involved + * Gets the root aliases of the query. This is the entity aliases involved * in the construction of the query. * * @@ -251,7 +251,7 @@ class QueryBuilder * $qb->getRootAliases(); // array('u') * * - * @return string $rootAlias + * @return array $rootAliases */ public function getRootAliases() { @@ -272,6 +272,39 @@ class QueryBuilder return $aliases; } + /** + * Gets the root entities of the query. This is the entity aliases involved + * in the construction of the query. + * + * + * $qb = $em->createQueryBuilder() + * ->select('u') + * ->from('User', 'u'); + * + * $qb->getRootEntities(); // array('User') + * + * + * @return array $rootEntities + */ + public function getRootEntities() + { + $entities = array(); + + foreach ($this->_dqlParts['from'] as &$fromClause) { + if (is_string($fromClause)) { + $spacePos = strrpos($fromClause, ' '); + $from = substr($fromClause, 0, $spacePos); + $alias = substr($fromClause, $spacePos + 1); + + $fromClause = new Query\Expr\From($from, $alias); + } + + $entities[] = $fromClause->getFrom(); + } + + return $entities; + } + /** * Sets a query parameter for the query being constructed. * diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index cf570f52c..2cde45223 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -652,6 +652,15 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals(array('u'), $qb->getRootAliases()); } + public function testGetRootEntities() + { + $qb = $this->_em->createQueryBuilder() + ->select('u') + ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u'); + + $this->assertEquals(array('Doctrine\Tests\Models\CMS\CmsUser'), $qb->getRootEntities()); + } + public function testGetSeveralRootAliases() { $qb = $this->_em->createQueryBuilder() From c7eaf77d156ae035ab51ea006891ec19f065c5dd Mon Sep 17 00:00:00 2001 From: Bertrand Zuchuat Date: Sun, 12 Jun 2011 14:46:02 +0200 Subject: [PATCH 029/220] Renamed function getFullName with getName to match with last change on Symfony Console --- .../ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php index ea43f770b..b96a5a673 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php @@ -71,7 +71,7 @@ class UpdateCommand extends AbstractCommand ), )); - $fullName = $this->getFullName(); + $fullName = $this->getName(); $this->setHelp(<<$fullName command generates the SQL needed to synchronize the database schema with the current mapping metadata of the From 05bf8477a37d4843e615cc492d08051a18bc26db Mon Sep 17 00:00:00 2001 From: Peter Kruithof Date: Tue, 14 Jun 2011 02:36:49 -0700 Subject: [PATCH 030/220] The `columns` attribute of the `index` type was `xs:NMTOKENS`, therefore not allowing a comma, which is needed when multiple columns need to be specified. (I've checked the XmlDriver code for this) It should be the same as the `columns` attribute of the `unique-constraints` type, namely `xs:string`. --- doctrine-mapping.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index 126f30290..c76ae49b0 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -212,7 +212,7 @@ - + From b37c8f6a230c770999841816b4cefb0219a02c73 Mon Sep 17 00:00:00 2001 From: Fabien Potencier Date: Tue, 14 Jun 2011 17:01:33 +0200 Subject: [PATCH 031/220] Update Symfony2 vendors --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 2 +- lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php | 4 ++-- lib/vendor/Symfony/Component/Console | 2 +- lib/vendor/Symfony/Component/Yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 97617a64d..47eb07c45 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -506,6 +506,6 @@ class YamlDriver extends AbstractFileDriver */ protected function _loadMappingFile($file) { - return \Symfony\Component\Yaml\Yaml::load($file); + return \Symfony\Component\Yaml\Yaml::parse($file); } } diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php index ecd04ce6d..1a5600cdb 100644 --- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php +++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php @@ -70,10 +70,10 @@ class ConvertDoctrine1Schema if (is_dir($path)) { $files = glob($path . '/*.yml'); foreach ($files as $file) { - $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::load($file)); + $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::parse($file)); } } else { - $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::load($path)); + $schema = array_merge($schema, (array) \Symfony\Component\Yaml\Yaml::parse($path)); } } diff --git a/lib/vendor/Symfony/Component/Console b/lib/vendor/Symfony/Component/Console index 4200b4bc9..3762cec59 160000 --- a/lib/vendor/Symfony/Component/Console +++ b/lib/vendor/Symfony/Component/Console @@ -1 +1 @@ -Subproject commit 4200b4bc95ae3c1b03d943cd875277e35a17898a +Subproject commit 3762cec59aaecf1e55ed92b2b0b3e7f2d602d09a diff --git a/lib/vendor/Symfony/Component/Yaml b/lib/vendor/Symfony/Component/Yaml index 3d864452c..c3e1d03ef 160000 --- a/lib/vendor/Symfony/Component/Yaml +++ b/lib/vendor/Symfony/Component/Yaml @@ -1 +1 @@ -Subproject commit 3d864452ca73ae5409f1434b65f0c7204a50e061 +Subproject commit c3e1d03effe339de6940f69a4d0278ea34665702 From 3be621834131e7d1fb9a917aab871c01655861e7 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Wed, 15 Jun 2011 18:31:59 +0200 Subject: [PATCH 032/220] DDC-1208 - Allow namespace separator in --- doctrine-mapping.xsd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index c76ae49b0..bb4a1cc39 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -229,7 +229,7 @@ - + From 5ff44b5ec75f6d716ec3dc49f5a79082d3f700da Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Wed, 15 Jun 2011 22:27:24 +0200 Subject: [PATCH 033/220] DDC-1203, DDC-1204 - Fix problems with mapped superclasses in midth of inheritance hierachy and entities not mapped in discriminator map. --- .../ORM/Mapping/ClassMetadataFactory.php | 31 +++---- lib/Doctrine/ORM/Mapping/MappingException.php | 8 ++ .../Mapping/BasicInheritanceMappingTest.php | 87 +++++++++++++++++++ 3 files changed, 111 insertions(+), 15 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 506f99763..58f1cab8d 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -261,19 +261,15 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface $class = $this->newClassMetadataInstance($className); if ($parent) { - if (!$parent->isMappedSuperclass) { - $class->setInheritanceType($parent->inheritanceType); - $class->setDiscriminatorColumn($parent->discriminatorColumn); - } + $class->setInheritanceType($parent->inheritanceType); + $class->setDiscriminatorColumn($parent->discriminatorColumn); $class->setIdGeneratorType($parent->generatorType); $this->addInheritedFields($class, $parent); $this->addInheritedRelations($class, $parent); $class->setIdentifier($parent->identifier); $class->setVersioned($parent->isVersioned); $class->setVersionField($parent->versionField); - if (!$parent->isMappedSuperclass) { - $class->setDiscriminatorMap($parent->discriminatorMap); - } + $class->setDiscriminatorMap($parent->discriminatorMap); $class->setLifecycleCallbacks($parent->lifecycleCallbacks); $class->setChangeTrackingPolicy($parent->changeTrackingPolicy); } @@ -285,7 +281,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface throw MappingException::reflectionFailure($className, $e); } - if ($parent && ! $parent->isMappedSuperclass) { + if ($parent) { if ($parent->isIdGeneratorSequence()) { $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition); } else if ($parent->isIdGeneratorTable()) { @@ -318,18 +314,23 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface } // verify inheritance - if (!$parent && !$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) { - if (count($class->discriminatorMap) == 0) { - throw MappingException::missingDiscriminatorMap($class->name); - } - if (!$class->discriminatorColumn) { - throw MappingException::missingDiscriminatorColumn($class->name); + if (!$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) { + if (!$parent) { + if (count($class->discriminatorMap) == 0) { + throw MappingException::missingDiscriminatorMap($class->name); + } + if (!$class->discriminatorColumn) { + throw MappingException::missingDiscriminatorColumn($class->name); + } + } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) { + // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. + throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); } } else if ($class->isMappedSuperclass && $class->name == $class->rootEntityName && (count($class->discriminatorMap) || $class->discriminatorColumn)) { // second condition is necessary for mapped superclasses in the middle of an inheritance hierachy throw MappingException::noInheritanceOnMappedSuperClass($class->name); } - + $this->loadedMetadata[$className] = $class; $parent = $class; diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php index 5652cf04b..9c65ad928 100644 --- a/lib/Doctrine/ORM/Mapping/MappingException.php +++ b/lib/Doctrine/ORM/Mapping/MappingException.php @@ -284,4 +284,12 @@ class MappingException extends \Doctrine\ORM\ORMException { return new self("Its not supported to define inheritance information on a mapped superclass '" . $className . "'."); } + + public static function mappedClassNotPartOfDiscriminatorMap($className, $rootClassName) + { + return new self( + "Entity '" . $className . "' has to be part of the descriminator map of '" . $rootClassName . "' " . + "to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract." + ); + } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index 671028852..9985bc241 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\ORM\Mapping\ClassMetadataFactory; +use Doctrine\ORM\Tools\SchemaTool; require_once __DIR__ . '/../../TestInit.php'; @@ -66,6 +67,28 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertTrue(isset($class2->reflFields['mapped2'])); $this->assertTrue(isset($class2->reflFields['mappedRelated1'])); } + + /** + * @group DDC-1203 + */ + public function testUnmappedSuperclassInHierachy() + { + $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyD'); + + $this->assertTrue(isset($class->fieldMappings['id'])); + $this->assertTrue(isset($class->fieldMappings['a'])); + $this->assertTrue(isset($class->fieldMappings['d'])); + } + + /** + * @group DDC-1204 + */ + public function testUnmappedEntityInHierachy() + { + $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract."); + + $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE'); + } } class TransientBaseClass { @@ -103,3 +126,67 @@ class EntitySubClass2 extends MappedSuperclassBase { /** @Column(type="string") */ private $name; } + +/** + * @Entity + * @InheritanceType("SINGLE_TABLE") + * @DiscriminatorColumn(name="type", type="string", length=20) + * @DiscriminatorMap({ + * "c" = "HierachyC", + * "d" = "HierachyD", + * "e" = "HierachyE" + * }) + */ +abstract class HierachyBase +{ + /** + * @Column(type="integer") @Id @GeneratedValue + * @var int + */ + public $id; +} + +/** + * @MappedSuperclass + */ +abstract class HierachyASuperclass extends HierachyBase +{ + /** @Column(type="string") */ + public $a; +} + +/** + * @Entity + */ +abstract class HierachyBEntity extends HierachyBase +{ + /** @Column(type="string") */ + public $b; +} + +/** + * @Entity + */ +class HierachyC extends HierachyBase +{ + /** @Column(type="string") */ + public $c; +} + +/** + * @Entity + */ +class HierachyD extends HierachyASuperclass +{ + /** @Column(type="string") */ + public $d; +} + +/** + * @Entity + */ +class HierachyE extends HierachyBEntity +{ + /** @Column(type="string") */ + public $e; +} \ No newline at end of file From da2d83fc7d8170cdaffcb70373f20ddd8a1bc7b0 Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Wed, 15 Jun 2011 17:15:46 -0400 Subject: [PATCH 034/220] DDC-1209 tests --- lib/Doctrine/ORM/ORMException.php | 2 +- .../ORM/Functional/Ticket/DDC1209Test.php | 125 ++++++++++++++++++ 2 files changed, 126 insertions(+), 1 deletion(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php index 0825ae87d..75b91d2e4 100644 --- a/lib/Doctrine/ORM/ORMException.php +++ b/lib/Doctrine/ORM/ORMException.php @@ -38,7 +38,7 @@ class ORMException extends Exception public static function entityMissingForeignAssignedId($entity, $relatedEntity) { return new self( - "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntityClass) . ", " . + "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntity) . ", " . "however this entity has no ientity itself. You have to call EntityManager#persist() on the related entity " . "and make sure it an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " . "of Post Insert ID Generation (such as MySQL Auto-Increment or PostgreSQL SERIAL) this means you have to call " . diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php new file mode 100644 index 000000000..8ff5e52a5 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -0,0 +1,125 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_1'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_2'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1209_3') + )); + } catch(\Exception $e) { + } + } + + /** + * @group DDC-1209 + */ + public function testIdentifierCanHaveCustomType() + { + $this->_em->persist(new DDC1209_3()); + $this->_em->flush(); + } + + /** + * @group DDC-1209 + */ + public function testCompositeIdentifierCanHaveCustomType() + { + $future1 = new DDC1209_1(); + $this->_em->persist($future1); + + $this->_em->flush(); + + $future2 = new DDC1209_2($future1); + $this->_em->persist($future2); + + $this->_em->flush(); + } +} + +/** + * @Entity + */ +class DDC1209_1 +{ + /** + * @Id @GeneratedValue @Column(type="integer") + */ + private $id; + + public function getId() + { + return $this->id; + } +} + +/** + * @Entity + */ +class DDC1209_2 +{ + /** + * @Id + * @ManyToOne(targetEntity="DDC1209_1") + * @JoinColumn(referencedColumnName="id", nullable=false) + */ + private $future1; + /** + * @Id + * @Column(type="datetime", nullable=false) + */ + private $starting_datetime; + /** + * @Id + * @Column(type="datetime", nullable=false) + */ + private $during_datetime; + /** + * @Id + * @Column(type="datetime", nullable=false) + */ + private $ending_datetime; + + public function __construct(DDC1209_1 $future1) + { + $this->future1 = $future1; + $this->starting_datetime = new \DateTime(); + $this->during_datetime = new \DateTime(); + $this->ending_datetime = new \DateTime(); + } +} + +/** + * @Entity + */ +class DDC1209_3 +{ + /** + * @Id + * @Column(type="datetime") + */ + private $date; + + public function __construct() + { + $this->date = new DateTime2(); + } +} + +class DateTime2 extends \DateTime +{ + public function __toString() + { + return $this->form('Y'); + } +} \ No newline at end of file From d1106a730bf541c2e8fa819e8ac1c2431c342fd1 Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Thu, 16 Jun 2011 08:55:09 -0400 Subject: [PATCH 035/220] Made DDC-1209 test pass --- lib/Doctrine/ORM/Id/AssignedGenerator.php | 4 ++-- .../Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Doctrine/ORM/Id/AssignedGenerator.php b/lib/Doctrine/ORM/Id/AssignedGenerator.php index 63c6e5418..05c3790af 100644 --- a/lib/Doctrine/ORM/Id/AssignedGenerator.php +++ b/lib/Doctrine/ORM/Id/AssignedGenerator.php @@ -49,7 +49,7 @@ class AssignedGenerator extends AbstractIdGenerator foreach ($idFields as $idField) { $value = $class->reflFields[$idField]->getValue($entity); if (isset($value)) { - if (is_object($value)) { + if (isset($class->associationMappings[$idField])) { if (!$em->getUnitOfWork()->isInIdentityMap($value)) { throw ORMException::entityMissingForeignAssignedId($entity, $value); } @@ -67,7 +67,7 @@ class AssignedGenerator extends AbstractIdGenerator $idField = $class->identifier[0]; $value = $class->reflFields[$idField]->getValue($entity); if (isset($value)) { - if (is_object($value)) { + if (isset($class->associationMappings[$idField])) { if (!$em->getUnitOfWork()->isInIdentityMap($value)) { throw ORMException::entityMissingForeignAssignedId($entity, $value); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php index 8ff5e52a5..472978bc2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -93,9 +93,9 @@ class DDC1209_2 public function __construct(DDC1209_1 $future1) { $this->future1 = $future1; - $this->starting_datetime = new \DateTime(); - $this->during_datetime = new \DateTime(); - $this->ending_datetime = new \DateTime(); + $this->starting_datetime = new DateTime2(); + $this->during_datetime = new DateTime2(); + $this->ending_datetime = new DateTime2(); } } @@ -120,6 +120,6 @@ class DateTime2 extends \DateTime { public function __toString() { - return $this->form('Y'); + return $this->format('Y'); } } \ No newline at end of file From 42c5382a037c95960744341030313c7472f6c15b Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 16 Jun 2011 22:34:04 +0200 Subject: [PATCH 036/220] DDC-1172 - Handle sequence dropping in SchemaTool. --- lib/Doctrine/ORM/Tools/SchemaTool.php | 18 ++++++++++++++++ .../SchemaTool/PostgreSqlSchemaToolTest.php | 21 +++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 321076996..d38f5d159 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -619,6 +619,24 @@ class SchemaTool } } } + + if ($this->_platform->supportsSequences()) { + foreach ($schema->getSequences() AS $sequence) { + $visitor->acceptSequence($sequence); + } + foreach ($schema->getTables() AS $table) { + /* @var $sequence Table */ + if ($table->hasPrimaryKey()) { + $columns = $table->getPrimaryKey()->getColumns(); + if (count($columns) == 1) { + $checkSequence = $table->getName() . "_" . $columns[0] . "_seq"; + if ($fullSchema->hasSequence($checkSequence)) { + $visitor->acceptSequence($fullSchema->getSequence($checkSequence)); + } + } + } + } + } return $visitor->getQueries(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php index 681485251..b93753ce0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/PostgreSqlSchemaToolTest.php @@ -80,4 +80,25 @@ class PostgreSqlSchemaToolTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals("CREATE TABLE boolean_model (id INT NOT NULL, booleanField BOOLEAN NOT NULL, PRIMARY KEY(id))", $sql[0]); $this->assertEquals("CREATE SEQUENCE boolean_model_id_seq INCREMENT BY 1 MINVALUE 1 START 1", $sql[1]); } + + public function testGetDropSchemaSql() + { + $classes = array( + $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress'), + $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'), + $this->_em->getClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber'), + ); + + $tool = new SchemaTool($this->_em); + $sql = $tool->getDropSchemaSQL($classes); + + $this->assertEquals(13, count($sql)); + $dropSequenceSQLs = 0; + foreach ($sql AS $stmt) { + if (strpos($stmt, "DROP SEQUENCE") === 0) { + $dropSequenceSQLs++; + } + } + $this->assertEquals(4, $dropSequenceSQLs, "Expect 4 sequences to be dropped."); + } } From 0cd0ae49a1c98ff0d606189cf95ebf6b91c6f419 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 16 Jun 2011 23:00:59 +0200 Subject: [PATCH 037/220] Fix regression introduced with DDC-1203,DDC-1204 patch --- .../ORM/Mapping/ClassMetadataFactory.php | 2 +- .../Mapping/BasicInheritanceMappingTest.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 58f1cab8d..c036ba2f6 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -281,7 +281,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface throw MappingException::reflectionFailure($className, $e); } - if ($parent) { + if ($parent && ! $parent->isMappedSuperclass) { if ($parent->isIdGeneratorSequence()) { $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition); } else if ($parent->isIdGeneratorTable()) { diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index 9985bc241..a454141d3 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -89,6 +89,17 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE'); } + + /** + * @group DDC-1204 + * @group DDC-1203 + */ + public function testMappedSuperclassWithId() + { + $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\SuperclassEntity'); + + $this->assertTrue(isset($class->fieldMappings['id'])); + } } class TransientBaseClass { @@ -189,4 +200,24 @@ class HierachyE extends HierachyBEntity { /** @Column(type="string") */ public $e; +} + +/** + * @Entity + */ +class SuperclassEntity extends SuperclassBase +{ + +} + +/** + * @MappedSuperclass + */ +abstract class SuperclassBase +{ + /** + * @Column(type="integer") @Id @GeneratedValue + * @var int + */ + public $id; } \ No newline at end of file From 1fed340793cfb744c89517eb32f3855c72736187 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Thu, 16 Jun 2011 19:54:50 -0300 Subject: [PATCH 038/220] Optimized AnnotationDriver to filter found files during getAllClassnames(). --- .../ORM/Mapping/Driver/AnnotationDriver.php | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index cbf06fe7b..e30b9bf01 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -495,18 +495,20 @@ class AnnotationDriver implements Driver throw MappingException::fileMappingDriversRequireConfiguredDirectoryPath($path); } - $iterator = new \RecursiveIteratorIterator( - new \RecursiveDirectoryIterator($path), - \RecursiveIteratorIterator::LEAVES_ONLY + $iterator = new \RegexIterator( + new \RecursiveIteratorIterator( + new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS), + \RecursiveIteratorIterator::LEAVES_ONLY + ), + '/^.+\\' . $this->_fileExtension . '$/i', + \RecursiveRegexIterator::GET_MATCH ); - + foreach ($iterator as $file) { - if (($fileName = $file->getBasename($this->_fileExtension)) == $file->getBasename()) { - continue; - } - - $sourceFile = realpath($file->getPathName()); + $sourceFile = realpath($file[0]); + require_once $sourceFile; + $includedFiles[] = $sourceFile; } } From 626e467a1746d99d44ca4fe2dc6e179631dff16f Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Fri, 17 Jun 2011 16:15:19 -0300 Subject: [PATCH 039/220] Implemented COALESCE and NULLIF support in DQL. --- .../ORM/Query/AST/CoalesceExpression.php | 47 ++++++++++++++++++ .../ORM/Query/AST/NullIfExpression.php | 49 +++++++++++++++++++ 2 files changed, 96 insertions(+) create mode 100644 lib/Doctrine/ORM/Query/AST/CoalesceExpression.php create mode 100644 lib/Doctrine/ORM/Query/AST/NullIfExpression.php diff --git a/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php b/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php new file mode 100644 index 000000000..338d49fce --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/CoalesceExpression.php @@ -0,0 +1,47 @@ +. + */ + +namespace Doctrine\ORM\Query\AST; + +/** + * CoalesceExpression ::= "COALESCE" "(" ScalarExpression {"," ScalarExpression}* ")" + * + * @since 2.1 + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @link www.doctrine-project.org + * @author Benjamin Eberlei + * @author Guilherme Blanco + * @author Jonathan Wage + * @author Roman Borschel + */ +class CoalesceExpression extends Node +{ + public $scalarExpressions = array(); + + + public function __construct(array $scalarExpressions) + { + $this->scalarExpressions = $scalarExpressions; + } + + public function dispatch($sqlWalker) + { + return $sqlWalker->walkCoalesceExpression($this); + } +} \ No newline at end of file diff --git a/lib/Doctrine/ORM/Query/AST/NullIfExpression.php b/lib/Doctrine/ORM/Query/AST/NullIfExpression.php new file mode 100644 index 000000000..c79d23a99 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/NullIfExpression.php @@ -0,0 +1,49 @@ +. + */ + +namespace Doctrine\ORM\Query\AST; + +/** + * NullIfExpression ::= "NULLIF" "(" ScalarExpression "," ScalarExpression ")" + * + * @since 2.1 + * @license http://www.opensource.org/licenses/lgpl-license.php LGPL + * @link www.doctrine-project.org + * @author Benjamin Eberlei + * @author Guilherme Blanco + * @author Jonathan Wage + * @author Roman Borschel + */ +class NullIfExpression extends Node +{ + public $firstExpression; + + public $secondExpression; + + public function __construct($firstExpression, $secondExpression) + { + $this->firstExpression = $firstExpression; + $this->secondExpression = $secondExpression; + } + + public function dispatch($sqlWalker) + { + return $sqlWalker->walkNullIfExpression($this); + } +} \ No newline at end of file From 699ccfddb6050136e30eb45724761276b3afc64a Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Fri, 17 Jun 2011 16:16:22 -0300 Subject: [PATCH 040/220] Implemented COALESCE and NULLIF support in DQL. --- lib/Doctrine/ORM/Query/AST/FromClause.php | 3 - lib/Doctrine/ORM/Query/Parser.php | 75 ++++++++++++++++-- lib/Doctrine/ORM/Query/SqlWalker.php | 78 ++++++++++++++++++- .../ORM/Query/LanguageRecognitionTest.php | 10 +++ .../ORM/Query/SelectSqlGenerationTest.php | 16 ++++ 5 files changed, 170 insertions(+), 12 deletions(-) diff --git a/lib/Doctrine/ORM/Query/AST/FromClause.php b/lib/Doctrine/ORM/Query/AST/FromClause.php index 5325ea795..83aa85ccb 100644 --- a/lib/Doctrine/ORM/Query/AST/FromClause.php +++ b/lib/Doctrine/ORM/Query/AST/FromClause.php @@ -1,7 +1,5 @@ * @author Jonathan Wage * @author Roman Borschel diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 791f765e9..20a5122e6 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -1644,6 +1644,10 @@ class Parser return $this->StateFieldPathExpression(); } else if ($lookahead == Lexer::T_INTEGER || $lookahead == Lexer::T_FLOAT) { return $this->SimpleArithmeticExpression(); + } else if ($lookahead == Lexer::T_CASE || $lookahead == Lexer::T_COALESCE || $lookahead == Lexer::T_NULLIF) { + // Since NULLIF and COALESCE can be identified as a function, + // we need to check if before check for FunctionDeclaration + return $this->CaseExpression(); } else if ($this->_isFunction() || $this->_isAggregateFunction($this->_lexer->lookahead['type'])) { // We may be in an ArithmeticExpression (find the matching ")" and inspect for Math operator) $this->_lexer->peek(); // "(" @@ -1665,8 +1669,6 @@ class Parser } else if ($lookahead == Lexer::T_TRUE || $lookahead == Lexer::T_FALSE) { $this->match($lookahead); return new AST\Literal(AST\Literal::BOOLEAN, $this->_lexer->token['value']); - } else if ($lookahead == Lexer::T_CASE || $lookahead == Lexer::T_COALESCE || $lookahead == Lexer::T_NULLIF) { - return $this->CaseExpression(); } else { $this->syntaxError(); } @@ -1674,11 +1676,66 @@ class Parser public function CaseExpression() { + $lookahead = $this->_lexer->lookahead['type']; + // if "CASE" "WHEN" => GeneralCaseExpression // else if "CASE" => SimpleCaseExpression - // else if "COALESCE" => CoalesceExpression - // else if "NULLIF" => NullifExpression - $this->semanticalError('CaseExpression not yet supported.'); + // [DONE] else if "COALESCE" => CoalesceExpression + // [DONE] else if "NULLIF" => NullifExpression + switch ($lookahead) { + case Lexer::T_NULLIF: + return $this->NullIfExpression(); + + case Lexer::T_COALESCE: + return $this->CoalesceExpression(); + + default: + $this->semanticalError('CaseExpression not yet supported.'); + return null; + } + } + + /** + * CoalesceExpression ::= "COALESCE" "(" ScalarExpression {"," ScalarExpression}* ")" + * + * @return Doctrine\ORM\Query\AST\CoalesceExpression + */ + public function CoalesceExpression() + { + $this->match(Lexer::T_COALESCE); + $this->match(Lexer::T_OPEN_PARENTHESIS); + + // Process ScalarExpressions (1..N) + $scalarExpressions = array(); + $scalarExpressions[] = $this->ScalarExpression(); + + while ($this->_lexer->isNextToken(Lexer::T_COMMA)) { + $this->match(Lexer::T_COMMA); + $scalarExpressions[] = $this->ScalarExpression(); + } + + $this->match(Lexer::T_CLOSE_PARENTHESIS); + + return new AST\CoalesceExpression($scalarExpressions); + } + + /** + * NullIfExpression ::= "NULLIF" "(" ScalarExpression "," ScalarExpression ")" + * + * @return Doctrine\ORM\Query\AST\ExistsExpression + */ + public function NullIfExpression() + { + $this->match(Lexer::T_NULLIF); + $this->match(Lexer::T_OPEN_PARENTHESIS); + + $firstExpression = $this->ScalarExpression(); + $this->match(Lexer::T_COMMA); + $secondExpression = $this->ScalarExpression(); + + $this->match(Lexer::T_CLOSE_PARENTHESIS); + + return new AST\NullIfExpression($firstExpression, $secondExpression); } /** @@ -1717,12 +1774,16 @@ class Parser } } else if ($this->_isFunction()) { $this->_lexer->peek(); // "(" - $beyond = $this->_peekBeyondClosingParenthesis(); - + + $lookaheadType = $this->_lexer->lookahead['type']; + $beyond = $this->_peekBeyondClosingParenthesis(); + if ($this->_isMathOperator($beyond)) { $expression = $this->ScalarExpression(); } else if ($this->_isAggregateFunction($this->_lexer->lookahead['type'])) { $expression = $this->AggregateExpression(); + } else if (in_array ($lookaheadType, array(Lexer::T_CASE, Lexer::T_COALESCE, Lexer::T_NULLIF))) { + $expression = $this->CaseExpression(); } else { // Shortcut: ScalarExpression => Function $expression = $this->FunctionDeclaration(); diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 270131ea2..f36e0ae8f 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -873,6 +873,60 @@ class SqlWalker implements TreeWalker return $sql; } + + /** + * Walks down a CoalesceExpression AST node and generates the corresponding SQL. + * + * @param CoalesceExpression $coalesceExpression + * @return string The SQL. + */ + public function walkCoalesceExpression($coalesceExpression) + { + $sql = 'COALESCE('; + + $scalarExpressions = array(); + + foreach ($coalesceExpression->scalarExpressions as $scalarExpression) { + $scalarExpressions[] = $this->walkSimpleArithmeticExpression($scalarExpression); + } + + $sql .= implode(', ', $scalarExpressions) . ')'; + + return $sql; + } + + public function walkCaseExpression($expression) + { + switch (true) { + case ($expression instanceof AST\CoalesceExpression): + return $this->walkCoalesceExpression($expression); + + case ($expression instanceof AST\NullIfExpression): + return $this->walkNullIfExpression($expression); + + default: + return ''; + } + } + + /** + * Walks down a NullIfExpression AST node and generates the corresponding SQL. + * + * @param NullIfExpression $nullIfExpression + * @return string The SQL. + */ + public function walkNullIfExpression($nullIfExpression) + { + $firstExpression = is_string($nullIfExpression->firstExpression) + ? $this->_conn->quote($nullIfExpression->firstExpression) + : $this->walkSimpleArithmeticExpression($nullIfExpression->firstExpression); + + $secondExpression = is_string($nullIfExpression->secondExpression) + ? $this->_conn->quote($nullIfExpression->secondExpression) + : $this->walkSimpleArithmeticExpression($nullIfExpression->secondExpression); + + return 'NULLIF(' . $firstExpression . ', ' . $secondExpression . ')'; + } /** * Walks down a SelectExpression AST node and generates the corresponding SQL. @@ -956,8 +1010,7 @@ class SqlWalker implements TreeWalker $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); $this->_rsm->addScalarResult($columnAlias, $resultAlias); - } - else if ( + } else if ( $expr instanceof AST\SimpleArithmeticExpression || $expr instanceof AST\ArithmeticTerm || $expr instanceof AST\ArithmeticFactor || @@ -971,11 +1024,32 @@ class SqlWalker implements TreeWalker } $columnAlias = 'sclr' . $this->_aliasCounter++; + if ($expr instanceof AST\Literal) { $sql .= $this->walkLiteral($expr) . ' AS ' .$columnAlias; } else { $sql .= $this->walkSimpleArithmeticExpression($expr) . ' AS ' . $columnAlias; } + + $this->_scalarResultAliasMap[$resultAlias] = $columnAlias; + + $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); + $this->_rsm->addScalarResult($columnAlias, $resultAlias); + } else if ( + $expr instanceof AST\NullIfExpression || + $expr instanceof AST\CoalesceExpression || + $expr instanceof AST\CaseExpression + ) { + if ( ! $selectExpression->fieldIdentificationVariable) { + $resultAlias = $this->_scalarResultCounter++; + } else { + $resultAlias = $selectExpression->fieldIdentificationVariable; + } + + $columnAlias = 'sclr' . $this->_aliasCounter++; + + $sql .= $this->walkCaseExpression($expr) . ' AS ' . $columnAlias; + $this->_scalarResultAliasMap[$resultAlias] = $columnAlias; $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); diff --git a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php index 2733d80f7..cf9575869 100644 --- a/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php +++ b/tests/Doctrine/Tests/ORM/Query/LanguageRecognitionTest.php @@ -570,6 +570,16 @@ class LanguageRecognitionTest extends \Doctrine\Tests\OrmTestCase { $this->assertValidDQL("SELECT e, t FROM Doctrine\Tests\Models\DDC117\DDC117Editor e JOIN e.reviewingTranslations t WHERE SIZE(e.reviewingTranslations) > 0"); } + + public function testCaseSupportContainingNullIfExpression() + { + $this->assertValidDQL("SELECT u.id, NULLIF(u.name, u.name) AS shouldBeNull FROM Doctrine\Tests\Models\CMS\CmsUser u"); + } + + public function testCaseSupportContainingCoalesceExpression() + { + $this->assertValidDQL("select COALESCE(NULLIF(u.name, ''), u.username) as Display FROM Doctrine\Tests\Models\CMS\CmsUser u"); + } } /** @Entity */ diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 6652ad67a..deffb9232 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -906,6 +906,22 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase 'SELECT c0_.id AS id0, c0_.name AS name1, count(c1_.id) AS sclr2 FROM cms_groups c0_ INNER JOIN cms_users_groups c2_ ON c0_.id = c2_.group_id INNER JOIN cms_users c1_ ON c1_.id = c2_.user_id GROUP BY c0_.id' ); } + + public function testCaseContainingNullIf() + { + $this->assertSqlGeneration( + "SELECT NULLIF(g.id, g.name) AS NullIfEqual FROM Doctrine\Tests\Models\CMS\CmsGroup g", + 'SELECT NULLIF(c0_.id, c0_.name) AS sclr0 FROM cms_groups c0_' + ); + } + + public function testCaseContainingCoalesce() + { + $this->assertSqlGeneration( + "SELECT COALESCE(NULLIF(u.name, ''), u.username) as Display FROM Doctrine\Tests\Models\CMS\CmsUser u", + "SELECT COALESCE(NULLIF(c0_.name, ''), c0_.username) AS sclr0 FROM cms_users c0_" + ); + } } From 02f06b6d523b2507362c4c061da15d8665187456 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 01:05:30 +0200 Subject: [PATCH 041/220] Add convenience Setup Tool to register autoloaders and create configuration objects --- lib/Doctrine/ORM/Tools/Setup.php | 193 +++++++++++++++++++ tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 62 ++++++ 2 files changed, 255 insertions(+) create mode 100644 lib/Doctrine/ORM/Tools/Setup.php create mode 100644 tests/Doctrine/Tests/ORM/Tools/SetupTest.php diff --git a/lib/Doctrine/ORM/Tools/Setup.php b/lib/Doctrine/ORM/Tools/Setup.php new file mode 100644 index 000000000..33bdbf53a --- /dev/null +++ b/lib/Doctrine/ORM/Tools/Setup.php @@ -0,0 +1,193 @@ +. +*/ + +namespace Doctrine\ORM\Tools; + +use Doctrine\Common\ClassLoader; +use Doctrine\Common\Cache\Cache; +use Doctrine\Common\Cache\ArrayCache; +use Doctrine\ORM\Configuration; +use Doctrine\ORM\Mapping\Driver\XmlDriver; +use Doctrine\ORM\Mapping\Driver\YamlDriver; + +/** + * Convenience class for setting up Doctrine from different installations and configurations. + * + * @author Benjamin Eberlei + */ +class Setup +{ + /** + * Use this method to register all autoloaders for a setup where Doctrine is checked out from + * its github repository at {@link http://github.com/doctrine/doctrine2} + * + * @param string $gitCheckoutRootPath + * @return void + */ + static public function registerAutoloadGit($gitCheckoutRootPath) + { + if (!class_exists('Doctrine\Common\ClassLoader', false)) { + require_once $gitCheckoutRootPath . "/lib/vendor/doctrine-common/lib/Doctrine/Common/ClassLoader.php"; + } + + $loader = new ClassLoader("Doctrine\Common", $gitCheckoutRootPath . "/lib/vendor/doctrine-common/lib"); + $loader->register(); + + $loader = new ClassLoader("Doctrine\DBAL", $gitCheckoutRootPath . "/lib/vendor/doctrine-dbal/lib"); + $loader->register(); + + $loader = new ClassLoader("Doctrine\ORM", $gitCheckoutRootPath . "/lib"); + $loader->register(); + + $loader = new ClassLoader("Symfony\Component", $gitCheckoutRootPath . "/lib/vendor"); + $loader->register(); + } + + /** + * Use this method to register all autoloaders for a setup where Doctrine is installed + * though {@link http://pear.doctrine-project.org}. + * + * @return void + */ + static public function registerAutoloadPEAR() + { + if (!class_exists('Doctrine\Common\ClassLoader', false)) { + require_once "Doctrine/Common/ClassLoader.php"; + } + + $loader = new ClassLoader("Doctrine"); + $loader->register(); + + $parts = explode(PATH_SEPARATOR, get_include_path()); + + foreach ($parts AS $includePath) { + if ($includePath != "." && file_exists($includePath . "/Doctrine")) { + $loader = new ClassLoader("Symfony\Component", $includePath . "/Doctrine"); + $loader->register(); + return; + } + } + } + + /** + * Use this method to register all autoloads for a downloaded Doctrine library. + * Pick the directory the library was uncompressed into. + * + * @param string $directory + */ + static public function registerAutoloadDirectory($directory) + { + if (!class_exists('Doctrine\Common\ClassLoader', false)) { + require_once $directory . "/Doctrine/Common/ClassLoader.php"; + } + + $loader = new ClassLoader("Doctrine"); + $loader->register(); + + $loader = new ClassLoader("Symfony\Component", $directory . "/Doctrine"); + $loader->register(); + } + + /** + * Create a configuration with an annotation metadata driver. + * + * @param array $paths + * @param boolean $isDevMode + * @param string $proxyDir + * @param Cache $cache + * @return Configuration + */ + static public function createAnnotationMetadataConfiguration(array $paths, $isDevMode = false, $proxyDir = null, Cache $cache = null) + { + $config = self::createConfiguration($isDevMode, $cache, $proxyDir); + $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver($paths)); + return $config; + } + + /** + * Create a configuration with an annotation metadata driver. + * + * @param array $paths + * @param boolean $isDevMode + * @param string $proxyDir + * @param Cache $cache + * @return Configuration + */ + static public function createXMLMetadataConfiguration(array $paths, $isDevMode = false, $proxyDir = null, Cache $cache = null) + { + $config = self::createConfiguration($isDevMode, $cache, $proxyDir); + $config->setMetadataDriverImpl(new XmlDriver($paths)); + return $config; + } + + /** + * Create a configuration with an annotation metadata driver. + * + * @param array $paths + * @param boolean $isDevMode + * @param string $proxyDir + * @param Cache $cache + * @return Configuration + */ + static public function createYAMLMetadataConfiguration(array $paths, $isDevMode = false, $proxyDir = null, Cache $cache = null) + { + $config = self::createConfiguration($isDevMode, $cache, $proxyDir); + $config->setMetadataDriverImpl(new YamlDriver($paths)); + return $config; + } + + /** + * Create a configuration without a metadata driver. + * + * @param bool $isDevMode + * @param string $proxyDir + * @param Cache $cache + * @return Configuration + */ + static public function createConfiguration($isDevMode = false, $proxyDir = null, Cache $cache = null) + { + if ($isDevMode === false && $cache === null) { + if (extension_loaded('apc')) { + $cache = new \Doctrine\Common\Cache\ApcCache; + } else if (extension_loaded('xcache')) { + $cache = new \Doctrine\Common\Cache\XcacheCache; + } else if (extension_loaded('memcache')) { + $memcache = new \Memcache(); + $memcache->connect('127.0.0.1'); + $cache = new \Doctrine\Common\Cache\MemcacheCache(); + $cache->setMemcache($memcache); + } else { + $cache = new ArrayCache; + } + $cache->setNamespace("dc2_"); // to avoid collisions + } else if ($cache === null) { + $cache = new ArrayCache; + } + + $config = new Configuration(); + $config->setMetadataCacheImpl($cache); + $config->setQueryCacheImpl($cache); + $config->setResultCacheImpl($cache); + $config->setProxyDir( $proxyDir ?: sys_get_temp_dir() ); + $config->setProxyNamespace('DoctrineProxies'); + $config->setAutoGenerateProxyClasses($isDevMode); + + return $config; + } +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php new file mode 100644 index 000000000..6c375db77 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -0,0 +1,62 @@ +markTestSkipped("Test only runs in a dev-installation from Github"); + } + + $this->originalAutoloaderCount = count(spl_autoload_functions()); + $this->originalIncludePath = get_include_path(); + } + + public function testGitAutoload() + { + Setup::registerAutoloadGit(__DIR__ . "/../../../../../"); + + $this->assertEquals($this->originalAutoloaderCount + 4, count(spl_autoload_functions())); + } + + public function testPEARAutoload() + { + set_include_path(get_include_path() . PATH_SEPARATOR . __DIR__ . "/../../../../../lib/vendor/doctrine-common/lib"); + + Setup::registerAutoloadPEAR(); + + $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions())); + } + + public function testDirectoryAutoload() + { + Setup::registerAutoloadDirectory(__DIR__ . "/../../../../../lib/vendor/doctrine-common/lib"); + + $this->assertEquals($this->originalAutoloaderCount + 2, count(spl_autoload_functions())); + } + + public function testAnnotationConfiguration() + { + + } + + public function tearDown() + { + set_include_path($this->originalIncludePath); + $loaders = spl_autoload_functions(); + for ($i = 0; $i < count($loaders); $i++) { + if ($i > $this->originalAutoloaderCount+1) { + spl_autoload_unregister($loaders[$i]); + } + } + } +} \ No newline at end of file From 989d375be5b54f022f28b6e6e1089c0341e10983 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 08:47:10 +0200 Subject: [PATCH 042/220] Some more tests for the Setup helper --- tests/Doctrine/Tests/ORM/Tools/AllTests.php | 1 + tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 21 ++++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Tools/AllTests.php b/tests/Doctrine/Tests/ORM/Tools/AllTests.php index 3d9fe929c..4364b5ec6 100644 --- a/tests/Doctrine/Tests/ORM/Tools/AllTests.php +++ b/tests/Doctrine/Tests/ORM/Tools/AllTests.php @@ -29,6 +29,7 @@ class AllTests $suite->addTestSuite('Doctrine\Tests\ORM\Tools\EntityGeneratorTest'); $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SchemaValidatorTest'); $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommandTest'); + $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SetupTest'); return $suite; } diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php index 6c375db77..27a1f413c 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -46,7 +46,28 @@ class SetupTest extends \Doctrine\Tests\OrmTestCase public function testAnnotationConfiguration() { + $config = Setup::createAnnotationMetadataConfiguration(array(), true); + $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); + $this->assertEquals(sys_get_temp_dir(), $config->getProxyDir()); + $this->assertEquals('DoctrineProxies', $config->getProxyNamespace()); + $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\AnnotationDriver', $config->getMetadataDriverImpl()); + } + + public function testXMLConfiguration() + { + $config = Setup::createXMLMetadataConfiguration(array(), true); + + $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); + $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\XmlDriver', $config->getMetadataDriverImpl()); + } + + public function testYAMLConfiguration() + { + $config = Setup::createYAMLMetadataConfiguration(array(), true); + + $this->assertInstanceOf('Doctrine\ORM\Configuration', $config); + $this->assertInstanceOf('Doctrine\ORM\Mapping\Driver\YamlDriver', $config->getMetadataDriverImpl()); } public function tearDown() From 1aa90dc8723a840fa9ed04c3599244c7dde253c6 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 21:25:29 +0200 Subject: [PATCH 043/220] Add UPGRADE note about annotations parser changes --- UPGRADE_TO_2_1 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/UPGRADE_TO_2_1 b/UPGRADE_TO_2_1 index bfb759ec7..69dee07dc 100644 --- a/UPGRADE_TO_2_1 +++ b/UPGRADE_TO_2_1 @@ -4,3 +4,19 @@ your project from Doctrine 2.0.x to 2.1 ## Interface for EntityRepository The EntityRepository now has an interface Doctrine\Common\Persistence\ObjectRepository. This means that your classes that override EntityRepository and extend find(), findOneBy() or findBy() must be adjusted to follow this interface. + +## AnnotationReader changes + +The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory the operation of the new reader should be backwards compatible, but it has to be setup differently to work that way: + + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); + // new code necessary starting here + $reader->setIgnoreNotImportedAnnotations(true); + $reader->setEnableParsePhpImports(false); + $reader = new \Doctrine\Common\Annotations\CachedReader( + new \Doctrine\Common\Annotations\IndexedReader($reader), new ArrayCache() + ); + +This is already done inside the ``$config->newDefaultAnnotationDriver``, so everything should automatically work if you are using this method. You can verify if everything still works by executing a console command such as schema-validate that loads all metadata into memory. + From 32b146ea8ad9484bfbb522b3d7ead8f01803a628 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 22:47:21 +0200 Subject: [PATCH 044/220] Switch testsuite to run with phpunit.ini.dist from main folder, not using AllTests approach. Fixed global state problem in tests that was caused by EventManager being reused. Significantly enhanced error message about cascade persist --- lib/Doctrine/ORM/UnitOfWork.php | 8 ++- phpunit.xml.dist | 59 +++++++++++++++++++ .../Functional/Locking/GearmanLockTest.php | 3 + .../ORM/Functional/SchemaTool/DDC214Test.php | 9 ++- .../ORM/Functional/Ticket/DDC758Test.php | 1 + .../Performance/HydrationPerformanceTest.php | 1 + .../InheritancePersisterPerformanceTest.php | 3 + .../ORM/Performance/InsertPerformanceTest.php | 1 + .../Performance/PersisterPerformanceTest.php | 3 + .../Performance/UnitOfWorkPerformanceTest.php | 1 + .../Doctrine/Tests/OrmFunctionalTestCase.php | 8 +++ tests/Doctrine/Tests/TestInit.php | 11 ++-- 12 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 phpunit.xml.dist diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index e53f38c52..8279c8554 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -573,10 +573,12 @@ class UnitOfWork implements PropertyChangedListener $oid = spl_object_hash($entry); if ($state == self::STATE_NEW) { if ( ! $assoc['isCascadePersist']) { - throw new InvalidArgumentException("A new entity was found through a relationship that was not" - . " configured to cascade persist operations: " . self::objToStr($entry) . "." + throw new InvalidArgumentException("A new entity was found through the relationship '" + . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not" + . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "." . " Explicitly persist the new entity or configure cascading persist operations" - . " on the relationship."); + . " on the relationship. If you cannot find out which entity casues the problem" + . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."); } $this->persistNew($targetClass, $entry); $this->computeChangeSet($targetClass, $entry); diff --git a/phpunit.xml.dist b/phpunit.xml.dist new file mode 100644 index 000000000..3ab5edbae --- /dev/null +++ b/phpunit.xml.dist @@ -0,0 +1,59 @@ + + + + + + + ./tests/Doctrine/Tests/ORM + + + + + + performance + locking_functional + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php index c1d4037d3..a597cc207 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php @@ -9,6 +9,9 @@ use Doctrine\Tests\Models\CMS\CmsArticle, require_once __DIR__ . '/../../../TestInit.php'; +/** + * @group locking_functional + */ class GearmanLockTest extends \Doctrine\Tests\OrmFunctionalTestCase { private $gearman = null; diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php index e4e5e69a0..fb58bf07f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/DDC214Test.php @@ -68,8 +68,11 @@ class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase $classMetadata[] = $this->_em->getClassMetadata($class); } - $this->schemaTool->dropDatabase(); - $this->schemaTool->createSchema($classMetadata); + try { + $this->schemaTool->createSchema($classMetadata); + } catch(\Exception $e) { + // was already created + } $sm = $this->_em->getConnection()->getSchemaManager(); @@ -80,6 +83,8 @@ class DDC214Test extends \Doctrine\Tests\OrmFunctionalTestCase $schemaDiff = $comparator->compare($fromSchema, $toSchema); $sql = $schemaDiff->toSql($this->_em->getConnection()->getDatabasePlatform()); + $sql = array_filter($sql, function($sql) { return strpos($sql, 'DROP') === false; }); + $this->assertEquals(0, count($sql), "SQL: " . implode(PHP_EOL, $sql)); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php index 60a0ff89c..76bb3bba8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC758Test.php @@ -14,6 +14,7 @@ class DDC758Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { + $this->markTestSkipped('Destroys testsuite'); $this->useModelSet("cms"); parent::setUp(); diff --git a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php index a8a16e428..01f02c0d9 100644 --- a/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/HydrationPerformanceTest.php @@ -15,6 +15,7 @@ use Doctrine\Tests\Mocks\HydratorMockStatement, * seriously degrade performance. * * @author robo + * @group performance */ class HydrationPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase { diff --git a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php index 01113f21b..1c192648a 100644 --- a/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/InheritancePersisterPerformanceTest.php @@ -7,6 +7,9 @@ use Doctrine\ORM\Query; require_once __DIR__ . '/../../TestInit.php'; +/** +* @group performance + */ class InheritancePersisterPerformanceTest extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() diff --git a/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php index 97466e69f..cccc480a2 100644 --- a/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/InsertPerformanceTest.php @@ -10,6 +10,7 @@ use Doctrine\Tests\Models\CMS\CmsUser; * Description of InsertPerformanceTest * * @author robo + * @group performance */ class InsertPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase { diff --git a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php index bbd4f445f..ec432689d 100644 --- a/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/PersisterPerformanceTest.php @@ -13,6 +13,9 @@ use Doctrine\Tests\Models\CMS\CmsComment; require_once __DIR__ . '/../../TestInit.php'; +/** + * @group performance + */ class PersisterPerformanceTest extends \Doctrine\Tests\OrmFunctionalTestCase { protected function setUp() diff --git a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php index 28d9ea6d3..650228ba4 100644 --- a/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php +++ b/tests/Doctrine/Tests/ORM/Performance/UnitOfWorkPerformanceTest.php @@ -10,6 +10,7 @@ use Doctrine\Tests\Models\CMS\CmsUser; * Description of InsertPerformanceTest * * @author robo + * @group performance */ class UnitOfWorkPerformanceTest extends \Doctrine\Tests\OrmPerformanceTestCase { diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 166cdfb6a..516a72aa2 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -288,6 +288,14 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn = static::$_sharedConn; $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack); + + // get rid of more global state + $evm = $conn->getEventManager(); + foreach ($evm->getListeners() AS $event => $listeners) { + foreach ($listeners AS $listener) { + $evm->removeEventListener(array($event), $listener); + } + } return \Doctrine\ORM\EntityManager::create($conn, $config); } diff --git a/tests/Doctrine/Tests/TestInit.php b/tests/Doctrine/Tests/TestInit.php index 0445cf76b..3a35c2104 100644 --- a/tests/Doctrine/Tests/TestInit.php +++ b/tests/Doctrine/Tests/TestInit.php @@ -22,7 +22,10 @@ if (isset($GLOBALS['DOCTRINE_DBAL_PATH'])) { } $classLoader->register(); -$classLoader = new \Doctrine\Common\ClassLoader('Doctrine'); +$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\ORM', __DIR__ . '/../../../lib'); +$classLoader->register(); + +$classLoader = new \Doctrine\Common\ClassLoader('Doctrine\Tests', __DIR__ . '/../../'); $classLoader->register(); $classLoader = new \Doctrine\Common\ClassLoader('Symfony', __DIR__ . "/../../../lib/vendor"); @@ -38,9 +41,3 @@ if (!file_exists(__DIR__."/ORM/Proxy/generated")) { throw new Exception("Could not create " . __DIR__."/ORM/Proxy/generated Folder."); } } - -set_include_path( - __DIR__ . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR . 'lib' - . PATH_SEPARATOR . - get_include_path() -); \ No newline at end of file From fa7574b2bab57ab7adf7b071de70d63ee8a39de4 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 22:49:25 +0200 Subject: [PATCH 045/220] Removed AllTests files and Suites --- tests/Doctrine/Tests/AllTests.php | 33 -------- .../Tests/DbalFunctionalTestSuite.php | 19 ----- tests/Doctrine/Tests/DbalTestSuite.php | 10 --- tests/Doctrine/Tests/DoctrineTestSuite.php | 11 --- tests/Doctrine/Tests/ORM/AllTests.php | 41 ---------- tests/Doctrine/Tests/ORM/Entity/AllTests.php | 31 -------- .../Tests/ORM/Functional/AllTests.php | 75 ------------------- .../Tests/ORM/Functional/Locking/AllTests.php | 31 -------- .../ORM/Functional/SchemaTool/AllTests.php | 33 -------- .../Tests/ORM/Functional/Ticket/AllTests.php | 34 --------- .../Doctrine/Tests/ORM/Hydration/AllTests.php | 36 --------- tests/Doctrine/Tests/ORM/Id/AllTests.php | 31 -------- tests/Doctrine/Tests/ORM/Mapping/AllTests.php | 39 ---------- .../Tests/ORM/Performance/AllTests.php | 32 -------- tests/Doctrine/Tests/ORM/Proxy/AllTests.php | 30 -------- tests/Doctrine/Tests/ORM/Query/AllTests.php | 37 --------- tests/Doctrine/Tests/ORM/Tools/AllTests.php | 40 ---------- .../Doctrine/Tests/OrmFunctionalTestSuite.php | 15 ---- tests/Doctrine/Tests/OrmTestSuite.php | 10 --- 19 files changed, 588 deletions(-) delete mode 100644 tests/Doctrine/Tests/AllTests.php delete mode 100644 tests/Doctrine/Tests/DbalFunctionalTestSuite.php delete mode 100644 tests/Doctrine/Tests/DbalTestSuite.php delete mode 100644 tests/Doctrine/Tests/DoctrineTestSuite.php delete mode 100644 tests/Doctrine/Tests/ORM/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Entity/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Functional/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Hydration/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Id/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Mapping/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Performance/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Proxy/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Query/AllTests.php delete mode 100644 tests/Doctrine/Tests/ORM/Tools/AllTests.php delete mode 100644 tests/Doctrine/Tests/OrmFunctionalTestSuite.php delete mode 100644 tests/Doctrine/Tests/OrmTestSuite.php diff --git a/tests/Doctrine/Tests/AllTests.php b/tests/Doctrine/Tests/AllTests.php deleted file mode 100644 index 032366d04..000000000 --- a/tests/Doctrine/Tests/AllTests.php +++ /dev/null @@ -1,33 +0,0 @@ -addTest(ORM\AllTests::suite()); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/DbalFunctionalTestSuite.php b/tests/Doctrine/Tests/DbalFunctionalTestSuite.php deleted file mode 100644 index e6c78cbd8..000000000 --- a/tests/Doctrine/Tests/DbalFunctionalTestSuite.php +++ /dev/null @@ -1,19 +0,0 @@ -sharedFixture['conn'])) { - $this->sharedFixture['conn'] = TestUtil::getConnection(); - } - } - - protected function tearDown() - { - $this->sharedFixture['conn']->close(); - $this->sharedFixture = null; - } -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/DbalTestSuite.php b/tests/Doctrine/Tests/DbalTestSuite.php deleted file mode 100644 index 4f9cc4ef3..000000000 --- a/tests/Doctrine/Tests/DbalTestSuite.php +++ /dev/null @@ -1,10 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\UnitOfWorkTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\EntityManagerTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\CommitOrderCalculatorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\QueryBuilderTest'); - $suite->addTest(Query\AllTests::suite()); - $suite->addTest(Hydration\AllTests::suite()); - $suite->addTest(Entity\AllTests::suite()); - $suite->addTest(Mapping\AllTests::suite()); - $suite->addTest(Functional\AllTests::suite()); - $suite->addTest(Id\AllTests::suite()); - $suite->addTest(Proxy\AllTests::suite()); - $suite->addTest(Tools\AllTests::suite()); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_AllTests::main') { - AllTests::main(); -} diff --git a/tests/Doctrine/Tests/ORM/Entity/AllTests.php b/tests/Doctrine/Tests/ORM/Entity/AllTests.php deleted file mode 100644 index 3de6ee880..000000000 --- a/tests/Doctrine/Tests/ORM/Entity/AllTests.php +++ /dev/null @@ -1,31 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Entity\ConstructorTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Entity_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/AllTests.php deleted file mode 100644 index 4dd2b0644..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/AllTests.php +++ /dev/null @@ -1,75 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Functional\BasicFunctionalTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\DefaultValuesTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\TypeTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\AdvancedAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\NativeQueryTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SingleTableInheritanceTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClassTableInheritanceTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClassTableInheritanceTest2'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\DetachedEntityTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryCacheTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ResultCacheTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\QueryDqlFunctionTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\AdvancedDqlQueryTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneUnidirectionalAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneBidirectionalAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneEagerLoadingTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToManyBidirectionalAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToManyUnidirectionalAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManyBasicAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManyUnidirectionalAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManyBidirectionalAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToOneSelfReferentialAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OneToManySelfReferentialAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ManyToManySelfReferentialAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OrderedCollectionTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\OrderedJoinedTableInheritanceCollectionTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\IndexByAssociationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\CompositePrimaryKeyTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ReferenceProxyTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\LifecycleCallbackTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\StandardEntityPersisterTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\CustomTreeWalkersTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\MappedSuperclassTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\EntityRepositoryTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\IdentityMapTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\DatabaseDriverTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\PostgreSQLIdentityStrategyTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ExtraLazyCollectionTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ClearEventTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\ReadOnlyTest'); - - $suite->addTest(Locking\AllTests::suite()); - $suite->addTest(Ticket\AllTests::suite()); - $suite->addTest(SchemaTool\AllTests::suite()); - - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Functional_AllTests::main') { - AllTests::main(); -} diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php deleted file mode 100644 index be725f0b0..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/AllTests.php +++ /dev/null @@ -1,31 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Functional\Locking\OptimisticTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\Locking\LockTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Locking_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php deleted file mode 100644 index d9479b98a..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaTool/AllTests.php +++ /dev/null @@ -1,33 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\CompanySchemaTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\MySqlSchemaToolTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\PostgreSqlSchemaToolTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Functional\SchemaTool\DDC214Test'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Tools_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php deleted file mode 100644 index 5820a273f..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/AllTests.php +++ /dev/null @@ -1,34 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Functional\Ticket\\' . $info['filename']); - } - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Functional_Ticket_AllTests::main') { - AllTests::main(); -} diff --git a/tests/Doctrine/Tests/ORM/Hydration/AllTests.php b/tests/Doctrine/Tests/ORM/Hydration/AllTests.php deleted file mode 100644 index d2ecafec3..000000000 --- a/tests/Doctrine/Tests/ORM/Hydration/AllTests.php +++ /dev/null @@ -1,36 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Hydration\ObjectHydratorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ArrayHydratorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ScalarHydratorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\SingleScalarHydratorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\ResultSetMappingTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Hydration\CustomHydratorTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Hydration_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Id/AllTests.php b/tests/Doctrine/Tests/ORM/Id/AllTests.php deleted file mode 100644 index 87201d915..000000000 --- a/tests/Doctrine/Tests/ORM/Id/AllTests.php +++ /dev/null @@ -1,31 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Id\SequenceGeneratorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Id\AssignedGeneratorTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Id_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/AllTests.php b/tests/Doctrine/Tests/ORM/Mapping/AllTests.php deleted file mode 100644 index 30a8ead5b..000000000 --- a/tests/Doctrine/Tests/ORM/Mapping/AllTests.php +++ /dev/null @@ -1,39 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Mapping\ClassMetadataTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\XmlMappingDriverTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\YamlMappingDriverTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\AnnotationDriverTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\PHPMappingDriverTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\StaticPHPMappingDriverTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\ClassMetadataFactoryTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\ClassMetadataLoadEventTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\BasicInheritanceMappingTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Mapping\DriverChainTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Mapping_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Performance/AllTests.php b/tests/Doctrine/Tests/ORM/Performance/AllTests.php deleted file mode 100644 index b4a993bb2..000000000 --- a/tests/Doctrine/Tests/ORM/Performance/AllTests.php +++ /dev/null @@ -1,32 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Performance\HydrationPerformanceTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Performance\InsertPerformanceTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Performance_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Proxy/AllTests.php b/tests/Doctrine/Tests/ORM/Proxy/AllTests.php deleted file mode 100644 index aeaff5848..000000000 --- a/tests/Doctrine/Tests/ORM/Proxy/AllTests.php +++ /dev/null @@ -1,30 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Proxy\ProxyClassGeneratorTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Proxy_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Query/AllTests.php b/tests/Doctrine/Tests/ORM/Query/AllTests.php deleted file mode 100644 index 0d94856f9..000000000 --- a/tests/Doctrine/Tests/ORM/Query/AllTests.php +++ /dev/null @@ -1,37 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Query\SelectSqlGenerationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\LanguageRecognitionTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\LexerTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\DeleteSqlGenerationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\UpdateSqlGenerationTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\ExprTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\ParserResultTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Query\QueryTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Query_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Tools/AllTests.php b/tests/Doctrine/Tests/ORM/Tools/AllTests.php deleted file mode 100644 index 4364b5ec6..000000000 --- a/tests/Doctrine/Tests/ORM/Tools/AllTests.php +++ /dev/null @@ -1,40 +0,0 @@ -addTestSuite('Doctrine\Tests\ORM\Tools\Export\YamlClassMetadataExporterTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\XmlClassMetadataExporterTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\PhpClassMetadataExporterTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Export\AnnotationClassMetadataExporterTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\ConvertDoctrine1SchemaTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SchemaToolTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\EntityGeneratorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SchemaValidatorTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\Console\Command\ConvertDoctrine1SchemaCommandTest'); - $suite->addTestSuite('Doctrine\Tests\ORM\Tools\SetupTest'); - - return $suite; - } -} - -if (PHPUnit_MAIN_METHOD == 'Orm_Tools_AllTests::main') { - AllTests::main(); -} \ No newline at end of file diff --git a/tests/Doctrine/Tests/OrmFunctionalTestSuite.php b/tests/Doctrine/Tests/OrmFunctionalTestSuite.php deleted file mode 100644 index 8d4b8b058..000000000 --- a/tests/Doctrine/Tests/OrmFunctionalTestSuite.php +++ /dev/null @@ -1,15 +0,0 @@ - Date: Sat, 18 Jun 2011 23:06:07 +0200 Subject: [PATCH 046/220] Fix bug in ChangeTrackingNotify code --- lib/Doctrine/ORM/UnitOfWork.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 8279c8554..4b4be9e31 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -455,7 +455,7 @@ class UnitOfWork implements PropertyChangedListener // and we have a copy of the original data $originalData = $this->originalEntityData[$oid]; $isChangeTrackingNotify = $class->isChangeTrackingNotify(); - $changeSet = $isChangeTrackingNotify ? $this->entityChangeSets[$oid] : array(); + $changeSet = ($isChangeTrackingNotify && isset($this->entityChangeSets[$oid])) ? $this->entityChangeSets[$oid] : array(); foreach ($actualData as $propName => $actualValue) { $orgValue = isset($originalData[$propName]) ? $originalData[$propName] : null; From 7810f5fe6939d57712fbec2ce1bd5d77f98725e6 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 23:23:43 +0200 Subject: [PATCH 047/220] Add convenience helper for running tests against multiple different databases --- run-all.sh | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100755 run-all.sh diff --git a/run-all.sh b/run-all.sh new file mode 100755 index 000000000..80712eebc --- /dev/null +++ b/run-all.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +# This script is a small convenience wrapper for running the doctrine testsuite against a large bunch of databases. +# Just create the phpunit.xmls as described in the array below and configure the specific files section +# to connect to that database. Just omit a file if you dont have that database and the tests will be skipped. + +configs[1]="mysql.phpunit.xml" +configs[2]='postgres.phpunit.xml' +configs[3]='sqlite.phpunit.xml' +configs[4]='oracle.phpunit.xml' +configs[5]='db2.phpunit.xml' +configs[6]='pdo-ibm.phpunit.xml' +configs[7]='sqlsrv.phpunit.xml' + +for i in "${configs[@]}"; do + if [ -f "$i" ]; + then + echo "RUNNING TESTS WITH CONFIG $i" + phpunit -c "$i" "$@" + fi; +done From f0bc3d925d7ecd8de146642f98d8336fb8015979 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 22:02:40 +0000 Subject: [PATCH 048/220] Bump dependencies of Common and DBAL to 2.1.0RC1 --- lib/vendor/doctrine-common | 2 +- lib/vendor/doctrine-dbal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index f87ee1be5..565674b9b 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit f87ee1be5113a4a594827731dd1f5647cfc288fc +Subproject commit 565674b9b376edbc5e31070e91fd85ea6dbd5d60 diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index 0a9943872..f2c150d19 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit 0a99438729e59bcb5262b22c06c782de4dfacbb0 +Subproject commit f2c150d194af4ac846362ef8c6bf002402ed5f63 From c6746d4a4a0b66bd7eeb8a2118dd3a786d88f753 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 22:07:14 +0000 Subject: [PATCH 049/220] Merge 2.0.x build.xml changes into master build.xml --- build.xml | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/build.xml b/build.xml index e4c138ef6..e9d2115f0 100644 --- a/build.xml +++ b/build.xml @@ -100,6 +100,9 @@ + + + @@ -166,7 +169,7 @@ script Doctrine/Common/ Doctrine/DBAL/ - Symfony/Component/Yaml/ + Symfony/Component/Yaml/ Symfony/Component/Console/ @@ -188,9 +191,12 @@ - - - + + + + + + @@ -205,11 +211,10 @@ - + - @@ -232,7 +237,7 @@ - bin + bin/ Doctrine/Common/ Doctrine/DBAL/ Doctrine/ORM/ @@ -255,7 +260,7 @@ - bin + bin/ Doctrine/Common/ Doctrine/DBAL/ Doctrine/ORM/ @@ -268,4 +273,5 @@ - \ No newline at end of file + + From 054ac220ac8c24eaeea082aeb4efa06d33318930 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 22:08:37 +0000 Subject: [PATCH 050/220] Release 2.1.0RC1 --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 002e28930..ac5e7463e 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0BETA2-DEV'; + const VERSION = '2.1.0RC1'; /** * Compares a Doctrine version with the current one. From 197744a57fc3cdc6ee58083fa48aaea37453cb37 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 18 Jun 2011 22:08:52 +0000 Subject: [PATCH 051/220] Bump Dev Version to 2.1.0RC2-DEV --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index ac5e7463e..7041ecf03 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC1'; + const VERSION = '2.1.0RC2-DEV'; /** * Compares a Doctrine version with the current one. From 82f0c244e8b6bb6e6bba81a0cd0753ba566d09e3 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 19 Jun 2011 09:39:34 +0200 Subject: [PATCH 052/220] DDC-1189 - Bugfix with PersistentCollection#clear() in combination with lazy loading --- lib/Doctrine/ORM/PersistentCollection.php | 1 + .../ORM/Functional/BasicFunctionalTest.php | 30 ------------------- .../ManyToManyBasicAssociationTest.php | 20 +++++++++++++ 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/lib/Doctrine/ORM/PersistentCollection.php b/lib/Doctrine/ORM/PersistentCollection.php index ce3c2e45d..82d616686 100644 --- a/lib/Doctrine/ORM/PersistentCollection.php +++ b/lib/Doctrine/ORM/PersistentCollection.php @@ -572,6 +572,7 @@ final class PersistentCollection implements Collection } } $this->coll->clear(); + $this->initialized = true; // direct call, {@link initialize()} is too expensive if ($this->association['isOwningSide']) { $this->changed(); $this->em->getUnitOfWork()->scheduleCollectionDeletion($this); diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index b6ca444ca..cb79795bc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -827,36 +827,6 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(0, $this->_em->getConnection()->fetchColumn("select count(*) from cms_addresses where id=".$addressId."")); } - public function testClearingCollectionDoesNotInitialize() - { - $user = new CmsUser(); - $user->username = "beberlei"; - $user->name = "Benjamin E."; - $user->status = 'active'; - - $grp = new CmsGroup(); - $grp->setName("The Dudes"); - - $grp->addUser($user); - $user->addGroup($grp); - - $this->_em->persist($user); - $this->_em->persist($grp); - $this->_em->flush(); - $this->_em->clear(); - - $this->assertEquals(1, $this->_em->getConnection()->fetchColumn("select count(*) from cms_users_groups")); - - $user2 = $this->_em->find(get_class($user), $user->id); - $this->assertFalse($user2->groups->isInitialized()); - $user2->groups->clear(); - $this->assertFalse($user2->groups->isInitialized()); - $this->_em->flush(); - $this->assertFalse($user2->groups->isInitialized()); - - $this->assertEquals(0, $this->_em->getConnection()->fetchColumn("select count(*) from cms_users_groups")); - } - public function testGetPartialReferenceToUpdateObjectWithoutLoadingIt() { //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index c537b4c5f..5f97717d4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -357,4 +357,24 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa $this->_em->getUnitOfWork()->initializeObject($user->groups); $this->assertTrue($user->groups->isInitialized(), "Collection should be initialized after calling UnitOfWork::initializeObject()"); } + + /** + * @group DDC-1189 + * @group DDC-956 + */ + public function testClearBeforeLazyLoad() + { + $user = $this->addCmsUserGblancoWithGroups(4); + + $this->_em->clear(); + + $user = $this->_em->find(get_class($user), $user->id); + $user->groups->clear(); + $this->assertEquals(0, count($user->groups)); + + $this->_em->flush(); + + $user = $this->_em->find(get_class($user), $user->id); + $this->assertEquals(0, count($user->groups)); + } } From 1c2ade61ab4ccdb0db7ec7465bb77c917159aaa4 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 19 Jun 2011 10:05:30 +0200 Subject: [PATCH 053/220] DDC-1214 - Fix UpdateCommand::getFullName() --- .../ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php index b96a5a673..a39995e0f 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/SchemaTool/UpdateCommand.php @@ -128,8 +128,8 @@ EOT $output->writeln(sprintf('The Schema-Tool would execute "%s" queries to update the database.', count($sqls))); $output->writeln('Please run the operation by passing one of the following options:'); - $output->writeln(sprintf(' %s --force to execute the command', $this->getFullName())); - $output->writeln(sprintf(' %s --dump-sql to dump the SQL statements to the screen', $this->getFullName())); + $output->writeln(sprintf(' %s --force to execute the command', $this->getName())); + $output->writeln(sprintf(' %s --dump-sql to dump the SQL statements to the screen', $this->getName())); } } } From c7c430032cadb54aa132d73e854192eec220ae67 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 19 Jun 2011 10:17:35 +0200 Subject: [PATCH 054/220] DDC-1211 - Fix bug with empty numeric literal --- lib/Doctrine/ORM/Query/Expr/Base.php | 2 +- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 28 +++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/Expr/Base.php b/lib/Doctrine/ORM/Query/Expr/Base.php index 93bca7507..abe7e54be 100644 --- a/lib/Doctrine/ORM/Query/Expr/Base.php +++ b/lib/Doctrine/ORM/Query/Expr/Base.php @@ -55,7 +55,7 @@ abstract class Base public function add($arg) { - if ( ! empty($arg) || ($arg instanceof self && $arg->count() > 0)) { + if ( $arg !== null || ($arg instanceof self && $arg->count() > 0)) { // If we decide to keep Expr\Base instances, we can use this check if ( ! is_string($arg)) { $class = get_class($arg); diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 2cde45223..963b64ce7 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -681,4 +681,32 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u INNER JOIN u.groups g', $qb->getDQL()); } + + /** + * @group DDC-1211 + */ + public function testEmptyStringLiteral() + { + $expr = $this->_em->getExpressionBuilder(); + $qb = $this->_em->createQueryBuilder() + ->select('u') + ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->where($expr->eq('u.username', $expr->literal(""))); + + $this->assertEquals("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = ''", $qb->getDQL()); + } + + /** + * @group DDC-1211 + */ + public function testEmptyNumericLiteral() + { + $expr = $this->_em->getExpressionBuilder(); + $qb = $this->_em->createQueryBuilder() + ->select('u') + ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->where($expr->eq('u.username', $expr->literal(0))); + + $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 0', $qb->getDQL()); + } } \ No newline at end of file From c05fffcc93ea6488ab8c7cef7391c80c3e3933db Mon Sep 17 00:00:00 2001 From: Johannes Heinen Date: Mon, 20 Jun 2011 19:07:03 +0200 Subject: [PATCH 055/220] Suppressed php undefined variable notice adding initialization code to Doctrine\ORM\Mapping\Driver\DatabaseDriver.php --- lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index 0ee1060c7..c2d9240a2 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -110,6 +110,8 @@ class DatabaseDriver implements Driver return; } + $tables = array(); + foreach ($this->_sm->listTableNames() as $tableName) { $tables[$tableName] = $this->_sm->listTableDetails($tableName); } From 3717ae3c53f55c62c383fe84422632ac191af50f Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 20 Jun 2011 21:26:12 +0200 Subject: [PATCH 056/220] strtolower() on cascade information avoids problem with case-sensitivity in YAML and annotations mapping driver. --- 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 8a95b82db..c1f25a828 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -832,7 +832,7 @@ class ClassMetadataInfo implements ClassMetadata } // Cascades - $cascades = isset($mapping['cascade']) ? $mapping['cascade'] : array(); + $cascades = isset($mapping['cascade']) ? array_map('strtolower', $mapping['cascade']) : array(); if (in_array('all', $cascades)) { $cascades = array( 'remove', From db80b2b1351f055f58a549cbf0cb79b27b92741c Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Tue, 21 Jun 2011 12:38:08 -0300 Subject: [PATCH 057/220] Fixed phpunit tests which was failing due to a duplicate use declaration. --- tests/Doctrine/Tests/ORM/Functional/TypeTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index a2a738b56..25523bb80 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -8,7 +8,7 @@ use Doctrine\Tests\Models\Generic\DecimalModel; use Doctrine\Tests\Models\Generic\SerializationModel; use Doctrine\ORM\Mapping\AssociationMapping; -use Doctrine\DBAL\Types\Type; +use Doctrine\DBAL\Types\Type as DBALType; require_once __DIR__ . '/../../TestInit.php'; @@ -135,7 +135,7 @@ class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $dateTimeDb = $this->_em->createQuery('SELECT d FROM Doctrine\Tests\Models\Generic\DateTimeModel d WHERE d.datetime = ?1') - ->setParameter(1, $date, Type::DATETIME) + ->setParameter(1, $date, DBALType::DATETIME) ->getSingleResult(); } @@ -154,7 +154,7 @@ class TypeTest extends \Doctrine\Tests\OrmFunctionalTestCase ->select('d') ->from('Doctrine\Tests\Models\Generic\DateTimeModel', 'd') ->where('d.datetime = ?1') - ->setParameter(1, $date, Type::DATETIME) + ->setParameter(1, $date, DBALType::DATETIME) ->getQuery()->getSingleResult(); } From fe8b28a09f32ca9c5d23f114aa118d6717a07624 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 25 Jun 2011 09:57:15 +0200 Subject: [PATCH 058/220] Add test for DDC-1156, DDC-1218 --- .../ORM/Mapping/BasicInheritanceMappingTest.php | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index a454141d3..033a2488b 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -100,6 +100,19 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertTrue(isset($class->fieldMappings['id'])); } + + /** + * @group DDC-1156 + * @group DDC-1218 + */ + public function testGeneratedValueFromMappedSuperclass() + { + $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\SuperclassEntity'); + /* @var $class ClassMetadataInfo */ + + $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); + $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); + } } class TransientBaseClass { @@ -216,7 +229,7 @@ class SuperclassEntity extends SuperclassBase abstract class SuperclassBase { /** - * @Column(type="integer") @Id @GeneratedValue + * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE") @SequenceGenerator(sequenceName="foo", initialValue="10") * @var int */ public $id; From 10b70df1afb327933dc45221551b9b3d6d2757b7 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 25 Jun 2011 10:20:37 +0200 Subject: [PATCH 059/220] DDC-1218, DDC-1156 - Fixed bugs with mapped superclasses in inheritance hierachies --- .../ORM/Mapping/ClassMetadataFactory.php | 8 +++- .../Mapping/BasicInheritanceMappingTest.php | 48 ++++++++++++++++++- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index c036ba2f6..3f65da3c5 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -248,11 +248,13 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface // Move down the hierarchy of parent classes, starting from the topmost class $parent = null; + $rootEntityFound = false; $visited = array(); foreach ($parentClasses as $className) { if (isset($this->loadedMetadata[$className])) { $parent = $this->loadedMetadata[$className]; if ( ! $parent->isMappedSuperclass) { + $rootEntityFound = true; array_unshift($visited, $className); } continue; @@ -281,7 +283,10 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface throw MappingException::reflectionFailure($className, $e); } - if ($parent && ! $parent->isMappedSuperclass) { + // If this class has a parent the id generator strategy is inherited. + // However this is only true if the hierachy of parents contains the root entity, + // if it consinsts of mapped superclasses these don't necessarily include the id field. + if ($parent && $rootEntityFound) { if ($parent->isIdGeneratorSequence()) { $class->setSequenceGeneratorDefinition($parent->sequenceGeneratorDefinition); } else if ($parent->isIdGeneratorTable()) { @@ -336,6 +341,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface $parent = $class; if ( ! $class->isMappedSuperclass) { + $rootEntityFound = true; array_unshift($visited, $className); } diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index 033a2488b..91ebbd99b 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -113,6 +113,32 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); } + + /** + * @group DDC-1156 + * @group DDC-1218 + */ + public function testSequenceDefinitionInHierachyWithSandwichMappedSuperclass() + { + $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyD'); + /* @var $class ClassMetadataInfo */ + + $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); + $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); + } + + /** + * @group DDC-1156 + * @group DDC-1218 + */ + public function testMultipleMappedSuperclasses() + { + $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\MediumSuperclassEntity'); + /* @var $class ClassMetadataInfo */ + + $this->assertInstanceOf('Doctrine\ORM\Id\SequenceGenerator', $class->idGenerator); + $this->assertEquals(array('allocationSize' => 1, 'initialValue' => 10, 'sequenceName' => 'foo'), $class->sequenceGeneratorDefinition); + } } class TransientBaseClass { @@ -164,7 +190,8 @@ class EntitySubClass2 extends MappedSuperclassBase { abstract class HierachyBase { /** - * @Column(type="integer") @Id @GeneratedValue + * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE") + * @SequenceGenerator(sequenceName="foo", initialValue="10") * @var int */ public $id; @@ -229,8 +256,25 @@ class SuperclassEntity extends SuperclassBase abstract class SuperclassBase { /** - * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE") @SequenceGenerator(sequenceName="foo", initialValue="10") + * @Column(type="integer") @Id @GeneratedValue(strategy="SEQUENCE") + * @SequenceGenerator(sequenceName="foo", initialValue="10") * @var int */ public $id; +} + +/** + * @MappedSuperclass + */ +abstract class MediumSuperclassBase extends SuperclassBase +{ + +} + +/** + * @Entity + */ +class MediumSuperclassEntity extends MediumSuperclassBase +{ + } \ No newline at end of file From 0dd1dc20c8ccf8eee6cee3b3cf8d4d9bdc5a6401 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 25 Jun 2011 10:25:22 +0200 Subject: [PATCH 060/220] DDC-1227 - Fix regression in QueryBuilder::add() due to Expr\From refactoring. --- lib/Doctrine/ORM/QueryBuilder.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/QueryBuilder.php b/lib/Doctrine/ORM/QueryBuilder.php index b67a550d8..4facce77f 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -986,7 +986,7 @@ class QueryBuilder foreach ($fromParts as $from) { $fromClause = (string) $from; - if (isset($joinParts[$from->getAlias()])) { + if ($from instanceof Expr\From && isset($joinParts[$from->getAlias()])) { foreach ($joinParts[$from->getAlias()] as $join) { $fromClause .= ' ' . ((string) $join); } From 07f568e2b4b9bc0b3bd807144fe4c73600393bc1 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 25 Jun 2011 10:27:06 +0200 Subject: [PATCH 061/220] Add test for DDC-1227 regression --- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 963b64ce7..57eb82946 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -709,4 +709,16 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 0', $qb->getDQL()); } + + /** + * @group DDC-1227 + */ + public function testAddFromString() + { + $qb = $this->_em->createQueryBuilder() + ->add('select', 'u') + ->add('from', 'Doctrine\Tests\Models\CMS\CmsUser u'); + + $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $qb->getDQL()); + } } \ No newline at end of file From a73a1e8437fcf03a7a333df36d38bd01ed9d58ee Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 25 Jun 2011 14:38:44 +0200 Subject: [PATCH 062/220] DDC-1226, DDC-1228 - Bugfix with refereshing proxy references not setting the originalEntityData. --- lib/Doctrine/ORM/UnitOfWork.php | 5 +- .../ORM/Functional/Ticket/DDC1228Test.php | 136 ++++++++++++++++++ 2 files changed, 140 insertions(+), 1 deletion(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 4b4be9e31..3d46303ea 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1884,13 +1884,16 @@ class UnitOfWork implements PropertyChangedListener if ($entity instanceof Proxy && ! $entity->__isInitialized__) { $entity->__isInitialized__ = true; $overrideLocalValues = true; - $this->originalEntityData[$oid] = $data; if ($entity instanceof NotifyPropertyChanged) { $entity->addPropertyChangedListener($this); } } else { $overrideLocalValues = isset($hints[Query::HINT_REFRESH]); } + + if ($overrideLocalValues) { + $this->originalEntityData[$oid] = $data; + } } else { $entity = $class->newInstance(); $oid = spl_object_hash($entity); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php new file mode 100644 index 000000000..34aef78cf --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1228Test.php @@ -0,0 +1,136 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228User'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1228Profile'), + )); + } catch(\PDOException $e) { + + } + } + + public function testOneToOnePersist() + { + $user = new DDC1228User; + $profile = new DDC1228Profile(); + $profile->name = "Foo"; + $user->profile = $profile; + + $this->_em->persist($user); + $this->_em->persist($profile); + $this->_em->flush(); + $this->_em->clear(); + + $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id); + + $this->assertFalse($user->getProfile()->__isInitialized__, "Proxy is not initialized"); + $user->getProfile()->setName("Bar"); + $this->assertTrue($user->getProfile()->__isInitialized__, "Proxy is not initialized"); + + $this->assertEquals("Bar", $user->getProfile()->getName()); + $this->assertEquals(array("id" => 1, "name" => "Foo"), $this->_em->getUnitOfWork()->getOriginalEntityData($user->getProfile())); + + $this->_em->flush(); + $this->_em->clear(); + + $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id); + $this->assertEquals("Bar", $user->getProfile()->getName()); + } + + public function testRefresh() + { + $user = new DDC1228User; + $profile = new DDC1228Profile(); + $profile->name = "Foo"; + $user->profile = $profile; + + $this->_em->persist($user); + $this->_em->persist($profile); + $this->_em->flush(); + $this->_em->clear(); + + $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1228User', $user->id); + + $this->_em->refresh($user); + $user->name = "Baz"; + $this->_em->flush(); + $this->_em->clear(); + + $user = $this->_em->find(__NAMESPACE__ . '\\DDC1228User', $user->id); + $this->assertEquals("Baz", $user->name); + } +} + +/** + * @Entity + */ +class DDC1228User +{ + /** + * @Id @Column(type="integer") @GeneratedValue + * @var int + */ + public $id; + + /** + * @column(type="string") + * @var string + */ + public $name = ''; + + /** + * @OneToOne(targetEntity="DDC1228Profile") + * @var Profile + */ + public $profile; + + public function getProfile() + { + return $this->profile; + } +} + +/** + * @Entity + */ +class DDC1228Profile +{ + /** + * @Id @Column(type="integer") @GeneratedValue + * @var int + */ + public $id; + + /** + * @column(type="string") + * @var string + */ + public $name; + + public function getName() + { + return $this->name; + } + + public function setName($name) + { + $this->name = $name; + } +} \ No newline at end of file From a607e2ec7a3fa262aee3bd0e8c106f2e87b46beb Mon Sep 17 00:00:00 2001 From: Ruben de Vries Date: Sat, 25 Jun 2011 17:08:56 +0200 Subject: [PATCH 063/220] fixed wrong keyname --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 47eb07c45..ae488ce63 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -435,7 +435,7 @@ class YamlDriver extends AbstractFileDriver } if (isset($manyToManyElement['orphanRemoval'])) { - $mapping['orphanRemoval'] = (bool)$manyToManyElement['orphan-removal']; + $mapping['orphanRemoval'] = (bool)$manyToManyElement['orphanRemoval']; } if (isset($manyToManyElement['orderBy'])) { From 7efe071ac48fe62d5c78a377425f3f5995d9e0ab Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 26 Jun 2011 10:10:57 +0200 Subject: [PATCH 064/220] DDC-1224 - Bugfix with temporary table ids and tables in schema (in postgresql) --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 3 ++- .../Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index c1f25a828..7c5cf8d26 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1271,7 +1271,8 @@ class ClassMetadataInfo implements ClassMetadata */ public function getTemporaryIdTableName() { - return $this->table['name'] . '_id_tmp'; + // replace dots with underscores because PostgreSQL creates temporary tables in a special schema + return str_replace('.', '_', $this->table['name'] . '_id_tmp'); } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 8f57280df..bcf4df543 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -236,6 +236,17 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase $this->setExpectedException('Doctrine\ORM\Mapping\MappingException'); $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); } + + /** + * @group DDC-1224 + */ + public function testGetTemporaryTableNameSchema() + { + $cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser'); + $cm->setTableName('foo.bar'); + + $this->assertEquals('foo_bar_id_tmp', $cm->getTemporaryIdTableName()); + } public function testDefaultTableName() { From 52431251cbe1aff0d7fef1ec7135540d0d345f04 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 26 Jun 2011 17:20:03 +0200 Subject: [PATCH 065/220] Fix some of the problems with Oracle testsuite --- lib/vendor/doctrine-dbal | 2 +- .../Tests/ORM/Functional/QueryDqlFunctionTest.php | 13 +++++++++---- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 7 +++++++ tests/Doctrine/Tests/TestUtil.php | 12 +----------- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index f2c150d19..4cfb32db0 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit f2c150d194af4ac846362ef8c6bf002402ed5f63 +Subproject commit 4cfb32db00da53638bc2dca84e3e63553fdf3c5b diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php index 42971e6b0..e37ea9f62 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryDqlFunctionTest.php @@ -274,10 +274,15 @@ class QueryDqlFunctionTest extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testDateDiff() { - $arg = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), '2011-01-01') AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m") - ->getARrayResult(); - - $this->assertTrue($arg[0]['diff'] > 0); + $query = $this->_em->createQuery("SELECT DATE_DIFF(CURRENT_TIMESTAMP(), DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day')) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m"); + $arg = $query->getArrayResult(); + + $this->assertEquals(-10, $arg[0]['diff'], "Should be roughly -10 (or -9)", 1); + + $query = $this->_em->createQuery("SELECT DATE_DIFF(DATE_ADD(CURRENT_TIMESTAMP(), 10, 'day'), CURRENT_TIMESTAMP()) AS diff FROM Doctrine\Tests\Models\Company\CompanyManager m"); + $arg = $query->getArrayResult(); + + $this->assertEquals(10, $arg[0]['diff'], "Should be roughly 10 (or 9)", 1); } /** diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 516a72aa2..92320e3a4 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -297,6 +297,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase } } + if (isset($GLOBALS['db_event_subscribers'])) { + foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) { + $subscriberInstance = new $subscriberClass(); + $evm->addEventSubscriber($subscriberInstance); + } + } + return \Doctrine\ORM\EntityManager::create($conn, $config); } diff --git a/tests/Doctrine/Tests/TestUtil.php b/tests/Doctrine/Tests/TestUtil.php index 5a187e595..a77812f7f 100644 --- a/tests/Doctrine/Tests/TestUtil.php +++ b/tests/Doctrine/Tests/TestUtil.php @@ -77,17 +77,7 @@ class TestUtil } } - $eventManager = null; - if (isset($GLOBALS['db_event_subscribers'])) { - $eventManager = new \Doctrine\Common\EventManager(); - foreach (explode(",", $GLOBALS['db_event_subscribers']) AS $subscriberClass) { - $subscriberInstance = new $subscriberClass(); - $eventManager->addEventSubscriber($subscriberInstance); - } - } - - $conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, $eventManager); - + $conn = \Doctrine\DBAL\DriverManager::getConnection($realDbParams, null, null); } else { $params = array( 'driver' => 'pdo_sqlite', From ed516edf90b99f89d1d7f050f1ef7bdbb21b5c54 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 26 Jun 2011 17:49:34 +0200 Subject: [PATCH 066/220] Fix discriminator casing problem in Oracle --- lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php | 2 +- lib/Doctrine/ORM/Persisters/SingleTablePersister.php | 2 +- lib/Doctrine/ORM/Query/SqlWalker.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php index 1cb73a9d6..715495b01 100644 --- a/lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php @@ -284,7 +284,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister } $resultColumnName = $this->_platform->getSQLResultCasing($discrColumn); - $this->_rsm->setDiscriminatorColumn('r', $discrColumn); + $this->_rsm->setDiscriminatorColumn('r', $resultColumnName); $this->_rsm->addMetaResult('r', $resultColumnName, $discrColumn); } diff --git a/lib/Doctrine/ORM/Persisters/SingleTablePersister.php b/lib/Doctrine/ORM/Persisters/SingleTablePersister.php index bf9104580..f910a8e06 100644 --- a/lib/Doctrine/ORM/Persisters/SingleTablePersister.php +++ b/lib/Doctrine/ORM/Persisters/SingleTablePersister.php @@ -49,7 +49,7 @@ class SingleTablePersister extends AbstractEntityInheritancePersister $rootClass = $this->_em->getClassMetadata($this->_class->rootEntityName); $tableAlias = $this->_getSQLTableAlias($rootClass->name); $resultColumnName = $this->_platform->getSQLResultCasing($discrColumn); - $this->_rsm->setDiscriminatorColumn('r', $discrColumn); + $this->_rsm->setDiscriminatorColumn('r', $resultColumnName); $this->_rsm->addMetaResult('r', $resultColumnName, $discrColumn); // Append subclass columns diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index f36e0ae8f..2a9f58faf 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -558,7 +558,7 @@ class SqlWalker implements TreeWalker $columnAlias = $this->_platform->getSQLResultCasing($columnAlias); $this->_rsm->setDiscriminatorColumn($dqlAlias, $columnAlias); - $this->_rsm->addMetaResult($dqlAlias, $this->_platform->getSQLResultCasing($columnAlias), $discrColumn['fieldName']); + $this->_rsm->addMetaResult($dqlAlias, $columnAlias, $discrColumn['fieldName']); // Add foreign key columns to SQL, if necessary if ($addMetaColumns) { From 5afc097527685f33abddbfb10af4741e8bd7385a Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 26 Jun 2011 19:06:52 +0200 Subject: [PATCH 067/220] Bump DBAL dependency to latest master --- lib/vendor/doctrine-dbal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index 4cfb32db0..2cb22496a 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit 4cfb32db00da53638bc2dca84e3e63553fdf3c5b +Subproject commit 2cb22496a732029373d98ff9e4d54a7187ee9bb8 From e899205300fd4eb676e4c0ec8c2b0d7afd0a5b3e Mon Sep 17 00:00:00 2001 From: Michel Weimerskirch Date: Tue, 28 Jun 2011 12:24:24 -0700 Subject: [PATCH 068/220] Removed superfluous variable name in "@return" documentation --- 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 4221c9db7..50b0f18ed 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -103,7 +103,7 @@ use Doctrine\ORM\Mapping as ORM; '/** * * - * @return $ + * @return */ public function () { From 551f6d05d96b9d25172902a48df4c83149d45738 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:37:53 +0200 Subject: [PATCH 069/220] DDC-1230 - Fix bug where UnitOfWork does not set STATE_REMOVE when calling EntityManager#remove() on an entity --- lib/Doctrine/ORM/UnitOfWork.php | 3 +- .../ORM/Functional/BasicFunctionalTest.php | 34 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 3d46303ea..970ade604 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -984,7 +984,7 @@ class UnitOfWork implements PropertyChangedListener if ($this->isInIdentityMap($entity)) { $this->removeFromIdentityMap($entity); } - unset($this->entityInsertions[$oid]); + unset($this->entityInsertions[$oid], $this->entityStates[$oid]); return; // entity has not been persisted yet, so nothing more to do. } @@ -999,6 +999,7 @@ class UnitOfWork implements PropertyChangedListener } if ( ! isset($this->entityDeletions[$oid])) { $this->entityDeletions[$oid] = $entity; + $this->entityStates[$oid] = self::STATE_REMOVED; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index cb79795bc..572b6c73d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -140,6 +140,40 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertFalse($user2->address instanceof \Doctrine\ORM\Proxy\Proxy); } + /** + * @group DDC-1230 + */ + public function testRemove() + { + $user = new CmsUser; + $user->name = 'Guilherme'; + $user->username = 'gblanco'; + $user->status = 'developer'; + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user)); + + $this->_em->persist($user); + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($user)); + + $this->_em->remove($user); + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user)); + + $this->_em->persist($user); + $this->_em->flush(); + $id = $user->getId(); + + $this->_em->remove($user); + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_REMOVED, $this->_em->getUnitOfWork()->getEntityState($user)); + $this->_em->flush(); + + $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($user)); + + $this->assertNull($this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $id)); + } + public function testOneToManyOrphanRemoval() { $user = new CmsUser; From 9ae30421dd80683e1c26b09de7d86000ddeadd1c Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Tue, 28 Jun 2011 15:50:14 -0400 Subject: [PATCH 070/220] Removed onUpdate property on join columns --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 4 ---- lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php | 1 - lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 4 ---- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 4 ---- lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php | 1 - lib/Doctrine/ORM/Tools/EntityGenerator.php | 4 ---- lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php | 9 --------- lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php | 3 --- lib/Doctrine/ORM/Tools/SchemaTool.php | 4 ---- .../Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php | 2 +- .../Tests/ORM/Mapping/AbstractMappingDriverTest.php | 6 ++---- .../ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php | 1 - .../Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml | 1 - .../Tools/Export/AbstractClassMetadataExporterTest.php | 1 - .../annotation/Doctrine.Tests.ORM.Tools.Export.User.php | 2 +- .../Export/php/Doctrine.Tests.ORM.Tools.Export.User.php | 1 - .../Doctrine/Tests/ORM/Tools/doctrine1schema/schema.yml | 1 - 17 files changed, 4 insertions(+), 45 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index e30b9bf01..2303f7f15 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -244,7 +244,6 @@ class AnnotationDriver implements Driver 'unique' => $joinColumnAnnot->unique, 'nullable' => $joinColumnAnnot->nullable, 'onDelete' => $joinColumnAnnot->onDelete, - 'onUpdate' => $joinColumnAnnot->onUpdate, 'columnDefinition' => $joinColumnAnnot->columnDefinition, ); } else if ($joinColumnsAnnot = $this->_reader->getPropertyAnnotation($property, 'Doctrine\ORM\Mapping\JoinColumns')) { @@ -255,7 +254,6 @@ class AnnotationDriver implements Driver 'unique' => $joinColumn->unique, 'nullable' => $joinColumn->nullable, 'onDelete' => $joinColumn->onDelete, - 'onUpdate' => $joinColumn->onUpdate, 'columnDefinition' => $joinColumn->columnDefinition, ); } @@ -363,7 +361,6 @@ class AnnotationDriver implements Driver 'unique' => $joinColumn->unique, 'nullable' => $joinColumn->nullable, 'onDelete' => $joinColumn->onDelete, - 'onUpdate' => $joinColumn->onUpdate, 'columnDefinition' => $joinColumn->columnDefinition, ); } @@ -375,7 +372,6 @@ class AnnotationDriver implements Driver 'unique' => $joinColumn->unique, 'nullable' => $joinColumn->nullable, 'onDelete' => $joinColumn->onDelete, - 'onUpdate' => $joinColumn->onUpdate, 'columnDefinition' => $joinColumn->columnDefinition, ); } diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php index 84d2cd1c8..2a32352c8 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php @@ -48,7 +48,6 @@ final class JoinColumn extends Annotation { public $unique = false; public $nullable = true; public $onDelete; - public $onUpdate; public $columnDefinition; } final class JoinColumns extends Annotation {} diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index b41710b4b..c26a2a35c 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -471,10 +471,6 @@ class XmlDriver extends AbstractFileDriver $joinColumn['onDelete'] = (string)$joinColumnElement['on-delete']; } - if (isset($joinColumnElement['on-update'])) { - $joinColumn['onUpdate'] = (string)$joinColumnElement['on-update']; - } - if (isset($joinColumnElement['column-definition'])) { $joinColumn['columnDefinition'] = (string)$joinColumnElement['column-definition']; } diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 47eb07c45..2d4ca5843 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -490,10 +490,6 @@ class YamlDriver extends AbstractFileDriver $joinColumn['onDelete'] = $joinColumnElement['onDelete']; } - if (isset($joinColumnElement['onUpdate'])) { - $joinColumn['onUpdate'] = $joinColumnElement['onUpdate']; - } - if (isset($joinColumnElement['columnDefinition'])) { $joinColumn['columnDefinition'] = $joinColumnElement['columnDefinition']; } diff --git a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php index 1a5600cdb..fd4ed3a41 100644 --- a/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php +++ b/lib/Doctrine/ORM/Tools/ConvertDoctrine1Schema.php @@ -248,7 +248,6 @@ class ConvertDoctrine1Schema 'name' => $relation['local'], 'referencedColumnName' => $relation['foreign'], 'onDelete' => isset($relation['onDelete']) ? $relation['onDelete'] : null, - 'onUpdate' => isset($relation['onUpdate']) ? $relation['onUpdate'] : null, ) ); } diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 4221c9db7..9d4f490dd 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -762,10 +762,6 @@ public function () $joinColumnAnnot[] = 'onDelete=' . ($joinColumn['onDelete'] ? 'true' : 'false'); } - if (isset($joinColumn['onUpdate'])) { - $joinColumnAnnot[] = 'onUpdate=' . ($joinColumn['onUpdate'] ? 'true' : 'false'); - } - if (isset($joinColumn['columnDefinition'])) { $joinColumnAnnot[] = 'columnDefinition="' . $joinColumn['columnDefinition'] . '"'; } diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php index fc27ea911..f9668c78f 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/XmlExporter.php @@ -215,9 +215,6 @@ class XmlExporter extends AbstractExporter if (isset($joinColumn['onDelete'])) { $joinColumnXml->addAttribute('on-delete', $joinColumn['onDelete']); } - if (isset($joinColumn['onUpdate'])) { - $joinColumnXml->addAttribute('on-update', $joinColumn['onUpdate']); - } } $inverseJoinColumnsXml = $joinTableXml->addChild('inverse-join-columns'); foreach ($associationMapping['joinTable']['inverseJoinColumns'] as $inverseJoinColumn) { @@ -227,9 +224,6 @@ class XmlExporter extends AbstractExporter if (isset($inverseJoinColumn['onDelete'])) { $inverseJoinColumnXml->addAttribute('on-delete', $inverseJoinColumn['onDelete']); } - if (isset($inverseJoinColumn['onUpdate'])) { - $inverseJoinColumnXml->addAttribute('on-update', $inverseJoinColumn['onUpdate']); - } if (isset($inverseJoinColumn['columnDefinition'])) { $inverseJoinColumnXml->addAttribute('column-definition', $inverseJoinColumn['columnDefinition']); } @@ -250,9 +244,6 @@ class XmlExporter extends AbstractExporter if (isset($joinColumn['onDelete'])) { $joinColumnXml->addAttribute('on-delete', $joinColumn['onDelete']); } - if (isset($joinColumn['onUpdate'])) { - $joinColumnXml->addAttribute('on-update', $joinColumn['onUpdate']); - } if (isset($joinColumn['columnDefinition'])) { $joinColumnXml->addAttribute('column-definition', $joinColumn['columnDefinition']); } diff --git a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php index 669e76ce4..36e272246 100644 --- a/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php +++ b/lib/Doctrine/ORM/Tools/Export/Driver/YamlExporter.php @@ -154,9 +154,6 @@ class YamlExporter extends AbstractExporter if (isset($joinColumn['onDelete'])) { $newJoinColumns[$joinColumn['name']]['onDelete'] = $joinColumn['onDelete']; } - if (isset($joinColumn['onUpdate'])) { - $newJoinColumns[$joinColumn['name']]['onUpdate'] = $joinColumn['onUpdate']; - } } $oneToOneMappingArray = array( 'mappedBy' => $associationMapping['mappedBy'], diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index d38f5d159..77106ec7d 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -523,10 +523,6 @@ class SchemaTool $uniqueConstraints[] = array('columns' => array($columnName)); } - if (isset($joinColumn['onUpdate'])) { - $fkOptions['onUpdate'] = $joinColumn['onUpdate']; - } - if (isset($joinColumn['onDelete'])) { $fkOptions['onDelete'] = $joinColumn['onDelete']; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php index 91c9e129e..f0867f352 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC448Test.php @@ -42,7 +42,7 @@ class DDC448MainTable /** * @ManyToOne(targetEntity="DDC448ConnectedClass", cascade={"all"}, fetch="EAGER") - * @JoinColumn(name="connectedClassId", referencedColumnName="id", onDelete="CASCADE", onUpdate="CASCADE", nullable=true) + * @JoinColumn(name="connectedClassId", referencedColumnName="id", onDelete="CASCADE", nullable=true) */ private $connectedClassId; } diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index ee2ea4249..6e4e2f353 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -267,10 +267,9 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase * @depends testColumnDefinition * @param ClassMetadata $class */ - public function testJoinColumnOnDeleteAndOnUpdate($class) + public function testJoinColumnOnDelete($class) { $this->assertEquals('CASCADE', $class->associationMappings['address']['joinColumns'][0]['onDelete']); - $this->assertEquals('CASCADE', $class->associationMappings['address']['joinColumns'][0]['onUpdate']); return $class; } @@ -324,7 +323,7 @@ class User /** * @OneToOne(targetEntity="Address", cascade={"remove"}, inversedBy="user") - * @JoinColumn(onDelete="CASCADE", onUpdate="CASCADE") + * @JoinColumn(onDelete="CASCADE") */ public $address; @@ -412,7 +411,6 @@ class User 'name' => 'address_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE', - 'onUpdate' => 'CASCADE' ), ), 'orphanRemoval' => false, diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php index 2abe648ad..505188757 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php @@ -51,7 +51,6 @@ $metadata->mapOneToOne(array( 'name' => 'address_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE', - 'onUpdate' => 'CASCADE' ), ), 'orphanRemoval' => false, diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml index a787a93c9..490a21c2a 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml @@ -30,7 +30,6 @@ Doctrine\Tests\ORM\Mapping\User: name: address_id referencedColumnName: id onDelete: CASCADE - onUpdate: CASCADE cascade: [ remove ] oneToMany: phonenumbers: diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 850fb76ba..11b3d113d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -217,7 +217,6 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest $this->assertEquals('address_id', $class->associationMappings['address']['joinColumns'][0]['name']); $this->assertEquals('id', $class->associationMappings['address']['joinColumns'][0]['referencedColumnName']); $this->assertEquals('CASCADE', $class->associationMappings['address']['joinColumns'][0]['onDelete']); - $this->assertEquals('CASCADE', $class->associationMappings['address']['joinColumns'][0]['onUpdate']); $this->assertTrue($class->associationMappings['address']['isCascadeRemove']); $this->assertFalse($class->associationMappings['address']['isCascadePersist']); diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php index e71da460e..4fb951087 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/annotation/Doctrine.Tests.ORM.Tools.Export.User.php @@ -24,7 +24,7 @@ class User /** * @OneToOne(targetEntity="Doctrine\Tests\ORM\Tools\Export\Address", cascade={"remove"}, inversedBy="user") - * @JoinColumn(name="address_id", onDelete="CASCADE", onUpdate="CASCADE") + * @JoinColumn(name="address_id", onDelete="CASCADE") */ public $address; diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php index 1a3824543..0dc182168 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/php/Doctrine.Tests.ORM.Tools.Export.User.php @@ -47,7 +47,6 @@ $metadata->mapOneToOne(array( 'name' => 'address_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE', - 'onUpdate' => 'CASCADE' ), ), 'orphanRemoval' => false, diff --git a/tests/Doctrine/Tests/ORM/Tools/doctrine1schema/schema.yml b/tests/Doctrine/Tests/ORM/Tools/doctrine1schema/schema.yml index 67301c05d..efa24c791 100644 --- a/tests/Doctrine/Tests/ORM/Tools/doctrine1schema/schema.yml +++ b/tests/Doctrine/Tests/ORM/Tools/doctrine1schema/schema.yml @@ -24,6 +24,5 @@ Profile: relations: User: onDelete: CASCADE - onUpdate: CASCADE foreignType: one type: one \ No newline at end of file From c19d7fe2ebe465f5cba4e4a45ba8ea119a18a4d9 Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Tue, 28 Jun 2011 15:55:43 -0400 Subject: [PATCH 071/220] Missed one --- .../Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml index 2b3048fba..4c169f8d4 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml +++ b/tests/Doctrine/Tests/ORM/Tools/Export/yaml/Doctrine.Tests.ORM.Tools.Export.User.dcm.yml @@ -23,7 +23,6 @@ Doctrine\Tests\ORM\Tools\Export\User: name: address_id referencedColumnName: id onDelete: CASCADE - onUpdate: CASCADE cascade: [ remove ] inversedBy: user oneToMany: From 66e92b147d6e3671f3982e66e1a3176acfaa70c7 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 22:30:17 +0200 Subject: [PATCH 072/220] Minor spelling mistake, thanks Alexandre Mathieu for reporting --- lib/Doctrine/ORM/UnitOfWork.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 970ade604..2a2ec68c6 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -577,7 +577,7 @@ class UnitOfWork implements PropertyChangedListener . $assoc['sourceEntity'] . "#" . $assoc['fieldName'] . "' that was not" . " configured to cascade persist operations for entity: " . self::objToStr($entry) . "." . " Explicitly persist the new entity or configure cascading persist operations" - . " on the relationship. If you cannot find out which entity casues the problem" + . " on the relationship. If you cannot find out which entity causes the problem" . " implement '" . $assoc['targetEntity'] . "#__toString()' to get a clue."); } $this->persistNew($targetClass, $entry); From 379584fb26fafeb2e13c11fd2fcbb7a8edc48ee5 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:10:43 +0000 Subject: [PATCH 073/220] Bump dependencies of Common and DBAL to 2.1.0RC2 --- lib/vendor/doctrine-common | 2 +- lib/vendor/doctrine-dbal | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 565674b9b..6a74bf90f 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 565674b9b376edbc5e31070e91fd85ea6dbd5d60 +Subproject commit 6a74bf90f5fcf6b404f49aee6c11b78fbd568c6c diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index 2cb22496a..be3790059 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit 2cb22496a732029373d98ff9e4d54a7187ee9bb8 +Subproject commit be3790059cc43b674a55548eb42d5d25846ea6a9 From 01935e66611c5ffa5bc71168f7a93889faf841e6 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:11:02 +0000 Subject: [PATCH 074/220] Release 2.1.0RC2 --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 7041ecf03..058dd5985 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC2-DEV'; + const VERSION = '2.1.0RC2'; /** * Compares a Doctrine version with the current one. From 6d035be3e3e4a9805abf0ef6a7895555cb6b9bbf Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 28 Jun 2011 21:11:14 +0000 Subject: [PATCH 075/220] Bump Dev Version to 2.1.0-DEV --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 058dd5985..e459dceb6 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC2'; + const VERSION = '2.1.0-DEV'; /** * Compares a Doctrine version with the current one. From 9395eeed3d0a94506b7d3240f570fabe8a151873 Mon Sep 17 00:00:00 2001 From: Peter Kruithof Date: Wed, 29 Jun 2011 03:15:05 -0700 Subject: [PATCH 076/220] Changed order of elements --- .../Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml b/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml index 11bb6ac95..de638b236 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml +++ b/tests/Doctrine/Tests/ORM/Tools/Export/xml/Doctrine.Tests.ORM.Tools.Export.User.dcm.xml @@ -26,12 +26,12 @@ - - - + + + From 570103606892d2d57ca350a974cb0d856d055dc1 Mon Sep 17 00:00:00 2001 From: Johannes Schmitt Date: Thu, 30 Jun 2011 11:03:32 +0200 Subject: [PATCH 077/220] added @Annotation to annotations --- .../Mapping/Driver/DoctrineAnnotations.php | 76 +++++++++++++++++-- 1 file changed, 69 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php index 84d2cd1c8..532ee1c77 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php @@ -23,24 +23,41 @@ use Doctrine\Common\Annotations\Annotation; /* Annotations */ +/** @Annotation */ final class Entity extends Annotation { public $repositoryClass; public $readOnly = false; } + +/** @Annotation */ final class MappedSuperclass extends Annotation {} + +/** @Annotation */ final class InheritanceType extends Annotation {} + +/** @Annotation */ final class DiscriminatorColumn extends Annotation { public $name; public $fieldName; // field name used in non-object hydration (array/scalar) public $type; public $length; } + +/** @Annotation */ final class DiscriminatorMap extends Annotation {} + +/** @Annotation */ final class Id extends Annotation {} + +/** @Annotation */ final class GeneratedValue extends Annotation { public $strategy = 'AUTO'; } + +/** @Annotation */ final class Version extends Annotation {} + +/** @Annotation */ final class JoinColumn extends Annotation { public $name; public $fieldName; // field name used in non-object hydration (array/scalar) @@ -51,7 +68,11 @@ final class JoinColumn extends Annotation { public $onUpdate; public $columnDefinition; } + +/** @Annotation */ final class JoinColumns extends Annotation {} + +/** @Annotation */ final class Column extends Annotation { public $type = 'string'; public $length; @@ -65,6 +86,8 @@ final class Column extends Annotation { public $options = array(); public $columnDefinition; } + +/** @Annotation */ final class OneToOne extends Annotation { public $targetEntity; public $mappedBy; @@ -73,6 +96,8 @@ final class OneToOne extends Annotation { public $fetch = 'LAZY'; public $orphanRemoval = false; } + +/** @Annotation */ final class OneToMany extends Annotation { public $mappedBy; public $targetEntity; @@ -81,12 +106,16 @@ final class OneToMany extends Annotation { public $orphanRemoval = false; public $indexBy; } + +/** @Annotation */ final class ManyToOne extends Annotation { public $targetEntity; public $cascade; public $fetch = 'LAZY'; public $inversedBy; } + +/** @Annotation */ final class ManyToMany extends Annotation { public $targetEntity; public $mappedBy; @@ -95,50 +124,83 @@ final class ManyToMany extends Annotation { public $fetch = 'LAZY'; public $indexBy; } + +/** @Annotation */ final class ElementCollection extends Annotation { public $tableName; } + +/** @Annotation */ final class Table extends Annotation { public $name; public $schema; public $indexes; public $uniqueConstraints; } + +/** @Annotation */ final class UniqueConstraint extends Annotation { public $name; public $columns; } + +/** @Annotation */ final class Index extends Annotation { public $name; public $columns; } + +/** @Annotation */ final class JoinTable extends Annotation { public $name; public $schema; public $joinColumns = array(); public $inverseJoinColumns = array(); } + +/** @Annotation */ final class SequenceGenerator extends Annotation { public $sequenceName; public $allocationSize = 1; public $initialValue = 1; } + +/** @Annotation */ final class ChangeTrackingPolicy extends Annotation {} + +/** @Annotation */ final class OrderBy extends Annotation {} +/** @Annotation */ final class NamedQueries extends Annotation {} + +/** @Annotation */ final class NamedQuery extends Annotation { public $name; public $query; } /* Annotations for lifecycle callbacks */ +/** @Annotation */ final class HasLifecycleCallbacks extends Annotation {} -final class PrePersist extends Annotation {} -final class PostPersist extends Annotation {} -final class PreUpdate extends Annotation {} -final class PostUpdate extends Annotation {} -final class PreRemove extends Annotation {} -final class PostRemove extends Annotation {} -final class PostLoad extends Annotation {} +/** @Annotation */ +final class PrePersist extends Annotation {} + +/** @Annotation */ +final class PostPersist extends Annotation {} + +/** @Annotation */ +final class PreUpdate extends Annotation {} + +/** @Annotation */ +final class PostUpdate extends Annotation {} + +/** @Annotation */ +final class PreRemove extends Annotation {} + +/** @Annotation */ +final class PostRemove extends Annotation {} + +/** @Annotation */ +final class PostLoad extends Annotation {} From 4603e94fe990e1063f4a2d6ccc87247e3bc3935b Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Thu, 30 Jun 2011 15:04:57 -0300 Subject: [PATCH 078/220] Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap. --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 3f65da3c5..8bfda6450 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -327,7 +327,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface if (!$class->discriminatorColumn) { throw MappingException::missingDiscriminatorColumn($class->name); } - } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) { + } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) { // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); } From 5362206297d8c6715e4e8f43fab778bb662f810a Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 30 Jun 2011 20:12:22 +0200 Subject: [PATCH 079/220] Revert "Fixed ClassMetadataFactory which was throwing an exception if parent class on inheritance hierarchy is an abstract class and also extends from a mapped superclass (so it contains an inheritance already), but is not in the discriminatorMap." This reverts commit 4603e94fe990e1063f4a2d6ccc87247e3bc3935b. Making an exception go away is not a fix for something. :) --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 8bfda6450..3f65da3c5 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -327,7 +327,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface if (!$class->discriminatorColumn) { throw MappingException::missingDiscriminatorColumn($class->name); } - } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) { + } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) { // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); } From a0a81db045359496974a490bb6e37bf765106a3c Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 30 Jun 2011 20:57:29 +0200 Subject: [PATCH 080/220] DDC-1204, DDC-1203 - No need to throw this exception for abstract classes anymore --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 2 +- lib/Doctrine/ORM/Mapping/MappingException.php | 3 ++- .../Tests/ORM/Mapping/BasicInheritanceMappingTest.php | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 3f65da3c5..8bfda6450 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -327,7 +327,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface if (!$class->discriminatorColumn) { throw MappingException::missingDiscriminatorColumn($class->name); } - } else if ($parent && !in_array($class->name, array_values($class->discriminatorMap))) { + } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) { // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); } diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php index 9c65ad928..5bedf3a06 100644 --- a/lib/Doctrine/ORM/Mapping/MappingException.php +++ b/lib/Doctrine/ORM/Mapping/MappingException.php @@ -289,7 +289,8 @@ class MappingException extends \Doctrine\ORM\ORMException { return new self( "Entity '" . $className . "' has to be part of the descriminator map of '" . $rootClassName . "' " . - "to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract." + "to be properly mapped in the inheritance hierachy. Alternatively you can make '".$className."' an abstract class " . + "to avoid this exception from occuring." ); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php index 91ebbd99b..d5aac63f9 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/BasicInheritanceMappingTest.php @@ -85,7 +85,7 @@ class BasicInheritanceMappingTest extends \Doctrine\Tests\OrmTestCase */ public function testUnmappedEntityInHierachy() { - $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. If you want to avoid instantiation of this type mark it abstract."); + $this->setExpectedException('Doctrine\ORM\Mapping\MappingException', "Entity 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' has to be part of the descriminator map of 'Doctrine\Tests\ORM\Mapping\HierachyBase' to be properly mapped in the inheritance hierachy. Alternatively you can make 'Doctrine\Tests\ORM\Mapping\HierachyBEntity' an abstract class to avoid this exception from occuring."); $class = $this->_factory->getMetadataFor(__NAMESPACE__ . '\\HierachyE'); } @@ -209,7 +209,7 @@ abstract class HierachyASuperclass extends HierachyBase /** * @Entity */ -abstract class HierachyBEntity extends HierachyBase +class HierachyBEntity extends HierachyBase { /** @Column(type="string") */ public $b; From 5299bd788f7afa8bee9a251f6efa99fb64742ffe Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 30 Jun 2011 21:04:46 +0200 Subject: [PATCH 081/220] DDC-1239 - Fix missing AND in Eager LEFT JOIN of entity persister when multiple join columns are used --- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 5ce7080c2..2ee3cf4fe 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -953,12 +953,17 @@ class BasicEntityPersister } } $this->_selectJoinSql .= ' LEFT JOIN'; // TODO: Inner join when all join columns are NOT nullable. + $first = true; if ($assoc['isOwningSide']) { $this->_selectJoinSql .= ' ' . $eagerEntity->table['name'] . ' ' . $this->_getSQLTableAlias($eagerEntity->name, $assocAlias) .' ON '; foreach ($assoc['sourceToTargetKeyColumns'] AS $sourceCol => $targetCol) { + if (!$first) { + $this->_selectJoinSql .= ' AND '; + } $this->_selectJoinSql .= $this->_getSQLTableAlias($assoc['sourceEntity']) . '.'.$sourceCol.' = ' . $this->_getSQLTableAlias($assoc['targetEntity'], $assocAlias) . '.'.$targetCol.' '; + $first = false; } } else { $eagerEntity = $this->_em->getClassMetadata($assoc['targetEntity']); @@ -967,8 +972,12 @@ class BasicEntityPersister $this->_selectJoinSql .= ' ' . $eagerEntity->table['name'] . ' ' . $this->_getSQLTableAlias($eagerEntity->name, $assocAlias) .' ON '; foreach ($owningAssoc['sourceToTargetKeyColumns'] AS $sourceCol => $targetCol) { + if (!$first) { + $this->_selectJoinSql .= ' AND '; + } $this->_selectJoinSql .= $this->_getSQLTableAlias($owningAssoc['sourceEntity'], $assocAlias) . '.'.$sourceCol.' = ' . $this->_getSQLTableAlias($owningAssoc['targetEntity']) . '.' . $targetCol . ' '; + $first = false; } } } From 43d8466fa99f0b9057b59c83a9d9c6b5d5c26c23 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 2 Jul 2011 19:48:43 +0200 Subject: [PATCH 082/220] Update annotation handling in AnnotationDriver to work with AnnotationRegistry and bump common dependency --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 4 ++-- lib/vendor/doctrine-common | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index e30b9bf01..cb30e1cbf 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -21,11 +21,10 @@ namespace Doctrine\ORM\Mapping\Driver; use Doctrine\Common\Cache\ArrayCache, Doctrine\Common\Annotations\AnnotationReader, + Doctrine\Common\Annotations\AnnotationRegistry, Doctrine\ORM\Mapping\ClassMetadataInfo, Doctrine\ORM\Mapping\MappingException; -require __DIR__ . '/DoctrineAnnotations.php'; - /** * The AnnotationDriver reads the mapping metadata from docblock annotations. * @@ -73,6 +72,7 @@ class AnnotationDriver implements Driver public function __construct($reader, $paths = null) { $this->_reader = $reader; + AnnotationRegistry::registerFile(__DIR__ . '/DoctrineAnnotations.php'); if ($paths) { $this->addPaths((array) $paths); } diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 6a74bf90f..6aab4ffd6 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 6a74bf90f5fcf6b404f49aee6c11b78fbd568c6c +Subproject commit 6aab4ffd67baa5a8b7342c986616fb07a399c510 From f589cd0d9fd48581292be11a886ccb5ba5f15789 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 2 Jul 2011 20:30:35 +0200 Subject: [PATCH 083/220] Update common version --- lib/vendor/doctrine-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 6aab4ffd6..9a4add671 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 6aab4ffd67baa5a8b7342c986616fb07a399c510 +Subproject commit 9a4add6713069fddc36b79484909c010b6c110c1 From cbe14a694a3fc922d356d8c1eb2c70c372ba012c Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 2 Jul 2011 20:28:04 +0000 Subject: [PATCH 084/220] Update Common dependency to 2.1 RC3 --- lib/vendor/doctrine-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 9a4add671..74a2c924c 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 9a4add6713069fddc36b79484909c010b6c110c1 +Subproject commit 74a2c924cd08b30785877808b1fb519b4b2e60b1 From e4f2a5627749dd30958a1e7f10c39839c45e1772 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 2 Jul 2011 20:28:37 +0000 Subject: [PATCH 085/220] Release 2.1.0RC3 --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index e459dceb6..d6d32a10b 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0-DEV'; + const VERSION = '2.1.0RC3'; /** * Compares a Doctrine version with the current one. From ffca455788d251529994e9268a67a9822ed6d05b Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 2 Jul 2011 20:29:02 +0000 Subject: [PATCH 086/220] Bump Dev Version to 2.1.0RC4-DEV --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index d6d32a10b..5e811edd0 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC3'; + const VERSION = '2.1.0RC4-DEV'; /** * Compares a Doctrine version with the current one. From 550fcbc17fc9d927edf34bd0e5f9efc3b68ce344 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Sun, 3 Jul 2011 01:48:18 -0300 Subject: [PATCH 087/220] [DDC-1237] Fixed issue with QueryBuilder where user may have includes nested complex expression in a string format while consuming a composite expression (AND or OR). --- lib/Doctrine/ORM/Query/Expr/Composite.php | 21 ++++++++++++++++--- tests/Doctrine/Tests/ORM/QueryBuilderTest.php | 11 ++++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Query/Expr/Composite.php b/lib/Doctrine/ORM/Query/Expr/Composite.php index 97c15e64b..0d606a9b0 100644 --- a/lib/Doctrine/ORM/Query/Expr/Composite.php +++ b/lib/Doctrine/ORM/Query/Expr/Composite.php @@ -43,11 +43,26 @@ class Composite extends Base $components = array(); foreach ($this->_parts as $part) { - $components[] = (is_object($part) && $part instanceof self && $part->count() > 1) - ? $this->_preSeparator . ((string) $part) . $this->_postSeparator - : ((string) $part); + $components[] = $this->processQueryPart($part); } return implode($this->_separator, $components); } + + + private function processQueryPart($part) + { + $queryPart = (string) $part; + + if (is_object($part) && $part instanceof self && $part->count() > 1) { + return $this->_preSeparator . $queryPart . $this->_postSeparator; + } + + // Fixes DDC-1237: User may have added a where item containing nested expression (with "OR" or "AND") + if (mb_stripos($queryPart, ' OR ') !== false || mb_stripos($queryPart, ' AND ') !== false) { + return $this->_preSeparator . $queryPart . $this->_postSeparator; + } + + return $queryPart; + } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php index 57eb82946..2b352bdce 100644 --- a/tests/Doctrine/Tests/ORM/QueryBuilderTest.php +++ b/tests/Doctrine/Tests/ORM/QueryBuilderTest.php @@ -197,6 +197,17 @@ class QueryBuilderTest extends \Doctrine\Tests\OrmTestCase $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = :uid'); } + + public function testComplexAndWhere() + { + $qb = $this->_em->createQueryBuilder() + ->select('u') + ->from('Doctrine\Tests\Models\CMS\CmsUser', 'u') + ->where('u.id = :uid OR u.id = :uid2 OR u.id = :uid3') + ->andWhere('u.name = :name'); + + $this->assertValidQueryBuilder($qb, 'SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE (u.id = :uid OR u.id = :uid2 OR u.id = :uid3) AND u.name = :name'); + } public function testAndWhere() { From 6b54cceed71368be7a8a2e6a1b50d9dfc775f0fa Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 3 Jul 2011 12:21:04 +0200 Subject: [PATCH 088/220] Moved AnnotationRegistry::registerFile() call to Configuration#newDefaultAnnotationDriver() and documented the migration in UPGRADE_TO_2_1 --- UPGRADE_TO_2_1 | 2 ++ lib/Doctrine/ORM/Configuration.php | 21 +++++++++++++------ .../ORM/Mapping/Driver/AnnotationDriver.php | 1 - 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/UPGRADE_TO_2_1 b/UPGRADE_TO_2_1 index 69dee07dc..8b289ecd4 100644 --- a/UPGRADE_TO_2_1 +++ b/UPGRADE_TO_2_1 @@ -9,6 +9,8 @@ The EntityRepository now has an interface Doctrine\Common\Persistence\ObjectRepo The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory the operation of the new reader should be backwards compatible, but it has to be setup differently to work that way: + \Doctrine\Common\Annotations\AnnotationRegistry::registerFile('/doctrine-src/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); + $reader = new \Doctrine\Common\Annotations\AnnotationReader(); $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); // new code necessary starting here diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 4ea7809b3..a7219da8b 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -20,8 +20,11 @@ namespace Doctrine\ORM; use Doctrine\Common\Cache\Cache, + Doctrine\Common\Cache\ArrayCache, + Doctrine\Common\Annotations\AnnotationRegistry, + Doctrine\Common\Annotations\AnnotationReader, Doctrine\ORM\Mapping\Driver\Driver, - Doctrine\Common\Cache\ArrayCache; + Doctrine\ORM\Mapping\Driver\AnnotationDriver; /** * Configuration container for all configuration options of Doctrine. @@ -122,10 +125,16 @@ class Configuration extends \Doctrine\DBAL\Configuration public function newDefaultAnnotationDriver($paths = array()) { if (version_compare(\Doctrine\Common\Version::VERSION, '3.0.0-DEV', '>=')) { - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + // Register the ORM Annotations in the AnnotationRegistry + AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php'); + + $reader = new AnnotationReader(); $reader = new \Doctrine\Common\Annotations\CachedReader($reader, new ArrayCache()); - } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-BETA3-DEV', '>=')) { - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + } else if (version_compare(\Doctrine\Common\Version::VERSION, '2.1.0-DEV', '>=')) { + // Register the ORM Annotations in the AnnotationRegistry + AnnotationRegistry::registerFile(__DIR__ . '/Mapping/Driver/DoctrineAnnotations.php'); + + $reader = new AnnotationReader(); $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); $reader->setIgnoreNotImportedAnnotations(true); $reader->setEnableParsePhpImports(false); @@ -133,10 +142,10 @@ class Configuration extends \Doctrine\DBAL\Configuration new \Doctrine\Common\Annotations\IndexedReader($reader), new ArrayCache() ); } else { - $reader = new \Doctrine\Common\Annotations\AnnotationReader(); + $reader = new AnnotationReader(); $reader->setDefaultAnnotationNamespace('Doctrine\ORM\Mapping\\'); } - return new \Doctrine\ORM\Mapping\Driver\AnnotationDriver($reader, (array)$paths); + return new AnnotationDriver($reader, (array)$paths); } /** diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index cb30e1cbf..4de9520d1 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -72,7 +72,6 @@ class AnnotationDriver implements Driver public function __construct($reader, $paths = null) { $this->_reader = $reader; - AnnotationRegistry::registerFile(__DIR__ . '/DoctrineAnnotations.php'); if ($paths) { $this->addPaths((array) $paths); } From db37d974c835ca6b752e195ae86887fb9e861cab Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Mon, 4 Jul 2011 11:33:44 -0300 Subject: [PATCH 089/220] Increasing visibility of AnnotationReader inside AnnotationDriver from private to protected. --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index cb30e1cbf..a29b832ac 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -41,7 +41,7 @@ class AnnotationDriver implements Driver * * @var AnnotationReader */ - private $_reader; + protected $_reader; /** * The paths where to look for mapping files. From 8e7c15645197f8f4cfb3aab933d8dfada4057838 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 30 Jun 2011 20:09:49 +0200 Subject: [PATCH 090/220] Started trying to reproduce this issue --- .../ORM/Functional/Ticket/DDC1238Test.php | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php new file mode 100644 index 000000000..ab92a24b3 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php @@ -0,0 +1,89 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238User'), + #$this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238UserBase'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238UserSuperClass'), + )); + } catch(\PDOException $e) { + + } + } + + public function testIssue() + { + $user = new DDC1238User; + $user->setName("test"); + + $this->_em->persist($user); + $this->_em->flush(); + $this->_em->clear(); + + for ($i = 0; $i < 5; $i++) { + $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $user->getId()); + } + + $this->assertInstanceOf(__NAMESPACE__ . '\\DDC1238User', $user); + } +} + +/** + * @MappedSuperclass + */ +abstract class DDC1238UserSuperClass +{ + /** + * @Column + * @var string + */ + private $name; + + public function getName() + { + return $this->name; + } + + public function setName($name) + { + $this->name = $name; + } +} + +/** + * nothing + */ +abstract class DDC1238UserBase extends DDC1238UserSuperClass +{ + +} + +/** + * @Entity + */ +class DDC1238User extends DDC1238UserBase +{ + /** @Id @GeneratedValue @Column(type="integer") */ + private $id; + + public function getId() + { + return $this->id; + } +} + From a947e8a4b0a1d7dbdd1cd61ddbfe73ce182bda49 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 4 Jul 2011 20:35:33 +0200 Subject: [PATCH 091/220] DDC-1238 - Reproducible case, its correct through --- .../Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php index ab92a24b3..f2475c764 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php @@ -35,11 +35,12 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - for ($i = 0; $i < 5; $i++) { - $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $user->getId()); - } + $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $user->getId()); + $this->_em->clear(); - $this->assertInstanceOf(__NAMESPACE__ . '\\DDC1238User', $user); + $userId = $user->getId(); + + $this->assertNull($userId, "This proxy is unitialized and was cleared from the identity map, so no loading possible."); } } From a638154046c09872ff96a8daa064eba1a5b625f0 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 4 Jul 2011 20:59:42 +0200 Subject: [PATCH 092/220] Update tests --- .../ORM/Functional/Ticket/DDC1238Test.php | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php index f2475c764..63b986bd7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php @@ -35,11 +35,17 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $user->getId()); + $userId = $user->getId(); $this->_em->clear(); + $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + $this->_em->clear(); + #$user2 = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + + xdebug_start_trace("/tmp/doctrine"); $userId = $user->getId(); + $this->assertNotSame($user, $user2); $this->assertNull($userId, "This proxy is unitialized and was cleared from the identity map, so no loading possible."); } } @@ -66,18 +72,10 @@ abstract class DDC1238UserSuperClass } } -/** - * nothing - */ -abstract class DDC1238UserBase extends DDC1238UserSuperClass -{ - -} - /** * @Entity */ -class DDC1238User extends DDC1238UserBase +class DDC1238User extends DDC1238UserSuperClass { /** @Id @GeneratedValue @Column(type="integer") */ private $id; From 2858b8290fc63ca96a31ef173c9cf128ec18bfe7 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 4 Jul 2011 23:19:08 +0200 Subject: [PATCH 093/220] DDC-1238 - Fixed a bug introduced when refactoring persisters hydration. This occurs when you call $em->clear() and you start accessing a proxy. --- .../Internal/Hydration/AbstractHydrator.php | 21 ++++++++ .../ORM/Internal/Hydration/ObjectHydrator.php | 6 +++ .../Hydration/SimpleObjectHydrator.php | 16 ++---- .../ORM/Persisters/BasicEntityPersister.php | 8 +-- lib/Doctrine/ORM/Query.php | 9 ++++ lib/Doctrine/ORM/UnitOfWork.php | 6 +-- .../ORM/Functional/Ticket/DDC1238Test.php | 52 +++++++++++-------- 7 files changed, 76 insertions(+), 42 deletions(-) diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php index 4bc53f738..181854e36 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php @@ -287,4 +287,25 @@ abstract class AbstractHydrator return $rowData; } + + protected function registerManaged($class, $entity, $data) + { + if ($class->isIdentifierComposite) { + $id = array(); + foreach ($class->identifier as $fieldName) { + if (isset($class->associationMappings[$fieldName])) { + $id[$fieldName] = $data[$class->associationMappings[$fieldName]['joinColumns'][0]['name']]; + } else { + $id[$fieldName] = $data[$fieldName]; + } + } + } else { + if (isset($class->associationMappings[$class->identifier[0]])) { + $id = array($class->identifier[0] => $data[$class->associationMappings[$class->identifier[0]]['joinColumns'][0]['name']]); + } else { + $id = array($class->identifier[0] => $data[$class->identifier[0]]); + } + } + $this->_em->getUnitOfWork()->registerManaged($entity, $id, $data); + } } diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index 381fd4ab1..2935f67a7 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -205,6 +205,12 @@ class ObjectHydrator extends AbstractHydrator $className = $this->_ce[$className]->discriminatorMap[$data[$discrColumn]]; unset($data[$discrColumn]); } + + if (isset($this->_hints[Query::HINT_REFRESH_ENTITY]) && isset($this->_rootAliases[$dqlAlias])) { + $class = $this->_ce[$className]; + $this->registerManaged($class, $this->_hints[Query::HINT_REFRESH_ENTITY], $data); + } + return $this->_uow->createEntity($className, $data, $this->_hints); } diff --git a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php index 3524f89e9..34d8e31b1 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/SimpleObjectHydrator.php @@ -23,11 +23,10 @@ namespace Doctrine\ORM\Internal\Hydration; use \PDO; use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\DBAL\Types\Type; +use Doctrine\ORM\Query; class SimpleObjectHydrator extends AbstractHydrator { - const REFRESH_ENTITY = 'doctrine_refresh_entity'; - /** * @var ClassMetadata */ @@ -123,17 +122,8 @@ class SimpleObjectHydrator extends AbstractHydrator } } - if (isset($this->_hints[self::REFRESH_ENTITY])) { - $this->_hints[Query::HINT_REFRESH] = true; - $id = array(); - if ($this->_class->isIdentifierComposite) { - foreach ($this->_class->identifier as $fieldName) { - $id[$fieldName] = $data[$fieldName]; - } - } else { - $id = array($this->_class->identifier[0] => $data[$this->_class->identifier[0]]); - } - $this->_em->getUnitOfWork()->registerManaged($this->_hints[self::REFRESH_ENTITY], $id, $data); + if (isset($this->_hints[Query::HINT_REFRESH_ENTITY])) { + $this->registerManaged($this->class, $this->_hints[Query::HINT_REFRESH_ENTITY], $data); } $result[] = $this->_em->getUnitOfWork()->createEntity($entityName, $data, $this->_hints); diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 2ee3cf4fe..2de0611cd 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -570,6 +570,7 @@ class BasicEntityPersister if ($entity !== null) { $hints[Query::HINT_REFRESH] = true; + $hints[Query::HINT_REFRESH_ENTITY] = $entity; } if ($this->_selectJoinSql) { @@ -587,13 +588,12 @@ class BasicEntityPersister * * @param array $assoc The association to load. * @param object $sourceEntity The entity that owns the association (not necessarily the "owning side"). - * @param object $targetEntity The existing ghost entity (proxy) to load, if any. * @param array $identifier The identifier of the entity to load. Must be provided if * the association to load represents the owning side, otherwise * the identifier is derived from the $sourceEntity. * @return object The loaded and managed entity instance or NULL if the entity can not be found. */ - public function loadOneToOneEntity(array $assoc, $sourceEntity, $targetEntity, array $identifier = array()) + public function loadOneToOneEntity(array $assoc, $sourceEntity, array $identifier = array()) { if ($foundEntity = $this->_em->getUnitOfWork()->tryGetById($identifier, $assoc['targetEntity'])) { return $foundEntity; @@ -621,7 +621,7 @@ class BasicEntityPersister } */ - $targetEntity = $this->load($identifier, $targetEntity, $assoc, $hints); + $targetEntity = $this->load($identifier, null, $assoc, $hints); // Complete bidirectional association, if necessary if ($targetEntity !== null && $isInverseSingleValued) { @@ -641,7 +641,7 @@ class BasicEntityPersister } } - $targetEntity = $this->load($identifier, $targetEntity, $assoc); + $targetEntity = $this->load($identifier, null, $assoc); if ($targetEntity !== null) { $targetClass->setFieldValue($targetEntity, $assoc['mappedBy'], $sourceEntity); diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index fa7fff2e4..820711d55 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -53,6 +53,15 @@ final class Query extends AbstractQuery * @var string */ const HINT_REFRESH = 'doctrine.refresh'; + + + /** + * Internal hint: is set to the proxy entity that is currently triggered for loading + * + * @var string + */ + const HINT_REFRESH_ENTITY = 'doctrine.refresh.entity'; + /** * The forcePartialLoad query hint forces a particular query to return * partial objects. diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 2a2ec68c6..684210272 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1976,7 +1976,7 @@ class UnitOfWork implements PropertyChangedListener // a way to solve this with deferred eager loading, which means putting // an entity with subclasses at a *-to-one location is really bad! (performance-wise) $newValue = $this->getEntityPersister($assoc['targetEntity']) - ->loadOneToOneEntity($assoc, $entity, null, $associatedId); + ->loadOneToOneEntity($assoc, $entity, $associatedId); } else { // Deferred eager load only works for single identifier classes @@ -2012,7 +2012,7 @@ class UnitOfWork implements PropertyChangedListener } else { // Inverse side of x-to-one can never be lazy $class->reflFields[$field]->setValue($entity, $this->getEntityPersister($assoc['targetEntity']) - ->loadOneToOneEntity($assoc, $entity, null)); + ->loadOneToOneEntity($assoc, $entity)); } } else { // Inject collection @@ -2143,7 +2143,7 @@ class UnitOfWork implements PropertyChangedListener * @return array The identifier values. */ public function getEntityIdentifier($entity) - { + { return $this->entityIdentifiers[spl_object_hash($entity)]; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php index 63b986bd7..93a89818e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1238Test.php @@ -18,8 +18,6 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema(array( $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238User'), - #$this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238UserBase'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1238UserSuperClass'), )); } catch(\PDOException $e) { @@ -40,27 +38,51 @@ class DDC1238Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); $this->_em->clear(); - #$user2 = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); - xdebug_start_trace("/tmp/doctrine"); + $userId2 = $user->getId(); + $this->assertEquals($userId, $userId2, "This proxy can still be initialized."); + } + + public function testIssueProxyClear() + { + $user = new DDC1238User; + $user->setName("test"); + + $this->_em->persist($user); + $this->_em->flush(); + $this->_em->clear(); + $userId = $user->getId(); + $this->_em->clear(); - $this->assertNotSame($user, $user2); - $this->assertNull($userId, "This proxy is unitialized and was cleared from the identity map, so no loading possible."); + $user = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + $this->_em->clear(); + + $user2 = $this->_em->getReference(__NAMESPACE__ . '\\DDC1238User', $userId); + + $this->assertNull($user->getId(), "Now this is null, we already have a user instance of that type"); } } /** - * @MappedSuperclass + * @Entity */ -abstract class DDC1238UserSuperClass +class DDC1238User { + /** @Id @GeneratedValue @Column(type="integer") */ + private $id; + /** * @Column * @var string */ private $name; + public function getId() + { + return $this->id; + } + public function getName() { return $this->name; @@ -72,17 +94,3 @@ abstract class DDC1238UserSuperClass } } -/** - * @Entity - */ -class DDC1238User extends DDC1238UserSuperClass -{ - /** @Id @GeneratedValue @Column(type="integer") */ - private $id; - - public function getId() - { - return $this->id; - } -} - From cb49648eed3b3f9ac740d64c8a55ac75068059ed Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 4 Jul 2011 21:33:36 +0000 Subject: [PATCH 094/220] Bump Common and DBAL to 2.1 --- lib/Doctrine/ORM/Version.php | 2 +- lib/vendor/doctrine-common | 2 +- lib/vendor/doctrine-dbal | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index 5e811edd0..e459dceb6 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0RC4-DEV'; + const VERSION = '2.1.0-DEV'; /** * Compares a Doctrine version with the current one. diff --git a/lib/vendor/doctrine-common b/lib/vendor/doctrine-common index 74a2c924c..40f1bf16e 160000 --- a/lib/vendor/doctrine-common +++ b/lib/vendor/doctrine-common @@ -1 +1 @@ -Subproject commit 74a2c924cd08b30785877808b1fb519b4b2e60b1 +Subproject commit 40f1bf16e84ddc5291a6a63aa00b9879c40e3500 diff --git a/lib/vendor/doctrine-dbal b/lib/vendor/doctrine-dbal index be3790059..0127ee98a 160000 --- a/lib/vendor/doctrine-dbal +++ b/lib/vendor/doctrine-dbal @@ -1 +1 @@ -Subproject commit be3790059cc43b674a55548eb42d5d25846ea6a9 +Subproject commit 0127ee98a4301f2f6e3463c824adc3a3687f901f From dfdb7353065407afc997956e23f3a44ec3effd72 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 4 Jul 2011 21:34:47 +0000 Subject: [PATCH 095/220] Release 2.1.0 --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index e459dceb6..a64643d9f 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0-DEV'; + const VERSION = '2.1.0'; /** * Compares a Doctrine version with the current one. From 024b7b7cb6a11aa8c7fd753bf955f33c2fbc3054 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 4 Jul 2011 21:34:59 +0000 Subject: [PATCH 096/220] Bump Dev Version to 2.2.0-DEV --- lib/Doctrine/ORM/Version.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Version.php b/lib/Doctrine/ORM/Version.php index a64643d9f..183887147 100644 --- a/lib/Doctrine/ORM/Version.php +++ b/lib/Doctrine/ORM/Version.php @@ -36,7 +36,7 @@ class Version /** * Current Doctrine Version */ - const VERSION = '2.1.0'; + const VERSION = '2.2.0-DEV'; /** * Compares a Doctrine version with the current one. From ef663c83f3c8bd0a560b2ada4f971c4b7756a539 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Fri, 8 Jul 2011 14:27:59 +0200 Subject: [PATCH 097/220] DDC-1258 - Add Debug UnitOfWork Listener --- .../ORM/Tools/DebugUnitOfWorkListener.php | 134 ++++++++++++++++++ .../Doctrine/Tests/OrmFunctionalTestCase.php | 4 + 2 files changed, 138 insertions(+) create mode 100644 lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php diff --git a/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php new file mode 100644 index 000000000..fa81d0aa4 --- /dev/null +++ b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php @@ -0,0 +1,134 @@ +. + */ + +namespace Doctrine\ORM\Tools; + +use Doctrine\ORM\Event\OnFlushEventArgs; +use Doctrine\ORM\Mapping\ClassMetadata; +use Doctrine\ORM\PersistentCollection; +use Doctrine\ORM\UnitOfWork; + +/** + * Use this logger to dump the identity map during the onFlush event. This is useful for debugging + * weird UnitOfWork behavior with complex operations. + */ +class DebugUnitOfWorkListener +{ + private $file; + private $context; + + public function __construct($file = 'php://output', $context = '') + { + $this->file = $file; + $this->context = $context; + } + + public function onFlush(OnFlushEventArgs $args) + { + $em = $args->getEntityManager(); + + $uow = $em->getUnitOfWork(); + $identityMap = $uow->getIdentityMap(); + + $fh = fopen($this->file, "x+"); + if (count($identityMap) == 0) { + fwrite($fh, "Flush Operation [".$this->context."] - Empty identity map.\n"); + return; + } + + fwrite($fh, "Flush Operation [".$this->context."] - Dumping identity map:\n"); + foreach ($identityMap AS $className => $map) { + fwrite($fh, "Class: ". $className . "\n"); + foreach ($map AS $idHash => $entity) { + fwrite($fh, " Entity: " . $this->getIdString($entity, $uow) . " " . spl_object_hash($entity)."\n"); + fwrite($fh, " Associations:\n"); + + $cm = $em->getClassMetadata($className); + foreach ($cm->associationMappings AS $field => $assoc) { + fwrite($fh, " " . $field . " "); + $value = $cm->reflFields[$field]->getValue($entity); + + if ($assoc['type'] & ClassMetadata::TO_ONE) { + if ($value === null) { + fwrite($fh, " NULL\n"); + } else { + if ($value instanceof Proxy && !$value->__isInitialized__) { + fwrite($fh, "[PROXY] "); + } + + fwrite($fh, $this->getIdString($value, $uow) . " " . spl_object_hash($value) . "\n"); + } + } else { + $initialized = !($value instanceof PersistentCollection) || $value->isInitialized(); + if ($value === null) { + fwrite($fh, " NULL\n"); + } else if ($initialized) { + fwrite($fh, "[INITIALIZED] " . $this->getType($value). " " . count($value) . " elements\n"); + foreach ($value AS $obj) { + fwrite($fh, " " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n"); + } + } else { + fwrite($fh, "[PROXY] " . $this->getType($value) . " unknown element size\n"); + foreach ($value->unwrap() AS $obj) { + fwrite($fh, " " . $this->getIdString($obj, $uow) . " " . spl_object_hash($obj)."\n"); + } + } + } + } + } + } + fclose($fh); + } + + private function getType($var) + { + if (is_object($var)) { + $refl = new \ReflectionObject($var); + return $refl->getShortname(); + } else { + return gettype($var); + } + } + + private function getIdString($entity, $uow) + { + if ($uow->isInIdentityMap($entity)) { + $ids = $uow->getEntityIdentifier($entity); + $idstring = ""; + foreach ($ids AS $k => $v) { + $idstring .= $k."=".$v; + } + } else { + $idstring = "NEWOBJECT "; + } + + $state = $uow->getEntityState($entity); + if ($state == UnitOfWork::STATE_NEW) { + $idstring .= " [NEW]"; + } else if ($state == UnitOfWork::STATE_REMOVED) { + $idstring .= " [REMOVED]"; + } else if ($state == UnitOfWork::STATE_MANAGED) { + $idstring .= " [MANAGED]"; + } else if ($state == UnitOfwork::STATE_DETACHED) { + $idstring .= " [DETACHED]"; + } + + return $idstring; + } +} \ No newline at end of file diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 92320e3a4..1f8032aeb 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -303,6 +303,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $evm->addEventSubscriber($subscriberInstance); } } + + if (isset($GLOBALS['debug_uow_listener'])) { + $evm->addEventListener(array('onFlush'), new \Doctrine\ORM\Tools\DebugUnitOfWorkListener()); + } return \Doctrine\ORM\EntityManager::create($conn, $config); } From ac76dafe62b47f60b4ab5f4c1cbe4b9ae522feb5 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Fri, 8 Jul 2011 14:32:12 +0200 Subject: [PATCH 098/220] Add doccomments, refactor into listener and dump method to allow re-use --- .../ORM/Tools/DebugUnitOfWorkListener.php | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php index fa81d0aa4..5475d998f 100644 --- a/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php +++ b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php @@ -33,6 +33,14 @@ class DebugUnitOfWorkListener private $file; private $context; + /** + * Pass a stream and contet information for the debugging session. + * + * The stream can be php://output to print to the screen. + * + * @param string $file + * @param string $context + */ public function __construct($file = 'php://output', $context = '') { $this->file = $file; @@ -41,8 +49,17 @@ class DebugUnitOfWorkListener public function onFlush(OnFlushEventArgs $args) { - $em = $args->getEntityManager(); + $this->dumpIdentityMap($args->getEntityManager()); + } + /** + * Dump the contents of the identity map into a stream. + * + * @param EntityManager $em + * @return void + */ + public function dumpIdentityMap(EntityManager $em) + { $uow = $em->getUnitOfWork(); $identityMap = $uow->getIdentityMap(); From 9a6807487891fd31ed3038a65c3811ddb550dccd Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Fri, 8 Jul 2011 14:42:15 +0200 Subject: [PATCH 099/220] Clarify possible problem --- UPGRADE_TO_2_1 | 1 + 1 file changed, 1 insertion(+) diff --git a/UPGRADE_TO_2_1 b/UPGRADE_TO_2_1 index 8b289ecd4..f42244493 100644 --- a/UPGRADE_TO_2_1 +++ b/UPGRADE_TO_2_1 @@ -9,6 +9,7 @@ The EntityRepository now has an interface Doctrine\Common\Persistence\ObjectRepo The annotation reader was heavily refactored between 2.0 and 2.1-RC1. In theory the operation of the new reader should be backwards compatible, but it has to be setup differently to work that way: + // new call to the AnnotationRegistry \Doctrine\Common\Annotations\AnnotationRegistry::registerFile('/doctrine-src/lib/Doctrine/ORM/Mapping/Driver/DoctrineAnnotations.php'); $reader = new \Doctrine\Common\Annotations\AnnotationReader(); From b6bd46dbed81418dc4f9b1b8c182cdc2f17befc9 Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Fri, 8 Jul 2011 16:26:54 -0300 Subject: [PATCH 100/220] General fix for end point as file extension on Annotation driver. --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index 23cdb4b91..7d87f1d89 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -499,7 +499,7 @@ class AnnotationDriver implements Driver new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS), \RecursiveIteratorIterator::LEAVES_ONLY ), - '/^.+\\' . $this->_fileExtension . '$/i', + '/^.+' . str_replace('.', '\.', $this->_fileExtension) . '$/i', \RecursiveRegexIterator::GET_MATCH ); From 2b207106a38b12849da226bced67b442f4298b93 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 9 Jul 2011 12:12:44 +0200 Subject: [PATCH 101/220] DDC-1022 - Call __wakeup() with the same semantics then ClassMetadata::newInstance() does inside UnitOfWork --- lib/Doctrine/ORM/Proxy/ProxyFactory.php | 8 ++++++++ .../Tests/Models/ECommerce/ECommerceProduct.php | 9 +++++++++ .../Tests/ORM/Functional/ReferenceProxyTest.php | 17 +++++++++++++++++ 3 files changed, 34 insertions(+) diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php index 52a4791a9..90a3a8d5b 100644 --- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php +++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php @@ -274,6 +274,14 @@ class extends \ implements \Doctrine\ORM\Proxy\Proxy { if (!$this->__isInitialized__ && $this->_entityPersister) { $this->__isInitialized__ = true; + + if (method_exists($this, "__wakeup")) { + // call this after __isInitialized__to avoid infinite recursion + // but before loading to emulate what ClassMetadata::newInstance() + // provides. + $this->__wakeup(); + } + if ($this->_entityPersister->load($this->_identifier, $this) === null) { throw new \Doctrine\ORM\EntityNotFoundException(); } diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php index 198e16720..d159a51da 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php @@ -56,6 +56,7 @@ class ECommerceProduct private $related; public $isCloned = false; + public $wakeUp = false; public function __construct() { @@ -166,4 +167,12 @@ class ECommerceProduct { $this->isCloned = true; } + + /** + * Testing docblock contents here + */ + public function __wakeup() + { + $this->wakeUp = true; + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php index 3b6e1f546..8ecb389af 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ReferenceProxyTest.php @@ -130,4 +130,21 @@ class ReferenceProxyTest extends \Doctrine\Tests\OrmFunctionalTestCase $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); $this->assertEquals('Doctrine 2 Cookbook', $entity->getName()); } + + /** + * @group DDC-1022 + */ + public function testWakeupCalledOnProxy() + { + $id = $this->createProduct(); + + /* @var $entity Doctrine\Tests\Models\ECommerce\ECommerceProduct */ + $entity = $this->_em->getReference('Doctrine\Tests\Models\ECommerce\ECommerceProduct' , $id); + + $this->assertFalse($entity->wakeUp); + + $entity->setName('Doctrine 2 Cookbook'); + + $this->assertTrue($entity->wakeUp, "Loading the proxy should call __wakeup()."); + } } From a8048af65daf9ac7195bdc5113aef0cf12c0c9af Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 9 Jul 2011 14:53:25 +0200 Subject: [PATCH 102/220] DDC-1251 - Fix bug in token parsing of EntityGenerator --- 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 50b0f18ed..853e1e3b4 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -451,7 +451,7 @@ public function () } else if ($token[0] == T_FUNCTION) { if ($tokens[$i+2][0] == T_STRING) { $this->_staticReflection[$lastSeenClass]['methods'][] = $tokens[$i+2][1]; - } else if ($tokens[$i+2][0] == T_AMPERSAND && $tokens[$i+3][0] == T_STRING) { + } else if ($tokens[$i+2] == "&" && $tokens[$i+3][0] == T_STRING) { $this->_staticReflection[$lastSeenClass]['methods'][] = $tokens[$i+3][1]; } } else if (in_array($token[0], array(T_VAR, T_PUBLIC, T_PRIVATE, T_PROTECTED)) && $tokens[$i+2][0] != T_FUNCTION) { From 442a2b3a51c5290808176f88b5810cbac020b2b7 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 9 Jul 2011 15:11:16 +0200 Subject: [PATCH 103/220] DDC-1257 - Fix bug where validation callbacks are added multiple times in EntityGenerator --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 853e1e3b4..c9fc21136 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -691,6 +691,7 @@ public function () if ($this->_hasMethod($methodName, $metadata)) { return; } + $this->_staticReflection[$metadata->name]['methods'][] = $methodName; $var = sprintf('_%sMethodTemplate', $type); $template = self::$$var; @@ -723,6 +724,7 @@ public function () if ($this->_hasMethod($methodName, $metadata)) { return; } + $this->_staticReflection[$metadata->name]['methods'][] = $methodName; $replacements = array( '' => $this->_annotationsPrefix . $name, From c261315ea7ea0c671a36d6aa2329c67809dccb95 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sat, 9 Jul 2011 15:40:10 +0200 Subject: [PATCH 104/220] DDC-1250 - Fix bug with inverse one to one loading and ambigious column names in certain scenarios --- .../ORM/Persisters/BasicEntityPersister.php | 8 +- .../Models/ECommerce/ECommerceCustomer.php | 2 +- ...OneToOneSelfReferentialAssociationTest.php | 10 ++ .../ORM/Functional/Ticket/DDC1250Test.php | 96 +++++++++++++++++++ 4 files changed, 113 insertions(+), 3 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 2ee3cf4fe..90ff8ffa9 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -633,7 +633,11 @@ class BasicEntityPersister // TRICKY: since the association is specular source and target are flipped foreach ($owningAssoc['targetToSourceKeyColumns'] as $sourceKeyColumn => $targetKeyColumn) { if (isset($sourceClass->fieldNames[$sourceKeyColumn])) { - $identifier[$targetKeyColumn] = $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity); + // unset the old value and set the new sql aliased value here. By definition + // unset($identifier[$targetKeyColumn] works here with how UnitOfWork::createEntity() calls this method. + $identifier[$this->_getSQLTableAlias($targetClass->name) . "." . $targetKeyColumn] = + $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity); + unset($identifier[$targetKeyColumn]); } else { throw MappingException::joinColumnMustPointToMappedField( $sourceClass->name, $sourceKeyColumn @@ -1214,7 +1218,7 @@ class BasicEntityPersister } else if ($assoc !== null && strpos($field, " ") === false && strpos($field, "(") === false) { // very careless developers could potentially open up this normally hidden api for userland attacks, // therefore checking for spaces and function calls which are not allowed. - + // found a join column condition, not really a "field" $conditionSql .= $field; } else { diff --git a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php index fff4c9b82..0144b0998 100644 --- a/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php +++ b/tests/Doctrine/Tests/Models/ECommerce/ECommerceCustomer.php @@ -34,7 +34,7 @@ class ECommerceCustomer * only one customer at the time, while a customer can choose only one * mentor. Not properly appropriate but it works. * - * @OneToOne(targetEntity="ECommerceCustomer", cascade={"persist"}) + * @OneToOne(targetEntity="ECommerceCustomer", cascade={"persist"}, fetch="EAGER") * @JoinColumn(name="mentor_id", referencedColumnName="id") */ private $mentor; diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php index 321f66340..d7132ed60 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php @@ -49,6 +49,14 @@ class OneToOneSelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunction $this->assertForeignKeyIs(null); } + public function testFind() + { + $id = $this->_createFixture(); + + $customer = $this->_em->find('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $id); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $customer->getMentor()); + } + public function testEagerLoadsAssociation() { $this->_createFixture(); @@ -127,6 +135,8 @@ class OneToOneSelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunction $this->_em->flush(); $this->_em->clear(); + + return $customer->getId(); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php new file mode 100644 index 000000000..3a756da9a --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1250Test.php @@ -0,0 +1,96 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\\DDC1250ClientHistory'), + )); + } catch(\PDOException $e) { + + } + } + + public function testIssue() + { + $c1 = new DDC1250ClientHistory; + $c2 = new DDC1250ClientHistory; + $c1->declinedClientsHistory = $c2; + $c1->declinedBy = $c2; + $c2->declinedBy = $c1; + $c2->declinedClientsHistory= $c1; + + $this->_em->persist($c1); + $this->_em->persist($c2); + $this->_em->flush(); + $this->_em->clear(); + + $history = $this->_em->createQuery('SELECT h FROM ' . __NAMESPACE__ . '\\DDC1250ClientHistory h WHERE h.id = ?1') + ->setParameter(1, $c2->id)->getSingleResult(); + + $this->assertInstanceOf(__NAMESPACE__ . '\\DDC1250ClientHistory', $history); + } +} + +/** + * @Entity + */ +class DDC1250ClientHistory +{ + /** @Id @GeneratedValue @Column(type="integer") */ + public $id; + + /** @OneToOne(targetEntity="DDC1250ClientHistory", inversedBy="declinedBy") + * @JoinColumn(name="declined_clients_history_id", referencedColumnName="id") + */ + public $declinedClientsHistory; + + /** + * @OneToOne(targetEntity="DDC1250ClientHistory", mappedBy="declinedClientsHistory") + * @var + */ + public $declinedBy; +} + +/** + * +Entities\ClientsHistory: +type: entity +table: clients_history +fields: +id: +id: true +type: integer +unsigned: false +nullable: false +generator: +strategy: IDENTITY +[...skiped...] +oneToOne: +declinedClientsHistory: +targetEntity: Entities\ClientsHistory +joinColumn: +name: declined_clients_history_id +referencedColumnName: id +inversedBy: declinedBy +declinedBy: +targetEntity: Entities\ClientsHistory +mappedBy: declinedClientsHistory +lifecycleCallbacks: { } +repositoryClass: Entities\ClientsHistoryRepository + + + */ \ No newline at end of file From 98fabd98be04787bab0d60c069718c28d77e517e Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 12 Jul 2011 22:50:21 +0200 Subject: [PATCH 105/220] DDC-1240 - Fix optimistic lock exception loosing the message --- lib/Doctrine/ORM/OptimisticLockException.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Doctrine/ORM/OptimisticLockException.php b/lib/Doctrine/ORM/OptimisticLockException.php index 028698cd8..9b5147aae 100644 --- a/lib/Doctrine/ORM/OptimisticLockException.php +++ b/lib/Doctrine/ORM/OptimisticLockException.php @@ -33,6 +33,7 @@ class OptimisticLockException extends ORMException public function __construct($msg, $entity) { + parent::__construct($msg); $this->entity = $entity; } From 4796452b0732692612e66412daca72f2f6449e1c Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 12 Jul 2011 23:25:15 +0200 Subject: [PATCH 106/220] DDC-1268 - Singular add*() method name through using targetEntity shortname --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 8 +++++++- tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index c9fc21136..0580cb27e 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -686,7 +686,13 @@ public function () private function _generateEntityStubMethod(ClassMetadataInfo $metadata, $type, $fieldName, $typeHint = null) { - $methodName = $type . Inflector::classify($fieldName); + if ($type == "add") { + $addMethod = explode("\\", $typeHint); + $addMethod = end($addMethod); + $methodName = $type . $addMethod; + } else { + $methodName = $type . Inflector::classify($fieldName); + } if ($this->_hasMethod($methodName, $metadata)) { return; diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 698219e24..fce7d4c20 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -98,7 +98,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'setAuthor'), "EntityGeneratorBook::setAuthor() missing."); $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getAuthor'), "EntityGeneratorBook::getAuthor() missing."); $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'getComments'), "EntityGeneratorBook::getComments() missing."); - $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'addComments'), "EntityGeneratorBook::addComments() missing."); + $this->assertTrue(method_exists($metadata->namespace . '\EntityGeneratorBook', 'addEntityGeneratorComment'), "EntityGeneratorBook::addEntityGeneratorComment() missing."); $this->assertEquals('published', $book->getStatus()); @@ -110,7 +110,7 @@ class EntityGeneratorTest extends \Doctrine\Tests\OrmTestCase $this->assertEquals($author, $book->getAuthor()); $comment = new EntityGeneratorComment(); - $book->addComments($comment); + $book->addEntityGeneratorComment($comment); $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $book->getComments()); $this->assertEquals(new \Doctrine\Common\Collections\ArrayCollection(array($comment)), $book->getComments()); } From c87dedbec5063ac9efcf5586a17381fd1615a36d Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 12 Jul 2011 23:39:56 +0200 Subject: [PATCH 107/220] DDC-1254 - Dont throw exception about missing id in disconnected metadata factory --- .../ORM/Mapping/ClassMetadataFactory.php | 55 +++++++++++-------- .../DisconnectedClassMetadataFactory.php | 11 ++++ 2 files changed, 44 insertions(+), 22 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index 8bfda6450..a021f756c 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -313,28 +313,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface $this->evm->dispatchEvent(Events::loadClassMetadata, $eventArgs); } - // Verify & complete identifier mapping - if ( ! $class->identifier && ! $class->isMappedSuperclass) { - throw MappingException::identifierRequired($className); - } - - // verify inheritance - if (!$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) { - if (!$parent) { - if (count($class->discriminatorMap) == 0) { - throw MappingException::missingDiscriminatorMap($class->name); - } - if (!$class->discriminatorColumn) { - throw MappingException::missingDiscriminatorColumn($class->name); - } - } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) { - // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. - throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); - } - } else if ($class->isMappedSuperclass && $class->name == $class->rootEntityName && (count($class->discriminatorMap) || $class->discriminatorColumn)) { - // second condition is necessary for mapped superclasses in the middle of an inheritance hierachy - throw MappingException::noInheritanceOnMappedSuperClass($class->name); - } + $this->validateRuntimeMetadata($class, $parent); $this->loadedMetadata[$className] = $class; @@ -351,6 +330,38 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface return $loaded; } + /** + * Validate runtime metadata is correctly defined. + * + * @param ClassMetadata $class + * @param ClassMetadata $parent + */ + protected function validateRuntimeMetadata($class, $parent) + { + // Verify & complete identifier mapping + if ( ! $class->identifier && ! $class->isMappedSuperclass) { + throw MappingException::identifierRequired($className); + } + + // verify inheritance + if (!$class->isMappedSuperclass && !$class->isInheritanceTypeNone()) { + if (!$parent) { + if (count($class->discriminatorMap) == 0) { + throw MappingException::missingDiscriminatorMap($class->name); + } + if (!$class->discriminatorColumn) { + throw MappingException::missingDiscriminatorColumn($class->name); + } + } else if ($parent && !$class->reflClass->isAbstract() && !in_array($class->name, array_values($class->discriminatorMap))) { + // enforce discriminator map for all entities of an inheritance hierachy, otherwise problems will occur. + throw MappingException::mappedClassNotPartOfDiscriminatorMap($class->name, $class->rootEntityName); + } + } else if ($class->isMappedSuperclass && $class->name == $class->rootEntityName && (count($class->discriminatorMap) || $class->discriminatorColumn)) { + // second condition is necessary for mapped superclasses in the middle of an inheritance hierachy + throw MappingException::noInheritanceOnMappedSuperClass($class->name); + } + } + /** * Creates a new ClassMetadata instance for the given class name. * diff --git a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php index 55503d400..7a7715231 100644 --- a/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Tools/DisconnectedClassMetadataFactory.php @@ -52,6 +52,17 @@ class DisconnectedClassMetadataFactory extends ClassMetadataFactory return $metadata; } + /** + * Validate runtime metadata is correctly defined. + * + * @param ClassMetadata $class + * @param ClassMetadata $parent + */ + protected function validateRuntimeMetadata($class, $parent) + { + // validate nothing + } + /** * @override */ From d9b1dbbb091ef667b529af27441afba3610f8e4a Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 12 Jul 2011 23:43:24 +0200 Subject: [PATCH 108/220] DDC-1244 - Fix bug with entities without namespace --- 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 0580cb27e..f55af76b1 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -438,7 +438,7 @@ public function () if ($inClass) { $inClass = false; - $lastSeenClass = $lastSeenNamespace . '\\' . $token[1]; + $lastSeenClass = $lastSeenNamespace . ($lastSeenNamespace ? '\\' : '') . $token[1]; $this->_staticReflection[$lastSeenClass]['properties'] = array(); $this->_staticReflection[$lastSeenClass]['methods'] = array(); } From 99bdf65c10373e1deec8b4dfaee717c4fb461cf8 Mon Sep 17 00:00:00 2001 From: Fabien Pennequin Date: Sun, 17 Jul 2011 19:39:55 +0200 Subject: [PATCH 109/220] Fixed php notice in ClassMetadataFactory --- lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php index a021f756c..2044932d6 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataFactory.php @@ -340,7 +340,7 @@ class ClassMetadataFactory implements ClassMetadataFactoryInterface { // Verify & complete identifier mapping if ( ! $class->identifier && ! $class->isMappedSuperclass) { - throw MappingException::identifierRequired($className); + throw MappingException::identifierRequired($class->name); } // verify inheritance From 0e6121e8f508097226ead3aace9ccc41ced2ca70 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Thu, 21 Jul 2011 12:40:43 +0200 Subject: [PATCH 110/220] Now findByOne really retrieve only one entity adding limit to query --- lib/Doctrine/ORM/EntityRepository.php | 2 +- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php index de2689db2..2b2bee7ac 100644 --- a/lib/Doctrine/ORM/EntityRepository.php +++ b/lib/Doctrine/ORM/EntityRepository.php @@ -178,7 +178,7 @@ class EntityRepository implements ObjectRepository */ public function findOneBy(array $criteria) { - return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria); + return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria, null, null, array(), 0, 1); } /** diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 19da2e200..c1436ffa2 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -558,13 +558,13 @@ class BasicEntityPersister * a new entity is created. * @param $assoc The association that connects the entity to load to another entity, if any. * @param array $hints Hints for entity creation. - * @param int $lockMode + * @param int $limit Limit number of results * @return object The loaded and managed entity instance or NULL if the entity can not be found. * @todo Check identity map? loadById method? Try to guess whether $criteria is the id? */ - public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0) + public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0, $limit = 0) { - $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode); + $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode, $limit); list($params, $types) = $this->expandParameters($criteria); $stmt = $this->_conn->executeQuery($sql, $params, $types); From 570799b48db72a762226897ace966a7f71f893dd Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Thu, 21 Jul 2011 04:13:15 -0700 Subject: [PATCH 111/220] Restoring the missing comment --- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index c1436ffa2..1938ad160 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -558,6 +558,7 @@ class BasicEntityPersister * a new entity is created. * @param $assoc The association that connects the entity to load to another entity, if any. * @param array $hints Hints for entity creation. + * @param int $lockMode * @param int $limit Limit number of results * @return object The loaded and managed entity instance or NULL if the entity can not be found. * @todo Check identity map? loadById method? Try to guess whether $criteria is the id? From 4b85d7a68302ca78648ecb8a7e3acc8e6a14821f Mon Sep 17 00:00:00 2001 From: Guilherme Blanco Date: Fri, 22 Jul 2011 11:38:20 -0300 Subject: [PATCH 112/220] Reverted PR #86, which broke our suite. --- lib/Doctrine/ORM/EntityRepository.php | 2 +- lib/Doctrine/ORM/Persisters/BasicEntityPersister.php | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/EntityRepository.php b/lib/Doctrine/ORM/EntityRepository.php index 2b2bee7ac..de2689db2 100644 --- a/lib/Doctrine/ORM/EntityRepository.php +++ b/lib/Doctrine/ORM/EntityRepository.php @@ -178,7 +178,7 @@ class EntityRepository implements ObjectRepository */ public function findOneBy(array $criteria) { - return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria, null, null, array(), 0, 1); + return $this->_em->getUnitOfWork()->getEntityPersister($this->_entityName)->load($criteria); } /** diff --git a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php index 1938ad160..19da2e200 100644 --- a/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/BasicEntityPersister.php @@ -559,13 +559,12 @@ class BasicEntityPersister * @param $assoc The association that connects the entity to load to another entity, if any. * @param array $hints Hints for entity creation. * @param int $lockMode - * @param int $limit Limit number of results * @return object The loaded and managed entity instance or NULL if the entity can not be found. * @todo Check identity map? loadById method? Try to guess whether $criteria is the id? */ - public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0, $limit = 0) + public function load(array $criteria, $entity = null, $assoc = null, array $hints = array(), $lockMode = 0) { - $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode, $limit); + $sql = $this->_getSelectEntitiesSQL($criteria, $assoc, $lockMode); list($params, $types) = $this->expandParameters($criteria); $stmt = $this->_conn->executeQuery($sql, $params, $types); From 65f7e897b579549b9ef75465edcad4d32d54f727 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 26 Jul 2011 00:19:26 +0200 Subject: [PATCH 113/220] [DDC-1294] Add discriminator information to subselects --- lib/Doctrine/ORM/Query/SqlWalker.php | 41 +++++++++---------- .../ORM/Query/SelectSqlGenerationTest.php | 11 +++++ 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 2a9f58faf..7393ba893 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -359,13 +359,7 @@ class SqlWalker implements TreeWalker { $sql = $this->walkSelectClause($AST->selectClause); $sql .= $this->walkFromClause($AST->fromClause); - - if (($whereClause = $AST->whereClause) !== null) { - $sql .= $this->walkWhereClause($whereClause); - } else if (($discSql = $this->_generateDiscriminatorColumnConditionSQL($this->_rootAliases)) !== '') { - $sql .= ' WHERE ' . $discSql; - } - + $sql .= $this->walkWhereClause($AST->whereClause); $sql .= $AST->groupByClause ? $this->walkGroupByClause($AST->groupByClause) : ''; $sql .= $AST->havingClause ? $this->walkHavingClause($AST->havingClause) : ''; @@ -407,12 +401,7 @@ class SqlWalker implements TreeWalker { $this->_useSqlTableAliases = false; $sql = $this->walkUpdateClause($AST->updateClause); - - if (($whereClause = $AST->whereClause) !== null) { - $sql .= $this->walkWhereClause($whereClause); - } else if (($discSql = $this->_generateDiscriminatorColumnConditionSQL($this->_rootAliases)) !== '') { - $sql .= ' WHERE ' . $discSql; - } + $sql .= $this->walkWhereClause($AST->whereClause); return $sql; } @@ -427,12 +416,7 @@ class SqlWalker implements TreeWalker { $this->_useSqlTableAliases = false; $sql = $this->walkDeleteClause($AST->deleteClause); - - if (($whereClause = $AST->whereClause) !== null) { - $sql .= $this->walkWhereClause($whereClause); - } else if (($discSql = $this->_generateDiscriminatorColumnConditionSQL($this->_rootAliases)) !== '') { - $sql .= ' WHERE ' . $discSql; - } + $sql .= $this->walkWhereClause($AST->whereClause); return $sql; } @@ -1158,15 +1142,19 @@ class SqlWalker implements TreeWalker public function walkSubselect($subselect) { $useAliasesBefore = $this->_useSqlTableAliases; + $rootAliasesBefore = $this->_rootAliases; + + $this->_rootAliases = array(); // reset the rootAliases for the subselect $this->_useSqlTableAliases = true; $sql = $this->walkSimpleSelectClause($subselect->simpleSelectClause); $sql .= $this->walkSubselectFromClause($subselect->subselectFromClause); - $sql .= $subselect->whereClause ? $this->walkWhereClause($subselect->whereClause) : ''; + $sql .= $this->walkWhereClause($subselect->whereClause); $sql .= $subselect->groupByClause ? $this->walkGroupByClause($subselect->groupByClause) : ''; $sql .= $subselect->havingClause ? $this->walkHavingClause($subselect->havingClause) : ''; $sql .= $subselect->orderByClause ? $this->walkOrderByClause($subselect->orderByClause) : ''; + $this->_rootAliases = $rootAliasesBefore; // put the main aliases back $this->_useSqlTableAliases = $useAliasesBefore; return $sql; @@ -1193,6 +1181,8 @@ class SqlWalker implements TreeWalker $sql .= $class->getQuotedTableName($this->_platform) . ' ' . $this->getSQLTableAlias($class->table['name'], $dqlAlias); + $this->_rootAliases[] = $dqlAlias; + if ($class->isInheritanceTypeJoined()) { $sql .= $this->_generateClassTableInheritanceJoins($class, $dqlAlias); } @@ -1414,16 +1404,23 @@ class SqlWalker implements TreeWalker /** * Walks down a WhereClause AST node, thereby generating the appropriate SQL. + * WhereClause or not, the appropriate discriminator sql is added. * * @param WhereClause * @return string The SQL. */ public function walkWhereClause($whereClause) { + $condSql = null !== $whereClause ? $this->walkConditionalExpression($whereClause->conditionalExpression) : ''; $discrSql = $this->_generateDiscriminatorColumnConditionSql($this->_rootAliases); - $condSql = $this->walkConditionalExpression($whereClause->conditionalExpression); - return ' WHERE ' . (( ! $discrSql) ? $condSql : '(' . $condSql . ') AND ' . $discrSql); + if ($condSql) { + return ' WHERE ' . (( ! $discrSql) ? $condSql : '(' . $condSql . ') AND ' . $discrSql); + } else if ($discrSql) { + return ' WHERE ' . $discrSql; + } + + return ''; } /** diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index deffb9232..6c21abfcf 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -922,6 +922,17 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase "SELECT COALESCE(NULLIF(c0_.name, ''), c0_.username) AS sclr0 FROM cms_users c0_" ); } + + /** + * Test that the right discriminator data is inserted in a subquery. + */ + public function testSubSelectDiscriminator() + { + $this->assertSqlGeneration( + "SELECT u.name, (SELECT COUNT(cfc.id) total FROM Doctrine\Tests\Models\Company\CompanyFixContract cfc) as cfc_count FROM Doctrine\Tests\Models\CMS\CmsUser u", + "SELECT c0_.name AS name0, (SELECT COUNT(c1_.id) AS dctrn__total FROM company_contracts c1_ WHERE c1_.discr IN ('fix')) AS sclr1 FROM cms_users c0_" + ); + } } From b58f573b3151a492465dabd0de562353771aa899 Mon Sep 17 00:00:00 2001 From: Michel Weimerskirch Date: Tue, 26 Jul 2011 10:59:21 +0300 Subject: [PATCH 114/220] Corrected typo --- lib/Doctrine/ORM/ORMException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php index 75b91d2e4..fa6fdd30e 100644 --- a/lib/Doctrine/ORM/ORMException.php +++ b/lib/Doctrine/ORM/ORMException.php @@ -39,7 +39,7 @@ class ORMException extends Exception { return new self( "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntity) . ", " . - "however this entity has no ientity itself. You have to call EntityManager#persist() on the related entity " . + "however this entity has no identity itself. You have to call EntityManager#persist() on the related entity " . "and make sure it an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " . "of Post Insert ID Generation (such as MySQL Auto-Increment or PostgreSQL SERIAL) this means you have to call " . "EntityManager#flush() between both persist operations." From 6ef4ac62d773755d4655560a2348e8383d1cb553 Mon Sep 17 00:00:00 2001 From: Michel Weimerskirch Date: Tue, 26 Jul 2011 11:03:23 +0300 Subject: [PATCH 115/220] Missed another typo --- lib/Doctrine/ORM/ORMException.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php index fa6fdd30e..89203359c 100644 --- a/lib/Doctrine/ORM/ORMException.php +++ b/lib/Doctrine/ORM/ORMException.php @@ -40,7 +40,7 @@ class ORMException extends Exception return new self( "Entity of type " . get_class($entity) . " has identity through a foreign entity " . get_class($relatedEntity) . ", " . "however this entity has no identity itself. You have to call EntityManager#persist() on the related entity " . - "and make sure it an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " . + "and make sure that an identifier was generated before trying to persist '" . get_class($entity) . "'. In case " . "of Post Insert ID Generation (such as MySQL Auto-Increment or PostgreSQL SERIAL) this means you have to call " . "EntityManager#flush() between both persist operations." ); From 49c735109c998555ad937fb10b781f24959cce10 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Tue, 26 Jul 2011 11:38:09 +0200 Subject: [PATCH 116/220] Change from assertType to assertInstanceOf. Now PHPUnit doesn't show warning about deprecation of assertType. Also some refractoring from assertTrue($a instanceof $b) to assertInstanceOf. Leading \ in namespaces is not required so I removed it from few assertions. --- tests/Doctrine/Tests/ORM/EntityManagerTest.php | 18 +++++++++--------- .../ORM/Functional/AdvancedAssociationTest.php | 16 ++++++++-------- .../ORM/Functional/BasicFunctionalTest.php | 16 ++++++++-------- .../ORM/Functional/CompositePrimaryKeyTest.php | 2 +- .../Tests/ORM/Functional/DefaultValuesTest.php | 2 +- .../ORM/Functional/EntityRepositoryTest.php | 12 ++++++------ .../ORM/Functional/MappedSuperclassTest.php | 4 ++-- .../OneToOneUnidirectionalAssociationTest.php | 4 ++-- .../Functional/StandardEntityPersisterTest.php | 4 ++-- .../Tests/ORM/Functional/Ticket/DDC237Test.php | 6 +++--- .../Tests/ORM/Functional/Ticket/DDC258Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC345Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC371Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC422Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC440Test.php | 4 ++-- .../Tests/ORM/Functional/Ticket/DDC501Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC633Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC729Test.php | 4 ++-- .../Tests/ORM/Functional/Ticket/DDC736Test.php | 2 +- .../Tests/ORM/Functional/Ticket/DDC748Test.php | 4 ++-- .../Tests/ORM/Functional/Ticket/DDC837Test.php | 8 ++++---- .../Tests/ORM/Functional/Ticket/DDC949Test.php | 4 ++-- .../Tests/ORM/Mapping/ClassMetadataTest.php | 4 ++-- 23 files changed, 63 insertions(+), 63 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/EntityManagerTest.php b/tests/Doctrine/Tests/ORM/EntityManagerTest.php index ca896ad10..f54974a27 100644 --- a/tests/Doctrine/Tests/ORM/EntityManagerTest.php +++ b/tests/Doctrine/Tests/ORM/EntityManagerTest.php @@ -26,32 +26,32 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase public function testGetConnection() { - $this->assertInstanceOf('\Doctrine\DBAL\Connection', $this->_em->getConnection()); + $this->assertInstanceOf('Doctrine\DBAL\Connection', $this->_em->getConnection()); } public function testGetMetadataFactory() { - $this->assertInstanceOf('\Doctrine\ORM\Mapping\ClassMetadataFactory', $this->_em->getMetadataFactory()); + $this->assertInstanceOf('Doctrine\ORM\Mapping\ClassMetadataFactory', $this->_em->getMetadataFactory()); } public function testGetConfiguration() { - $this->assertInstanceOf('\Doctrine\ORM\Configuration', $this->_em->getConfiguration()); + $this->assertInstanceOf('Doctrine\ORM\Configuration', $this->_em->getConfiguration()); } public function testGetUnitOfWork() { - $this->assertInstanceOf('\Doctrine\ORM\UnitOfWork', $this->_em->getUnitOfWork()); + $this->assertInstanceOf('Doctrine\ORM\UnitOfWork', $this->_em->getUnitOfWork()); } public function testGetProxyFactory() { - $this->assertInstanceOf('\Doctrine\ORM\Proxy\ProxyFactory', $this->_em->getProxyFactory()); + $this->assertInstanceOf('Doctrine\ORM\Proxy\ProxyFactory', $this->_em->getProxyFactory()); } public function testGetEventManager() { - $this->assertInstanceOf('\Doctrine\Common\EventManager', $this->_em->getEventManager()); + $this->assertInstanceOf('Doctrine\Common\EventManager', $this->_em->getEventManager()); } public function testCreateNativeQuery() @@ -64,7 +64,7 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase public function testCreateQueryBuilder() { - $this->assertInstanceOf('\Doctrine\ORM\QueryBuilder', $this->_em->createQueryBuilder()); + $this->assertInstanceOf('Doctrine\ORM\QueryBuilder', $this->_em->createQueryBuilder()); } public function testCreateQueryBuilderAliasValid() @@ -83,7 +83,7 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase public function testCreateQuery_DqlIsOptional() { - $this->assertInstanceOf('\Doctrine\ORM\Query', $this->_em->createQuery()); + $this->assertInstanceOf('Doctrine\ORM\Query', $this->_em->createQuery()); } public function testGetPartialReference() @@ -97,7 +97,7 @@ class EntityManagerTest extends \Doctrine\Tests\OrmTestCase public function testCreateQuery() { $q = $this->_em->createQuery('SELECT 1'); - $this->assertInstanceOf('\Doctrine\ORM\Query', $q); + $this->assertInstanceOf('Doctrine\ORM\Query', $q); $this->assertEquals('SELECT 1', $q->getDql()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php index a7c9cdc07..c4e43dfad 100644 --- a/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/AdvancedAssociationTest.php @@ -64,8 +64,8 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase $query = $this->_em->createQuery("SELECT p,t FROM Doctrine\Tests\ORM\Functional\Phrase p JOIN p.type t"); $res = $query->getResult(); $this->assertEquals(1, count($res)); - $this->assertTrue($res[0]->getType() instanceof PhraseType); - $this->assertTrue($res[0]->getType()->getPhrases() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\PhraseType', $res[0]->getType()); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $res[0]->getType()->getPhrases()); $this->assertFalse($res[0]->getType()->getPhrases()->isInitialized()); $this->_em->clear(); @@ -74,8 +74,8 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase $query = $this->_em->createQuery("SELECT p,t,pp FROM Doctrine\Tests\ORM\Functional\Phrase p JOIN p.type t JOIN t.phrases pp"); $res = $query->getResult(); $this->assertEquals(1, count($res)); - $this->assertTrue($res[0]->getType() instanceof PhraseType); - $this->assertTrue($res[0]->getType()->getPhrases() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\PhraseType', $res[0]->getType()); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $res[0]->getType()->getPhrases()); $this->assertTrue($res[0]->getType()->getPhrases()->isInitialized()); $this->_em->clear(); @@ -83,8 +83,8 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase // test3 - lazy-loading one-to-many after find() $phrase3 = $this->_em->find('Doctrine\Tests\ORM\Functional\Phrase', $phrase->getId()); $definitions = $phrase3->getDefinitions(); - $this->assertTrue($definitions instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($definitions[0] instanceof Definition); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $definitions); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Definition', $definitions[0]); $this->_em->clear(); @@ -95,7 +95,7 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(1, count($res)); - $this->assertTrue($definitions[0] instanceof Definition); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Definition', $definitions[0]); $this->assertEquals(2, $definitions->count()); } @@ -119,7 +119,7 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase $res = $query->getResult(); $types = $res[0]->getTypes(); - $this->assertTrue($types[0] instanceof Type); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Type', $types[0]); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index 572b6c73d..f69b3f862 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -136,8 +136,8 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase ->getSingleResult(); // Address has been eager-loaded because it cant be lazy - $this->assertTrue($user2->address instanceof CmsAddress); - $this->assertFalse($user2->address instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $user2->address); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $user2->address); } /** @@ -276,7 +276,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals('Guilherme', $users[0]->name); $this->assertEquals('gblanco', $users[0]->username); $this->assertEquals('developer', $users[0]->status); - $this->assertTrue($users[0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->phonenumbers); $this->assertTrue($users[0]->phonenumbers->isInitialized()); $this->assertEquals(0, $users[0]->phonenumbers->count()); //$this->assertNull($users[0]->articles); @@ -520,8 +520,8 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.address a where u.username='gblanco'"); $gblanco = $query->getSingleResult(); - $this->assertTrue($gblanco instanceof CmsUser); - $this->assertTrue($gblanco->getAddress() instanceof CmsAddress); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $gblanco); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $gblanco->getAddress()); $this->assertEquals('Berlin', $gblanco->getAddress()->getCity()); } @@ -629,7 +629,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $user2 = $query->getSingleResult(); $this->assertEquals(1, count($user2->articles)); - $this->assertTrue($user2->address instanceof CmsAddress); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $user2->address); $oldLogger = $this->_em->getConnection()->getConfiguration()->getSQLLogger(); $debugStack = new \Doctrine\DBAL\Logging\DebugStack; @@ -690,7 +690,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase ->setParameter('user', $userRef) ->getSingleResult(); - $this->assertTrue($address2->getUser() instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $address2->getUser()); $this->assertTrue($userRef === $address2->getUser()); $this->assertFalse($userRef->__isInitialized__); $this->assertEquals('Germany', $address2->country); @@ -905,7 +905,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $user2 = $this->_em->find(get_class($managedUser), $userId); - $this->assertTrue($user2 instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $user2); } public function testMergeThrowsExceptionIfEntityWithGeneratedIdentifierDoesNotExist() diff --git a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php index 7eced1b84..ee762d345 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CompositePrimaryKeyTest.php @@ -45,7 +45,7 @@ class CompositePrimaryKeyTest extends \Doctrine\Tests\OrmFunctionalTestCase $poi = $this->_em->find('Doctrine\Tests\Models\Navigation\NavPointOfInterest', array('lat' => 100, 'long' => 200)); - $this->assertType('Doctrine\Tests\Models\Navigation\NavPointOfInterest', $poi); + $this->assertInstanceOf('Doctrine\Tests\Models\Navigation\NavPointOfInterest', $poi); $this->assertEquals(100, $poi->getLat()); $this->assertEquals(200, $poi->getLong()); $this->assertEquals('Brandenburger Tor', $poi->getName()); diff --git a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php index 873f0d938..3da6bc09b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DefaultValuesTest.php @@ -50,7 +50,7 @@ class DefaultValuesTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $a2 = $this->_em->find(get_class($a), $a->id); - $this->assertTrue($a2->getUser() instanceof DefaultValueUser); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\DefaultValueUser', $a2->getUser()); $this->assertEquals($userId, $a2->getUser()->getId()); $this->assertEquals('Poweruser', $a2->getUser()->type); } diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index 6c620db38..029d55252 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -47,7 +47,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsUser'); $user = $repos->find($user1Id); - $this->assertTrue($user instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$user); $this->assertEquals('Roman', $user->name); $this->assertEquals('freak', $user->status); } @@ -59,7 +59,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $repos->findBy(array('status' => 'dev')); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$users[0]); $this->assertEquals('Guilherme', $users[0]->name); $this->assertEquals('dev', $users[0]->status); } @@ -72,7 +72,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $repos->findByStatus('dev'); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser',$users[0]); $this->assertEquals('Guilherme', $users[0]->name); $this->assertEquals('dev', $users[0]->status); } @@ -244,7 +244,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); $address = $repos->findOneBy(array('user' => $userId)); - $this->assertType('Doctrine\Tests\Models\CMS\CmsAddress', $address); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $address); $this->assertEquals($addressId, $address->id); } @@ -285,7 +285,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase $repos = $this->_em->getRepository('Doctrine\Tests\Models\CMS\CmsAddress'); $address = $repos->findOneByUser($userId); - $this->assertType('Doctrine\Tests\Models\CMS\CmsAddress', $address); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $address); $this->assertEquals($addressId, $address->id); } @@ -295,7 +295,7 @@ class EntityRepositoryTest extends \Doctrine\Tests\OrmFunctionalTestCase $query = $repos->createNamedQuery('all'); - $this->assertType('Doctrine\ORM\Query', $query); + $this->assertInstanceOf('Doctrine\ORM\Query', $query); $this->assertEquals('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u', $query->getDQL()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php index 9b1f8d607..bb324bf67 100644 --- a/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/MappedSuperclassTest.php @@ -38,9 +38,9 @@ class MappedSuperclassTest extends \Doctrine\Tests\OrmFunctionalTestCase $cleanFile = $this->_em->find(get_class($file), $file->getId()); - $this->assertType('Doctrine\Tests\Models\DirectoryTree\Directory', $cleanFile->getParent()); + $this->assertInstanceOf('Doctrine\Tests\Models\DirectoryTree\Directory', $cleanFile->getParent()); $this->assertEquals($directory->getId(), $cleanFile->getParent()->getId()); - $this->assertType('Doctrine\Tests\Models\DirectoryTree\Directory', $cleanFile->getParent()->getParent()); + $this->assertInstanceOf('Doctrine\Tests\Models\DirectoryTree\Directory', $cleanFile->getParent()->getParent()); $this->assertEquals($root->getId(), $cleanFile->getParent()->getParent()->getId()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php index 3adde7c10..ad4dd7404 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneUnidirectionalAssociationTest.php @@ -56,7 +56,7 @@ class OneToOneUnidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $result = $query->getResult(); $product = $result[0]; - $this->assertTrue($product->getShipping() instanceof ECommerceShipping); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceShipping', $product->getShipping()); $this->assertEquals(1, $product->getShipping()->getDays()); } @@ -69,7 +69,7 @@ class OneToOneUnidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $result = $query->getResult(); $product = $result[0]; - $this->assertTrue($product->getShipping() instanceof ECommerceShipping); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceShipping', $product->getShipping()); $this->assertEquals(1, $product->getShipping()->getDays()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php index 8b37a02ba..e8132de5c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/StandardEntityPersisterTest.php @@ -64,7 +64,7 @@ class StandardEntityPersisterTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->assertEquals(2, count($p->getFeatures())); - $this->assertTrue($p->getFeatures() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $p->getFeatures()); $q = $this->_em->createQuery( 'SELECT p, f @@ -75,7 +75,7 @@ class StandardEntityPersisterTest extends \Doctrine\Tests\OrmFunctionalTestCase $res = $q->getResult(); $this->assertEquals(2, count($p->getFeatures())); - $this->assertTrue($p->getFeatures() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $p->getFeatures()); // Check that the features are the same instances still foreach ($p->getFeatures() as $feature) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php index 6dc23c895..4685f1d03 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php @@ -37,7 +37,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $x2 = $this->_em->find(get_class($x), $x->id); // proxy injected for Y - $this->assertTrue($x2->y instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $x2->y); $this->assertFalse($x2->y->__isInitialized__); // proxy for Y is in identity map @@ -45,7 +45,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $z2 = $this->_em->createQuery('select z,y from ' . get_class($z) . ' z join z.y y where z.id = ?1') ->setParameter(1, $z->id) ->getSingleResult(); - $this->assertTrue($z2->y instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $x2->y); $this->assertTrue($z2->y->__isInitialized__); $this->assertEquals('Y', $z2->y->data); $this->assertEquals($y->id, $z2->y->id); @@ -56,7 +56,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNotSame($x, $x2); $this->assertNotSame($z, $z2); $this->assertSame($z2->y, $x2->y); - $this->assertTrue($z2->y instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $x2->y); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php index 29a35dada..9e92c34ce 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC258Test.php @@ -44,7 +44,7 @@ class DDC258Test extends \Doctrine\Tests\OrmFunctionalTestCase $e2 = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC258Super', $c2->id); - $this->assertType('Doctrine\Tests\ORM\Functional\Ticket\DDC258Class2', $e2); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC258Class2', $e2); $this->assertEquals('Bar', $e2->title); $this->assertEquals('Bar', $e2->description); $this->assertEquals('Bar', $e2->text); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php index 63a084c87..fc2c3fc6d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC345Test.php @@ -48,7 +48,7 @@ class DDC345Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals(1, $membership->prePersistCallCount); $this->assertEquals(0, $membership->preUpdateCallCount); - $this->assertTrue($membership->updated instanceof \DateTime); + $this->assertInstanceOf('DateTime', $membership->updated); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php index 399e35c34..ad1584fa0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC371Test.php @@ -41,7 +41,7 @@ class DDC371Test extends \Doctrine\Tests\OrmFunctionalTestCase ->getResult(); $this->assertEquals(1, count($children)); - $this->assertFalse($children[0]->parent instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $children[0]->parent); $this->assertFalse($children[0]->parent->children->isInitialized()); $this->assertEquals(0, $children[0]->parent->children->unwrap()->count()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php index bec65acae..ebe9f9d55 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC422Test.php @@ -28,7 +28,7 @@ class DDC422Test extends \Doctrine\Tests\OrmFunctionalTestCase $customer = $this->_em->find(get_class($customer), $customer->id); - $this->assertTrue($customer->contacts instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $customer->contacts); $this->assertFalse($customer->contacts->isInitialized()); $contact = new DDC422Contact; $customer->contacts->add($contact); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php index a11c62407..46096fe5b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC440Test.php @@ -64,13 +64,13 @@ class DDC440Test extends \Doctrine\Tests\OrmFunctionalTestCase // Test the first phone. The assertion actually failed because original entity data is not set properly. // This was because it is also set as MainPhone and that one is created as a proxy, not the // original object when the find on Client is called. However loading proxies did not work correctly. - $this->assertType('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone', $p1); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone', $p1); $originalData = $uw->getOriginalEntityData($p1); $this->assertEquals($phone->getNumber(), $originalData['number']); //If you comment out previous test, this one should pass - $this->assertType('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone', $p2); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC440Phone', $p2); $originalData = $uw->getOriginalEntityData($p2); $this->assertEquals($phone2->getNumber(), $originalData['number']); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php index 99da4c203..45c4340dc 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC501Test.php @@ -50,7 +50,7 @@ class DDC501Test extends OrmFunctionalTestCase // freeze and unfreeze $userClone = unserialize(serialize($userReloaded)); - $this->assertType('Doctrine\Tests\Models\CMS\CmsUser', $userClone); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $userClone); // detached user can't know about his phonenumbers $this->assertEquals(0, count($userClone->getPhonenumbers())); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php index d51bdd361..fa7e0af2f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC633Test.php @@ -66,7 +66,7 @@ class DDC633Test extends \Doctrine\Tests\OrmFunctionalTestCase $appointments = $this->_em->createQuery("SELECT a FROM " . __NAMESPACE__ . "\DDC633Appointment a")->getResult(); foreach ($appointments AS $eagerAppointment) { - $this->assertType('Doctrine\ORM\Proxy\Proxy', $eagerAppointment->patient); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $eagerAppointment->patient); $this->assertTrue($eagerAppointment->patient->__isInitialized__, "Proxy should already be initialized due to eager loading!"); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php index c2be27b11..939c35d7b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC729Test.php @@ -36,11 +36,11 @@ class DDC729Test extends \Doctrine\Tests\OrmFunctionalTestCase $a = new DDC729A(); $a->id = $aId; - $this->assertType('Doctrine\Common\Collections\ArrayCollection', $a->related); + $this->assertInstanceOf('Doctrine\Common\Collections\ArrayCollection', $a->related); $a = $this->_em->merge($a); - $this->assertType('Doctrine\ORM\PersistentCollection', $a->related); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $a->related); $this->assertFalse($a->related->isInitialized(), "Collection should not be marked initialized."); $this->assertFalse($a->related->isDirty(), "Collection should not be marked as dirty."); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php index 66c73bb78..de9e275bf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC736Test.php @@ -72,7 +72,7 @@ class DDC736Test extends \Doctrine\Tests\OrmFunctionalTestCase /* @var $cart2 Doctrine\Tests\Models\ECommerce\ECommerceCart */ $cart2 = $result[0][0]; - $this->assertType('Doctrine\ORM\Proxy\Proxy', $cart2->getCustomer()); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $cart2->getCustomer()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php index 1548552d7..9954a697b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC748Test.php @@ -33,10 +33,10 @@ class DDC748Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($article); $this->_em->flush(); - $this->assertType('Doctrine\Common\Collections\Collection', $user->articles); + $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $user->articles); $this->_em->refresh($article); $this->assertTrue($article !== $user->articles, "The article should not be replaced on the inverse side of the relation."); - $this->assertType('Doctrine\Common\Collections\Collection', $user->articles); + $this->assertInstanceOf('Doctrine\Common\Collections\Collection', $user->articles); } public function testRefreshOneToOne() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php index 6afea88cd..1665b1585 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC837Test.php @@ -52,20 +52,20 @@ class DDC837Test extends \Doctrine\Tests\OrmFunctionalTestCase // Test Class1 $e1 = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC837Super', $c1->id); - $this->assertType('Doctrine\Tests\ORM\Functional\Ticket\DDC837Class1', $e1); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC837Class1', $e1); $this->assertEquals('Foo', $e1->title); $this->assertEquals('Foo', $e1->description); - $this->assertType(__NAMESPACE__ . '\DDC837Aggregate', $e1->aggregate); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC837Aggregate', $e1->aggregate); $this->assertEquals('test1', $e1->aggregate->getSysname()); // Test Class 2 $e2 = $this->_em->find('Doctrine\Tests\ORM\Functional\Ticket\DDC837Super', $c2->id); - $this->assertType('Doctrine\Tests\ORM\Functional\Ticket\DDC837Class2', $e2); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC837Class2', $e2); $this->assertEquals('Bar', $e2->title); $this->assertEquals('Bar', $e2->description); $this->assertEquals('Bar', $e2->text); - $this->assertType(__NAMESPACE__ . '\DDC837Aggregate', $e2->aggregate); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC837Aggregate', $e2->aggregate); $this->assertEquals('test2', $e2->aggregate->getSysname()); $all = $this->_em->getRepository(__NAMESPACE__.'\DDC837Super')->findAll(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php index adab29d93..473a8679f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC949Test.php @@ -34,10 +34,10 @@ class DDC949Test extends \Doctrine\Tests\OrmFunctionalTestCase $true = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => true)); $false = $this->_em->getRepository('Doctrine\Tests\Models\Generic\BooleanModel')->findOneBy(array('booleanField' => false)); - $this->assertType('Doctrine\Tests\Models\Generic\BooleanModel', $true); + $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $true); $this->assertTrue($true->booleanField, "True Boolean Model should be true."); - $this->assertType('Doctrine\Tests\Models\Generic\BooleanModel', $false); + $this->assertInstanceOf('Doctrine\Tests\Models\Generic\BooleanModel', $false); $this->assertFalse($false->booleanField, "False Boolean Model should be false."); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index bcf4df543..7f7d3d6cf 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -16,7 +16,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase // Test initial state $this->assertTrue(count($cm->getReflectionProperties()) == 0); - $this->assertTrue($cm->reflClass instanceof \ReflectionClass); + $this->assertInstanceOf('ReflectionClass', $cm->reflClass); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->rootEntityName); $this->assertEquals(array(), $cm->subClasses); @@ -40,7 +40,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase // Check state $this->assertTrue(count($cm->getReflectionProperties()) > 0); $this->assertEquals('Doctrine\Tests\Models\CMS', $cm->namespace); - $this->assertTrue($cm->reflClass instanceof \ReflectionClass); + $this->assertInstanceOf('ReflectionClass', $cm->reflClass); $this->assertEquals('Doctrine\Tests\Models\CMS\CmsUser', $cm->name); $this->assertEquals('UserParent', $cm->rootEntityName); $this->assertEquals(array('Doctrine\Tests\Models\CMS\One', 'Doctrine\Tests\Models\CMS\Two', 'Doctrine\Tests\Models\CMS\Three'), $cm->subClasses); From 1ea3e543ab1729146fe6620c7d6861c2698042f9 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Tue, 26 Jul 2011 12:10:30 +0200 Subject: [PATCH 117/220] Correted indentation and variable name --- tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php index 4685f1d03..87939ff71 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC237Test.php @@ -45,7 +45,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $z2 = $this->_em->createQuery('select z,y from ' . get_class($z) . ' z join z.y y where z.id = ?1') ->setParameter(1, $z->id) ->getSingleResult(); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $x2->y); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $z2->y); $this->assertTrue($z2->y->__isInitialized__); $this->assertEquals('Y', $z2->y->data); $this->assertEquals($y->id, $z2->y->id); @@ -56,7 +56,7 @@ class DDC237Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertNotSame($x, $x2); $this->assertNotSame($z, $z2); $this->assertSame($z2->y, $x2->y); - $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $x2->y); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $z2->y); } } From 726106090598542b43735d538b0b941e3ed3588b Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Tue, 26 Jul 2011 15:22:57 +0200 Subject: [PATCH 118/220] Few more converts from assertTrue($a instance of $b) to assertInstanceOf --- .../ORM/Functional/BasicFunctionalTest.php | 4 +-- .../Functional/ClassTableInheritanceTest.php | 36 +++++++++---------- .../Functional/ClassTableInheritanceTest2.php | 8 ++--- .../ORM/Functional/DetachedEntityTest.php | 6 ++-- .../ManyToManyBasicAssociationTest.php | 6 ++-- ...ManyToManyBidirectionalAssociationTest.php | 20 +++++------ ...nyToManySelfReferentialAssociationTest.php | 8 ++--- ...anyToManyUnidirectionalAssociationTest.php | 8 ++--- .../Tests/ORM/Functional/NativeQueryTest.php | 22 ++++++------ .../OneToManyBidirectionalAssociationTest.php | 20 +++++------ ...neToManySelfReferentialAssociationTest.php | 8 ++--- .../OneToOneBidirectionalAssociationTest.php | 12 +++---- ...OneToOneSelfReferentialAssociationTest.php | 6 ++-- .../Tests/ORM/Functional/QueryTest.php | 8 ++--- .../ORM/Functional/Ticket/DDC168Test.php | 4 +-- .../ORM/Functional/Ticket/DDC199Test.php | 6 ++-- .../ORM/Functional/Ticket/DDC512Test.php | 8 ++--- .../ORM/Functional/Ticket/DDC522Test.php | 8 ++--- .../ORM/Functional/Ticket/DDC531Test.php | 4 +-- .../Tests/ORM/Functional/Ticket/Ticket69.php | 4 +-- .../ORM/Hydration/CustomHydratorTest.php | 2 +- 21 files changed, 104 insertions(+), 104 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index f69b3f862..d94aa253d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -46,7 +46,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->assertTrue($this->_em->contains($ph)); $this->assertTrue($this->_em->contains($user)); - //$this->assertTrue($user->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + //$this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->phonenumbers); // Update name $user->name = 'guilherme'; @@ -92,7 +92,7 @@ class BasicFunctionalTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($user); $this->_em->flush(); - //$this->assertTrue($user->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + //$this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $user->phonenumbers); // Remove the first element from the collection unset($user->phonenumbers[0]); diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 0fbff503e..3456d4ba0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -50,8 +50,8 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $entities = $query->getResult(); $this->assertEquals(2, count($entities)); - $this->assertTrue($entities[0] instanceof CompanyPerson); - $this->assertTrue($entities[1] instanceof CompanyEmployee); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $entities[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $entities[1]); $this->assertTrue(is_numeric($entities[0]->getId())); $this->assertTrue(is_numeric($entities[1]->getId())); $this->assertEquals('Roman S. Borschel', $entities[0]->getName()); @@ -65,7 +65,7 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $entities = $query->getResult(); $this->assertEquals(1, count($entities)); - $this->assertTrue($entities[0] instanceof CompanyEmployee); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $entities[0]); $this->assertTrue(is_numeric($entities[0]->getId())); $this->assertEquals('Guilherme Blanco', $entities[0]->getName()); $this->assertEquals(100000, $entities[0]->getSalary()); @@ -73,7 +73,7 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $guilherme = $this->_em->getRepository(get_class($employee))->findOneBy(array('name' => 'Guilherme Blanco')); - $this->assertTrue($guilherme instanceof CompanyEmployee); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $guilherme); $this->assertEquals('Guilherme Blanco', $guilherme->getName()); $this->_em->clear(); @@ -110,7 +110,7 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $manager = $this->_em->find('Doctrine\Tests\Models\Company\CompanyManager', $manager->getId()); - $this->assertTrue($manager instanceof CompanyManager); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyManager', $manager); $this->assertEquals('Roman B.', $manager->getName()); $this->assertEquals(119000, $manager->getSalary()); $this->assertEquals('CEO', $manager->getTitle()); @@ -130,12 +130,12 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $person = $this->_em->find('Doctrine\Tests\Models\Company\CompanyPerson', $manager->getId()); - $this->assertTrue($person instanceof CompanyManager); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyManager', $person); $this->assertEquals('Roman S. Borschel', $person->getName()); $this->assertEquals(100000, $person->getSalary()); $this->assertEquals('CTO', $person->getTitle()); $this->assertTrue(is_numeric($person->getId())); - //$this->assertTrue($person->getCar() instanceof CompanyCar); + //$this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyCar', $person->getCar()); } public function testSelfReferencingOneToOne() { @@ -167,9 +167,9 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof CompanyPerson); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyPerson', $result[0]); $this->assertEquals('Mary Smith', $result[0]->getName()); - $this->assertTrue($result[0]->getSpouse() instanceof CompanyEmployee); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $result[0]->getSpouse()); $this->assertEquals('John Smith', $result[0]->getSpouse()->getName()); $this->assertSame($result[0], $result[0]->getSpouse()->getSpouse()); } @@ -229,20 +229,20 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof CompanyOrganization); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyOrganization', $result[0]); $this->assertNull($result[0]->getMainEvent()); $events = $result[0]->getEvents(); - $this->assertTrue($events instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $events); $this->assertFalse($events->isInitialized()); $this->assertEquals(2, count($events)); if ($events[0] instanceof CompanyAuction) { - $this->assertTrue($events[1] instanceof CompanyRaffle); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyRaffle', $events[1]); } else { - $this->assertTrue($events[0] instanceof CompanyRaffle); - $this->assertTrue($events[1] instanceof CompanyAuction); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyRaffle', $events[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyAuction', $events[1]); } } @@ -263,7 +263,7 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof CompanyAuction, sprintf("Is of class %s",get_class($result[0]))); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyAuction', $result[0], sprintf("Is of class %s",get_class($result[0]))); $this->_em->clear(); @@ -273,12 +273,12 @@ class ClassTableInheritanceTest extends \Doctrine\Tests\OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof CompanyOrganization); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyOrganization', $result[0]); $mainEvent = $result[0]->getMainEvent(); // mainEvent should have been loaded because it can't be lazy - $this->assertTrue($mainEvent instanceof CompanyAuction); - $this->assertFalse($mainEvent instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyAuction', $mainEvent); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $mainEvent); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php index d720f5d92..e558f2abb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest2.php @@ -43,9 +43,9 @@ class ClassTableInheritanceTest2 extends \Doctrine\Tests\OrmFunctionalTestCase $related2 = $this->_em->find('Doctrine\Tests\ORM\Functional\CTIRelated', $relatedId); - $this->assertTrue($related2 instanceof CTIRelated); - $this->assertTrue($related2->getCTIParent() instanceof CTIChild); - $this->assertFalse($related2->getCTIParent() instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\CTIRelated', $related2); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\CTIChild', $related2->getCTIParent()); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $related2->getCTIParent()); $this->assertEquals('hello', $related2->getCTIParent()->getData()); $this->assertSame($related2, $related2->getCTIParent()->getRelated()); @@ -69,7 +69,7 @@ class ClassTableInheritanceTest2 extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertFalse($mmrel2->getCTIChildren()->isInitialized()); $this->assertEquals(1, count($mmrel2->getCTIChildren())); $this->assertTrue($mmrel2->getCTIChildren()->isInitialized()); - $this->assertTrue($mmrel2->getCTIChildren()->get(0) instanceof CTIChild); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\CTIChild', $mmrel2->getCTIChildren()->get(0)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index c6509f938..5d7e889ae 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -137,14 +137,14 @@ class DetachedEntityTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); $address2 = $this->_em->find(get_class($address), $address->id); - $this->assertTrue($address2->user instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $address2->user); $this->assertFalse($address2->user->__isInitialized__); $detachedAddress2 = unserialize(serialize($address2)); - $this->assertTrue($detachedAddress2->user instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $detachedAddress2->user); $this->assertFalse($detachedAddress2->user->__isInitialized__); $managedAddress2 = $this->_em->merge($detachedAddress2); - $this->assertTrue($managedAddress2->user instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $managedAddress2->user); $this->assertFalse($managedAddress2->user === $detachedAddress2->user); $this->assertFalse($managedAddress2->user->__isInitialized__); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index 5f97717d4..cbdb44104 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -47,7 +47,7 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa $result = $query->getResult(); $this->assertEquals(2, $this->_em->getUnitOfWork()->size()); - $this->assertTrue($result[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); $this->assertEquals('Guilherme', $result[0]->name); $this->assertEquals(1, $result[0]->getGroups()->count()); $groups = $result[0]->getGroups(); @@ -56,8 +56,8 @@ class ManyToManyBasicAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCa $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($result[0])); $this->assertEquals(\Doctrine\ORM\UnitOfWork::STATE_MANAGED, $this->_em->getUnitOfWork()->getEntityState($groups[0])); - $this->assertTrue($groups instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($groups[0]->getUsers() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $groups); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $groups[0]->getUsers()); $groups[0]->getUsers()->clear(); $groups->clear(); diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php index 5a6a2dd50..f8228d7ad 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBidirectionalAssociationTest.php @@ -117,8 +117,8 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati //$query->setHint(Query::HINT_FORCE_PARTIAL_LOAD, true); $result = $query->getResult(); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof ECommerceCategory); - $this->assertTrue($result[1] instanceof ECommerceCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $result[1]); $prods1 = $result[0]->getProducts(); $prods2 = $result[1]->getProducts(); $this->assertTrue($prods1->isInitialized()); @@ -157,10 +157,10 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati $this->assertEquals(2, count($secondCategoryProducts)); // lazy-load $this->assertTrue($secondCategoryProducts->isInitialized()); - $this->assertTrue($firstCategoryProducts[0] instanceof ECommerceProduct); - $this->assertTrue($firstCategoryProducts[1] instanceof ECommerceProduct); - $this->assertTrue($secondCategoryProducts[0] instanceof ECommerceProduct); - $this->assertTrue($secondCategoryProducts[1] instanceof ECommerceProduct); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstCategoryProducts[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstCategoryProducts[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondCategoryProducts[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondCategoryProducts[1]); $this->assertCollectionEquals($firstCategoryProducts, $secondCategoryProducts); } @@ -192,10 +192,10 @@ class ManyToManyBidirectionalAssociationTest extends AbstractManyToManyAssociati $this->assertEquals(2, count($secondProductCategories)); // lazy-load $this->assertTrue($secondProductCategories->isInitialized()); - $this->assertTrue($firstProductCategories[0] instanceof ECommerceCategory); - $this->assertTrue($firstProductCategories[1] instanceof ECommerceCategory); - $this->assertTrue($secondProductCategories[0] instanceof ECommerceCategory); - $this->assertTrue($secondProductCategories[1] instanceof ECommerceCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $firstProductCategories[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $firstProductCategories[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $secondProductCategories[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $secondProductCategories[1]); $this->assertCollectionEquals($firstProductCategories, $secondProductCategories); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php index 020e77aec..2993825fa 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManySelfReferentialAssociationTest.php @@ -95,10 +95,10 @@ class ManyToManySelfReferentialAssociationTest extends AbstractManyToManyAssocia $this->assertEquals(2, count($firstRelatedBy)); $this->assertEquals(2, count($secondRelatedBy)); - $this->assertTrue($firstRelatedBy[0] instanceof ECommerceProduct); - $this->assertTrue($firstRelatedBy[1] instanceof ECommerceProduct); - $this->assertTrue($secondRelatedBy[0] instanceof ECommerceProduct); - $this->assertTrue($secondRelatedBy[1] instanceof ECommerceProduct); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstRelatedBy[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $firstRelatedBy[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondRelatedBy[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $secondRelatedBy[1]); $this->assertCollectionEquals($firstRelatedBy, $secondRelatedBy); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php index d6c38fc54..7de55e4f0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyUnidirectionalAssociationTest.php @@ -69,8 +69,8 @@ class ManyToManyUnidirectionalAssociationTest extends AbstractManyToManyAssociat $products = $firstCart->getProducts(); $secondCart = $result[1]; - $this->assertTrue($products[0] instanceof ECommerceProduct); - $this->assertTrue($products[1] instanceof ECommerceProduct); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[1]); $this->assertCollectionEquals($products, $secondCart->getProducts()); //$this->assertEquals("Doctrine 1.x Manual", $products[0]->getName()); //$this->assertEquals("Doctrine 2.x Manual", $products[1]->getName()); @@ -88,8 +88,8 @@ class ManyToManyUnidirectionalAssociationTest extends AbstractManyToManyAssociat $products = $firstCart->getProducts(); $secondCart = $result[1]; - $this->assertTrue($products[0] instanceof ECommerceProduct); - $this->assertTrue($products[1] instanceof ECommerceProduct); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $products[1]); $this->assertCollectionEquals($products, $secondCart->getProducts()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index f997c6c01..d9bda728c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -49,7 +49,7 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); $this->assertEquals('Roman', $users[0]->name); } @@ -83,9 +83,9 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertTrue($users[0]->getPhonenumbers() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); $this->assertTrue($users[0]->getPhonenumbers()->isInitialized()); $this->assertEquals(1, count($users[0]->getPhonenumbers())); $phones = $users[0]->getPhonenumbers(); @@ -132,11 +132,11 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertTrue($users[0]->getPhonenumbers() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); $this->assertFalse($users[0]->getPhonenumbers()->isInitialized()); - $this->assertTrue($users[0]->getAddress() instanceof CmsAddress); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $users[0]->getAddress()); $this->assertTrue($users[0]->getAddress()->getUser() == $users[0]); $this->assertEquals('germany', $users[0]->getAddress()->getCountry()); $this->assertEquals(10827, $users[0]->getAddress()->getZipCode()); @@ -185,9 +185,9 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertTrue($users[0]->getPhonenumbers() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); $this->assertTrue($users[0]->getPhonenumbers()->isInitialized()); $this->assertEquals(1, count($users[0]->getPhonenumbers())); $phones = $users[0]->getPhonenumbers(); @@ -226,11 +226,11 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); $this->assertEquals('Roman', $users[0]->name); - $this->assertTrue($users[0]->getPhonenumbers() instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $users[0]->getPhonenumbers()); $this->assertFalse($users[0]->getPhonenumbers()->isInitialized()); - $this->assertTrue($users[0]->getAddress() instanceof CmsAddress); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsAddress', $users[0]->getAddress()); $this->assertTrue($users[0]->getAddress()->getUser() == $users[0]); $this->assertEquals('germany', $users[0]->getAddress()->getCountry()); $this->assertEquals(10827, $users[0]->getAddress()->getZipCode()); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php index 16a633dde..e39e10b3e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManyBidirectionalAssociationTest.php @@ -77,13 +77,13 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $features = $product->getFeatures(); - $this->assertTrue($features[0] instanceof ECommerceFeature); - $this->assertFalse($features[0]->getProduct() instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[0]); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $features[0]->getProduct()); $this->assertSame($product, $features[0]->getProduct()); $this->assertEquals('Model writing tutorial', $features[0]->getDescription()); - $this->assertTrue($features[1] instanceof ECommerceFeature); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[1]); $this->assertSame($product, $features[1]->getProduct()); - $this->assertFalse($features[1]->getProduct() instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $features[1]->getProduct()); $this->assertEquals('Annotations examples', $features[1]->getDescription()); } @@ -97,11 +97,11 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $features = $product->getFeatures(); $this->assertFalse($features->isInitialized()); - $this->assertTrue($features[0] instanceof ECommerceFeature); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[0]); $this->assertTrue($features->isInitialized()); $this->assertSame($product, $features[0]->getProduct()); $this->assertEquals('Model writing tutorial', $features[0]->getDescription()); - $this->assertTrue($features[1] instanceof ECommerceFeature); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceFeature', $features[1]); $this->assertSame($product, $features[1]->getProduct()); $this->assertEquals('Annotations examples', $features[1]->getDescription()); } @@ -114,8 +114,8 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $features = $query->getResult(); $product = $features[0]->getProduct(); - $this->assertTrue($product instanceof \Doctrine\ORM\Proxy\Proxy); - $this->assertTrue($product instanceof ECommerceProduct); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $product); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $product); $this->assertFalse($product->__isInitialized__); $this->assertSame('Doctrine Cookbook', $product->getName()); $this->assertTrue($product->__isInitialized__); @@ -130,8 +130,8 @@ class OneToManyBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctiona $features = $query->getResult(); $product = $features[0]->getProduct(); - $this->assertFalse($product instanceof \Doctrine\ORM\Proxy\Proxy); - $this->assertTrue($product instanceof ECommerceProduct); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $product); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $product); $this->assertSame('Doctrine Cookbook', $product->getName()); $this->assertFalse($product->getFeatures()->isInitialized()); diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php index 5d6c182ab..e37497658 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToManySelfReferentialAssociationTest.php @@ -79,10 +79,10 @@ class OneToManySelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunctio $parent = $result[0]; $children = $parent->getChildren(); - $this->assertTrue($children[0] instanceof ECommerceCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[0]); $this->assertSame($parent, $children[0]->getParent()); $this->assertEquals(' books', strstr($children[0]->getName(), ' books')); - $this->assertTrue($children[1] instanceof ECommerceCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[1]); $this->assertSame($parent, $children[1]->getParent()); $this->assertEquals(' books', strstr($children[1]->getName(), ' books')); } @@ -98,10 +98,10 @@ class OneToManySelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunctio $parent = $result[0]; $children = $parent->getChildren(); - $this->assertTrue($children[0] instanceof ECommerceCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[0]); $this->assertSame($parent, $children[0]->getParent()); $this->assertEquals(' books', strstr($children[0]->getName(), ' books')); - $this->assertTrue($children[1] instanceof ECommerceCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCategory', $children[1]); $this->assertSame($parent, $children[1]->getParent()); $this->assertEquals(' books', strstr($children[1]->getName(), ' books')); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php index 93e30cbc0..75be67e77 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneBidirectionalAssociationTest.php @@ -62,7 +62,7 @@ class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctional $result = $query->getResult(); $customer = $result[0]; - $this->assertTrue($customer->getCart() instanceof ECommerceCart); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart()); $this->assertEquals('paypal', $customer->getCart()->getPayment()); } @@ -75,7 +75,7 @@ class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctional $result = $query->getResult(); $cart = $result[0]; - $this->assertTrue($cart->getCustomer() instanceof ECommerceCustomer); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart->getCustomer()); $this->assertEquals('Giorgio', $cart->getCustomer()->getName()); } @@ -90,8 +90,8 @@ class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctional $customer = $result[0]; $this->assertNull($customer->getMentor()); - $this->assertTrue($customer->getCart() instanceof ECommerceCart); - $this->assertFalse($customer->getCart() instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOF('Doctrine\Tests\Models\ECommerce\ECommerceCart', $customer->getCart()); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $customer->getCart()); $this->assertEquals('paypal', $customer->getCart()->getPayment()); } @@ -107,7 +107,7 @@ class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctional $this->_em->flush(); $this->_em->clear(); - $this->assertTrue($cust->getCart() instanceof ECommerceCart); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCart', $cust->getCart()); $this->assertEquals('Roman', $cust->getName()); $this->assertSame($cust, $cart->getCustomer()); @@ -126,7 +126,7 @@ class OneToOneBidirectionalAssociationTest extends \Doctrine\Tests\OrmFunctional $cart3 = $query2->getSingleResult(); - $this->assertTrue($cart3->getCustomer() instanceof ECommerceCustomer); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $cart3->getCustomer()); $this->assertEquals('Roman', $cart3->getCustomer()->getName()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php index d7132ed60..bcd41dcaf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/OneToOneSelfReferentialAssociationTest.php @@ -104,8 +104,8 @@ class OneToOneSelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunction $entity2 = $this->_em->find(get_class($entity1), $entity1->getId()); - $this->assertTrue($entity2->getOther1() instanceof MultiSelfReference); - $this->assertTrue($entity2->getOther2() instanceof MultiSelfReference); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\MultiSelfReference', $entity2->getOther1()); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\MultiSelfReference', $entity2->getOther2()); $this->assertNull($entity2->getOther1()->getOther1()); $this->assertNull($entity2->getOther1()->getOther2()); $this->assertNull($entity2->getOther2()->getOther1()); @@ -114,7 +114,7 @@ class OneToOneSelfReferentialAssociationTest extends \Doctrine\Tests\OrmFunction public function assertLoadingOfAssociation($customer) { - $this->assertTrue($customer->getMentor() instanceof ECommerceCustomer); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceCustomer', $customer->getMentor()); $this->assertEquals('Obi-wan Kenobi', $customer->getMentor()->getName()); } diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index d8937289a..82180a4ed 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -38,7 +38,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0][0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); $this->assertEquals('Guilherme', $result[0][0]->name); $this->assertEquals('gblanco', $result[0][0]->username); $this->assertEquals('developer', $result[0][0]->status); @@ -90,7 +90,7 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a"); $users = $query->getResult(); $this->assertEquals(1, count($users)); - $this->assertTrue($users[0] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $users[0]); $this->assertEquals(2, count($users[0]->articles)); $this->assertEquals('Doctrine 2', $users[0]->articles[0]->topic); $this->assertEquals('Symfony 2', $users[0]->articles[1]->topic); @@ -361,9 +361,9 @@ class QueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof CmsArticle); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0]); $this->assertEquals("dr. dolittle", $result[0]->topic); - $this->assertTrue($result[0]->user instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $result[0]->user); $this->assertFalse($result[0]->user->__isInitialized__); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php index 41c41df45..004acfa8c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC168Test.php @@ -58,7 +58,7 @@ class DDC168Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals("bar", $theEmployee->getDepartment()); $this->assertEquals("Foo", $theEmployee->getName()); $this->assertEquals(1000, $theEmployee->getSalary()); - $this->assertTrue($theEmployee instanceof CompanyEmployee); - $this->assertTrue($theEmployee->getSpouse() instanceof CompanyEmployee); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee); + $this->assertInstanceOf('Doctrine\Tests\Models\Company\CompanyEmployee', $theEmployee->getSpouse()); } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php index e912c389f..8b5eddbf8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC199Test.php @@ -40,11 +40,11 @@ class DDC199Test extends \Doctrine\Tests\OrmFunctionalTestCase $result = $query->getResult(); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof DDC199ChildClass); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC199ParentClass', $result[0]); $this->assertTrue($result[0]->relatedEntities->isInitialized()); $this->assertEquals(2, $result[0]->relatedEntities->count()); - $this->assertTrue($result[0]->relatedEntities[0] instanceof DDC199RelatedClass); - $this->assertTrue($result[0]->relatedEntities[1] instanceof DDC199RelatedClass); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC199RelatedClass', $result[0]->relatedEntities[0]); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\DDC199RelatedClass', $result[0]->relatedEntities[1]); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php index 72b11aaab..b9c74d399 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC512Test.php @@ -32,14 +32,14 @@ class DDC512Test extends \Doctrine\Tests\OrmFunctionalTestCase $result = $q->getResult(); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof DDC512Customer); - $this->assertTrue($result[1] instanceof DDC512Customer); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC512Customer', $result[0]); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC512Customer', $result[1]); if ($result[0]->id == $customer1->id) { - $this->assertTrue($result[0]->item instanceof DDC512OfferItem); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC512OfferItem', $result[0]->item); $this->assertEquals($item->id, $result[0]->item->id); $this->assertNull($result[1]->item); } else { - $this->assertTrue($result[1]->item instanceof DDC512OfferItem); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC512OfferItem', $result[1]->item); $this->assertNull($result[0]->item); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php index d0e8f4c7d..c517d461e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -48,9 +48,9 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase $r = $this->_em->createQuery("select ca,c from ".get_class($cart)." ca join ca.customer c") ->getResult(); - $this->assertTrue($r[0] instanceof DDC522Cart); - $this->assertTrue($r[0]->customer instanceof DDC522Customer); - $this->assertFalse($r[0]->customer instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC522Cart', $r[0]); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC522Customer', $r[0]->customer); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $r[0]->customer); $this->assertEquals('name', $r[0]->customer->name); $fkt = new DDC522ForeignKeyTest(); @@ -62,7 +62,7 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase $fkt2 = $this->_em->find(get_class($fkt), $fkt->id); $this->assertEquals($fkt->cart->id, $fkt2->cartId); - $this->assertTrue($fkt2->cart instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf('Doctrine\ORM\Proxy\Proxy', $fkt2->cart); $this->assertFalse($fkt2->cart->__isInitialized__); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php index 0ac3b9b8d..7ce19cfab 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC531Test.php @@ -29,8 +29,8 @@ class DDC531Test extends \Doctrine\Tests\OrmFunctionalTestCase $item3 = $this->_em->find(__NAMESPACE__ . '\DDC531Item', $item2->id); // Load child item first (id 2) // parent will already be loaded, cannot be lazy because it has mapped subclasses and we would not // know which proxy type to put in. - $this->assertTrue($item3->parent instanceof DDC531Item); - $this->assertFalse($item3->parent instanceof \Doctrine\ORM\Proxy\Proxy); + $this->assertInstanceOf(__NAMESPACE__ . '\DDC531Item', $item3->parent); + $this->assertNotInstanceOf('Doctrine\ORM\Proxy\Proxy', $item3->parent); $item4 = $this->_em->find(__NAMESPACE__ . '\DDC531Item', $item1->id); // Load parent item (id 1) $this->assertNull($item4->parent); $this->assertNotNull($item4->getChildren()); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php index f6ef6c3bf..759a593fd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket69.php @@ -85,11 +85,11 @@ class AdvancedAssociationTest extends \Doctrine\Tests\OrmFunctionalTestCase { $lemma = $res[0]; $this->assertEquals('foo', $lemma->getLemma()); - $this->assertTrue($lemma instanceof Lemma); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\Lemma', $lemma); $relations = $lemma->getRelations(); foreach($relations as $relation) { - $this->assertTrue($relation instanceof Relation); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\Ticket\Relation', $relation); $this->assertTrue($relation->getType()->getType() != ''); } diff --git a/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php index 6b5e45149..8daf961b5 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/CustomHydratorTest.php @@ -15,7 +15,7 @@ class CustomHydratorTest extends HydrationTestCase $config->addCustomHydrationMode('CustomHydrator', 'Doctrine\Tests\ORM\Hydration\CustomHydrator'); $hydrator = $em->newHydrator('CustomHydrator'); - $this->assertTrue($hydrator instanceof \Doctrine\Tests\ORM\Hydration\CustomHydrator); + $this->assertInstanceOf('Doctrine\Tests\ORM\Hydration\CustomHydrator', $hydrator); $this->assertNull($config->getCustomHydrationMode('does not exist')); } } From 97a4dbf2cd7d199af8a96eb5240eb5e94a022337 Mon Sep 17 00:00:00 2001 From: Alexander Date: Tue, 26 Jul 2011 17:15:21 +0200 Subject: [PATCH 119/220] [DDC-1294] Added more tests for subselects in subselects --- .../ORM/Query/SelectSqlGenerationTest.php | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 6c21abfcf..ad5ce1329 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -933,6 +933,38 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase "SELECT c0_.name AS name0, (SELECT COUNT(c1_.id) AS dctrn__total FROM company_contracts c1_ WHERE c1_.discr IN ('fix')) AS sclr1 FROM cms_users c0_" ); } + + public function testIdVariableResultVariableReuse() + { + $exceptionThrown = false; + try { + $query = $this->_em->createQuery("SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name IN (SELECT u.name FROM Doctrine\Tests\Models\CMS\CmsUser u)"); + + $query->getSql(); + $query->free(); + } catch (\Exception $e) { + $exceptionThrown = true; + } + + $this->assertTrue($exceptionThrown); + + } + + public function testSubSelectAliasesFromOuterQuery() + { + $this->assertSqlGeneration( + "SELECT uo, (SELECT ui.name FROM Doctrine\Tests\Models\CMS\CmsUser ui WHERE ui.id = uo.id) AS bar FROM Doctrine\Tests\Models\CMS\CmsUser uo", + "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, (SELECT c1_.name FROM cms_users c1_ WHERE c1_.id = c0_.id) AS sclr4 FROM cms_users c0_" + ); + } + + public function testSubSelectAliasesFromOuterQueryWithSubquery() + { + $this->assertSqlGeneration( + "SELECT uo, (SELECT ui.name FROM Doctrine\Tests\Models\CMS\CmsUser ui WHERE ui.id = uo.id AND ui.name IN (SELECT uii.name FROM Doctrine\Tests\Models\CMS\CmsUser uii)) AS bar FROM Doctrine\Tests\Models\CMS\CmsUser uo", + "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, (SELECT c1_.name FROM cms_users c1_ WHERE c1_.id = c0_.id AND c1_.name IN (SELECT c2_.name FROM cms_users c2_)) AS sclr4 FROM cms_users c0_" + ); + } } From a99ffc126f3ec3fa45fa806bfdba4fc31f1afaa4 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 26 Jul 2011 22:15:27 +0200 Subject: [PATCH 120/220] DDC-1276 - Fix bug where merge managed and new entitiy share the same collection that is cascaded, cleared during the process and then empty afterwards. --- lib/Doctrine/ORM/UnitOfWork.php | 7 ++- .../ORM/Functional/Ticket/DDC1276Test.php | 50 +++++++++++++++++++ 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php diff --git a/lib/Doctrine/ORM/UnitOfWork.php b/lib/Doctrine/ORM/UnitOfWork.php index 684210272..d62eb62c7 100644 --- a/lib/Doctrine/ORM/UnitOfWork.php +++ b/lib/Doctrine/ORM/UnitOfWork.php @@ -1456,7 +1456,8 @@ class UnitOfWork implements PropertyChangedListener } if ($assoc2['isCascadeMerge']) { $managedCol->initialize(); - if (!$managedCol->isEmpty()) { + // clear and set dirty a managed collection if its not also the same collection to merge from. + if (!$managedCol->isEmpty() && $managedCol != $mergeCol) { $managedCol->unwrap()->clear(); $managedCol->setDirty(true); if ($assoc2['isOwningSide'] && $assoc2['type'] == ClassMetadata::MANY_TO_MANY && $class->isChangeTrackingNotify()) { @@ -1655,6 +1656,10 @@ class UnitOfWork implements PropertyChangedListener } $relatedEntities = $class->reflFields[$assoc['fieldName']]->getValue($entity); if ($relatedEntities instanceof Collection) { + if ($relatedEntities === $class->reflFields[$assoc['fieldName']]->getValue($managedCopy)) { + continue; + } + if ($relatedEntities instanceof PersistentCollection) { // Unwrap so that foreach() does not initialize $relatedEntities = $relatedEntities->unwrap(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php new file mode 100644 index 000000000..1b9dc8c99 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1276Test.php @@ -0,0 +1,50 @@ +useModelSet('cms'); + parent::setUp(); + } + + public function testIssue() + { + $user = new CmsUser(); + $user->name = "Benjamin"; + $user->username = "beberlei"; + $user->status = "active"; + $this->_em->persist($user); + + for ($i = 0; $i < 2; $i++) { + $group = new CmsGroup(); + $group->name = "group".$i; + $user->groups[] = $group; + $this->_em->persist($group); + } + $this->_em->flush(); + $this->_em->clear(); + + $user = $this->_em->find('Doctrine\Tests\Models\CMS\CmsUser', $user->id); + $cloned = clone $user; + + $this->assertSame($user->groups, $cloned->groups); + $this->assertEquals(2, count($user->groups)); + $this->_em->merge($cloned); + + $this->assertEquals(2, count($user->groups)); + + $this->_em->flush(); + } +} \ No newline at end of file From cbf210605a80da33dd0090ba488118102b518359 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 26 Jul 2011 22:24:16 +0200 Subject: [PATCH 121/220] [DDC-1290] Allow smallint and bigint for version fields --- 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 7c5cf8d26..a707577d7 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1800,7 +1800,7 @@ class ClassMetadataInfo implements ClassMetadata $this->versionField = $mapping['fieldName']; if ( ! isset($mapping['default'])) { - if ($mapping['type'] == 'integer') { + if (in_array($mapping['type'], array('integer', 'bigint', 'smallint'))) { $mapping['default'] = 1; } else if ($mapping['type'] == 'datetime') { $mapping['default'] = 'CURRENT_TIMESTAMP'; From 93d2e1bd0ab43c631301a32f88b04d61ca2b458e Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 26 Jul 2011 22:30:20 +0200 Subject: [PATCH 122/220] [DDC-1280] Only generate linefeeds in proxies for consistency. --- lib/Doctrine/ORM/Proxy/ProxyFactory.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Proxy/ProxyFactory.php b/lib/Doctrine/ORM/Proxy/ProxyFactory.php index 90a3a8d5b..8d62ca7ab 100644 --- a/lib/Doctrine/ORM/Proxy/ProxyFactory.php +++ b/lib/Doctrine/ORM/Proxy/ProxyFactory.php @@ -172,7 +172,7 @@ class ProxyFactory } if ($method->isPublic() && ! $method->isFinal() && ! $method->isStatic()) { - $methods .= PHP_EOL . ' public function '; + $methods .= "\n" . ' public function '; if ($method->returnsReference()) { $methods .= '&'; } @@ -208,10 +208,10 @@ class ProxyFactory } $methods .= $parameterString . ')'; - $methods .= PHP_EOL . ' {' . PHP_EOL; - $methods .= ' $this->__load();' . PHP_EOL; + $methods .= "\n" . ' {' . "\n"; + $methods .= ' $this->__load();' . "\n"; $methods .= ' return parent::' . $method->getName() . '(' . $argumentString . ');'; - $methods .= PHP_EOL . ' }' . PHP_EOL; + $methods .= "\n" . ' }' . "\n"; } } From 598ab36968007d24b420f6eb59011edae48dc389 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 26 Jul 2011 22:59:55 +0200 Subject: [PATCH 123/220] [DDC-1215] Fix EntityGenerator inheritance regenerating properties and methods --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index f55af76b1..c0e7b6267 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -462,6 +462,14 @@ public function () private function _hasProperty($property, ClassMetadataInfo $metadata) { + if ($this->_extendsClass()) { + // don't generate property if its already on the base class. + $reflClass = new \ReflectionClass($this->_getClassToExtend()); + if ($reflClass->hasProperty($property)) { + return true; + } + } + return ( isset($this->_staticReflection[$metadata->name]) && in_array($property, $this->_staticReflection[$metadata->name]['properties']) @@ -470,6 +478,14 @@ public function () private function _hasMethod($method, ClassMetadataInfo $metadata) { + if ($this->_extendsClass()) { + // don't generate method if its already on the base class. + $reflClass = new \ReflectionClass($this->_getClassToExtend()); + if ($reflClass->hasMethod($method)) { + return true; + } + } + return ( isset($this->_staticReflection[$metadata->name]) && in_array($method, $this->_staticReflection[$metadata->name]['methods']) From a0b7c3e76ddcae433c28c2e71fa2e4dbafa648fa Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Tue, 26 Jul 2011 23:16:38 +0200 Subject: [PATCH 124/220] Add UPGRADE_TO_2_2 file --- UPGRADE_TO_2_2 | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 UPGRADE_TO_2_2 diff --git a/UPGRADE_TO_2_2 b/UPGRADE_TO_2_2 new file mode 100644 index 000000000..0500e4599 --- /dev/null +++ b/UPGRADE_TO_2_2 @@ -0,0 +1,3 @@ +# Removed support for onUpdate in @JoinColumn + +The onUpdate foreign key handling makes absolutly no sense in an ORM. Additionally Oracle doesn't even support it. Support for it is removed. From 154fd60d850bf8feb2ff3c6976cd86972c63a2ea Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Tue, 26 Jul 2011 17:35:06 -0400 Subject: [PATCH 125/220] DDC-1275: Added join columns to result set mapping --- .../ORM/Query/ResultSetMappingBuilder.php | 19 ++++++ .../Tests/ORM/Functional/NativeQueryTest.php | 67 +++++++++++++++++++ 2 files changed, 86 insertions(+) diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php index ceacc9638..95d548daf 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php +++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php @@ -67,6 +67,7 @@ class ResultSetMappingBuilder extends ResultSetMapping } $this->addFieldResult($alias, $platform->getSQLResultCasing($columnName), $propertyName); } + $this->addAssocationMappings($alias, $classMetadata->getAssociationMappings()); } /** @@ -96,5 +97,23 @@ class ResultSetMappingBuilder extends ResultSetMapping } $this->addFieldResult($alias, $platform->getSQLResultCasing($columnName), $propertyName); } + $this->addAssocationMappings($alias, $classMetadata->getAssociationMappings()); + } + + protected function addAssocationMappings($alias, $associationMappings) + { + $platform = $this->em->getConnection()->getDatabasePlatform(); + foreach ($associationMappings AS $associationMapping) { + if (isset($associationMapping['joinColumns'])) { + foreach ($associationMapping['joinColumns'] AS $joinColumn) { + $columnName = $joinColumn['name']; + $renamedColumnName = isset($renamedColumns[$columnName]) ? $renamedColumns[$columnName] : $columnName; + if (isset($this->metaMappings[$renamedColumnName])) { + throw new \InvalidArgumentException("The column '$renamedColumnName' conflicts with another column in the mapper."); + } + $this->addMetaResult($alias, $platform->getSQLResultCasing($renamedColumnName), $platform->getSQLResultCasing($columnName)); + } + } + } } } \ No newline at end of file diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index f997c6c01..c8347d66d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -52,6 +52,48 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertTrue($users[0] instanceof CmsUser); $this->assertEquals('Roman', $users[0]->name); } + + public function testBasicNativeQueryWithMetaResult() + { + $user = new CmsUser; + $user->name = 'Roman'; + $user->username = 'romanb'; + $user->status = 'dev'; + + $addr = new CmsAddress; + $addr->country = 'germany'; + $addr->zip = 10827; + $addr->city = 'Berlin'; + + + $user->setAddress($addr); + + $this->_em->persist($user); + $this->_em->flush(); + + $this->_em->clear(); + + $rsm = new ResultSetMapping; + $rsm->addEntityResult('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); + $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('id'), 'id'); + $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('country'), 'country'); + $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('zip'), 'zip'); + $rsm->addFieldResult('a', $this->platform->getSQLResultCasing('city'), 'city'); + $rsm->addMetaResult('a', $this->platform->getSQLResultCasing('user_id'), 'user_id'); + + $query = $this->_em->createNativeQuery('SELECT a.id, a.country, a.zip, a.city, a.user_id FROM cms_addresses a WHERE a.id = ?', $rsm); + $query->setParameter(1, $addr->id); + + $addresses = $query->getResult(); + + $this->assertEquals(1, count($addresses)); + $this->assertTrue($addresses[0] instanceof CmsAddress); + $this->assertEquals($addr->country, $addresses[0]->country); + $this->assertEquals($addr->zip, $addresses[0]->zip); + $this->assertEquals($addr->city, $addresses[0]->city); + $this->assertEquals($addr->street, $addresses[0]->street); + $this->assertTrue($addresses[0]->user instanceof CmsUser); + } public function testJoinedOneToManyNativeQuery() { @@ -193,6 +235,20 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $phones = $users[0]->getPhonenumbers(); $this->assertEquals(424242, $phones[0]->phonenumber); $this->assertTrue($phones[0]->getUser() === $users[0]); + + $this->_em->clear(); + + $rsm = new ResultSetMappingBuilder($this->_em); + $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsPhonenumber', 'p'); + $query = $this->_em->createNativeQuery('SELECT p.* FROM cms_phonenumbers p WHERE p.phonenumber = ?', $rsm); + $query->setParameter(1, $phone->phonenumber); + $phone = $query->getSingleResult(); + +// \Doctrine\Common\Util\Debug::dump($phone); +// die(); + + $this->assertNotNull($phone->getUser()); + $this->assertEquals($user->name, $phone->getUser()->getName()); } public function testJoinedOneToOneNativeQueryWithRSMBuilder() @@ -235,6 +291,17 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertEquals('germany', $users[0]->getAddress()->getCountry()); $this->assertEquals(10827, $users[0]->getAddress()->getZipCode()); $this->assertEquals('Berlin', $users[0]->getAddress()->getCity()); + + $this->_em->clear(); + + $rsm = new ResultSetMappingBuilder($this->_em); + $rsm->addRootEntityFromClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', 'a'); + $query = $this->_em->createNativeQuery('SELECT a.* FROM cms_addresses a WHERE a.id = ?', $rsm); + $query->setParameter(1, $addr->getId()); + $address = $query->getSingleResult(); + + $this->assertNotNull($address->getUser()); + $this->assertEquals($user->name, $address->getUser()->getName()); } /** From 7f20a32db31d3d0e7b288b4e5c358a3f0334c4c0 Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Tue, 26 Jul 2011 17:39:57 -0400 Subject: [PATCH 126/220] Removing debug comment --- tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index c8347d66d..a8d5873f7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -244,9 +244,6 @@ class NativeQueryTest extends \Doctrine\Tests\OrmFunctionalTestCase $query->setParameter(1, $phone->phonenumber); $phone = $query->getSingleResult(); -// \Doctrine\Common\Util\Debug::dump($phone); -// die(); - $this->assertNotNull($phone->getUser()); $this->assertEquals($user->name, $phone->getUser()->getName()); } From a47af43bc1006178c65ba41052e4aa2b2099fa50 Mon Sep 17 00:00:00 2001 From: kwiateusz Date: Wed, 27 Jul 2011 08:54:06 +0200 Subject: [PATCH 127/220] Last change from assertTrue($a instanceof $b) to assertInstanceOf --- .../ORM/Hydration/ObjectHydratorTest.php | 110 +++++++++--------- .../Tests/ORM/Mapping/ClassMetadataTest.php | 2 +- .../AbstractClassMetadataExporterTest.php | 6 +- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php index ecd50f237..f2673ac70 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ObjectHydratorTest.php @@ -44,8 +44,8 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]); $this->assertEquals(1, $result[0]->id); $this->assertEquals('romanb', $result[0]->name); $this->assertEquals(2, $result[1]->id); @@ -116,10 +116,10 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(4, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[2] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[3] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[3]); $this->assertEquals(1, $result[0]->id); $this->assertEquals('romanb', $result[0]->name); @@ -173,7 +173,7 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm); $this->assertEquals(1, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\ECommerce\ECommerceProduct); + $this->assertInstanceOf('Doctrine\Tests\Models\ECommerce\ECommerceProduct', $result[0]); } /** @@ -231,12 +231,12 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[0][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->phonenumbers[1] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->phonenumbers); // first user => 2 phonenumbers $this->assertEquals(2, count($result[0][0]->phonenumbers)); @@ -293,8 +293,8 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(2, $result[0]['numPhones']); // second user => 1 phonenumber $this->assertEquals(1, $result[1]['numPhones']); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); } /** @@ -359,9 +359,9 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals('ROMANB', $result[0]['nameUpper']); $this->assertEquals('JWAGE', $result[1]['nameUpper']); - $this->assertTrue($result[0]['1'] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1]['2'] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[0]['1']->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]['1']); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]['2']); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0]['1']->phonenumbers); // first user => 2 phonenumbers. notice the custom indexing by user id $this->assertEquals(2, count($result[0]['1']->phonenumbers)); // second user => 1 phonenumber. notice the custom indexing by user id @@ -469,18 +469,18 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[0][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->phonenumbers[1] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->articles instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[0][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[1][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[1][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[1]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[1][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[1]); } /** @@ -604,29 +604,29 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertTrue(is_array($result[0])); $this->assertTrue(is_array($result[1])); - $this->assertTrue($result[0][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); - $this->assertTrue($result[1][0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); // phonenumbers - $this->assertTrue($result[0][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[0][0]->phonenumbers[1] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); - $this->assertTrue($result[1][0]->phonenumbers instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[1][0]->phonenumbers[0] instanceof \Doctrine\Tests\Models\CMS\CmsPhonenumber); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[0][0]->phonenumbers[1]); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->phonenumbers); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsPhonenumber', $result[1][0]->phonenumbers[0]); // articles - $this->assertTrue($result[0][0]->articles instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[0][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0]->articles[0] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); - $this->assertTrue($result[1][0]->articles[1] instanceof \Doctrine\Tests\Models\CMS\CmsArticle); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[0][0]->articles[1]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsArticle', $result[1][0]->articles[1]); // article comments - $this->assertTrue($result[0][0]->articles[0]->comments instanceof \Doctrine\ORM\PersistentCollection); - $this->assertTrue($result[0][0]->articles[0]->comments[0] instanceof \Doctrine\Tests\Models\CMS\CmsComment); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles[0]->comments); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsComment', $result[0][0]->articles[0]->comments[0]); // empty comment collections - $this->assertTrue($result[0][0]->articles[1]->comments instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[0][0]->articles[1]->comments); $this->assertEquals(0, count($result[0][0]->articles[1]->comments)); - $this->assertTrue($result[1][0]->articles[0]->comments instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->articles[0]->comments); $this->assertEquals(0, count($result[1][0]->articles[0]->comments)); - $this->assertTrue($result[1][0]->articles[1]->comments instanceof \Doctrine\ORM\PersistentCollection); + $this->assertInstanceOf('Doctrine\ORM\PersistentCollection', $result[1][0]->articles[1]->comments); $this->assertEquals(0, count($result[1][0]->articles[1]->comments)); } @@ -706,8 +706,8 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof \Doctrine\Tests\Models\Forum\ForumCategory); - $this->assertTrue($result[1] instanceof \Doctrine\Tests\Models\Forum\ForumCategory); + $this->assertInstanceOf('Doctrine\Tests\Models\Forum\ForumCategory', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\Forum\ForumCategory', $result[1]); $this->assertTrue($result[0] !== $result[1]); $this->assertEquals(1, $result[0]->getId()); $this->assertEquals(2, $result[1]->getId()); @@ -768,8 +768,8 @@ class ObjectHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm, array(Query::HINT_FORCE_PARTIAL_LOAD => true)); $this->assertEquals(2, count($result)); - $this->assertTrue($result[0] instanceof CmsUser); - $this->assertTrue($result[1] instanceof CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0]); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1]); $this->assertEquals(0, $result[0]->articles->count()); $this->assertEquals(0, $result[1]->articles->count()); } @@ -826,19 +826,19 @@ class ObjectHydratorTest extends HydrationTestCase $this->assertEquals(3, count($result)); - $this->assertTrue($result[0][0] instanceof CmsUser); // User object + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[0][0]); // User object $this->assertEquals(1, $result[0]['id']); $this->assertEquals('The First', $result[0]['topic']); $this->assertEquals(1, $result[0]['cid']); $this->assertEquals('First Comment', $result[0]['ctopic']); - $this->assertTrue($result[1][0] instanceof CmsUser); // Same User object + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[1][0]); // Same User object $this->assertEquals(1, $result[1]['id']); // duplicated $this->assertEquals('The First', $result[1]['topic']); // duplicated $this->assertEquals(2, $result[1]['cid']); $this->assertEquals('Second Comment', $result[1]['ctopic']); - $this->assertTrue($result[2][0] instanceof CmsUser); // Same User object + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $result[2][0]); // Same User object $this->assertEquals(42, $result[2]['id']); $this->assertEquals('The Answer', $result[2]['topic']); $this->assertNull($result[2]['cid']); @@ -877,7 +877,7 @@ class ObjectHydratorTest extends HydrationTestCase $rowNum = 0; while (($row = $iterableResult->next()) !== false) { $this->assertEquals(1, count($row)); - $this->assertTrue($row[0] instanceof \Doctrine\Tests\Models\CMS\CmsUser); + $this->assertInstanceOf('Doctrine\Tests\Models\CMS\CmsUser', $row[0]); if ($rowNum == 0) { $this->assertEquals(1, $row[0]->id); $this->assertEquals('romanb', $row[0]->name); diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 7f7d3d6cf..7868fb2fb 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -105,7 +105,7 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase )); $assoc = $cm->associationMappings['groups']; - //$this->assertTrue($assoc instanceof \Doctrine\ORM\Mapping\ManyToManyMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $assoc); $this->assertEquals(array( 'name' => 'cmsuser_cmsgroup', 'joinColumns' => array(array('name' => 'cmsuser_id', 'referencedColumnName' => 'id', 'onDelete' => 'CASCADE')), diff --git a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php index 11b3d113d..0dfbcc2f3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Export/AbstractClassMetadataExporterTest.php @@ -212,7 +212,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest public function testOneToOneAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['address'])); - //$this->assertTrue($class->associationMappings['address'] instanceof \Doctrine\ORM\Mapping\OneToOneMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToOneMapping', $class->associationMappings['address']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Address', $class->associationMappings['address']['targetEntity']); $this->assertEquals('address_id', $class->associationMappings['address']['joinColumns'][0]['name']); $this->assertEquals('id', $class->associationMappings['address']['joinColumns'][0]['referencedColumnName']); @@ -234,7 +234,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest public function testOneToManyAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['phonenumbers'])); - //$this->assertTrue($class->associationMappings['phonenumbers'] instanceof \Doctrine\ORM\Mapping\OneToManyMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\OneToManyMapping', $class->associationMappings['phonenumbers']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Phonenumber', $class->associationMappings['phonenumbers']['targetEntity']); $this->assertEquals('user', $class->associationMappings['phonenumbers']['mappedBy']); $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']); @@ -255,7 +255,7 @@ abstract class AbstractClassMetadataExporterTest extends \Doctrine\Tests\OrmTest public function testManyToManyAssociationsAreExported($class) { $this->assertTrue(isset($class->associationMappings['groups'])); - //$this->assertTrue($class->associationMappings['groups'] instanceof \Doctrine\ORM\Mapping\ManyToManyMapping); + //$this->assertInstanceOf('Doctrine\ORM\Mapping\ManyToManyMapping', $class->associationMappings['groups']); $this->assertEquals('Doctrine\Tests\ORM\Tools\Export\Group', $class->associationMappings['groups']['targetEntity']); $this->assertEquals('cms_users_groups', $class->associationMappings['groups']['joinTable']['name']); From 196632978cf39bc3914e14739767cb5b72a8df9d Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Wed, 27 Jul 2011 23:22:20 +0200 Subject: [PATCH 128/220] DDC-1298 - Fix bug in SQLWalker with derived entities that have no fields of their own. --- lib/Doctrine/ORM/Query/SqlWalker.php | 2 +- tests/Doctrine/Tests/Models/DDC117/DDC117Article.php | 5 +++++ .../Tests/ORM/Query/SelectSqlGenerationTest.php | 11 +++++++++++ tests/Doctrine/Tests/OrmFunctionalTestCase.php | 2 ++ 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 7393ba893..b4e8b3f15 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -511,7 +511,7 @@ class SqlWalker implements TreeWalker public function walkSelectClause($selectClause) { $sql = 'SELECT ' . (($selectClause->isDistinct) ? 'DISTINCT ' : '') . implode( - ', ', array_map(array($this, 'walkSelectExpression'), $selectClause->selectExpressions) + ', ', array_filter(array_map(array($this, 'walkSelectExpression'), $selectClause->selectExpressions)) ); $addMetaColumns = ! $this->_query->getHint(Query::HINT_FORCE_PARTIAL_LOAD) && diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php index 111c4fabe..51ea2278d 100644 --- a/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php +++ b/tests/Doctrine/Tests/Models/DDC117/DDC117Article.php @@ -27,6 +27,11 @@ class DDC117Article */ private $translations; + /** + * @OneToMany(targetEntity="DDC117Link", mappedBy="source") + */ + private $links; + public function __construct($title) { $this->title = $title; diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index ad5ce1329..6319f85fd 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -965,6 +965,17 @@ class SelectSqlGenerationTest extends \Doctrine\Tests\OrmTestCase "SELECT c0_.id AS id0, c0_.status AS status1, c0_.username AS username2, c0_.name AS name3, (SELECT c1_.name FROM cms_users c1_ WHERE c1_.id = c0_.id AND c1_.name IN (SELECT c2_.name FROM cms_users c2_)) AS sclr4 FROM cms_users c0_" ); } + + /** + * @group DDC-1298 + */ + public function testSelectForeignKeyPKWithoutFields() + { + $this->assertSqlGeneration( + "SELECT t, s, l FROM Doctrine\Tests\Models\DDC117\DDC117Link l INNER JOIN l.target t INNER JOIN l.source s", + "SELECT d0_.article_id AS article_id0, d0_.title AS title1, d1_.article_id AS article_id2, d1_.title AS title3 FROM DDC117Link d2_ INNER JOIN DDC117Article d0_ ON d2_.target_id = d0_.article_id INNER JOIN DDC117Article d1_ ON d2_.source_id = d1_.article_id" + ); + } } diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 1f8032aeb..876f13954 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -98,6 +98,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\DDC117\DDC117ArticleDetails', 'Doctrine\Tests\Models\DDC117\DDC117ApproveChanges', 'Doctrine\Tests\Models\DDC117\DDC117Editor', + 'Doctrine\Tests\Models\DDC117\DDC117Link', ), 'stockexchange' => array( 'Doctrine\Tests\Models\StockExchange\Bond', @@ -191,6 +192,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM ddc117editor_ddc117translation'); $conn->executeUpdate('DELETE FROM DDC117Editor'); $conn->executeUpdate('DELETE FROM DDC117ApproveChanges'); + $conn->executeUpdate('DELETE FROM DDC117Link'); $conn->executeUpdate('DELETE FROM DDC117Reference'); $conn->executeUpdate('DELETE FROM DDC117ArticleDetails'); $conn->executeUpdate('DELETE FROM DDC117Translation'); From b2951691e2c476a2c87212fdf9d0b8deec88d390 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 10:46:38 +0200 Subject: [PATCH 129/220] [DDC-1301] Added tests for fetch="EXTRA_LAZY" count() on a "legacy" database --- .../Tests/Models/Legacy/LegacyArticle.php | 33 ++++ .../Tests/Models/Legacy/LegacyCar.php | 41 +++++ .../Tests/Models/Legacy/LegacyUser.php | 80 ++++++++++ .../Models/Legacy/LegacyUserReference.php | 65 ++++++++ .../ORM/Functional/Ticket/DDC1301Test.php | 148 ++++++++++++++++++ .../Doctrine/Tests/OrmFunctionalTestCase.php | 12 ++ 6 files changed, 379 insertions(+) create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyCar.php create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyUser.php create mode 100644 tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php new file mode 100644 index 000000000..e373c337d --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php @@ -0,0 +1,33 @@ +user = $author; + } +} diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php new file mode 100644 index 000000000..a27d3c34c --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php @@ -0,0 +1,41 @@ +description; + } + + public function addUser(LegacyUser $user) { + $this->users[] = $user; + } + + public function getUsers() { + return $this->users; + } +} diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php new file mode 100644 index 000000000..fb06263a2 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -0,0 +1,80 @@ +articles = new ArrayCollection; + $this->references = new ArrayCollection; + $this->cars = new ArrayCollection; + } + + public function getId() { + return $this->id; + } + + public function getUsername() { + return $this->username; + } + + public function addArticle(LegacyArticle $article) { + $this->articles[] = $article; + $article->setAuthor($this); + } + + public function addReference($reference) + { + $this->references[] = $reference; + } + + public function references() + { + return $this->references; + } + + public function addCar(LegacyCar $car) { + $this->cars[] = $car; + $car->addUser($this); + } + + public function getCars() { + return $this->cars; + } +} diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php new file mode 100644 index 000000000..8b1ee9407 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php @@ -0,0 +1,65 @@ +addReference($this); + $target->addReference($this); + + $this->source = $source; + $this->target = $target; + $this->description = $description; + $this->created = new \DateTime("now"); + } + + public function source() + { + return $this->source; + } + + public function target() + { + return $this->target; + } + + public function setDescription($desc) + { + $this->description = $desc; + } + + public function getDescription() + { + return $this->description; + } +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php new file mode 100644 index 000000000..f1dd02498 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -0,0 +1,148 @@ +useModelSet('legacy'); + parent::setUp(); + + $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); + $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + + $this->loadFixture(); + } + + public function tearDown() + { + parent::tearDown(); + + $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); + $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + } + + public function testCountNotInitializesLegacyCollection() + { + $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $queryCount = $this->getCurrentQueryCount(); + + $this->assertFalse($user->articles->isInitialized()); + $this->assertEquals(2, count($user->articles)); + $this->assertFalse($user->articles->isInitialized()); + + foreach ($user->articles AS $article) { } + + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); + } + + public function testCountNotInitializesLegacyCollectionWithForeignIdentifier() + { + $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $queryCount = $this->getCurrentQueryCount(); + + $this->assertFalse($user->references->isInitialized()); + $this->assertEquals(2, count($user->references)); + $this->assertFalse($user->references->isInitialized()); + + foreach ($user->references AS $reference) { } + + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); + } + + public function testCountNotInitializesLegacyManyToManyCollection() + { + $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); + $queryCount = $this->getCurrentQueryCount(); + + $this->assertFalse($user->cars->isInitialized()); + $this->assertEquals(3, count($user->cars)); + $this->assertFalse($user->cars->isInitialized()); + + foreach ($user->cars AS $reference) { } + + $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); + } + + public function loadFixture() + { + $user1 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user1->username = "beberlei"; + $user1->name = "Benjamin"; + $user1->status = "active"; + + $user2 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user2->username = "jwage"; + $user2->name = "Jonathan"; + $user2->status = "active"; + + $user3 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); + $user3->username = "romanb"; + $user3->name = "Roman"; + $user3->status = "active"; + + $this->_em->persist($user1); + $this->_em->persist($user2); + $this->_em->persist($user3); + + $article1 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); + $article1->topic = "Test"; + $article1->text = "Test"; + $article1->setAuthor($user1); + + $article2 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); + $article2->topic = "Test"; + $article2->text = "Test"; + $article2->setAuthor($user1); + + $this->_em->persist($article1); + $this->_em->persist($article2); + + $car1 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car1->description = "Test1"; + + $car2 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car2->description = "Test2"; + + $car3 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); + $car3->description = "Test3"; + + $user1->addCar($car1); + $user1->addCar($car2); + $user1->addCar($car3); + + $user2->addCar($car1); + $user3->addCar($car1); + + $this->_em->persist($car1); + $this->_em->persist($car2); + $this->_em->persist($car3); + + $this->_em->flush(); + + $detail1 = new \Doctrine\Tests\Models\Legacy\LegacyUserReference($user1, $user2, "foo"); + $detail2 = new \Doctrine\Tests\Models\Legacy\LegacyUserReference($user1, $user3, "bar"); + + $this->_em->persist($detail1); + $this->_em->persist($detail2); + + $this->_em->flush(); + $this->_em->clear(); + + $this->userId = $user1->getId(); + } +} diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 1f8032aeb..66d20b38f 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -104,6 +104,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase 'Doctrine\Tests\Models\StockExchange\Stock', 'Doctrine\Tests\Models\StockExchange\Market', ), + 'legacy' => array( + 'Doctrine\Tests\Models\Legacy\LegacyUser', + 'Doctrine\Tests\Models\Legacy\LegacyUserReference', + 'Doctrine\Tests\Models\Legacy\LegacyArticle', + 'Doctrine\Tests\Models\Legacy\LegacyCar', + ), ); protected function useModelSet($setName) @@ -202,6 +208,12 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM exchange_stocks'); $conn->executeUpdate('DELETE FROM exchange_markets'); } + if (isset($this->_usedModelSets['legacy'])) { + $conn->executeUpdate('DELETE FROM legacy_articles'); + $conn->executeUpdate('DELETE FROM legacy_cars'); + $conn->executeUpdate('DELETE FROM legacy_users'); + $conn->executeUpdate('DELETE FROM legacy_users_reference'); + } $this->_em->clear(); } From d7dbde8f3e2ecbc341e8de47127d0706411bb910 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 11:01:52 +0200 Subject: [PATCH 130/220] [DDC-1301] Fixed count() for fetch="EXTRA_LAZY" on OneToMany association --- .../ORM/Persisters/OneToManyPersister.php | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php index 5e889ddb9..e9fcf06c5 100644 --- a/lib/Doctrine/ORM/Persisters/OneToManyPersister.php +++ b/lib/Doctrine/ORM/Persisters/OneToManyPersister.php @@ -124,24 +124,26 @@ class OneToManyPersister extends AbstractCollectionPersister public function count(PersistentCollection $coll) { $mapping = $coll->getMapping(); - $class = $this->_em->getClassMetadata($mapping['targetEntity']); + $targetClass = $this->_em->getClassMetadata($mapping['targetEntity']); + $sourceClass = $this->_em->getClassMetadata($mapping['sourceEntity']); + $params = array(); $id = $this->_em->getUnitOfWork()->getEntityIdentifier($coll->getOwner()); $where = ''; - foreach ($class->associationMappings[$mapping['mappedBy']]['joinColumns'] AS $joinColumn) { + foreach ($targetClass->associationMappings[$mapping['mappedBy']]['joinColumns'] AS $joinColumn) { if ($where != '') { $where .= ' AND '; } $where .= $joinColumn['name'] . " = ?"; - if ($class->containsForeignIdentifier) { - $params[] = $id[$class->getFieldForColumn($joinColumn['referencedColumnName'])]; + if ($targetClass->containsForeignIdentifier) { + $params[] = $id[$sourceClass->getFieldForColumn($joinColumn['referencedColumnName'])]; } else { - $params[] = $id[$class->fieldNames[$joinColumn['referencedColumnName']]]; + $params[] = $id[$sourceClass->fieldNames[$joinColumn['referencedColumnName']]]; } } - $sql = "SELECT count(*) FROM " . $class->getQuotedTableName($this->_conn->getDatabasePlatform()) . " WHERE " . $where; + $sql = "SELECT count(*) FROM " . $targetClass->getQuotedTableName($this->_conn->getDatabasePlatform()) . " WHERE " . $where; return $this->_conn->fetchColumn($sql, $params); } @@ -180,4 +182,4 @@ class OneToManyPersister extends AbstractCollectionPersister return $uow->getEntityPersister($mapping['targetEntity']) ->exists($element, array($mapping['mappedBy'] => $id)); } -} \ No newline at end of file +} From d439f67df5afe43858defbf8e4777afb0fcbb680 Mon Sep 17 00:00:00 2001 From: Alexander Date: Thu, 28 Jul 2011 12:25:23 +0200 Subject: [PATCH 131/220] [DDC-1301] Prefixed all Legacy models properties with _ --- .../Tests/Models/Legacy/LegacyArticle.php | 12 ++-- .../Tests/Models/Legacy/LegacyCar.php | 14 ++-- .../Tests/Models/Legacy/LegacyUser.php | 38 +++++------ .../Models/Legacy/LegacyUserReference.php | 28 ++++---- .../ORM/Functional/Ticket/DDC1301Test.php | 68 +++++++++---------- 5 files changed, 80 insertions(+), 80 deletions(-) diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php index e373c337d..fb754462e 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyArticle.php @@ -13,21 +13,21 @@ class LegacyArticle * @Column(name="iArticleId", type="integer") * @GeneratedValue(strategy="AUTO") */ - public $id; + public $_id; /** * @Column(name="sTopic", type="string", length=255) */ - public $topic; + public $_topic; /** * @Column(name="sText", type="text") */ - public $text; + public $_text; /** - * @ManyToOne(targetEntity="LegacyUser", inversedBy="articles") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_articles") * @JoinColumn(name="iUserId", referencedColumnName="iUserId") */ - public $user; + public $_user; public function setAuthor(LegacyUser $author) { - $this->user = $author; + $this->_user = $author; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php index a27d3c34c..ac3834145 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyCar.php @@ -15,27 +15,27 @@ class LegacyCar * @GeneratedValue * @Column(name="iCarId", type="integer", nullable=false) */ - public $id; + public $_id; /** - * @ManyToMany(targetEntity="LegacyUser", mappedBy="cars") + * @ManyToMany(targetEntity="LegacyUser", mappedBy="_cars") */ - public $users; + public $_users; /** * @Column(name="sDescription", type="string", length=255, unique=true) */ - public $description; + public $_description; function getDescription() { - return $this->description; + return $this->_description; } public function addUser(LegacyUser $user) { - $this->users[] = $user; + $this->_users[] = $user; } public function getUsers() { - return $this->users; + return $this->_users; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php index fb06263a2..d7c9a5c37 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -15,66 +15,66 @@ class LegacyUser * @GeneratedValue * @Column(name="iUserId", type="integer", nullable=false) */ - public $id; + public $_id; /** * @Column(name="sUsername", type="string", length=255, unique=true) */ - public $username; + public $_username; /** * @Column(type="string", length=255) */ - public $name; + public $_name; /** - * @OneToMany(targetEntity="LegacyArticle", mappedBy="user") + * @OneToMany(targetEntity="LegacyArticle", mappedBy="_user") */ - public $articles; + public $_articles; /** - * @OneToMany(targetEntity="LegacyUserReference", mappedBy="source", cascade={"remove"}) + * @OneToMany(targetEntity="LegacyUserReference", mappedBy="_source", cascade={"remove"}) */ - public $references; + public $_references; /** - * @ManyToMany(targetEntity="LegacyCar", inversedBy="users", cascade={"persist", "merge"}) + * @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"}) * @JoinTable(name="legace_users_cars", * joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")}, * inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")} * ) */ - public $cars; + public $_cars; public function __construct() { - $this->articles = new ArrayCollection; - $this->references = new ArrayCollection; - $this->cars = new ArrayCollection; + $this->_articles = new ArrayCollection; + $this->_references = new ArrayCollection; + $this->_cars = new ArrayCollection; } public function getId() { - return $this->id; + return $this->_id; } public function getUsername() { - return $this->username; + return $this->_username; } public function addArticle(LegacyArticle $article) { - $this->articles[] = $article; + $this->_articles[] = $article; $article->setAuthor($this); } public function addReference($reference) { - $this->references[] = $reference; + $this->_references[] = $reference; } public function references() { - return $this->references; + return $this->_references; } public function addCar(LegacyCar $car) { - $this->cars[] = $car; + $this->_cars[] = $car; $car->addUser($this); } public function getCars() { - return $this->cars; + return $this->_cars; } } diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php index 8b1ee9407..c6cd891a1 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUserReference.php @@ -10,56 +10,56 @@ class LegacyUserReference { /** * @Id - * @ManyToOne(targetEntity="LegacyUser", inversedBy="references") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_references") * @JoinColumn(name="iUserIdSource", referencedColumnName="iUserId") */ - private $source; + private $_source; /** * @Id - * @ManyToOne(targetEntity="LegacyUser", inversedBy="references") + * @ManyToOne(targetEntity="LegacyUser", inversedBy="_references") * @JoinColumn(name="iUserIdTarget", referencedColumnName="iUserId") */ - private $target; + private $_target; /** * @column(type="string") */ - private $description; + private $_description; /** * @column(type="datetime") */ - private $created; + private $_created; public function __construct($source, $target, $description) { $source->addReference($this); $target->addReference($this); - $this->source = $source; - $this->target = $target; - $this->description = $description; - $this->created = new \DateTime("now"); + $this->_source = $source; + $this->_target = $target; + $this->_description = $description; + $this->_created = new \DateTime("now"); } public function source() { - return $this->source; + return $this->_source; } public function target() { - return $this->target; + return $this->_target; } public function setDescription($desc) { - $this->description = $desc; + $this->_description = $desc; } public function getDescription() { - return $this->description; + return $this->_description; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php index f1dd02498..94d02f905 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1301Test.php @@ -19,9 +19,9 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); - $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; - $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; - $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; + $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_EXTRA_LAZY; $this->loadFixture(); } @@ -31,9 +31,9 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::tearDown(); $class = $this->_em->getClassMetadata('Doctrine\Tests\Models\Legacy\LegacyUser'); - $class->associationMappings['articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; - $class->associationMappings['references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; - $class->associationMappings['cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_articles']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_references']['fetch'] = ClassMetadataInfo::FETCH_LAZY; + $class->associationMappings['_cars']['fetch'] = ClassMetadataInfo::FETCH_LAZY; } public function testCountNotInitializesLegacyCollection() @@ -41,11 +41,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->articles->isInitialized()); - $this->assertEquals(2, count($user->articles)); - $this->assertFalse($user->articles->isInitialized()); + $this->assertFalse($user->_articles->isInitialized()); + $this->assertEquals(2, count($user->_articles)); + $this->assertFalse($user->_articles->isInitialized()); - foreach ($user->articles AS $article) { } + foreach ($user->_articles AS $article) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -55,11 +55,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->references->isInitialized()); - $this->assertEquals(2, count($user->references)); - $this->assertFalse($user->references->isInitialized()); + $this->assertFalse($user->_references->isInitialized()); + $this->assertEquals(2, count($user->_references)); + $this->assertFalse($user->_references->isInitialized()); - foreach ($user->references AS $reference) { } + foreach ($user->_references AS $reference) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -69,11 +69,11 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase $user = $this->_em->find('Doctrine\Tests\Models\Legacy\LegacyUser', $this->userId); $queryCount = $this->getCurrentQueryCount(); - $this->assertFalse($user->cars->isInitialized()); - $this->assertEquals(3, count($user->cars)); - $this->assertFalse($user->cars->isInitialized()); + $this->assertFalse($user->_cars->isInitialized()); + $this->assertEquals(3, count($user->_cars)); + $this->assertFalse($user->_cars->isInitialized()); - foreach ($user->cars AS $reference) { } + foreach ($user->_cars AS $reference) { } $this->assertEquals($queryCount + 2, $this->getCurrentQueryCount(), "Expecting two queries to be fired for count, then iteration."); } @@ -81,45 +81,45 @@ class DDC1301Test extends \Doctrine\Tests\OrmFunctionalTestCase public function loadFixture() { $user1 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user1->username = "beberlei"; - $user1->name = "Benjamin"; - $user1->status = "active"; + $user1->_username = "beberlei"; + $user1->_name = "Benjamin"; + $user1->_status = "active"; $user2 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user2->username = "jwage"; - $user2->name = "Jonathan"; - $user2->status = "active"; + $user2->_username = "jwage"; + $user2->_name = "Jonathan"; + $user2->_status = "active"; $user3 = new \Doctrine\Tests\Models\Legacy\LegacyUser(); - $user3->username = "romanb"; - $user3->name = "Roman"; - $user3->status = "active"; + $user3->_username = "romanb"; + $user3->_name = "Roman"; + $user3->_status = "active"; $this->_em->persist($user1); $this->_em->persist($user2); $this->_em->persist($user3); $article1 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); - $article1->topic = "Test"; - $article1->text = "Test"; + $article1->_topic = "Test"; + $article1->_text = "Test"; $article1->setAuthor($user1); $article2 = new \Doctrine\Tests\Models\Legacy\LegacyArticle(); - $article2->topic = "Test"; - $article2->text = "Test"; + $article2->_topic = "Test"; + $article2->_text = "Test"; $article2->setAuthor($user1); $this->_em->persist($article1); $this->_em->persist($article2); $car1 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car1->description = "Test1"; + $car1->_description = "Test1"; $car2 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car2->description = "Test2"; + $car2->_description = "Test2"; $car3 = new \Doctrine\Tests\Models\Legacy\LegacyCar(); - $car3->description = "Test3"; + $car3->_description = "Test3"; $user1->addCar($car1); $user1->addCar($car2); From 1250cd7a5aa3697fbc9743bc666bcbaa5d4a8aba Mon Sep 17 00:00:00 2001 From: Michael Ridgway Date: Thu, 28 Jul 2011 10:50:22 -0400 Subject: [PATCH 132/220] F[DDC-1275] ixed check for owning side of a toOne relationship --- .../ORM/Query/ResultSetMappingBuilder.php | 36 +++++++------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php index 95d548daf..d1690b72c 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php +++ b/lib/Doctrine/ORM/Query/ResultSetMappingBuilder.php @@ -20,6 +20,7 @@ namespace Doctrine\ORM\Query; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Mapping\ClassMetadataInfo; /** * A ResultSetMappingBuilder uses the EntityManager to automatically populate entity fields @@ -52,22 +53,7 @@ class ResultSetMappingBuilder extends ResultSetMapping public function addRootEntityFromClassMetadata($class, $alias, $renamedColumns = array()) { $this->addEntityResult($class, $alias); - $classMetadata = $this->em->getClassMetadata($class); - if ($classMetadata->isInheritanceTypeSingleTable() || $classMetadata->isInheritanceTypeJoined()) { - throw new \InvalidArgumentException('ResultSetMapping builder does not currently support inheritance.'); - } - $platform = $this->em->getConnection()->getDatabasePlatform(); - foreach ($classMetadata->getColumnNames() AS $columnName) { - $propertyName = $classMetadata->getFieldName($columnName); - if (isset($renamedColumns[$columnName])) { - $columnName = $renamedColumns[$columnName]; - } - if (isset($this->fieldMappings[$columnName])) { - throw new \InvalidArgumentException("The column '$columnName' conflicts with another column in the mapper."); - } - $this->addFieldResult($alias, $platform->getSQLResultCasing($columnName), $propertyName); - } - $this->addAssocationMappings($alias, $classMetadata->getAssociationMappings()); + $this->addAllClassFields($class, $alias, $renamedColumns); } /** @@ -82,6 +68,14 @@ class ResultSetMappingBuilder extends ResultSetMapping public function addJoinedEntityFromClassMetadata($class, $alias, $parentAlias, $relation, $renamedColumns = array()) { $this->addJoinedEntityResult($class, $alias, $parentAlias, $relation); + $this->addAllClassFields($class, $alias, $renamedColumns); + } + + /** + * Adds all fields of the given class to the result set mapping (columns and meta fields) + */ + protected function addAllClassFields($class, $alias, $renamedColumns = array()) + { $classMetadata = $this->em->getClassMetadata($class); if ($classMetadata->isInheritanceTypeSingleTable() || $classMetadata->isInheritanceTypeJoined()) { throw new \InvalidArgumentException('ResultSetMapping builder does not currently support inheritance.'); @@ -97,14 +91,8 @@ class ResultSetMappingBuilder extends ResultSetMapping } $this->addFieldResult($alias, $platform->getSQLResultCasing($columnName), $propertyName); } - $this->addAssocationMappings($alias, $classMetadata->getAssociationMappings()); - } - - protected function addAssocationMappings($alias, $associationMappings) - { - $platform = $this->em->getConnection()->getDatabasePlatform(); - foreach ($associationMappings AS $associationMapping) { - if (isset($associationMapping['joinColumns'])) { + foreach ($classMetadata->associationMappings AS $associationMapping) { + if ($associationMapping['isOwningSide'] && $associationMapping['type'] & ClassMetadataInfo::TO_ONE) { foreach ($associationMapping['joinColumns'] AS $joinColumn) { $columnName = $joinColumn['name']; $renamedColumnName = isset($renamedColumns[$columnName]) ? $renamedColumns[$columnName] : $columnName; From c34612b8e97ba5636d6eaae595669819963276e5 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Thu, 28 Jul 2011 23:44:11 +0200 Subject: [PATCH 133/220] [DDC-1298] DDC117Link file got lost from 2.1.x to master somehow --- .../Tests/Models/DDC117/DDC117Link.php | 31 +++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 tests/Doctrine/Tests/Models/DDC117/DDC117Link.php diff --git a/tests/Doctrine/Tests/Models/DDC117/DDC117Link.php b/tests/Doctrine/Tests/Models/DDC117/DDC117Link.php new file mode 100644 index 000000000..7e0084a67 --- /dev/null +++ b/tests/Doctrine/Tests/Models/DDC117/DDC117Link.php @@ -0,0 +1,31 @@ +source = $source; + $this->target = $target; + } +} From 953a0f657220f5256f9d59f388485521f6335bd5 Mon Sep 17 00:00:00 2001 From: Alexander Date: Fri, 29 Jul 2011 09:35:59 +0200 Subject: [PATCH 134/220] [DDC-1301] Fixed tests teardown for mysql suite --- tests/Doctrine/Tests/Models/Legacy/LegacyUser.php | 2 +- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php index d7c9a5c37..f4f5e1fcb 100644 --- a/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php +++ b/tests/Doctrine/Tests/Models/Legacy/LegacyUser.php @@ -34,7 +34,7 @@ class LegacyUser public $_references; /** * @ManyToMany(targetEntity="LegacyCar", inversedBy="_users", cascade={"persist", "merge"}) - * @JoinTable(name="legace_users_cars", + * @JoinTable(name="legacy_users_cars", * joinColumns={@JoinColumn(name="iUserId", referencedColumnName="iUserId")}, * inverseJoinColumns={@JoinColumn(name="iCarId", referencedColumnName="iCarId")} * ) diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 50edbfd75..56345bc6f 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -211,10 +211,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $conn->executeUpdate('DELETE FROM exchange_markets'); } if (isset($this->_usedModelSets['legacy'])) { + $conn->executeUpdate('DELETE FROM legacy_users_cars'); + $conn->executeUpdate('DELETE FROM legacy_users_reference'); $conn->executeUpdate('DELETE FROM legacy_articles'); $conn->executeUpdate('DELETE FROM legacy_cars'); $conn->executeUpdate('DELETE FROM legacy_users'); - $conn->executeUpdate('DELETE FROM legacy_users_reference'); } $this->_em->clear(); From 816039f23f3763129823a3c98ddf31286941e3ba Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Sun, 31 Jul 2011 11:32:57 +0200 Subject: [PATCH 135/220] DDC-1302 - Fix bug in XmlDriver not handling orphan removal --- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 8 ++++---- .../Tests/ORM/Mapping/AbstractMappingDriverTest.php | 5 +++-- .../ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php | 2 +- .../Mapping/xml/Doctrine.Tests.ORM.Mapping.User.dcm.xml | 2 +- .../Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml | 1 + 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index c26a2a35c..ab8e3b780 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -285,8 +285,8 @@ class XmlDriver extends AbstractFileDriver $mapping['cascade'] = $this->_getCascadeMappings($oneToOneElement->cascade); } - if (isset($oneToOneElement->{'orphan-removal'})) { - $mapping['orphanRemoval'] = (bool)$oneToOneElement->{'orphan-removal'}; + if (isset($oneToOneElement['orphan-removal'])) { + $mapping['orphanRemoval'] = (bool)$oneToOneElement['orphan-removal']; } $metadata->mapOneToOne($mapping); @@ -310,8 +310,8 @@ class XmlDriver extends AbstractFileDriver $mapping['cascade'] = $this->_getCascadeMappings($oneToManyElement->cascade); } - if (isset($oneToManyElement->{'orphan-removal'})) { - $mapping['orphanRemoval'] = (bool)$oneToManyElement->{'orphan-removal'}; + if (isset($oneToManyElement['orphan-removal'])) { + $mapping['orphanRemoval'] = (bool)$oneToManyElement['orphan-removal']; } if (isset($oneToManyElement->{'order-by'})) { diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index 6e4e2f353..8037a7fa7 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -186,6 +186,7 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeRefresh']); $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeDetach']); $this->assertFalse($class->associationMappings['phonenumbers']['isCascadeMerge']); + $this->assertTrue($class->associationMappings['phonenumbers']['orphanRemoval']); // Test Order By $this->assertEquals(array('number' => 'ASC'), $class->associationMappings['phonenumbers']['orderBy']); @@ -328,7 +329,7 @@ class User public $address; /** - * @OneToMany(targetEntity="Phonenumber", mappedBy="user", cascade={"persist"}) + * @OneToMany(targetEntity="Phonenumber", mappedBy="user", cascade={"persist"}, orphanRemoval=true) * @OrderBy({"number"="ASC"}) */ public $phonenumbers; @@ -423,7 +424,7 @@ class User 1 => 'persist', ), 'mappedBy' => 'user', - 'orphanRemoval' => false, + 'orphanRemoval' => true, 'orderBy' => array( 'number' => 'ASC', diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php index 505188757..2039578a3 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.ORM.Mapping.User.php @@ -63,7 +63,7 @@ $metadata->mapOneToMany(array( 1 => 'persist', ), 'mappedBy' => 'user', - 'orphanRemoval' => false, + 'orphanRemoval' => true, 'orderBy' => array( 'number' => 'ASC', 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 c066cbef1..524b2494f 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 @@ -39,7 +39,7 @@ - + diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml index 490a21c2a..333474981 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.ORM.Mapping.User.dcm.yml @@ -34,6 +34,7 @@ Doctrine\Tests\ORM\Mapping\User: oneToMany: phonenumbers: targetEntity: Phonenumber + orphanRemoval: true mappedBy: user orderBy: number: ASC From ba882be76bdb9d2c33cfaef739af6bbba7abcc30 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 1 Aug 2011 21:45:21 +0200 Subject: [PATCH 136/220] DDC-1313 - Optimize behavior of DriverChain::getAllClassNames() --- lib/Doctrine/ORM/Mapping/Driver/DriverChain.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php b/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php index 77c258a18..d84d2344b 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DriverChain.php @@ -88,15 +88,20 @@ class DriverChain implements Driver public function getAllClassNames() { $classNames = array(); + $driverClasses = array(); foreach ($this->_drivers AS $namespace => $driver) { - $driverClasses = $driver->getAllClassNames(); - foreach ($driverClasses AS $className) { + $oid = spl_object_hash($driver); + if (!isset($driverClasses[$oid])) { + $driverClasses[$oid] = $driver->getAllClassNames(); + } + + foreach ($driverClasses[$oid] AS $className) { if (strpos($className, $namespace) === 0) { - $classNames[] = $className; + $classNames[$className] = true; } } } - return array_unique($classNames); + return array_keys($classNames); } /** From c85de03b66a124f9cfa9f65917e4d9c11bb758c1 Mon Sep 17 00:00:00 2001 From: Benjamin Eberlei Date: Mon, 1 Aug 2011 23:09:03 +0200 Subject: [PATCH 137/220] Add phar packaging target and distribute phar into download folder --- build.xml | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index e9d2115f0..7981503a5 100644 --- a/build.xml +++ b/build.xml @@ -107,6 +107,23 @@ + + + + + + + + + + + + + + + + + @@ -206,6 +223,7 @@ + @@ -217,7 +235,7 @@ - + + + + + + @@ -235,7 +240,7 @@ - +