From 2c70f4edf76812c01e511161f2e52c676810ab8a Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 20 Jan 2016 16:42:58 +0100 Subject: [PATCH 001/124] [DOCUMENTATION] Update tests README --- tests/README.markdown | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tests/README.markdown b/tests/README.markdown index c1027aced..45e32c237 100644 --- a/tests/README.markdown +++ b/tests/README.markdown @@ -1,25 +1,24 @@ # Running the Doctrine 2 Testsuite -## Setting up a PHPUnit Configuration XML +To execute the Doctrine2 testsuite, you just need to execute this simple steps: -.. + * Clone the project from GitHub + * Enter the Doctrine2 folder + * Install the dependencies + * Execute the tests + + All this is (normally) done with: -## Testing Lock-Support +``` +git clone git@github.com:doctrine/doctrine2.git +cd doctrine2 +composer install +./vendor/bin/phpunit +``` -The Lock support in Doctrine 2 is tested using Gearman, which allows to run concurrent tasks in parallel. -Install Gearman with PHP as follows: +## Pre-requisites +Doctrine2 works on many database vendors; the tests can detect the presence of installed vendors, but you need at least one of those; the easier to install is SQLite. -1. Go to http://www.gearman.org and download the latest Gearman Server -2. Compile it and then call ldconfig -3. Start it up "gearmand -vvvv" -4. Install pecl/gearman by calling "gearman-beta" +If you're using a Debian-derivative Linux distribution, you can install SQLite with: -You can then go into tests/ and start up two workers: - - php Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php - -Then run the locking test-suite: - - phpunit --configuration Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php - -This can run considerable time, because it is using sleep() to test for the timing ranges of locks. \ No newline at end of file + sudo apt-get install sqlite From 1e97cf21e8e3253ade0f8cd359c6cdf1b8617ce4 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 20 Jan 2016 16:52:13 +0100 Subject: [PATCH 002/124] Reverting removal of lock tests paragraph; minor fixes --- tests/README.markdown | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/tests/README.markdown b/tests/README.markdown index 45e32c237..dfba6fa21 100644 --- a/tests/README.markdown +++ b/tests/README.markdown @@ -9,16 +9,34 @@ To execute the Doctrine2 testsuite, you just need to execute this simple steps: All this is (normally) done with: -``` -git clone git@github.com:doctrine/doctrine2.git -cd doctrine2 -composer install -./vendor/bin/phpunit -``` + git clone git@github.com:doctrine/doctrine2.git + cd doctrine2 + composer install + ./vendor/bin/phpunit ## Pre-requisites Doctrine2 works on many database vendors; the tests can detect the presence of installed vendors, but you need at least one of those; the easier to install is SQLite. -If you're using a Debian-derivative Linux distribution, you can install SQLite with: +If you're using Debian, or a Debian-derivate Linux distribution (like Ubuntu), you can install SQLite with: sudo apt-get install sqlite + +## Testing Lock-Support + +The Lock support in Doctrine 2 is tested using Gearman, which allows to run concurrent tasks in parallel. +Install Gearman with PHP as follows: + +1. Go to http://www.gearman.org and download the latest Gearman Server +2. Compile it and then call ldconfig +3. Start it up "gearmand -vvvv" +4. Install pecl/gearman by calling "gearman-beta" + +You can then go into `tests/` and start up two workers: + + php Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php + +Then run the locking test-suite: + + phpunit --configuration Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php + +This can run considerable time, because it is using sleep() to test for the timing ranges of locks. From b3df49b2f3810adbcb65812ac0dfe9369104bcc5 Mon Sep 17 00:00:00 2001 From: Aaron Merryman Date: Wed, 23 Mar 2016 18:54:20 -0700 Subject: [PATCH 003/124] Update tools.rst --- docs/en/reference/tools.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/reference/tools.rst b/docs/en/reference/tools.rst index 51f457300..a601010f0 100644 --- a/docs/en/reference/tools.rst +++ b/docs/en/reference/tools.rst @@ -205,7 +205,7 @@ tables of the current model to clean up with orphaned tables. You can also use database introspection to update your schema easily with the ``updateSchema()`` method. It will compare your existing database schema to the passed array of -``ClassMetdataInfo`` instances. +``ClassMetadataInfo`` instances. .. code-block:: php From 2f2236a1d6e558bdd4ea702afb4a359cb06d3eaa Mon Sep 17 00:00:00 2001 From: Andrei Sozonov Date: Fri, 1 Apr 2016 15:54:17 +0300 Subject: [PATCH 004/124] fix typo --- lib/Doctrine/ORM/Query/Expr/OrderBy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/Expr/OrderBy.php b/lib/Doctrine/ORM/Query/Expr/OrderBy.php index 932548bd6..291be6131 100644 --- a/lib/Doctrine/ORM/Query/Expr/OrderBy.php +++ b/lib/Doctrine/ORM/Query/Expr/OrderBy.php @@ -97,7 +97,7 @@ class OrderBy /** * @return string */ - public function __tostring() + public function __toString() { return $this->preSeparator . implode($this->separator, $this->parts) . $this->postSeparator; } From 165722cf05ba4b7dad8ad4caa28c1f99af8d10ac Mon Sep 17 00:00:00 2001 From: iBet7o Date: Sun, 17 Apr 2016 17:31:48 -0500 Subject: [PATCH 005/124] Fix bug: orderBy documentation --- docs/en/reference/query-builder.rst | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docs/en/reference/query-builder.rst b/docs/en/reference/query-builder.rst index 57eee179f..9d90f798d 100644 --- a/docs/en/reference/query-builder.rst +++ b/docs/en/reference/query-builder.rst @@ -113,7 +113,7 @@ suggested standard way to build queries: $qb->expr()->eq('u.id', '?1'), $qb->expr()->like('u.nickname', '?2') )) - ->orderBy('u.surname', 'ASC')); + ->orderBy('u.surname', 'ASC'); Here is a complete list of helper methods available in ``QueryBuilder``: @@ -126,7 +126,7 @@ Here is a complete list of helper methods available in ``QueryBuilder``: // Example - $qb->select(array('u', 'p')) // Example - $qb->select($qb->expr()->select('u', 'p')) public function select($select = null); - + // addSelect does not override previous calls to select // // Example - $qb->select('u'); @@ -562,4 +562,3 @@ same query of example 6 written using Of course this is the hardest way to build a DQL query in Doctrine. To simplify some of these efforts, we introduce what we call as ``Expr`` helper class. - From 5507e0be29ec7b6d078e4389ec59158a002f057f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20G=C4=85sowski?= Date: Thu, 23 Mar 2017 19:12:40 +0100 Subject: [PATCH 006/124] Fix wrong variable name Fix $fieldMapping to $embeddedClass in generateEmbeddedPropertyDocBlock --- 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 8d1f05ac1..5bc292a37 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -1731,7 +1731,7 @@ public function __construct() $embedded = ['class="' . $embeddedClass['class'] . '"']; - if (isset($fieldMapping['columnPrefix'])) { + if (isset($embeddedClass['columnPrefix'])) { $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); } From f537eb2915edda7820b53ff2f94bf395ed489ff7 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 4 Apr 2017 22:12:38 +0200 Subject: [PATCH 007/124] Add a table name type that accept quoted table name --- doctrine-mapping.xsd | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index bb8624190..c0c2d4623 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -191,7 +191,7 @@ - + @@ -200,6 +200,13 @@ + + + + + + + From b43325760ddddf4983768c7eae802a3644837c5f Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 4 Apr 2017 22:13:21 +0200 Subject: [PATCH 008/124] Add a type for the class FQCN --- doctrine-mapping.xsd | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index c0c2d4623..e220ab714 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -419,9 +419,16 @@ - + + + + + + + + From 0865181702428fd0f94bfe48c8606744ec191b93 Mon Sep 17 00:00:00 2001 From: mike Date: Tue, 4 Apr 2017 22:15:02 +0200 Subject: [PATCH 009/124] Do not force an order of definition in the entity elements --- doctrine-mapping.xsd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index e220ab714..303a26027 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -167,7 +167,7 @@ - + @@ -189,7 +189,7 @@ - + From 7e50a965fa1baf599b0f0b90dc32dcb5ce71cea0 Mon Sep 17 00:00:00 2001 From: Yannick de Lange Date: Wed, 12 Apr 2017 23:09:48 +0200 Subject: [PATCH 010/124] Updated broken links Updated all links pointing to http://www.doctrine-project.org/documentation/* to their http://docs.doctrine-project.org counterparts --- docs/en/cookbook/dql-user-defined-functions.rst | 2 +- docs/en/cookbook/implementing-wakeup-or-clone.rst | 2 +- docs/en/cookbook/integrating-with-codeigniter.rst | 2 +- docs/en/tutorials/getting-started.rst | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/en/cookbook/dql-user-defined-functions.rst b/docs/en/cookbook/dql-user-defined-functions.rst index a3a7606ad..3278319d2 100644 --- a/docs/en/cookbook/dql-user-defined-functions.rst +++ b/docs/en/cookbook/dql-user-defined-functions.rst @@ -132,7 +132,7 @@ dql statement. The ``ArithmeticPrimary`` method call is the most common denominator of valid EBNF tokens taken from the -`DQL EBNF grammar `_ +`DQL EBNF grammar `_ that matches our requirements for valid input into the DateDiff Dql function. Picking the right tokens for your methods is a tricky business, but the EBNF grammar is pretty helpful finding it, as is diff --git a/docs/en/cookbook/implementing-wakeup-or-clone.rst b/docs/en/cookbook/implementing-wakeup-or-clone.rst index 6a8ef9c91..93c2e54f4 100644 --- a/docs/en/cookbook/implementing-wakeup-or-clone.rst +++ b/docs/en/cookbook/implementing-wakeup-or-clone.rst @@ -4,7 +4,7 @@ Implementing Wakeup or Clone .. sectionauthor:: Roman Borschel (roman@code-factory.org) As explained in the -`restrictions for entity classes in the manual `_, +`restrictions for entity classes in the manual `_, it is usually not allowed for an entity to implement ``__wakeup`` or ``__clone``, because Doctrine makes special use of them. However, it is quite easy to make use of these methods in a safe diff --git a/docs/en/cookbook/integrating-with-codeigniter.rst b/docs/en/cookbook/integrating-with-codeigniter.rst index 1c06a34e2..49c5403aa 100644 --- a/docs/en/cookbook/integrating-with-codeigniter.rst +++ b/docs/en/cookbook/integrating-with-codeigniter.rst @@ -111,7 +111,7 @@ APC, get rid of EchoSqlLogger, and turn off autoGenerateProxyClasses. For more details, consult the -`Doctrine 2 Configuration documentation `_. +`Doctrine 2 Configuration documentation `_. Now to use it ------------- diff --git a/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst index c8247e21c..5cbcfb170 100644 --- a/docs/en/tutorials/getting-started.rst +++ b/docs/en/tutorials/getting-started.rst @@ -162,7 +162,7 @@ read up on the configuration details in the The third block shows the configuration options required to connect to a database, in my case a file-based sqlite database. All the configuration options for all the shipped drivers are given in the -`DBAL Configuration section of the manual `_. +`DBAL Configuration section of the manual `_. The last block shows how the ``EntityManager`` is obtained from a factory method. From 6b6c3003193d858546b4c34c1cb21ef758cfd709 Mon Sep 17 00:00:00 2001 From: Richard Henry Date: Sat, 15 Apr 2017 00:11:39 +0100 Subject: [PATCH 011/124] Fix incorrect YAML example for versioning a field. --- docs/en/reference/transactions-and-concurrency.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/reference/transactions-and-concurrency.rst b/docs/en/reference/transactions-and-concurrency.rst index 1b79adc57..c962232e6 100644 --- a/docs/en/reference/transactions-and-concurrency.rst +++ b/docs/en/reference/transactions-and-concurrency.rst @@ -214,8 +214,8 @@ example we'll use an integer. type: entity fields: version: - version: - type: integer + type: integer + version: true Alternatively a datetime type can be used (which maps to a SQL timestamp or datetime): From e44a83fc7bce112c6996f32c2c179132264a9078 Mon Sep 17 00:00:00 2001 From: Richard Henry Date: Sat, 15 Apr 2017 01:18:44 +0100 Subject: [PATCH 012/124] Fix incorrect YAML datetime version field. --- docs/en/reference/transactions-and-concurrency.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/reference/transactions-and-concurrency.rst b/docs/en/reference/transactions-and-concurrency.rst index c962232e6..5ce0852b2 100644 --- a/docs/en/reference/transactions-and-concurrency.rst +++ b/docs/en/reference/transactions-and-concurrency.rst @@ -247,8 +247,8 @@ timestamp or datetime): type: entity fields: version: - version: - type: datetime + type: datetime + version: true Version numbers (not timestamps) should however be preferred as they can not potentially conflict in a highly concurrent From 692a1afa86ab83eba4173471202af9364bf90d40 Mon Sep 17 00:00:00 2001 From: Adrien Crivelli Date: Sat, 22 Apr 2017 00:05:57 +0900 Subject: [PATCH 013/124] Minor typo naming strategy documentation --- docs/en/reference/namingstrategy.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/en/reference/namingstrategy.rst b/docs/en/reference/namingstrategy.rst index 9f8e4a599..fff5e601a 100644 --- a/docs/en/reference/namingstrategy.rst +++ b/docs/en/reference/namingstrategy.rst @@ -20,7 +20,7 @@ You can specify a different strategy by calling ``Doctrine\ORM\Configuration#set setNamingStrategy($namingStrategy); + $configuration->setNamingStrategy($namingStrategy); Underscore naming strategy --------------------------- @@ -31,7 +31,7 @@ Underscore naming strategy setNamingStrategy($namingStrategy); + $configuration->setNamingStrategy($namingStrategy); For SomeEntityName the strategy will generate the table SOME_ENTITY_NAME with the ``CASE_UPPER`` option, or some_entity_name with the ``CASE_LOWER`` option. From 38bfcc6a7ad264b880b847b69cafa10e3df5cf5d Mon Sep 17 00:00:00 2001 From: Jarek Jakubowski Date: Tue, 25 Apr 2017 11:01:17 +0200 Subject: [PATCH 014/124] Fix notice in ClassMetadata when there is no ID Column defined When you forget about defining the ID/PK Column, then this ugly Notice appear. Now it will throw nice Exception. --- .../ORM/Mapping/ClassMetadataInfo.php | 8 +++++-- lib/Doctrine/ORM/Mapping/MappingException.php | 10 +++++++++ .../Tests/Models/DDC6412/DDC6412File.php | 21 +++++++++++++++++++ .../Tests/ORM/Mapping/ClassMetadataTest.php | 10 +++++++++ 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 tests/Doctrine/Tests/Models/DDC6412/DDC6412File.php diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 9a5811163..ce3cd8685 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1796,13 +1796,17 @@ class ClassMetadataInfo implements ClassMetadata * * @return string * - * @throws MappingException If the class has a composite primary key. + * @throws MappingException If the class doesn't have an identifier or it has a composite primary key. */ public function getSingleIdentifierFieldName() { if ($this->isIdentifierComposite) { throw MappingException::singleIdNotAllowedOnCompositePrimaryKey($this->name); } + + if ( ! isset($this->identifier[0])) { + throw MappingException::noIdDefined($this->name); + } return $this->identifier[0]; } @@ -1813,7 +1817,7 @@ class ClassMetadataInfo implements ClassMetadata * * @return string * - * @throws MappingException If the class has a composite primary key. + * @throws MappingException If the class doesn't have an identifier or it has a composite primary key. */ public function getSingleIdentifierColumnName() { diff --git a/lib/Doctrine/ORM/Mapping/MappingException.php b/lib/Doctrine/ORM/Mapping/MappingException.php index 97686d654..7dc440515 100644 --- a/lib/Doctrine/ORM/Mapping/MappingException.php +++ b/lib/Doctrine/ORM/Mapping/MappingException.php @@ -424,6 +424,16 @@ class MappingException extends \Doctrine\ORM\ORMException return new self('Single id is not allowed on composite primary key in entity '.$entity); } + /** + * @param string $entity + * + * @return MappingException + */ + public static function noIdDefined($entity) + { + return new self('No ID defined for entity ' . $entity); + } + /** * @param string $entity * @param string $fieldName diff --git a/tests/Doctrine/Tests/Models/DDC6412/DDC6412File.php b/tests/Doctrine/Tests/Models/DDC6412/DDC6412File.php new file mode 100644 index 000000000..64551cdf4 --- /dev/null +++ b/tests/Doctrine/Tests/Models/DDC6412/DDC6412File.php @@ -0,0 +1,21 @@ +getSingleIdentifierFieldName(); } + public function testGetSingleIdentifierFieldName_NoIdEntity_ThrowsException() + { + $cm = new ClassMetadata(DDC6412File::class); + $cm->initializeReflection(new RuntimeReflectionService()); + + $this->expectException(\Doctrine\ORM\Mapping\MappingException::class); + $cm->getSingleIdentifierFieldName(); + } + public function testDuplicateAssociationMappingException() { $cm = new ClassMetadata(CMS\CmsUser::class); From a557c97a93adc1c7c0232e78290cce842a92a6bd Mon Sep 17 00:00:00 2001 From: Vytautas Stankus Date: Thu, 13 Apr 2017 16:25:44 +0300 Subject: [PATCH 015/124] Add support for STARTS_WITH and ENDS_WITH comparison operators --- composer.json | 2 +- .../reference/working-with-associations.rst | 2 ++ .../Entity/BasicEntityPersister.php | 22 +++++++------ .../ORM/Persisters/SqlValueVisitor.php | 16 ++++++++-- .../ORM/Query/QueryExpressionVisitor.php | 10 ++++++ .../ORM/Functional/EntityRepositoryTest.php | 32 +++++++++++++++++++ .../ORM/Query/QueryExpressionVisitorTest.php | 3 ++ 7 files changed, 73 insertions(+), 14 deletions(-) diff --git a/composer.json b/composer.json index 5c0bf5958..780105f3b 100644 --- a/composer.json +++ b/composer.json @@ -16,7 +16,7 @@ "require": { "php": "^7.0", "ext-pdo": "*", - "doctrine/collections": "~1.3", + "doctrine/collections": "^1.4", "doctrine/dbal": ">=2.5-dev,<2.7-dev", "doctrine/instantiator": "~1.0.1", "doctrine/common": "^2.7.1", diff --git a/docs/en/reference/working-with-associations.rst b/docs/en/reference/working-with-associations.rst index df7dd5955..e115efbc9 100644 --- a/docs/en/reference/working-with-associations.rst +++ b/docs/en/reference/working-with-associations.rst @@ -716,6 +716,8 @@ methods: * ``in($field, array $values)`` * ``notIn($field, array $values)`` * ``contains($field, $value)`` +* ``startsWith($field, $value)`` +* ``endsWith($field, $value)`` .. note:: diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index e3d0a165f..5cccadbe2 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -87,16 +87,18 @@ class BasicEntityPersister implements EntityPersister * @var array */ static private $comparisonMap = [ - Comparison::EQ => '= %s', - Comparison::IS => '= %s', - Comparison::NEQ => '!= %s', - Comparison::GT => '> %s', - Comparison::GTE => '>= %s', - Comparison::LT => '< %s', - Comparison::LTE => '<= %s', - Comparison::IN => 'IN (%s)', - Comparison::NIN => 'NOT IN (%s)', - Comparison::CONTAINS => 'LIKE %s', + Comparison::EQ => '= %s', + Comparison::IS => '= %s', + Comparison::NEQ => '!= %s', + Comparison::GT => '> %s', + Comparison::GTE => '>= %s', + Comparison::LT => '< %s', + Comparison::LTE => '<= %s', + Comparison::IN => 'IN (%s)', + Comparison::NIN => 'NOT IN (%s)', + Comparison::CONTAINS => 'LIKE %s', + Comparison::STARTS_WITH => 'LIKE %s', + Comparison::ENDS_WITH => 'LIKE %s', ]; /** diff --git a/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php b/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php index 2b3bdedc4..c8df1919d 100644 --- a/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php +++ b/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php @@ -111,8 +111,18 @@ class SqlValueVisitor extends ExpressionVisitor { $value = $comparison->getValue()->getValue(); - return $comparison->getOperator() == Comparison::CONTAINS - ? "%{$value}%" - : $value; + switch ($comparison->getOperator()) { + case Comparison::CONTAINS: + return "%{$value}%"; + + case Comparison::STARTS_WITH: + return "{$value}%"; + + case Comparison::ENDS_WITH: + return "%{$value}"; + + default: + return $value; + } } } diff --git a/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php b/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php index dbdaeb40c..8b00d998e 100644 --- a/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php +++ b/lib/Doctrine/ORM/Query/QueryExpressionVisitor.php @@ -185,6 +185,16 @@ class QueryExpressionVisitor extends ExpressionVisitor $parameter->setValue('%' . $parameter->getValue() . '%', $parameter->getType()); $this->parameters[] = $parameter; + return $this->expr->like($field, $placeholder); + case Comparison::STARTS_WITH: + $parameter->setValue($parameter->getValue() . '%', $parameter->getType()); + $this->parameters[] = $parameter; + + return $this->expr->like($field, $placeholder); + case Comparison::ENDS_WITH: + $parameter->setValue('%' . $parameter->getValue(), $parameter->getType()); + $this->parameters[] = $parameter; + return $this->expr->like($field, $placeholder); default: $operator = self::convertComparisonOperator($comparison->getOperator()); diff --git a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php index d329b8556..ebc7acee9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/EntityRepositoryTest.php @@ -910,6 +910,38 @@ class EntityRepositoryTest extends OrmFunctionalTestCase $this->assertEquals(2, count($users)); } + public function testMatchingCriteriaStartsWithComparison() + { + $this->loadFixture(); + + $repository = $this->_em->getRepository(CmsUser::class); + + $users = $repository->matching(new Criteria(Criteria::expr()->startsWith('name', 'Foo'))); + $this->assertCount(0, $users); + + $users = $repository->matching(new Criteria(Criteria::expr()->startsWith('name', 'R'))); + $this->assertCount(1, $users); + + $users = $repository->matching(new Criteria(Criteria::expr()->startsWith('status', 'de'))); + $this->assertCount(2, $users); + } + + public function testMatchingCriteriaEndsWithComparison() + { + $this->loadFixture(); + + $repository = $this->_em->getRepository(CmsUser::class); + + $users = $repository->matching(new Criteria(Criteria::expr()->endsWith('name', 'foo'))); + $this->assertCount(0, $users); + + $users = $repository->matching(new Criteria(Criteria::expr()->endsWith('name', 'oman'))); + $this->assertCount(1, $users); + + $users = $repository->matching(new Criteria(Criteria::expr()->endsWith('status', 'ev'))); + $this->assertCount(2, $users); + } + /** * @group DDC-2478 */ diff --git a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php index 4e7434c85..0e306ab06 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryExpressionVisitorTest.php @@ -68,6 +68,9 @@ class QueryExpressionVisitorTest extends TestCase [$cb->contains('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value%')], + [$cb->startsWith('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', 'value%')], + [$cb->endsWith('field', 'value'), $qb->like('o.field', ':field'), new Parameter('field', '%value')], + // Test parameter conversion [$cb->eq('object.field', 'value'), $qb->eq('o.object.field', ':object_field'), new Parameter('object_field', 'value')], From ccaa4b8ce146d3b1e1a7eee5c049257a3b8b5c83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Fri, 20 Jan 2017 00:59:53 +0100 Subject: [PATCH 016/124] Use `getMultiple()` to fetch associations as well --- lib/Doctrine/ORM/Cache/DefaultQueryCache.php | 19 ++++---- .../Tests/ORM/Cache/DefaultQueryCacheTest.php | 46 +++++++++++++++++-- 2 files changed, 53 insertions(+), 12 deletions(-) diff --git a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php index 076fe3beb..3ac206547 100644 --- a/lib/Doctrine/ORM/Cache/DefaultQueryCache.php +++ b/lib/Doctrine/ORM/Cache/DefaultQueryCache.php @@ -122,11 +122,9 @@ class DefaultQueryCache implements QueryCache // @TODO - move to cache hydration component foreach ($entry->result as $index => $entry) { - $entityEntry = is_array($entries) && array_key_exists($index, $entries) ? $entries[$index] : null; if ($entityEntry === null) { - if ($this->cacheLogger !== null) { $this->cacheLogger->entityCacheMiss($regionName, $cacheKeys->identifiers[$index]); } @@ -139,7 +137,6 @@ class DefaultQueryCache implements QueryCache } if ( ! $hasRelation) { - $result[$index] = $this->uow->createEntity($entityEntry->class, $entityEntry->resolveAssociationEntries($this->em), self::$hints); continue; @@ -178,14 +175,20 @@ class DefaultQueryCache implements QueryCache continue; } - $collection = new PersistentCollection($this->em, $assocMetadata, new ArrayCollection()); + $generateKeys = function ($id) use ($assocMetadata): EntityCacheKey { + return new EntityCacheKey($assocMetadata->rootEntityName, $id); + }; + + $collection = new PersistentCollection($this->em, $assocMetadata, new ArrayCollection()); + $assocKeys = new CollectionCacheEntry(array_map($generateKeys, $assoc['list'])); + $assocEntries = $assocRegion->getMultiple($assocKeys); foreach ($assoc['list'] as $assocIndex => $assocId) { + $assocEntry = is_array($assocEntries) && array_key_exists($assocIndex, $assocEntries) ? $assocEntries[$assocIndex] : null; - if (($assocEntry = $assocRegion->get($assocKey = new EntityCacheKey($assocMetadata->rootEntityName, $assocId))) === null) { - + if ($assocEntry === null) { if ($this->cacheLogger !== null) { - $this->cacheLogger->entityCacheMiss($assocRegion->getName(), $assocKey); + $this->cacheLogger->entityCacheMiss($assocRegion->getName(), $assocKeys->identifiers[$assocIndex]); } $this->uow->hydrationComplete(); @@ -198,7 +201,7 @@ class DefaultQueryCache implements QueryCache $collection->hydrateSet($assocIndex, $element); if ($this->cacheLogger !== null) { - $this->cacheLogger->entityCacheHit($assocRegion->getName(), $assocKey); + $this->cacheLogger->entityCacheHit($assocRegion->getName(), $assocKeys->identifiers[$assocIndex]); } } diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php index e011159bd..58eddd375 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultQueryCacheTest.php @@ -125,8 +125,7 @@ class DefaultQueryCacheTest extends OrmTestCase $stateClass = $this->em->getClassMetadata(State::class); $rsm->addRootEntityFromClassMetadata(City::class, 'c'); - $rsm->addJoinedEntityFromClassMetadata(State::class, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name'] - ); + $rsm->addJoinedEntityFromClassMetadata(State::class, 's', 'c', 'state', ['id'=>'state_id', 'name'=>'state_name']); for ($i = 0; $i < 4; $i++) { $state = new State("State $i"); @@ -283,8 +282,47 @@ class DefaultQueryCacheTest extends OrmTestCase $key = new QueryCacheKey('query.key1', 0); $entry = new QueryCacheEntry( [ - ['identifier' => ['id' => 1]], - ['identifier' => ['id' => 2]] + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] + ] + ); + + $data = [ + ['id'=>1, 'name' => 'Foo'], + ['id'=>2, 'name' => 'Bar'] + ]; + + $this->region->addReturn('get', $entry); + + $this->region->addReturn( + 'getMultiple', + [ + new EntityCacheEntry(Country::class, $data[0]), + new EntityCacheEntry(Country::class, $data[1]) + ] + ); + + $rsm->addRootEntityFromClassMetadata(Country::class, 'c'); + + $result = $this->queryCache->get($key, $rsm); + + $this->assertCount(2, $result); + $this->assertInstanceOf(Country::class, $result[0]); + $this->assertInstanceOf(Country::class, $result[1]); + $this->assertEquals(1, $result[0]->getId()); + $this->assertEquals(2, $result[1]->getId()); + $this->assertEquals('Foo', $result[0]->getName()); + $this->assertEquals('Bar', $result[1]->getName()); + } + + public function testGetWithAssociation() + { + $rsm = new ResultSetMappingBuilder($this->em); + $key = new QueryCacheKey('query.key1', 0); + $entry = new QueryCacheEntry( + [ + ['identifier' => ['id' => 1]], + ['identifier' => ['id' => 2]] ] ); From 7c6c5d87c82ad3bb1b4987f65f5201a99cede2d2 Mon Sep 17 00:00:00 2001 From: lemartin Date: Tue, 18 Apr 2017 19:25:02 +0200 Subject: [PATCH 017/124] Fix quoting issues related to ticket #6402 Apply quoting strategy to foreign key columns of one-to-one relation so that correct select statements are generated. And use unquoted column names in result mapping instead of quoted ones, as consumers (namely IdentifierFlattener) expect unquoted column names. --- .../Entity/BasicEntityPersister.php | 2 +- lib/Doctrine/ORM/Query/SqlWalker.php | 3 +- .../ORM/Functional/Ticket/GH6402Test.php | 66 +++++++++++++++++++ 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index 5cccadbe2..f3cdc7055 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -1329,7 +1329,7 @@ class BasicEntityPersister implements EntityPersister $resultColumnName = $this->getSQLColumnAlias($joinColumn['name']); $type = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); - $this->currentPersisterContext->rsm->addMetaResult($alias, $resultColumnName, $quotedColumn, $isIdentifier, $type); + $this->currentPersisterContext->rsm->addMetaResult($alias, $resultColumnName, $joinColumn['name'], $isIdentifier, $type); $columnList[] = sprintf('%s.%s AS %s', $sqlTableAlias, $quotedColumn, $resultColumnName); } diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 57287c7cb..310034e69 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -764,7 +764,8 @@ class SqlWalker implements TreeWalker $columnAlias = $this->getSQLColumnAlias($columnName); $columnType = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); - $sqlSelectExpressions[] = $sqlTableAlias . '.' . $columnName . ' AS ' . $columnAlias; + $quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); + $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $isIdentifier, $columnType); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php new file mode 100644 index 000000000..50450a6b9 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php @@ -0,0 +1,66 @@ +setUpEntitySchema([ + Address::class, + Group::class, + Phone::class, + User::class, + ]); + } catch (\Exception $exception) { + } + } + + public function testFind() + { + $id = $this->createAddress(); + + $address = $this->_em->find(Address::class, $id); + self::assertNotNull($address->user); + } + + public function testQuery() + { + $id = $this->createAddress(); + + $addresses = $this->_em->createQuery("SELECT a FROM " . Address::class . " a WHERE a.id = :id") + ->setParameter("id", $id) + ->getResult(); + + self::assertCount(1, $addresses); + self::assertNotNull($addresses[0]->user); + } + + private function createAddress() + { + $user = new User(); + $user->name = "foo"; + + $address = new Address(); + $address->zip = "bar"; + $user->setAddress($address); + + $this->_em->persist($user); + $this->_em->flush(); + $this->_em->clear(); + + return $address->id; + } +} From 942bb6cb1fdda9fa1192d3475c26b24b5c995b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Sun, 30 Apr 2017 18:49:19 +0200 Subject: [PATCH 018/124] Remove dead code from OrmFunctionalTestCase --- tests/Doctrine/Tests/OrmFunctionalTestCase.php | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 88fbc43ca..c1445eaec 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -616,14 +616,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase { $this->setUpDBALTypes(); - $forceCreateTables = false; - if ( ! isset(static::$_sharedConn)) { static::$_sharedConn = TestUtil::getConnection(); - - if (static::$_sharedConn->getDriver() instanceof SqliteDriver) { - $forceCreateTables = true; - } } if (isset($GLOBALS['DOCTRINE_MARK_SQL_LOGS'])) { @@ -642,7 +636,7 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $classes = []; foreach ($this->_usedModelSets as $setName => $bool) { - if ( ! isset(static::$_tablesCreated[$setName])/* || $forceCreateTables*/) { + if ( ! isset(static::$_tablesCreated[$setName])) { foreach (static::$_modelSets[$setName] as $className) { $classes[] = $this->_em->getClassMetadata($className); } From 4ebf27de357cabbb1cba1da4791fc6ac967a5807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Sun, 30 Apr 2017 18:51:26 +0200 Subject: [PATCH 019/124] Use "quoted" from existing data if exists In order to keep that information for inheritance mapping. --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index ce3cd8685..1af027eaf 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1803,7 +1803,7 @@ class ClassMetadataInfo implements ClassMetadata if ($this->isIdentifierComposite) { throw MappingException::singleIdNotAllowedOnCompositePrimaryKey($this->name); } - + if ( ! isset($this->identifier[0])) { throw MappingException::noIdDefined($this->name); } @@ -2303,6 +2303,10 @@ class ClassMetadataInfo implements ClassMetadata $this->table['name'] = $table['name']; } + if (isset($table['quoted'])) { + $this->table['quoted'] = $table['quoted']; + } + if (isset($table['schema'])) { $this->table['schema'] = $table['schema']; } From 0aef63b350c0ea1ff59fbb6b9ce9b3eec3aaa5eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Sun, 30 Apr 2017 18:50:37 +0200 Subject: [PATCH 020/124] Fix quoting also when using inheritance --- .../AbstractEntityInheritancePersister.php | 6 +- .../Entity/JoinedSubclassPersister.php | 34 +++------- .../Entity/SingleTablePersister.php | 11 ++-- lib/Doctrine/ORM/Query/SqlWalker.php | 5 +- tests/Doctrine/Tests/Models/Quote/Address.php | 5 +- tests/Doctrine/Tests/Models/Quote/City.php | 27 ++++++++ .../Tests/Models/Quote/FullAddress.php | 17 +++++ .../ORM/Functional/Ticket/GH6402Test.php | 64 ++++++++++++++----- .../ORM/Query/SelectSqlGenerationTest.php | 12 ++-- .../Doctrine/Tests/OrmFunctionalTestCase.php | 20 ++++-- 10 files changed, 137 insertions(+), 64 deletions(-) create mode 100644 tests/Doctrine/Tests/Models/Quote/City.php create mode 100644 tests/Doctrine/Tests/Models/Quote/FullAddress.php diff --git a/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php b/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php index 6052c63e5..79472b50c 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/AbstractEntityInheritancePersister.php @@ -82,16 +82,18 @@ abstract class AbstractEntityInheritancePersister extends BasicEntityPersister /** * @param string $tableAlias * @param string $joinColumnName + * @param string $quotedColumnName + * * @param string $type * * @return string */ - protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $type) + protected function getSelectJoinColumnSQL($tableAlias, $joinColumnName, $quotedColumnName, $type) { $columnAlias = $this->getSQLColumnAlias($joinColumnName); $this->currentPersisterContext->rsm->addMetaResult('r', $columnAlias, $joinColumnName, false, $type); - return $tableAlias . '.' . $joinColumnName . ' AS ' . $columnAlias; + return $tableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; } } diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index 8fe679ad4..6c09b604a 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -462,21 +462,14 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister ? $this->getSQLTableAlias($mapping['inherited']) : $baseTableAlias; - foreach ($mapping['targetToSourceKeyColumns'] as $srcColumn) { - $className = isset($mapping['inherited']) - ? $mapping['inherited'] - : $this->class->name; - - $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); + $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); + foreach ($mapping['joinColumns'] as $joinColumn) { $columnList[] = $this->getSelectJoinColumnSQL( $tableAlias, - $srcColumn, - PersisterHelper::getTypeOfColumn( - $mapping['sourceToTargetKeyColumns'][$srcColumn], - $targetClass, - $this->em - ) + $joinColumn['name'], + $this->quoteStrategy->getJoinColumnName($joinColumn, $this->class, $this->platform), + PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em) ); } } @@ -510,21 +503,14 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister continue; } - foreach ($mapping['targetToSourceKeyColumns'] as $srcColumn) { - $className = isset($mapping['inherited']) - ? $mapping['inherited'] - : $subClass->name; - - $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); + $targetClass = $this->em->getClassMetadata($mapping['targetEntity']); + foreach ($mapping['joinColumns'] as $joinColumn) { $columnList[] = $this->getSelectJoinColumnSQL( $tableAlias, - $srcColumn, - PersisterHelper::getTypeOfColumn( - $mapping['sourceToTargetKeyColumns'][$srcColumn], - $targetClass, - $this->em - ) + $joinColumn['name'], + $this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform), + PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em) ); } } diff --git a/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php b/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php index ff1d29652..4b8352b35 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php @@ -89,15 +89,12 @@ class SingleTablePersister extends AbstractEntityInheritancePersister $targetClass = $this->em->getClassMetadata($assoc['targetEntity']); - foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { + foreach ($assoc['joinColumns'] as $joinColumn) { $columnList[] = $this->getSelectJoinColumnSQL( $tableAlias, - $srcColumn, - PersisterHelper::getTypeOfColumn( - $assoc['sourceToTargetKeyColumns'][$srcColumn], - $targetClass, - $this->em - ) + $joinColumn['name'], + $this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform), + PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em) ); } } diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 310034e69..b39280b39 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -764,7 +764,7 @@ class SqlWalker implements TreeWalker $columnAlias = $this->getSQLColumnAlias($columnName); $columnType = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); - $quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); + $quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $class, $this->platform); $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $isIdentifier, $columnType); @@ -793,7 +793,8 @@ class SqlWalker implements TreeWalker $columnAlias = $this->getSQLColumnAlias($columnName); $columnType = PersisterHelper::getTypeOfColumn($joinColumn['referencedColumnName'], $targetClass, $this->em); - $sqlSelectExpressions[] = $sqlTableAlias . '.' . $columnName . ' AS ' . $columnAlias; + $quotedColumnName = $this->quoteStrategy->getJoinColumnName($joinColumn, $subClass, $this->platform); + $sqlSelectExpressions[] = $sqlTableAlias . '.' . $quotedColumnName . ' AS ' . $columnAlias; $this->rsm->addMetaResult($dqlAlias, $columnAlias, $columnName, $subClass->isIdentifier($columnName), $columnType); } diff --git a/tests/Doctrine/Tests/Models/Quote/Address.php b/tests/Doctrine/Tests/Models/Quote/Address.php index 58e303f13..42beaf2a4 100644 --- a/tests/Doctrine/Tests/Models/Quote/Address.php +++ b/tests/Doctrine/Tests/Models/Quote/Address.php @@ -5,6 +5,9 @@ namespace Doctrine\Tests\Models\Quote; /** * @Entity * @Table(name="`quote-address`") + * @InheritanceType("SINGLE_TABLE") + * @DiscriminatorColumn(name="type", type="string") + * @DiscriminatorMap({"simple" = Address::class, "full" = FullAddress::class}) */ class Address { @@ -51,4 +54,4 @@ class Address return $this->user; } -} \ No newline at end of file +} diff --git a/tests/Doctrine/Tests/Models/Quote/City.php b/tests/Doctrine/Tests/Models/Quote/City.php new file mode 100644 index 000000000..74503ea08 --- /dev/null +++ b/tests/Doctrine/Tests/Models/Quote/City.php @@ -0,0 +1,27 @@ +name = $name; + } +} diff --git a/tests/Doctrine/Tests/Models/Quote/FullAddress.php b/tests/Doctrine/Tests/Models/Quote/FullAddress.php new file mode 100644 index 000000000..b73cda5bd --- /dev/null +++ b/tests/Doctrine/Tests/Models/Quote/FullAddress.php @@ -0,0 +1,17 @@ +useModelSet('quote'); - try { - $this->setUpEntitySchema([ - Address::class, - Group::class, - Phone::class, - User::class, - ]); - } catch (\Exception $exception) { - } + parent::setUp(); } public function testFind() @@ -40,8 +34,28 @@ class GH6402Test extends OrmFunctionalTestCase { $id = $this->createAddress(); - $addresses = $this->_em->createQuery("SELECT a FROM " . Address::class . " a WHERE a.id = :id") - ->setParameter("id", $id) + $addresses = $this->_em->createQuery('SELECT a FROM ' . Address::class . ' a WHERE a.id = :id') + ->setParameter('id', $id) + ->getResult(); + + self::assertCount(1, $addresses); + self::assertNotNull($addresses[0]->user); + } + + public function testFindWithSubClass() + { + $id = $this->createFullAddress(); + + $address = $this->_em->find(FullAddress::class, $id); + self::assertNotNull($address->user); + } + + public function testQueryWithSubClass() + { + $id = $this->createFullAddress(); + + $addresses = $this->_em->createQuery('SELECT a FROM ' . FullAddress::class . ' a WHERE a.id = :id') + ->setParameter('id', $id) ->getResult(); self::assertCount(1, $addresses); @@ -49,18 +63,34 @@ class GH6402Test extends OrmFunctionalTestCase } private function createAddress() + { + $address = new Address(); + $address->zip = 'bar'; + + $this->persistAddress($address); + + return $address->id; + } + + private function createFullAddress() + { + $address = new FullAddress(); + $address->zip = 'bar'; + $address->city = new City('London'); + + $this->persistAddress($address); + + return $address->id; + } + + private function persistAddress(Address $address) { $user = new User(); $user->name = "foo"; - - $address = new Address(); - $address->zip = "bar"; $user->setAddress($address); $this->_em->persist($user); $this->_em->flush(); $this->_em->clear(); - - return $address->id; } } diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index b6bdce323..b674c5d38 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -39,8 +39,7 @@ class SelectSqlGenerationTest extends OrmTestCase * @param array $queryHints * @param array $queryParams */ - public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = [], array $queryParams = [] - ) + public function assertSqlGeneration($dqlToBeTested, $sqlToBeConfirmed, array $queryHints = [], array $queryParams = []) { try { $query = $this->_em->createQuery($dqlToBeTested); @@ -78,8 +77,7 @@ class SelectSqlGenerationTest extends OrmTestCase * @param array $queryHints * @param array $queryParams */ - public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = [], array $queryParams = [] - ) + public function assertInvalidSqlGeneration($dqlToBeTested, $expectedException, array $queryHints = [], array $queryParams = []) { $this->expectException($expectedException); @@ -892,7 +890,7 @@ class SelectSqlGenerationTest extends OrmTestCase } /** - * @expectedException Doctrine\ORM\Query\QueryException + * @expectedException \Doctrine\ORM\Query\QueryException */ public function testOrderBySupportsSingleValuedPathExpressionInverseSide() { @@ -1991,7 +1989,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $this->assertSqlGeneration( 'SELECT u, a FROM Doctrine\Tests\Models\Quote\User u JOIN u.address a', - 'SELECT q0_."user-id" AS userid_0, q0_."user-name" AS username_1, q1_."address-id" AS addressid_2, q1_."address-zip" AS addresszip_3 FROM "quote-user" q0_ INNER JOIN "quote-address" q1_ ON q0_."address-id" = q1_."address-id"' + 'SELECT q0_."user-id" AS userid_0, q0_."user-name" AS username_1, q1_."address-id" AS addressid_2, q1_."address-zip" AS addresszip_3, q1_.type AS type_4 FROM "quote-user" q0_ INNER JOIN "quote-address" q1_ ON q0_."address-id" = q1_."address-id" AND q1_.type IN (\'simple\', \'full\')' ); $this->assertSqlGeneration( @@ -2006,7 +2004,7 @@ class SelectSqlGenerationTest extends OrmTestCase $this->assertSqlGeneration( 'SELECT a, u FROM Doctrine\Tests\Models\Quote\Address a JOIN a.user u', - 'SELECT q0_."address-id" AS addressid_0, q0_."address-zip" AS addresszip_1, q1_."user-id" AS userid_2, q1_."user-name" AS username_3 FROM "quote-address" q0_ INNER JOIN "quote-user" q1_ ON q0_."user-id" = q1_."user-id"' + 'SELECT q0_."address-id" AS addressid_0, q0_."address-zip" AS addresszip_1, q1_."user-id" AS userid_2, q1_."user-name" AS username_3, q0_.type AS type_4 FROM "quote-address" q0_ INNER JOIN "quote-user" q1_ ON q0_."user-id" = q1_."user-id" WHERE q0_.type IN (\'simple\', \'full\')' ); $this->assertSqlGeneration( diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index c1445eaec..2ff2c347c 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -225,6 +225,8 @@ abstract class OrmFunctionalTestCase extends OrmTestCase ], 'quote' => [ Models\Quote\Address::class, + Models\Quote\City::class, + Models\Quote\FullAddress::class, Models\Quote\Group::class, Models\Quote\NumericEntity::class, Models\Quote\Phone::class, @@ -480,10 +482,20 @@ abstract class OrmFunctionalTestCase extends OrmTestCase } if (isset($this->_usedModelSets['quote'])) { - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-address")); - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-group")); - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-phone")); - $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier("quote-user")); + $conn->executeUpdate( + sprintf( + 'UPDATE %s SET %s = NULL', + $platform->quoteIdentifier("quote-address"), + $platform->quoteIdentifier('user-id') + ) + ); + + $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-users-groups')); + $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-group')); + $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-phone')); + $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-user')); + $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-address')); + $conn->executeUpdate('DELETE FROM ' . $platform->quoteIdentifier('quote-city')); } if (isset($this->_usedModelSets['vct_onetoone'])) { From a360da5a7e5463f6c12b0922f6063e1cf32dde6d Mon Sep 17 00:00:00 2001 From: Marcin Szulc Date: Fri, 3 Feb 2017 23:54:27 +0100 Subject: [PATCH 021/124] Fix lazy loading of 1-to-1 relationship with custom id object Fixing case when lazy loading of entity in one-to-one relationship on the side without foreign key did not return eht entity because of custom type not being detected and properly formatted before applying to database query. Closes https://github.com/doctrine/doctrine2/issues/5887 --- .../Entity/BasicEntityPersister.php | 2 +- .../ORM/Functional/Ticket/GH5887Test.php | 234 ++++++++++++++++++ 2 files changed, 235 insertions(+), 1 deletion(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index f3cdc7055..28dc9179a 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -785,7 +785,7 @@ class BasicEntityPersister implements EntityPersister // 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] = + $identifier[$targetClass->getFieldForColumn($targetKeyColumn)] = $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity); unset($identifier[$targetKeyColumn]); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php new file mode 100644 index 000000000..f19dd5924 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH5887Test.php @@ -0,0 +1,234 @@ +_schemaTool->createSchema( + [ + $this->_em->getClassMetadata(GH5887Cart::class), + $this->_em->getClassMetadata(GH5887Customer::class), + ] + ); + } + + public function testLazyLoadsForeignEntitiesInOneToOneRelationWhileHavingCustomIdObject() + { + $customerId = new GH5887CustomIdObject(1); + $customer = new GH5887Customer(); + $customer->setId($customerId); + + $cartId = 2; + $cart = new GH5887Cart(); + $cart->setId($cartId); + $cart->setCustomer($customer); + + $this->_em->persist($customer); + $this->_em->persist($cart); + $this->_em->flush(); + + // Clearing cached entities + $this->_em->clear(); + + $customerRepository = $this->_em->getRepository(GH5887Customer::class); + /** @var GH5887Customer $customer */ + $customer = $customerRepository->createQueryBuilder('c') + ->where('c.id = :id') + ->setParameter('id', $customerId->getId()) + ->getQuery() + ->getOneOrNullResult(); + + $this->assertInstanceOf(GH5887Cart::class, $customer->getCart()); + } +} + +/** + * @Entity + */ +class GH5887Cart +{ + /** + * @var int + * + * @Id + * @Column(type="integer") + * @GeneratedValue(strategy="NONE") + */ + private $id; + + /** + * One Cart has One Customer. + * + * @var GH5887Customer + * + * @OneToOne(targetEntity="GH5887Customer", inversedBy="cart") + * @JoinColumn(name="customer_id", referencedColumnName="id") + */ + private $customer; + + /** + * @return int + */ + public function getId() + { + return $this->id; + } + + /** + * @param int $id + */ + public function setId($id) + { + $this->id = $id; + } + + /** + * @return GH5887Customer + */ + public function getCustomer() + { + return $this->customer; + } + + /** + * @param GH5887Customer $customer + */ + public function setCustomer(GH5887Customer $customer) + { + if ($this->customer !== $customer) { + $this->customer = $customer; + $customer->setCart($this); + } + } +} + +/** + * @Entity + */ +class GH5887Customer +{ + /** + * @var GH5887CustomIdObject + * + * @Id + * @Column(type="GH5887CustomIdObject") + * @GeneratedValue(strategy="NONE") + */ + private $id; + + /** + * One Customer has One Cart. + * + * @var GH5887Cart + * + * @OneToOne(targetEntity="GH5887Cart", mappedBy="customer") + */ + private $cart; + + /** + * @return GH5887CustomIdObject + */ + public function getId() + { + return $this->id; + } + + /** + * @param GH5887CustomIdObject $id + */ + public function setId(GH5887CustomIdObject $id) + { + $this->id = $id; + } + + /** + * @return GH5887Cart + */ + public function getCart(): GH5887Cart + { + return $this->cart; + } + + /** + * @param GH5887Cart $cart + */ + public function setCart(GH5887Cart $cart) + { + if ($this->cart !== $cart) { + $this->cart = $cart; + $cart->setCustomer($this); + } + } +} + +class GH5887CustomIdObject +{ + /** + * @var int + */ + private $id; + + /** + * @param int $id + */ + public function __construct($id) + { + $this->id = $id; + } + + /** + * @return int + */ + public function getId(): int + { + return $this->id; + } + + public function __toString() + { + return 'non existing id'; + } +} + +class GH5887CustomIdObjectType extends StringType +{ + const NAME = 'GH5887CustomIdObject'; + + /** + * {@inheritdoc} + */ + public function convertToDatabaseValue($value, AbstractPlatform $platform) + { + return $value->getId(); + } + + /** + * {@inheritdoc} + */ + public function convertToPHPValue($value, AbstractPlatform $platform) + { + return new GH5887CustomIdObject($value); + } + + /** + * {@inheritdoc} + */ + public function getName() + { + return self::NAME; + } +} From 0a10f347d3951cc46e5f07dc2ef9ba8ae37af205 Mon Sep 17 00:00:00 2001 From: Timothy Clissold Date: Tue, 28 Mar 2017 13:50:52 +1100 Subject: [PATCH 022/124] Fix inheritance join alias --- .../ORM/Internal/Hydration/ObjectHydrator.php | 4 +- .../ORM/Functional/Ticket/GH6362Test.php | 144 ++++++++++++++++++ 2 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index 9d8ee329a..ef5e74371 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -358,8 +358,8 @@ class ObjectHydrator extends AbstractHydrator // Get a reference to the parent object to which the joined element belongs. if ($this->_rsm->isMixed && isset($this->rootAliases[$parentAlias])) { - $first = reset($this->resultPointers); - $parentObject = $first[key($first)]; + $objectClass = $this->resultPointers[$parentAlias]; + $parentObject = $objectClass[key($objectClass)]; } else if (isset($this->resultPointers[$parentAlias])) { $parentObject = $this->resultPointers[$parentAlias]; } else { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php new file mode 100644 index 000000000..576fbd0eb --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6362Test.php @@ -0,0 +1,144 @@ +_schemaTool->createSchema( + [ + $this->_em->getClassMetadata(GH6362Start::class), + $this->_em->getClassMetadata(GH6362Base::class), + $this->_em->getClassMetadata(GH6362Child::class), + $this->_em->getClassMetadata(GH6362Join::class), + ] + ); + } + + /** + * @group 6362 + * + * SELECT a as base, b, c, d + * FROM Start a + * LEFT JOIN a.bases b + * LEFT JOIN Child c WITH b.id = c.id + * LEFT JOIN c.joins d + */ + public function testInheritanceJoinAlias() + { + $rsm = new ResultSetMapping; + $rsm->addEntityResult(GH6362Start::class, 'a', 'base'); + $rsm->addJoinedEntityResult(GH6362Base::class, 'b', 'a', 'bases'); + $rsm->addEntityResult(GH6362Child::class, 'c'); + $rsm->addJoinedEntityResult(GH6362Join::class, 'd', 'c', 'joins'); + + $rsm->addFieldResult('a', 'id_0', 'id'); + $rsm->addFieldResult('b', 'id_1', 'id'); + $rsm->addFieldResult('c', 'id_2', 'id'); + $rsm->addFieldResult('d', 'id_3', 'id'); + + $rsm->addMetaResult('a', 'bases_id_4', 'bases_id', false, 'integer'); + $rsm->addMetaResult('b', 'type_5', 'type'); + $rsm->addMetaResult('c', 'type_6', 'type'); + $rsm->addMetaResult('d', 'child_id_7', 'child_id', false, 'integer'); + + $rsm->setDiscriminatorColumn('b', 'type_5'); + $rsm->setDiscriminatorColumn('c', 'type_6'); + + $resultSet = [ + [ + 'id_0' => '1', + 'id_1' => '1', + 'id_2' => '1', + 'id_3' => '1', + 'bases_id_4' => '1', + 'type_5' => 'child', + 'type_6' => 'child', + 'child_id_7' => '1', + ], + ]; + + $stmt = new HydratorMockStatement($resultSet); + $hydrator = new \Doctrine\ORM\Internal\Hydration\ObjectHydrator($this->_em); + $result = $hydrator->hydrateAll($stmt, $rsm, [Query::HINT_FORCE_PARTIAL_LOAD => true]); + + $this->assertInstanceOf(GH6362Start::class, $result[0]['base']); + $this->assertInstanceOf(GH6362Child::class, $result[1][0]); + } +} + +/** + * @Entity + */ +class GH6362Start +{ + /** + * @Column(type="integer") + * @Id + * @GeneratedValue + */ + protected $id; + + /** + * @ManyToOne(targetEntity="GH6362Base", inversedBy="starts") + */ + private $bases; +} + +/** + * @InheritanceType("SINGLE_TABLE") + * @DiscriminatorColumn(name="type", type="string") + * @DiscriminatorMap({"child" = "GH6362Child"}) + * @Entity + */ +abstract class GH6362Base +{ + /** + * @Column(type="integer") + * @Id + * @GeneratedValue + */ + protected $id; + + /** + * @OneToMany(targetEntity="GH6362Start", mappedBy="bases") + */ + private $starts; +} + +/** + * @Entity + */ +class GH6362Child extends GH6362Base +{ + /** + * @OneToMany(targetEntity="GH6362Join", mappedBy="child") + */ + private $joins; +} + +/** + * @Entity + */ +class GH6362Join +{ + /** + * @Column(type="integer") + * @Id + * @GeneratedValue + */ + private $id; + + /** + * @ManyToOne(targetEntity="GH6362Child", inversedBy="joins") + */ + private $child; +} From 85a52d781efe8f03599900b206139b858fd23d55 Mon Sep 17 00:00:00 2001 From: bruno da silva Date: Tue, 11 Apr 2017 10:27:14 +0200 Subject: [PATCH 023/124] add a not weel writend/nammed test testing Query::expireResultCache() --- .../ORM/Functional/Ticket/GH2947Test.php | 95 +++++++++++++++++++ .../Doctrine/Tests/OrmFunctionalTestCase.php | 11 +++ 2 files changed, 106 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/GH2947Test.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/GH2947Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH2947Test.php new file mode 100644 index 000000000..0b21b57f0 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH2947Test.php @@ -0,0 +1,95 @@ +resultCacheImpl = new ArrayCache(); + + parent::setUp(); + + $this->_schemaTool->createSchema([$this->_em->getClassMetadata(GH2947Car::class)]); + } + + public function testIssue() + { + $this->createData(); + $initialQueryCount = $this->getCurrentQueryCount(); + + $query = $this->createQuery(); + self::assertEquals('BMW', (string) $query->getSingleResult()); + self::assertEquals($initialQueryCount + 1, $this->getCurrentQueryCount()); + + $this->updateData(); + self::assertEquals('BMW', (string) $query->getSingleResult()); + self::assertEquals($initialQueryCount + 2, $this->getCurrentQueryCount()); + + $query->expireResultCache(true); + self::assertEquals('Dacia', (string) $query->getSingleResult()); + self::assertEquals($initialQueryCount + 3, $this->getCurrentQueryCount()); + + $query->expireResultCache(false); + self::assertEquals('Dacia', (string) $query->getSingleResult()); + self::assertEquals($initialQueryCount + 3, $this->getCurrentQueryCount()); + } + + private function createQuery() + { + return $this->_em->createQueryBuilder() + ->select('car') + ->from(GH2947Car::class, 'car') + ->getQuery() + ->useResultCache(true, 3600, 'foo-cache-id'); + } + + private function createData() + { + $this->_em->persist(new GH2947Car('BMW')); + $this->_em->flush(); + $this->_em->clear(); + } + + private function updateData() + { + $this->_em->createQueryBuilder() + ->update(GH2947Car::class, 'car') + ->set('car.brand', ':newBrand') + ->where('car.brand = :oldBrand') + ->setParameter('newBrand', 'Dacia') + ->setParameter('oldBrand', 'BMW') + ->getQuery() + ->execute(); + } +} + +/** + * @Entity + * @Table(name="GH2947_car") + */ +class GH2947Car +{ + /** + * @Id + * @Column(type="string", length=25) + * @GeneratedValue(strategy="NONE") + */ + public $brand; + + public function __construct(string $brand) + { + $this->brand = $brand; + } + + public function __toString(): string + { + return $this->brand; + } +} diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 2ff2c347c..5716f2a50 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -68,6 +68,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase */ protected $_usedModelSets = []; + /** + * To be configured by the test that uses result set cache + * + * @var \Doctrine\Common\Cache\Cache|null + */ + protected $resultCacheImpl; + /** * Whether the database schema has already been created. * @@ -699,6 +706,10 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $config->setProxyDir(__DIR__ . '/Proxies'); $config->setProxyNamespace('Doctrine\Tests\Proxies'); + if (null !== $this->resultCacheImpl) { + $config->setResultCacheImpl($this->resultCacheImpl); + } + $enableSecondLevelCache = getenv('ENABLE_SECOND_LEVEL_CACHE'); if ($this->isSecondLevelCacheEnabled || $enableSecondLevelCache) { From e71272e2b4e1f13318adfb1b16cc09c2e25ae70a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Sun, 30 Apr 2017 21:12:40 +0200 Subject: [PATCH 024/124] Evict result set cache if Query#expireResultCache() was called --- lib/Doctrine/ORM/Query.php | 19 +++++++++++ tests/Doctrine/Tests/ORM/Query/QueryTest.php | 33 ++++++++++++++++++++ 2 files changed, 52 insertions(+) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 12fb3f560..9a5ded2c7 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -20,6 +20,7 @@ namespace Doctrine\ORM; use Doctrine\DBAL\LockMode; +use Doctrine\ORM\Query\Exec\AbstractSqlExecutor; use Doctrine\ORM\Query\Parser; use Doctrine\ORM\Query\ParserResult; use Doctrine\ORM\Query\QueryException; @@ -322,9 +323,27 @@ final class Query extends AbstractQuery list($sqlParams, $types) = $this->processParameterMappings($paramMappings); + $this->evictResultSetCache($executor, $sqlParams, $types); + return $executor->execute($this->_em->getConnection(), $sqlParams, $types); } + private function evictResultSetCache(AbstractSqlExecutor $executor, array $sqlParams, array $types) + { + if (null === $this->_queryCacheProfile || ! $this->getExpireResultCache()) { + return; + } + + $cacheDriver = $this->_queryCacheProfile->getResultCacheDriver(); + $statements = (array) $executor->getSqlStatements(); // Type casted since it can either be a string or an array + + foreach ($statements as $statement) { + $cacheKeys = $this->_queryCacheProfile->generateCacheKeys($statement, $sqlParams, $types); + + $cacheDriver->delete(reset($cacheKeys)); + } + } + /** * Evict entity cache region */ diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index 9b8f24d40..6b0091e9c 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -243,4 +243,37 @@ class QueryTest extends OrmTestCase $query->setHydrationCacheProfile(null); $this->assertNull($query->getHydrationCacheProfile()); } + + /** + * @group 2947 + */ + public function testResultCacheEviction() + { + $this->_em->getConfiguration()->setResultCacheImpl(new ArrayCache()); + + $query = $this->_em->createQuery("SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u") + ->useResultCache(true); + + /** @var DriverConnectionMock $driverConnectionMock */ + $driverConnectionMock = $this->_em->getConnection() + ->getWrappedConnection(); + + $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1]])); + + // Performs the query and sets up the initial cache + self::assertCount(1, $query->getResult()); + + $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1], ['id_0' => 2]])); + + // Retrieves cached data since expire flag is false and we have a cached result set + self::assertCount(1, $query->getResult()); + + // Performs the query and caches the result set since expire flag is true + self::assertCount(2, $query->expireResultCache(true)->getResult()); + + $driverConnectionMock->setStatementMock(new StatementArrayMock([['id_0' => 1]])); + + // Retrieves cached data since expire flag is false and we have a cached result set + self::assertCount(2, $query->expireResultCache(false)->getResult()); + } } From 5c1908d82fcbf672cedfa6b87bcadee78018cf24 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Tue, 9 May 2017 19:21:49 +0200 Subject: [PATCH 025/124] Remove dead code Hopefully this does not do anything...? --- lib/Doctrine/ORM/Tools/SchemaTool.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 627f7b573..9acd85ffc 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -401,12 +401,6 @@ class SchemaTool $pkColumns[] = $this->quoteStrategy->getColumnName($mapping['fieldName'], $class, $this->platform); } } - - // For now, this is a hack required for single table inheritence, since this method is called - // twice by single table inheritence relations - if (!$table->hasIndex('primary')) { - //$table->setPrimaryKey($pkColumns); - } } /** From 885c431bd9c3094799beda88eb79c1e08fa996e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 10 May 2017 17:41:10 +0200 Subject: [PATCH 026/124] Pass the connection parameters for cache key generation That argument was added to not have key collisions for different connections. More info: https://github.com/doctrine/dbal/pull/713 --- lib/Doctrine/ORM/Query.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 9a5ded2c7..6d874a8ad 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -19,6 +19,7 @@ namespace Doctrine\ORM; +use Doctrine\DBAL\Driver\Connection; use Doctrine\DBAL\LockMode; use Doctrine\ORM\Query\Exec\AbstractSqlExecutor; use Doctrine\ORM\Query\Parser; @@ -323,13 +324,22 @@ final class Query extends AbstractQuery list($sqlParams, $types) = $this->processParameterMappings($paramMappings); - $this->evictResultSetCache($executor, $sqlParams, $types); + $this->evictResultSetCache( + $executor, + $sqlParams, + $types, + $this->_em->getConnection()->getParams() + ); return $executor->execute($this->_em->getConnection(), $sqlParams, $types); } - private function evictResultSetCache(AbstractSqlExecutor $executor, array $sqlParams, array $types) - { + private function evictResultSetCache( + AbstractSqlExecutor $executor, + array $sqlParams, + array $types, + array $connectionParams + ) { if (null === $this->_queryCacheProfile || ! $this->getExpireResultCache()) { return; } @@ -338,7 +348,7 @@ final class Query extends AbstractQuery $statements = (array) $executor->getSqlStatements(); // Type casted since it can either be a string or an array foreach ($statements as $statement) { - $cacheKeys = $this->_queryCacheProfile->generateCacheKeys($statement, $sqlParams, $types); + $cacheKeys = $this->_queryCacheProfile->generateCacheKeys($statement, $sqlParams, $types, $connectionParams); $cacheDriver->delete(reset($cacheKeys)); } From fac7e8facb38b90ec4f3532e38057a32ce7958fa Mon Sep 17 00:00:00 2001 From: Simone Gentili Date: Sat, 13 May 2017 23:05:37 +0200 Subject: [PATCH 027/124] align equals signs --- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 1af027eaf..f265814b1 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1547,11 +1547,11 @@ class ClassMetadataInfo implements ClassMetadata } $mapping['cascade'] = $cascades; - $mapping['isCascadeRemove'] = in_array('remove', $cascades); + $mapping['isCascadeRemove'] = in_array('remove', $cascades); $mapping['isCascadePersist'] = in_array('persist', $cascades); $mapping['isCascadeRefresh'] = in_array('refresh', $cascades); - $mapping['isCascadeMerge'] = in_array('merge', $cascades); - $mapping['isCascadeDetach'] = in_array('detach', $cascades); + $mapping['isCascadeMerge'] = in_array('merge', $cascades); + $mapping['isCascadeDetach'] = in_array('detach', $cascades); return $mapping; } From 0a801b895e44c5d2402503e085cd29a17c18a90c Mon Sep 17 00:00:00 2001 From: Simone Gentili Date: Mon, 15 May 2017 07:41:07 +0200 Subject: [PATCH 028/124] compute size of loaders beforehand and not on each iteration --- tests/Doctrine/Tests/ORM/Tools/SetupTest.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php index d69e5b030..c44cb6bcf 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SetupTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SetupTest.php @@ -35,7 +35,8 @@ class SetupTest extends OrmTestCase set_include_path($this->originalIncludePath); $loaders = spl_autoload_functions(); - for ($i = 0; $i < count($loaders); $i++) { + $numberOfLoaders = count($loaders); + for ($i = 0; $i < $numberOfLoaders; $i++) { if ($i > $this->originalAutoloaderCount+1) { spl_autoload_unregister($loaders[$i]); } From 73770ac090c235d4a79d498950a1b8212ebf918c Mon Sep 17 00:00:00 2001 From: Ivan Date: Mon, 15 May 2017 14:53:23 -0600 Subject: [PATCH 029/124] Update git submodule "docs/en/_theme" - This fixes the broken image at the footer of Doctrine 2 ORM's docs --- docs/en/_theme | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/en/_theme b/docs/en/_theme index dc294be1d..6f1bc8bea 160000 --- a/docs/en/_theme +++ b/docs/en/_theme @@ -1 +1 @@ -Subproject commit dc294be1dbcf9abde82d24aea1902898d6ee6314 +Subproject commit 6f1bc8bead17b8032389659c0b071d00f2c58328 From 7ce2381bdd7916f5af39336791a111aa1fa0beae Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Thu, 18 May 2017 12:57:36 +0200 Subject: [PATCH 030/124] Allow Symfony 4.0 --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 780105f3b..5c89e8f97 100644 --- a/composer.json +++ b/composer.json @@ -22,10 +22,10 @@ "doctrine/common": "^2.7.1", "doctrine/cache": "~1.5", "doctrine/annotations": "~1.2", - "symfony/console": "~2.5|~3.0" + "symfony/console": "~2.5|~3.0|~4.0" }, "require-dev": { - "symfony/yaml": "~2.3|~3.0", + "symfony/yaml": "~2.3|~3.0|~4.0", "phpunit/phpunit": "^6.0" }, "suggest": { From 7bfd172156e49bb5197a06dc0405bdf903fac863 Mon Sep 17 00:00:00 2001 From: Greg Bell Date: Sun, 21 May 2017 14:10:38 +1000 Subject: [PATCH 031/124] Clarify English and a few concepts - Globally change 'Shipping' to 'Shipment' - shipment is a noun and thus a clearer name for an object. - Move definition of unidirectional from example to the to of the document. - Explain inversedBy and mappedBy the first time they are used. - Clarify some ownership and bidirectionality text. - Minor English and punctuation fixes. --- docs/en/reference/association-mapping.rst | 91 ++++++++++++----------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/docs/en/reference/association-mapping.rst b/docs/en/reference/association-mapping.rst index a1a9f83a8..b1cfa22c8 100644 --- a/docs/en/reference/association-mapping.rst +++ b/docs/en/reference/association-mapping.rst @@ -16,6 +16,9 @@ This chapter is split into three different sections. - :ref:`association_mapping_defaults` are explained that simplify the use-case examples. - :ref:`collections` are introduced that contain entities in associations. +An association is considered to be unidirectional if only one side of the association has +a property referring to the other side. + To gain a full understanding of associations you should also read about :doc:`owning and inverse sides of associations ` @@ -96,9 +99,7 @@ One-To-One, Unidirectional -------------------------- Here is an example of a one-to-one association with a ``Product`` entity that -references one ``Shipping`` entity. The ``Shipping`` does not reference back to -the ``Product`` so that the reference is said to be unidirectional, in one -direction only. +references one ``Shipment`` entity. .. configuration-block:: @@ -111,16 +112,16 @@ direction only. // ... /** - * @OneToOne(targetEntity="Shipping") - * @JoinColumn(name="shipping_id", referencedColumnName="id") + * @OneToOne(targetEntity="Shipment") + * @JoinColumn(name="shipment_id", referencedColumnName="id") */ - private $shipping; + private $shipment; // ... } /** @Entity */ - class Shipping + class Shipment { // ... } @@ -129,8 +130,8 @@ direction only. - - + + @@ -140,10 +141,10 @@ direction only. Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment joinColumn: - name: shipping_id + name: shipment_id referencedColumnName: id Note that the @JoinColumn is not really necessary in this example, @@ -155,15 +156,15 @@ Generated MySQL Schema: CREATE TABLE Product ( id INT AUTO_INCREMENT NOT NULL, - shipping_id INT DEFAULT NULL, - UNIQUE INDEX UNIQ_6FBC94267FE4B2B (shipping_id), + shipment_id INT DEFAULT NULL, + UNIQUE INDEX UNIQ_6FBC94267FE4B2B (shipment_id), PRIMARY KEY(id) ) ENGINE = InnoDB; - CREATE TABLE Shipping ( + CREATE TABLE Shipment ( id INT AUTO_INCREMENT NOT NULL, PRIMARY KEY(id) ) ENGINE = InnoDB; - ALTER TABLE Product ADD FOREIGN KEY (shipping_id) REFERENCES Shipping(id); + ALTER TABLE Product ADD FOREIGN KEY (shipment_id) REFERENCES Shipment(id); One-To-One, Bidirectional ------------------------- @@ -172,6 +173,10 @@ Here is a one-to-one relationship between a ``Customer`` and a ``Cart``. The ``Cart`` has a reference back to the ``Customer`` so it is bidirectional. +Here we see the ``mappedBy`` and ``inversedBy`` annotations for the first time. +They are used to tell Doctrine which property on the other side refers to the +object. + .. configuration-block:: .. code-block:: php @@ -251,8 +256,9 @@ Generated MySQL Schema: ) ENGINE = InnoDB; ALTER TABLE Cart ADD FOREIGN KEY (customer_id) REFERENCES Customer(id); -See how the foreign key is defined on the owning side of the -relation, the table ``Cart``. +We had a choice of sides on which to place the ``mappedBy`` attribute. Because it +is on the ``Cart``, that is the owning side of the relation, and thus holds the +foreign key. One-To-One, Self-referencing ---------------------------- @@ -294,15 +300,16 @@ With the generated MySQL Schema: One-To-Many, Bidirectional -------------------------- -A one-to-many association has to be bidirectional, unless you are using an -additional join-table. This is necessary, because of the foreign key -in a one-to-many association being defined on the "many" side. Doctrine -needs a many-to-one association that defines the mapping of this -foreign key. +A one-to-many association has to be bidirectional, unless you are using a +join table. This is because the many side in a one-to-many association holds +the foreign key, making it the owning side. Doctrine needs the many side +defined in order to understand the association. This bidirectional mapping requires the ``mappedBy`` attribute on the -``OneToMany`` association and the ``inversedBy`` attribute on the ``ManyToOne`` -association. +"one" side and the "inversedBy" attribute on the "many" side. + +This means there is no difference between a bidirectional one-to-many and a +bidirectional many-to-one. .. configuration-block:: @@ -754,14 +761,14 @@ one is bidirectional. The MySQL schema is exactly the same as for the Many-To-Many uni-directional case above. -Owning and Inverse Side on a ManyToMany association +Owning and Inverse Side on a ManyToMany Association ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ For Many-To-Many associations you can chose which entity is the owning and which the inverse side. There is a very simple semantic rule to decide which side is more suitable to be the owning side -from a developers perspective. You only have to ask yourself, which -entity is responsible for the connection management and pick that +from a developers perspective. You only have to ask yourself which +entity is responsible for the connection management, and pick that as the owning side. Take an example of two entities ``Article`` and ``Tag``. Whenever @@ -769,7 +776,7 @@ you want to connect an Article to a Tag and vice-versa, it is mostly the Article that is responsible for this relation. Whenever you add a new article, you want to connect it with existing or new tags. Your create Article form will probably support this notion -and allow to specify the tags directly. This is why you should pick +and allow specifying the tags directly. This is why you should pick the Article as owning side, as it makes the code more understandable: @@ -883,14 +890,14 @@ As an example, consider this mapping: .. code-block:: php - + @@ -899,8 +906,8 @@ As an example, consider this mapping: Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment This is essentially the same as the following, more verbose, mapping: @@ -911,17 +918,17 @@ mapping: - - + + @@ -931,10 +938,10 @@ mapping: Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment joinColumn: - name: shipping_id + name: shipment_id referencedColumnName: id The @JoinTable definition used for many-to-many mappings has From 75821e75f502933bb61678b8b6ca10a4cbc8da7f Mon Sep 17 00:00:00 2001 From: Greg Bell Date: Sun, 21 May 2017 14:10:38 +1000 Subject: [PATCH 032/124] Clarify English and a few concepts - Globally change 'Shipping' to 'Shipment' - shipment is a noun and thus a clearer name for an object. - Move definition of unidirectional from example to the top of the document. - Explain inversedBy and mappedBy the first time they are used. - Clarify some ownership and bidirectionality text. - Minor English and punctuation fixes. --- docs/en/reference/association-mapping.rst | 91 ++++++++++++----------- 1 file changed, 49 insertions(+), 42 deletions(-) diff --git a/docs/en/reference/association-mapping.rst b/docs/en/reference/association-mapping.rst index a1a9f83a8..b1cfa22c8 100644 --- a/docs/en/reference/association-mapping.rst +++ b/docs/en/reference/association-mapping.rst @@ -16,6 +16,9 @@ This chapter is split into three different sections. - :ref:`association_mapping_defaults` are explained that simplify the use-case examples. - :ref:`collections` are introduced that contain entities in associations. +An association is considered to be unidirectional if only one side of the association has +a property referring to the other side. + To gain a full understanding of associations you should also read about :doc:`owning and inverse sides of associations ` @@ -96,9 +99,7 @@ One-To-One, Unidirectional -------------------------- Here is an example of a one-to-one association with a ``Product`` entity that -references one ``Shipping`` entity. The ``Shipping`` does not reference back to -the ``Product`` so that the reference is said to be unidirectional, in one -direction only. +references one ``Shipment`` entity. .. configuration-block:: @@ -111,16 +112,16 @@ direction only. // ... /** - * @OneToOne(targetEntity="Shipping") - * @JoinColumn(name="shipping_id", referencedColumnName="id") + * @OneToOne(targetEntity="Shipment") + * @JoinColumn(name="shipment_id", referencedColumnName="id") */ - private $shipping; + private $shipment; // ... } /** @Entity */ - class Shipping + class Shipment { // ... } @@ -129,8 +130,8 @@ direction only. - - + + @@ -140,10 +141,10 @@ direction only. Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment joinColumn: - name: shipping_id + name: shipment_id referencedColumnName: id Note that the @JoinColumn is not really necessary in this example, @@ -155,15 +156,15 @@ Generated MySQL Schema: CREATE TABLE Product ( id INT AUTO_INCREMENT NOT NULL, - shipping_id INT DEFAULT NULL, - UNIQUE INDEX UNIQ_6FBC94267FE4B2B (shipping_id), + shipment_id INT DEFAULT NULL, + UNIQUE INDEX UNIQ_6FBC94267FE4B2B (shipment_id), PRIMARY KEY(id) ) ENGINE = InnoDB; - CREATE TABLE Shipping ( + CREATE TABLE Shipment ( id INT AUTO_INCREMENT NOT NULL, PRIMARY KEY(id) ) ENGINE = InnoDB; - ALTER TABLE Product ADD FOREIGN KEY (shipping_id) REFERENCES Shipping(id); + ALTER TABLE Product ADD FOREIGN KEY (shipment_id) REFERENCES Shipment(id); One-To-One, Bidirectional ------------------------- @@ -172,6 +173,10 @@ Here is a one-to-one relationship between a ``Customer`` and a ``Cart``. The ``Cart`` has a reference back to the ``Customer`` so it is bidirectional. +Here we see the ``mappedBy`` and ``inversedBy`` annotations for the first time. +They are used to tell Doctrine which property on the other side refers to the +object. + .. configuration-block:: .. code-block:: php @@ -251,8 +256,9 @@ Generated MySQL Schema: ) ENGINE = InnoDB; ALTER TABLE Cart ADD FOREIGN KEY (customer_id) REFERENCES Customer(id); -See how the foreign key is defined on the owning side of the -relation, the table ``Cart``. +We had a choice of sides on which to place the ``mappedBy`` attribute. Because it +is on the ``Cart``, that is the owning side of the relation, and thus holds the +foreign key. One-To-One, Self-referencing ---------------------------- @@ -294,15 +300,16 @@ With the generated MySQL Schema: One-To-Many, Bidirectional -------------------------- -A one-to-many association has to be bidirectional, unless you are using an -additional join-table. This is necessary, because of the foreign key -in a one-to-many association being defined on the "many" side. Doctrine -needs a many-to-one association that defines the mapping of this -foreign key. +A one-to-many association has to be bidirectional, unless you are using a +join table. This is because the many side in a one-to-many association holds +the foreign key, making it the owning side. Doctrine needs the many side +defined in order to understand the association. This bidirectional mapping requires the ``mappedBy`` attribute on the -``OneToMany`` association and the ``inversedBy`` attribute on the ``ManyToOne`` -association. +"one" side and the "inversedBy" attribute on the "many" side. + +This means there is no difference between a bidirectional one-to-many and a +bidirectional many-to-one. .. configuration-block:: @@ -754,14 +761,14 @@ one is bidirectional. The MySQL schema is exactly the same as for the Many-To-Many uni-directional case above. -Owning and Inverse Side on a ManyToMany association +Owning and Inverse Side on a ManyToMany Association ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ For Many-To-Many associations you can chose which entity is the owning and which the inverse side. There is a very simple semantic rule to decide which side is more suitable to be the owning side -from a developers perspective. You only have to ask yourself, which -entity is responsible for the connection management and pick that +from a developers perspective. You only have to ask yourself which +entity is responsible for the connection management, and pick that as the owning side. Take an example of two entities ``Article`` and ``Tag``. Whenever @@ -769,7 +776,7 @@ you want to connect an Article to a Tag and vice-versa, it is mostly the Article that is responsible for this relation. Whenever you add a new article, you want to connect it with existing or new tags. Your create Article form will probably support this notion -and allow to specify the tags directly. This is why you should pick +and allow specifying the tags directly. This is why you should pick the Article as owning side, as it makes the code more understandable: @@ -883,14 +890,14 @@ As an example, consider this mapping: .. code-block:: php - + @@ -899,8 +906,8 @@ As an example, consider this mapping: Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment This is essentially the same as the following, more verbose, mapping: @@ -911,17 +918,17 @@ mapping: - - + + @@ -931,10 +938,10 @@ mapping: Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment joinColumn: - name: shipping_id + name: shipment_id referencedColumnName: id The @JoinTable definition used for many-to-many mappings has From 46cebfb33ddb93e981837763be9467f6892576dc Mon Sep 17 00:00:00 2001 From: Greg Bell Date: Sun, 21 May 2017 16:39:06 +1000 Subject: [PATCH 033/124] Clarify concepts, fix minor English issues. - Globally change 'Shipping' to 'Shipment' - shipment is a noun and thus a clearer name for an object. - Add definition of unidirectional to the top of the document. - Explain inversedBy and mappedBy the first time they are used. - Clarify some ownership and bidirectionality text. - Minor English and punctuation fixes. --- docs/en/reference/association-mapping.rst | 95 ++++++++++++----------- 1 file changed, 51 insertions(+), 44 deletions(-) diff --git a/docs/en/reference/association-mapping.rst b/docs/en/reference/association-mapping.rst index 1b58baa0d..ca3b02f9e 100644 --- a/docs/en/reference/association-mapping.rst +++ b/docs/en/reference/association-mapping.rst @@ -24,6 +24,9 @@ One tip for working with relations is to read the relation from left to right, w See below for all the possible relations. +An association is considered to be unidirectional if only one side of the association has +a property referring to the other side. + To gain a full understanding of associations you should also read about :doc:`owning and inverse sides of associations ` @@ -105,9 +108,7 @@ One-To-One, Unidirectional -------------------------- Here is an example of a one-to-one association with a ``Product`` entity that -references one ``Shipping`` entity. The ``Shipping`` does not reference back to -the ``Product`` so that the reference is said to be unidirectional, in one -direction only. +references one ``Shipment`` entity. .. configuration-block:: @@ -120,17 +121,17 @@ direction only. // ... /** - * One Product has One Shipping. - * @OneToOne(targetEntity="Shipping") - * @JoinColumn(name="shipping_id", referencedColumnName="id") + * One Product has One Shipment. + * @OneToOne(targetEntity="Shipment") + * @JoinColumn(name="shipment_id", referencedColumnName="id") */ - private $shipping; + private $shipment; // ... } /** @Entity */ - class Shipping + class Shipment { // ... } @@ -139,8 +140,8 @@ direction only. - - + + @@ -150,10 +151,10 @@ direction only. Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment joinColumn: - name: shipping_id + name: shipment_id referencedColumnName: id Note that the @JoinColumn is not really necessary in this example, @@ -165,15 +166,15 @@ Generated MySQL Schema: CREATE TABLE Product ( id INT AUTO_INCREMENT NOT NULL, - shipping_id INT DEFAULT NULL, - UNIQUE INDEX UNIQ_6FBC94267FE4B2B (shipping_id), + shipment_id INT DEFAULT NULL, + UNIQUE INDEX UNIQ_6FBC94267FE4B2B (shipment_id), PRIMARY KEY(id) ) ENGINE = InnoDB; - CREATE TABLE Shipping ( + CREATE TABLE Shipment ( id INT AUTO_INCREMENT NOT NULL, PRIMARY KEY(id) ) ENGINE = InnoDB; - ALTER TABLE Product ADD FOREIGN KEY (shipping_id) REFERENCES Shipping(id); + ALTER TABLE Product ADD FOREIGN KEY (shipment_id) REFERENCES Shipment(id); One-To-One, Bidirectional ------------------------- @@ -182,6 +183,10 @@ Here is a one-to-one relationship between a ``Customer`` and a ``Cart``. The ``Cart`` has a reference back to the ``Customer`` so it is bidirectional. +Here we see the ``mappedBy`` and ``inversedBy`` annotations for the first time. +They are used to tell Doctrine which property on the other side refers to the +object. + .. configuration-block:: .. code-block:: php @@ -263,8 +268,9 @@ Generated MySQL Schema: ) ENGINE = InnoDB; ALTER TABLE Cart ADD FOREIGN KEY (customer_id) REFERENCES Customer(id); -See how the foreign key is defined on the owning side of the -relation, the table ``Cart``. +We had a choice of sides on which to place the ``mappedBy`` attribute. Because it +is on the ``Cart``, that is the owning side of the relation, and thus holds the +foreign key. One-To-One, Self-referencing ---------------------------- @@ -307,15 +313,16 @@ With the generated MySQL Schema: One-To-Many, Bidirectional -------------------------- -A one-to-many association has to be bidirectional, unless you are using an -additional join-table. This is necessary, because of the foreign key -in a one-to-many association being defined on the "many" side. Doctrine -needs a many-to-one association that defines the mapping of this -foreign key. +A one-to-many association has to be bidirectional, unless you are using a +join table. This is because the many side in a one-to-many association holds +the foreign key, making it the owning side. Doctrine needs the many side +defined in order to understand the association. This bidirectional mapping requires the ``mappedBy`` attribute on the -``OneToMany`` association and the ``inversedBy`` attribute on the ``ManyToOne`` -association. +"one" side and the ``inversedBy`` attribute on the "many" side. + +This means there is no difference between a bidirectional one-to-many and a +bidirectional many-to-one. .. configuration-block:: @@ -775,14 +782,14 @@ one is bidirectional. The MySQL schema is exactly the same as for the Many-To-Many uni-directional case above. -Owning and Inverse Side on a ManyToMany association +Owning and Inverse Side on a ManyToMany Association ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ For Many-To-Many associations you can chose which entity is the owning and which the inverse side. There is a very simple semantic rule to decide which side is more suitable to be the owning side -from a developers perspective. You only have to ask yourself, which -entity is responsible for the connection management and pick that +from a developers perspective. You only have to ask yourself which +entity is responsible for the connection management, and pick that as the owning side. Take an example of two entities ``Article`` and ``Tag``. Whenever @@ -790,7 +797,7 @@ you want to connect an Article to a Tag and vice-versa, it is mostly the Article that is responsible for this relation. Whenever you add a new article, you want to connect it with existing or new tags. Your create Article form will probably support this notion -and allow to specify the tags directly. This is why you should pick +and allow specifying the tags directly. This is why you should pick the Article as owning side, as it makes the code more understandable: @@ -906,14 +913,14 @@ As an example, consider this mapping: .. code-block:: php - + @@ -922,8 +929,8 @@ As an example, consider this mapping: Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment This is essentially the same as the following, more verbose, mapping: @@ -934,18 +941,18 @@ mapping: - - + + @@ -955,10 +962,10 @@ mapping: Product: type: entity oneToOne: - shipping: - targetEntity: Shipping + shipment: + targetEntity: Shipment joinColumn: - name: shipping_id + name: shipment_id referencedColumnName: id The @JoinTable definition used for many-to-many mappings has From f304685c6887a58a1236d48524724a67301dbef9 Mon Sep 17 00:00:00 2001 From: Maciej Kosiedowski Date: Mon, 22 May 2017 14:40:12 +0200 Subject: [PATCH 034/124] Fix #6460 - \Doctrine\ORM\Mapping\ClassMetadataInfo::hasField should return true for embedded fields --- .../ORM/Mapping/ClassMetadataInfo.php | 2 +- .../ORM/Functional/Ticket/DDC6460Test.php | 100 ++++++++++++++++++ 2 files changed, 101 insertions(+), 1 deletion(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index f265814b1..75b528175 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1852,7 +1852,7 @@ class ClassMetadataInfo implements ClassMetadata */ public function hasField($fieldName) { - return isset($this->fieldMappings[$fieldName]); + return isset($this->fieldMappings[$fieldName]) || isset($this->embeddedClasses[$fieldName]); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php new file mode 100644 index 000000000..d50e2dbda --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php @@ -0,0 +1,100 @@ +_schemaTool->createSchema( + [ + $this->_em->getClassMetadata(DDC6460Entity::class), + $this->_em->getClassMetadata(DDC6460ParentEntity::class), + ] + ); + } catch (\Exception $e) { + } + } + + public function testInlineEmbeddable() + { + $isFieldMapped = $this->_em + ->getClassMetadata(DDC6460Entity::class) + ->hasField('embedded'); + + $this->assertTrue($isFieldMapped); + } + + public function testInlineEmbeddableProxyInitialization() + { + $entity = new DDC6460Entity(); + $entity->id = 1; + $entity->embedded = new DDC6460Embeddable(); + $entity->embedded->field = 'test'; + $this->_em->persist($entity); + $this->_em->flush(); + + $second = new DDC6460ParentEntity(); + $second->id = 1; + $second->lazyLoaded = $entity; + $this->_em->persist($second); + $this->_em->flush(); + + $this->_em->clear(); + + $proxy = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1); + + $this->assertNotNull($proxy->lazyLoaded->embedded); + } +} + +/** + * @Embeddable() + */ +class DDC6460Embeddable +{ + /** @Column(type="string") */ + public $field; +} + +/** + * @Entity() + */ +class DDC6460Entity +{ + /** + * @Id + * @GeneratedValue(strategy = "NONE") + * @Column(type = "integer") + */ + public $id; + + /** @Embedded(class = "DDC6460Embeddable") */ + public $embedded; +} + +/** + * @Entity() + */ +class DDC6460ParentEntity +{ + /** + * @Id + * @GeneratedValue(strategy = "NONE") + * @Column(type = "integer") + */ + public $id; + + /** @ManyToOne(targetEntity = "DDC6460Entity", fetch="EXTRA_LAZY") */ + public $lazyLoaded; +} From 76f0fe45af6568b6d862a7bd06f153f066495f2d Mon Sep 17 00:00:00 2001 From: Maciej Kosiedowski Date: Mon, 22 May 2017 15:52:19 +0200 Subject: [PATCH 035/124] fixes in tests --- .../ORM/Functional/Ticket/DDC6460Test.php | 27 +++++++++++++------ .../Tests/ORM/Mapping/ClassMetadataTest.php | 18 +++++++++++++ 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php index d50e2dbda..9868c7d1c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php @@ -2,12 +2,14 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\DBAL\Schema\SchemaException; use Doctrine\ORM\Mapping\Column; use Doctrine\ORM\Mapping\Embeddable; use Doctrine\ORM\Mapping\Entity; use Doctrine\ORM\Mapping\Id; use Doctrine\ORM\Mapping\GeneratedValue; use Doctrine\ORM\Mapping\ManyToOne; +use Doctrine\ORM\Proxy\Proxy; class DDC6460Test extends \Doctrine\Tests\OrmFunctionalTestCase { @@ -16,16 +18,19 @@ class DDC6460Test extends \Doctrine\Tests\OrmFunctionalTestCase parent::setUp(); try { - $this->_schemaTool->createSchema( + $this->setUpEntitySchema( [ - $this->_em->getClassMetadata(DDC6460Entity::class), - $this->_em->getClassMetadata(DDC6460ParentEntity::class), + DDC6460Entity::class, + DDC6460ParentEntity::class, ] ); - } catch (\Exception $e) { + } catch (SchemaException $e) { } } + /** + * @group DDC-6460 + */ public function testInlineEmbeddable() { $isFieldMapped = $this->_em @@ -35,6 +40,9 @@ class DDC6460Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertTrue($isFieldMapped); } + /** + * @group DDC-6460 + */ public function testInlineEmbeddableProxyInitialization() { $entity = new DDC6460Entity(); @@ -42,7 +50,6 @@ class DDC6460Test extends \Doctrine\Tests\OrmFunctionalTestCase $entity->embedded = new DDC6460Embeddable(); $entity->embedded->field = 'test'; $this->_em->persist($entity); - $this->_em->flush(); $second = new DDC6460ParentEntity(); $second->id = 1; @@ -52,9 +59,13 @@ class DDC6460Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $proxy = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1); + $secondEntityWithLazyParameter = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1); - $this->assertNotNull($proxy->lazyLoaded->embedded); + $this->assertInstanceOf(Proxy::class, $secondEntityWithLazyParameter->lazyLoaded); + $this->assertInstanceOf(DDC6460Entity::class, $secondEntityWithLazyParameter->lazyLoaded); + $this->assertFalse($secondEntityWithLazyParameter->lazyLoaded->__isInitialized()); + $this->assertEquals($secondEntityWithLazyParameter->lazyLoaded->embedded, $entity->embedded); + $this->assertTrue($secondEntityWithLazyParameter->lazyLoaded->__isInitialized()); } } @@ -95,6 +106,6 @@ class DDC6460ParentEntity */ public $id; - /** @ManyToOne(targetEntity = "DDC6460Entity", fetch="EXTRA_LAZY") */ + /** @ManyToOne(targetEntity = "DDC6460Entity", fetch="EXTRA_LAZY", cascade={"persist"}) */ public $lazyLoaded; } diff --git a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 734ea8547..24d9559f7 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -1269,6 +1269,24 @@ class ClassMetadataTest extends OrmTestCase self::assertSame(['foo', 'baz'], $metadata->getColumnNames(['status', 'name'])); } + + /** + * @group DDC-6460 + */ + public function testInlineEmbeddable() + { + $classMetadata = new ClassMetadata(TestEntity1::class); + + $classMetadata->mapEmbedded( + [ + 'fieldName' => 'test', + 'class' => TestEntity1::class, + 'columnPrefix' => false, + ] + ); + + $this->assertTrue($classMetadata->hasField('test')); + } } /** From db528a44b14e76751c41232f81601cfe8e263ad9 Mon Sep 17 00:00:00 2001 From: Franck Magnan Date: Tue, 23 May 2017 15:24:24 +0200 Subject: [PATCH 036/124] Update QueryBuilder.php Hello, thank you very much for your work, it's awesome! I found a minor error in PHPDOC for method setParameter. Argument "type" can be a string or null but can be also an int if it comes from \PDO::PARAM_*. So I've changed typehint "string" into "mixed". --- 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 70b55f17d..894fbc32f 100644 --- a/lib/Doctrine/ORM/QueryBuilder.php +++ b/lib/Doctrine/ORM/QueryBuilder.php @@ -526,7 +526,7 @@ class QueryBuilder * * @param string|integer $key The parameter position or name. * @param mixed $value The parameter value. - * @param string|null $type PDO::PARAM_* or \Doctrine\DBAL\Types\Type::* constant + * @param string|integer|null $type PDO::PARAM_* or \Doctrine\DBAL\Types\Type::* constant * * @return self */ From f18e1789608ee24aa130e32f7db98a6e25f60394 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 30 May 2017 12:51:51 +0200 Subject: [PATCH 037/124] Fix wrong YAML mapping We had duplicated keys and that's no longer valid on symfony/yaml 3.3. --- .../ORM/Mapping/yaml/Doctrine.Tests.Models.CMS.CmsUser.dcm.yml | 3 +-- .../yaml/Doctrine.Tests.Models.Company.CompanyPerson.dcm.yml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.CMS.CmsUser.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.CMS.CmsUser.dcm.yml index 3a03dd6c3..329e3d061 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.CMS.CmsUser.dcm.yml +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.CMS.CmsUser.dcm.yml @@ -135,7 +135,6 @@ Doctrine\Tests\Models\CMS\CmsUser: name: address_id referencedColumnName: id cascade: [ persist ] - oneToOne: email: targetEntity: CmsEmail orphanRemoval: true @@ -155,4 +154,4 @@ Doctrine\Tests\Models\CMS\CmsUser: inverseJoinColumns: group_id: referencedColumnName: id - cascade: [ persist , detach, merge] \ No newline at end of file + cascade: [ persist , detach, merge] diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Company.CompanyPerson.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Company.CompanyPerson.dcm.yml index 26846c5de..28eec43e3 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Company.CompanyPerson.dcm.yml +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.Company.CompanyPerson.dcm.yml @@ -52,7 +52,6 @@ Doctrine\Tests\Models\Company\CompanyPerson: name: address_id referencedColumnName: id cascade: [ persist ] - oneToOne: email: targetEntity: CmsEmail orphanRemoval: true @@ -72,4 +71,4 @@ Doctrine\Tests\Models\Company\CompanyPerson: inverseJoinColumns: group_id: referencedColumnName: id - cascade: [ persist , detach, merge] \ No newline at end of file + cascade: [ persist , detach, merge] From f9062d9931938222d6f50832b02b75131dfd03e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 30 May 2017 12:53:07 +0200 Subject: [PATCH 038/124] Force YAML parser to convert keys to string Since Symfony 3.3 implicit conversion is not enabled by default so we need to pass that flag manually. Related to: https://github.com/symfony/symfony/pull/21774 --- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 8793c070b..5161ed0f0 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -800,6 +800,10 @@ class YamlDriver extends FileDriver */ protected function loadMappingFile($file) { + if (defined(Yaml::class . '::PARSE_KEYS_AS_STRINGS')) { + return Yaml::parse(file_get_contents($file), Yaml::PARSE_KEYS_AS_STRINGS); + } + return Yaml::parse(file_get_contents($file)); } } From 92476b5953185b640ee6d4959f9568912c271305 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 16 Jul 2016 12:12:33 +0200 Subject: [PATCH 039/124] #5934 - add `fetch` option to `AssociationOverride` in order to override fetch strategy for subclasses of entities --- docs/en/reference/inheritance-mapping.rst | 1 + doctrine-mapping.xsd | 1 + .../ORM/Mapping/AssociationOverride.php | 9 ++++ .../ORM/Mapping/ClassMetadataInfo.php | 4 ++ .../ORM/Mapping/Driver/AnnotationDriver.php | 5 ++ lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 5 ++ .../ORM/Mapping/Driver/YamlDriver.php | 5 ++ .../Models/DDC5934/DDC5934BaseContract.php | 53 +++++++++++++++++++ .../Tests/Models/DDC5934/DDC5934Contract.php | 24 +++++++++ .../Tests/Models/DDC5934/DDC5934Member.php | 24 +++++++++ .../ORM/Mapping/AbstractMappingDriverTest.php | 13 +++++ ...sts.Models.DDC5934.DDC5934BaseContract.php | 17 ++++++ ...e.Tests.Models.DDC5934.DDC5934Contract.php | 7 +++ ...Models.DDC5934.DDC5934BaseContract.dcm.xml | 15 ++++++ ...sts.Models.DDC5934.DDC5934Contract.dcm.xml | 13 +++++ ...Models.DDC5934.DDC5934BaseContract.dcm.yml | 12 +++++ ...sts.Models.DDC5934.DDC5934Contract.dcm.yml | 5 ++ 17 files changed, 213 insertions(+) create mode 100644 tests/Doctrine/Tests/Models/DDC5934/DDC5934BaseContract.php create mode 100644 tests/Doctrine/Tests/Models/DDC5934/DDC5934Contract.php create mode 100644 tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php create mode 100644 tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.php create mode 100644 tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934Contract.php create mode 100644 tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.xml create mode 100644 tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.xml create mode 100644 tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.yml create mode 100644 tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.yml diff --git a/docs/en/reference/inheritance-mapping.rst b/docs/en/reference/inheritance-mapping.rst index 9e895fcbc..2063624fe 100644 --- a/docs/en/reference/inheritance-mapping.rst +++ b/docs/en/reference/inheritance-mapping.rst @@ -455,6 +455,7 @@ Things to note: - The association type *CANNOT* be changed. - The override could redefine the joinTables or joinColumns depending on the association type. - The override could redefine inversedBy to reference more than one extended entity. +- The override could redefine fetch to modify the fetch strategy of the extended entity. Attribute Override ~~~~~~~~~~~~~~~~~~~~ diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index bb8624190..18fb6838a 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -567,6 +567,7 @@ + diff --git a/lib/Doctrine/ORM/Mapping/AssociationOverride.php b/lib/Doctrine/ORM/Mapping/AssociationOverride.php index 83cff4179..e208b1622 100644 --- a/lib/Doctrine/ORM/Mapping/AssociationOverride.php +++ b/lib/Doctrine/ORM/Mapping/AssociationOverride.php @@ -57,4 +57,13 @@ final class AssociationOverride implements Annotation * @var string */ public $inversedBy; + + /** + * The fetching strategy to use for the association. + * + * @var string + * + * @Enum({"LAZY", "EAGER", "EXTRA_LAZY"}) + */ + public $fetch; } diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index f265814b1..e3da55bdf 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -2153,6 +2153,10 @@ class ClassMetadataInfo implements ClassMetadata $mapping['joinTable'] = $overrideMapping['joinTable']; } + if (isset($overrideMapping['fetch'])) { + $mapping['fetch'] = $overrideMapping['fetch']; + } + $mapping['joinColumnFieldNames'] = null; $mapping['joinTableColumns'] = null; $mapping['sourceToTargetKeyColumns'] = null; diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index b5a5b714c..59730f6b2 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -470,6 +470,11 @@ class AnnotationDriver extends AbstractAnnotationDriver $override['inversedBy'] = $associationOverride->inversedBy; } + // Check for `fetch` + if ($associationOverride->fetch) { + $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverride->fetch); + } + $metadata->setAssociationOverride($fieldName, $override); } } diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index d7099663f..0d51c4c92 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -621,6 +621,11 @@ class XmlDriver extends FileDriver $override['inversedBy'] = (string) $overrideElement->{'inversed-by'}['name']; } + // Check for `fetch` + if (isset($overrideElement['fetch'])) { + $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $overrideElement['fetch']); + } + $metadata->setAssociationOverride($fieldName, $override); } } diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 5161ed0f0..394722847 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -622,6 +622,11 @@ class YamlDriver extends FileDriver $override['inversedBy'] = (string) $associationOverrideElement['inversedBy']; } + // Check for `fetch` + if (isset($associationOverrideElement['fetch'])) { + $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverrideElement['fetch']); + } + $metadata->setAssociationOverride($fieldName, $override); } } diff --git a/tests/Doctrine/Tests/Models/DDC5934/DDC5934BaseContract.php b/tests/Doctrine/Tests/Models/DDC5934/DDC5934BaseContract.php new file mode 100644 index 000000000..84970c270 --- /dev/null +++ b/tests/Doctrine/Tests/Models/DDC5934/DDC5934BaseContract.php @@ -0,0 +1,53 @@ +members = new ArrayCollection(); + } + + public static function loadMetadata(ClassMetadata $metadata) + { + $metadata->mapField([ + 'id' => true, + 'fieldName' => 'id', + 'type' => 'integer', + 'columnName' => 'id', + ]); + + $metadata->mapManyToMany([ + 'fieldName' => 'members', + 'targetEntity' => 'DDC5934Member', + ]); + + $metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO); + } +} diff --git a/tests/Doctrine/Tests/Models/DDC5934/DDC5934Contract.php b/tests/Doctrine/Tests/Models/DDC5934/DDC5934Contract.php new file mode 100644 index 000000000..e26c4d665 --- /dev/null +++ b/tests/Doctrine/Tests/Models/DDC5934/DDC5934Contract.php @@ -0,0 +1,24 @@ +setAssociationOverride('members', [ + 'fetch' => ClassMetadata::FETCH_EXTRA_LAZY, + ]); + } +} diff --git a/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php b/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php new file mode 100644 index 000000000..ff85d6c66 --- /dev/null +++ b/tests/Doctrine/Tests/Models/DDC5934/DDC5934Member.php @@ -0,0 +1,24 @@ +contracts = new ArrayCollection(); + } +} diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index 4e19c987c..f857bed45 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -28,6 +28,7 @@ use Doctrine\Tests\Models\DDC1476\DDC1476EntityWithDefaultFieldType; use Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable; use Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName; use Doctrine\Tests\Models\DDC3579\DDC3579Admin; +use Doctrine\Tests\Models\DDC5934\DDC5934Contract; use Doctrine\Tests\Models\DDC869\DDC869ChequePayment; use Doctrine\Tests\Models\DDC869\DDC869CreditCardPayment; use Doctrine\Tests\Models\DDC869\DDC869PaymentRepository; @@ -816,6 +817,18 @@ abstract class AbstractMappingDriverTest extends OrmTestCase $this->assertEquals('admins', $adminGroups['inversedBy']); } + /** + * @group DDC-5934 + */ + public function testFetchOverrideMapping() + { + // check override metadata + $contractMetadata = $this->createClassMetadataFactory()->getMetadataFor(DDC5934Contract::class); + + $this->assertArrayHasKey('members', $contractMetadata->associationMappings); + $this->assertSame(ClassMetadata::FETCH_EXTRA_LAZY, $contractMetadata->associationMappings['members']['fetch']); + } + /** * @group DDC-964 */ diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.php new file mode 100644 index 000000000..fca4bb118 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.php @@ -0,0 +1,17 @@ +mapField([ + 'id' => true, + 'fieldName' => 'id', + 'type' => 'integer', + 'columnName' => 'id', +]); + +$metadata->mapManyToMany([ + 'fieldName' => 'members', + 'targetEntity' => 'DDC5934Member', +]); + +$metadata->setIdGeneratorType(ClassMetadata::GENERATOR_TYPE_AUTO); diff --git a/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934Contract.php b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934Contract.php new file mode 100644 index 000000000..3ecf178a6 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC5934.DDC5934Contract.php @@ -0,0 +1,7 @@ +setAssociationOverride('members', [ + 'fetch' => ClassMetadata::FETCH_EXTRA_LAZY, +]); diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.xml new file mode 100644 index 000000000..78a5af6b8 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.xml b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.xml new file mode 100644 index 000000000..bba41b94e --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.xml @@ -0,0 +1,13 @@ + + + + + + + + + + diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.yml new file mode 100644 index 000000000..2044c9be5 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934BaseContract.dcm.yml @@ -0,0 +1,12 @@ +Doctrine\Tests\Models\DDC5934\DDC5934BaseContract: + type: mappedSuperclass + id: + id: + type: integer + column: id + generator: + strategy: AUTO + manyToMany: + members: + targetEntity: DDC5934Member + inversedBy: contract diff --git a/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.yml b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.yml new file mode 100644 index 000000000..45ba14585 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC5934.DDC5934Contract.dcm.yml @@ -0,0 +1,5 @@ +Doctrine\Tests\Models\DDC5934\DDC5934Contract: + type: entity + associationOverride: + members: + fetch: EXTRA_LAZY From fcfaa13df9aada8321236a1459b58cc0eeabdf7b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 31 May 2017 14:52:29 +0200 Subject: [PATCH 040/124] #5934 - #5938 - use `ClassMetadata::class` expression rather than FQCN in config drivers as of @Ocramius's review --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 2 +- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 2 +- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 2 +- 3 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 59730f6b2..d916bafb3 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -472,7 +472,7 @@ class AnnotationDriver extends AbstractAnnotationDriver // Check for `fetch` if ($associationOverride->fetch) { - $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverride->fetch); + $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverride->fetch); } $metadata->setAssociationOverride($fieldName, $override); diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index 0d51c4c92..2ca9190bc 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -623,7 +623,7 @@ class XmlDriver extends FileDriver // Check for `fetch` if (isset($overrideElement['fetch'])) { - $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . (string) $overrideElement['fetch']); + $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . (string) $overrideElement['fetch']); } $metadata->setAssociationOverride($fieldName, $override); diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 394722847..d65481be4 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -624,7 +624,7 @@ class YamlDriver extends FileDriver // Check for `fetch` if (isset($associationOverrideElement['fetch'])) { - $override['fetch'] = constant('Doctrine\ORM\Mapping\ClassMetadata::FETCH_' . $associationOverrideElement['fetch']); + $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverrideElement['fetch']); } $metadata->setAssociationOverride($fieldName, $override); From 49bb34553316f34181a147b36f89192074345e30 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 31 May 2017 15:01:25 +0200 Subject: [PATCH 041/124] #5934 - #5938 - fix accidentally introduced regression with wrong target of ::class expression --- lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php | 2 +- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 3 ++- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index d916bafb3..d59fd3bb7 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php @@ -472,7 +472,7 @@ class AnnotationDriver extends AbstractAnnotationDriver // Check for `fetch` if ($associationOverride->fetch) { - $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverride->fetch); + $override['fetch'] = constant(Mapping\ClassMetadata::class . '::FETCH_' . $associationOverride->fetch); } $metadata->setAssociationOverride($fieldName, $override); diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index 2ca9190bc..603648ed5 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -24,6 +24,7 @@ use Doctrine\Common\Persistence\Mapping\Driver\FileDriver; use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder; use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\MappingException; +use Doctrine\ORM\Mapping\ClassMetadata as Metadata; /** * XmlDriver is a metadata driver that enables mapping through XML files. @@ -623,7 +624,7 @@ class XmlDriver extends FileDriver // Check for `fetch` if (isset($overrideElement['fetch'])) { - $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . (string) $overrideElement['fetch']); + $override['fetch'] = constant(Metadata::class . '::FETCH_' . (string) $overrideElement['fetch']); } $metadata->setAssociationOverride($fieldName, $override); diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index d65481be4..0908a2878 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -22,6 +22,7 @@ namespace Doctrine\ORM\Mapping\Driver; use Doctrine\Common\Persistence\Mapping\ClassMetadata; use Doctrine\ORM\Mapping\Builder\EntityListenerBuilder; use Doctrine\Common\Persistence\Mapping\Driver\FileDriver; +use Doctrine\ORM\Mapping\ClassMetadata as Metadata; use Doctrine\ORM\Mapping\MappingException; use Symfony\Component\Yaml\Yaml; @@ -624,7 +625,7 @@ class YamlDriver extends FileDriver // Check for `fetch` if (isset($associationOverrideElement['fetch'])) { - $override['fetch'] = constant(ClassMetadata::class . '::FETCH_' . $associationOverrideElement['fetch']); + $override['fetch'] = constant(Metadata::class . '::FETCH_' . $associationOverrideElement['fetch']); } $metadata->setAssociationOverride($fieldName, $override); From 23593601492f6cee39f0fd7c5b68424a91539b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 11:25:10 +0200 Subject: [PATCH 042/124] Disable XDebug based on PHPUnit flags instead Then we don't need to keep changing versions information. --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5509e3970..fab92a629 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ env: before_script: - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi - - if [[ $TRAVIS_PHP_VERSION -lt '7.0' && $TRAVIS_PHP_VERSION != 'hhv*' ]]; then phpenv config-rm xdebug.ini; fi + - if [[ "$PHPUNIT_FLAGS" == "" ]]; then phpenv config-rm xdebug.ini; fi - composer self-update - composer install --prefer-source - if [ "$DEPENDENCIES" != "low" ]; then composer update; fi; From 1559db7ac17f16c3cb07de7ca4866cda096a19b0 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Thu, 8 Jun 2017 16:25:03 +0100 Subject: [PATCH 043/124] Update HydratorMockStatement to implement the right interface. --- tests/Doctrine/Tests/Mocks/HydratorMockStatement.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index ca0df22fe..f2a031488 100644 --- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php +++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php @@ -30,13 +30,12 @@ class HydratorMockStatement implements \IteratorAggregate, Statement /** * Fetches all rows from the result set. * - * @param int|null $fetchStyle - * @param int|null $columnIndex + * @param null $fetchMode + * @param null $fetchArgument * @param array|null $ctorArgs - * * @return array */ - public function fetchAll($fetchStyle = null, $columnIndex = null, array $ctorArgs = null) + public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = null) { return $this->_resultSet; } @@ -55,7 +54,7 @@ class HydratorMockStatement implements \IteratorAggregate, Statement /** * {@inheritdoc} */ - public function fetch($fetchStyle = null) + public function fetch($fetchStyle = null, $cursorOrientation = \PDO::FETCH_ORI_NEXT, $cursorOffset = 0) { $current = current($this->_resultSet); next($this->_resultSet); @@ -108,8 +107,9 @@ class HydratorMockStatement implements \IteratorAggregate, Statement /** * {@inheritdoc} */ - public function execute($params = []) + public function execute($params = null) { + } /** From a59367423adb725ea85f9f5adb0bba6dfed529f7 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Thu, 8 Jun 2017 16:25:57 +0100 Subject: [PATCH 044/124] Update StatementMock to implement the right interface. --- tests/Doctrine/Tests/Mocks/StatementMock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/StatementMock.php b/tests/Doctrine/Tests/Mocks/StatementMock.php index 8107ff1be..efba7d841 100644 --- a/tests/Doctrine/Tests/Mocks/StatementMock.php +++ b/tests/Doctrine/Tests/Mocks/StatementMock.php @@ -75,14 +75,14 @@ class StatementMock implements \IteratorAggregate, Statement /** * {@inheritdoc} */ - public function fetch($fetchStyle = null) + public function fetch($fetchMode = null, $cursorOrientation = \PDO::FETCH_ORI_NEXT, $cursorOffset = 0) { } /** * {@inheritdoc} */ - public function fetchAll($fetchStyle = null) + public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = null) { } From 633b821e18d62cc94ebd68c2038acc82ac2a5311 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Thu, 8 Jun 2017 16:27:28 +0100 Subject: [PATCH 045/124] Update StatementArrayMock to implement the right interface. --- tests/Doctrine/Tests/Mocks/StatementArrayMock.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/StatementArrayMock.php b/tests/Doctrine/Tests/Mocks/StatementArrayMock.php index 9ef37da46..ed6ea4fdf 100644 --- a/tests/Doctrine/Tests/Mocks/StatementArrayMock.php +++ b/tests/Doctrine/Tests/Mocks/StatementArrayMock.php @@ -34,12 +34,12 @@ class StatementArrayMock extends StatementMock } } - public function fetchAll($fetchStyle = null) + public function fetchAll($fetchMode = null, $fetchArgument = null, $ctorArgs = null) { return $this->_result; } - public function fetch($fetchStyle = null) + public function fetch($fetchMode = null, $cursorOrientation = \PDO::FETCH_ORI_NEXT, $cursorOffset = 0) { $current = current($this->_result); next($this->_result); From 9f13557d144dc089ea9e9b41c8bbcc585c5bea8b Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Thu, 8 Jun 2017 16:42:11 +0100 Subject: [PATCH 046/124] Be consistent with the rest of the file. --- tests/Doctrine/Tests/Mocks/HydratorMockStatement.php | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index f2a031488..3110dbce6 100644 --- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php +++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php @@ -109,7 +109,6 @@ class HydratorMockStatement implements \IteratorAggregate, Statement */ public function execute($params = null) { - } /** From b42c36f4720b3ccfac6b40e1d7566a468b0ae6a3 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Thu, 8 Jun 2017 16:43:18 +0100 Subject: [PATCH 047/124] Update phpDoc --- tests/Doctrine/Tests/Mocks/HydratorMockStatement.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index 3110dbce6..4f6df40e5 100644 --- a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php +++ b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php @@ -30,8 +30,8 @@ class HydratorMockStatement implements \IteratorAggregate, Statement /** * Fetches all rows from the result set. * - * @param null $fetchMode - * @param null $fetchArgument + * @param int|null $fetchMode + * @param int|null $fetchArgument * @param array|null $ctorArgs * @return array */ From 43009682a49c9fa7fe1bacabf22a7230aa524e1f Mon Sep 17 00:00:00 2001 From: Artem Stepin Date: Thu, 8 Jun 2017 22:04:07 +0200 Subject: [PATCH 048/124] minor code work: - method calls with incorrect case - removed unused imports - typos and some other minor code smells - documentation update (wrong return types etc. ) --- lib/Doctrine/ORM/AbstractQuery.php | 3 --- lib/Doctrine/ORM/Cache/DefaultCacheFactory.php | 1 - .../ORM/Cache/Region/DefaultMultiGetRegion.php | 1 - lib/Doctrine/ORM/EntityManager.php | 1 - .../ORM/Internal/Hydration/ObjectHydrator.php | 2 +- lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php | 4 ++-- lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php | 4 ++-- lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php | 2 +- lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php | 2 +- lib/Doctrine/ORM/Mapping/NamingStrategy.php | 10 +++++----- .../ORM/Persisters/Entity/BasicEntityPersister.php | 13 +++++++------ .../Persisters/Entity/JoinedSubclassPersister.php | 4 ++-- lib/Doctrine/ORM/Persisters/PersisterException.php | 3 +++ lib/Doctrine/ORM/Persisters/SqlValueVisitor.php | 4 ++-- lib/Doctrine/ORM/Query.php | 5 ++--- .../ORM/Query/AST/Functions/AbsFunction.php | 2 ++ .../ORM/Query/AST/Functions/BitAndFunction.php | 2 ++ .../ORM/Query/AST/Functions/BitOrFunction.php | 2 ++ .../ORM/Query/AST/Functions/ConcatFunction.php | 2 ++ .../Query/AST/Functions/CurrentDateFunction.php | 2 ++ .../Query/AST/Functions/CurrentTimeFunction.php | 2 ++ .../AST/Functions/CurrentTimestampFunction.php | 2 ++ .../ORM/Query/AST/Functions/DateAddFunction.php | 2 ++ .../ORM/Query/AST/Functions/DateDiffFunction.php | 2 ++ .../ORM/Query/AST/Functions/DateSubFunction.php | 1 + .../ORM/Query/AST/Functions/LengthFunction.php | 2 ++ .../ORM/Query/AST/Functions/LocateFunction.php | 2 ++ .../ORM/Query/AST/Functions/LowerFunction.php | 2 ++ .../ORM/Query/AST/Functions/ModFunction.php | 2 ++ .../ORM/Query/AST/Functions/SizeFunction.php | 2 ++ .../ORM/Query/AST/Functions/SqrtFunction.php | 2 ++ .../ORM/Query/AST/Functions/SubstringFunction.php | 2 ++ .../ORM/Query/AST/Functions/UpperFunction.php | 2 ++ lib/Doctrine/ORM/Query/Parser.php | 14 ++++++-------- lib/Doctrine/ORM/Query/SqlWalker.php | 6 +++--- .../Command/ConvertDoctrine1SchemaCommand.php | 1 - .../Console/Command/MappingDescribeCommand.php | 2 +- lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php | 4 ++-- .../ORM/Tools/Pagination/RowNumberOverFunction.php | 2 ++ .../ORM/Tools/ResolveTargetEntityListener.php | 2 +- lib/Doctrine/ORM/Tools/SchemaTool.php | 7 +++---- lib/Doctrine/ORM/Tools/SchemaValidator.php | 2 +- 42 files changed, 82 insertions(+), 52 deletions(-) diff --git a/lib/Doctrine/ORM/AbstractQuery.php b/lib/Doctrine/ORM/AbstractQuery.php index 0430a113f..ba013bbbb 100644 --- a/lib/Doctrine/ORM/AbstractQuery.php +++ b/lib/Doctrine/ORM/AbstractQuery.php @@ -27,9 +27,6 @@ use Doctrine\ORM\Query\Parameter; use Doctrine\ORM\Cache\QueryCacheKey; use Doctrine\DBAL\Cache\QueryCacheProfile; -use Doctrine\ORM\Cache; -use Doctrine\ORM\Query\ResultSetMapping; - /** * Base contract for ORM queries. Base class for Query and NativeQuery. * diff --git a/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php b/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php index 3bfccdf84..77a773a53 100644 --- a/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php +++ b/lib/Doctrine/ORM/Cache/DefaultCacheFactory.php @@ -30,7 +30,6 @@ use Doctrine\ORM\Cache\Persister\Collection\ReadWriteCachedCollectionPersister; use Doctrine\ORM\Cache\Persister\Entity\NonStrictReadWriteCachedEntityPersister; use Doctrine\ORM\Cache\Persister\Entity\ReadOnlyCachedEntityPersister; use Doctrine\ORM\Cache\Persister\Entity\ReadWriteCachedEntityPersister; -use Doctrine\ORM\Cache\Region; use Doctrine\ORM\Cache\Region\DefaultMultiGetRegion; use Doctrine\ORM\Cache\Region\DefaultRegion; use Doctrine\ORM\Cache\Region\FileLockRegion; diff --git a/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php b/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php index 1df073c3e..2cd94292b 100644 --- a/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php +++ b/lib/Doctrine/ORM/Cache/Region/DefaultMultiGetRegion.php @@ -21,7 +21,6 @@ namespace Doctrine\ORM\Cache\Region; use Doctrine\Common\Cache\MultiGetCache; -use Doctrine\ORM\Cache\Region; use Doctrine\ORM\Cache\CollectionCacheEntry; /** diff --git a/lib/Doctrine/ORM/EntityManager.php b/lib/Doctrine/ORM/EntityManager.php index 53573c25c..d4b032bfc 100644 --- a/lib/Doctrine/ORM/EntityManager.php +++ b/lib/Doctrine/ORM/EntityManager.php @@ -19,7 +19,6 @@ namespace Doctrine\ORM; -use Doctrine\ORM\Mapping\MappingException; use Exception; use Doctrine\Common\EventManager; use Doctrine\DBAL\Connection; diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index ef5e74371..42f599739 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php @@ -433,7 +433,7 @@ class ObjectHydrator extends AbstractHydrator if ( ! $reflFieldValue || isset($this->_hints[Query::HINT_REFRESH]) || ($reflFieldValue instanceof Proxy && !$reflFieldValue->__isInitialized__)) { // we only need to take action if this value is null, - // we refresh the entity or its an unitialized proxy. + // we refresh the entity or its an uninitialized proxy. if (isset($nonemptyComponents[$dqlAlias])) { $element = $this->getEntity($data, $dqlAlias); $reflField->setValue($parentObject, $element); diff --git a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php index 61328cdac..b5eebcdde 100644 --- a/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php +++ b/lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php @@ -1376,7 +1376,7 @@ class ClassMetadataInfo implements ClassMetadata * * @param array $mapping The field mapping to validate & complete. * - * @return array The validated and completed field mapping. + * @return void * * @throws MappingException */ @@ -2034,7 +2034,7 @@ class ClassMetadataInfo implements ClassMetadata * * @return \Doctrine\DBAL\Types\Type|string|null * - * @deprecated 3.0 remove this. this method is bogous and unreliable, since it cannot resolve the type of a column + * @deprecated 3.0 remove this. this method is bogus and unreliable, since it cannot resolve the type of a column * that is derived by a referenced field on a different entity. */ public function getTypeOfColumn($columnName) diff --git a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php index 41c740ec4..756399f6d 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php @@ -393,7 +393,7 @@ class DatabaseDriver implements MappingDriver 'fieldName' => $this->getFieldNameForColumn($tableName, $column->getName(), false), 'columnName' => $column->getName(), 'type' => $column->getType()->getName(), - 'nullable' => ( ! $column->getNotNull()), + 'nullable' => ( ! $column->getNotnull()), ]; // Type specific elements @@ -482,7 +482,7 @@ class DatabaseDriver implements MappingDriver } /** - * Retreive schema table definition foreign keys. + * Retrieve schema table definition foreign keys. * * @param \Doctrine\DBAL\Schema\Table $table * diff --git a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php index 603648ed5..39af412c9 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php @@ -166,7 +166,7 @@ class XmlDriver extends FileDriver $inheritanceType = (string) $xmlRoot['inheritance-type']; $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType)); - if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) { + if ($metadata->inheritanceType != Metadata::INHERITANCE_TYPE_NONE) { // Evaluate if (isset($xmlRoot->{'discriminator-column'})) { $discrColumn = $xmlRoot->{'discriminator-column'}; diff --git a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php index 0908a2878..c4fb45ece 100644 --- a/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php +++ b/lib/Doctrine/ORM/Mapping/Driver/YamlDriver.php @@ -175,7 +175,7 @@ class YamlDriver extends FileDriver if (isset($element['inheritanceType'])) { $metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . strtoupper($element['inheritanceType']))); - if ($metadata->inheritanceType != \Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_NONE) { + if ($metadata->inheritanceType != Metadata::INHERITANCE_TYPE_NONE) { // Evaluate discriminatorColumn if (isset($element['discriminatorColumn'])) { $discrColumn = $element['discriminatorColumn']; diff --git a/lib/Doctrine/ORM/Mapping/NamingStrategy.php b/lib/Doctrine/ORM/Mapping/NamingStrategy.php index 8845cb1ed..9960f949f 100644 --- a/lib/Doctrine/ORM/Mapping/NamingStrategy.php +++ b/lib/Doctrine/ORM/Mapping/NamingStrategy.php @@ -52,8 +52,10 @@ interface NamingStrategy /** * Returns a column name for an embedded property. * - * @param string $propertyName - * @param string $embeddedColumnName + * @param string $propertyName + * @param string $embeddedColumnName + * @param string $className + * @param string $embeddedClassName * * @return string */ @@ -70,12 +72,10 @@ interface NamingStrategy * Returns a join column name for a property. * * @param string $propertyName A property name. - * @param string|null $className The fully-qualified class name. - * This parameter is omitted from the signature due to BC * * @return string A join column name. */ - function joinColumnName($propertyName/*, $className = null*/); + function joinColumnName($propertyName); /** * Returns a join table name. diff --git a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index 28dc9179a..6af159fc7 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php @@ -1064,11 +1064,11 @@ class BasicEntityPersister implements EntityPersister switch ($lockMode) { case LockMode::PESSIMISTIC_READ: - $lockSql = ' ' . $this->platform->getReadLockSql(); + $lockSql = ' ' . $this->platform->getReadLockSQL(); break; case LockMode::PESSIMISTIC_WRITE: - $lockSql = ' ' . $this->platform->getWriteLockSql(); + $lockSql = ' ' . $this->platform->getWriteLockSQL(); break; } @@ -1520,12 +1520,12 @@ class BasicEntityPersister implements EntityPersister switch ($lockMode) { case LockMode::PESSIMISTIC_READ: - $lockSql = $this->platform->getReadLockSql(); + $lockSql = $this->platform->getReadLockSQL(); break; case LockMode::PESSIMISTIC_WRITE: - $lockSql = $this->platform->getWriteLockSql(); + $lockSql = $this->platform->getWriteLockSQL(); break; } @@ -1870,8 +1870,9 @@ class BasicEntityPersister implements EntityPersister /** * Infers field types to be used by parameter type casting. * - * @param string $field - * @param mixed $value + * @param string $field + * @param mixed $value + * @param ClassMetadata $class * * @return array * diff --git a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php index 6c09b604a..0be150689 100644 --- a/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php +++ b/lib/Doctrine/ORM/Persisters/Entity/JoinedSubclassPersister.php @@ -341,13 +341,13 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister switch ($lockMode) { case LockMode::PESSIMISTIC_READ: - $lockSql = ' ' . $this->platform->getReadLockSql(); + $lockSql = ' ' . $this->platform->getReadLockSQL(); break; case LockMode::PESSIMISTIC_WRITE: - $lockSql = ' ' . $this->platform->getWriteLockSql(); + $lockSql = ' ' . $this->platform->getWriteLockSQL(); break; } diff --git a/lib/Doctrine/ORM/Persisters/PersisterException.php b/lib/Doctrine/ORM/Persisters/PersisterException.php index 71fd0d179..09f73b21b 100644 --- a/lib/Doctrine/ORM/Persisters/PersisterException.php +++ b/lib/Doctrine/ORM/Persisters/PersisterException.php @@ -24,6 +24,9 @@ use Doctrine\ORM\ORMException; class PersisterException extends ORMException { /** + * @param string $class + * @param string $associationName + * * @return PersisterException */ static public function matchingAssocationFieldRequiresObject($class, $associationName) diff --git a/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php b/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php index c8df1919d..78fd0333b 100644 --- a/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php +++ b/lib/Doctrine/ORM/Persisters/SqlValueVisitor.php @@ -46,7 +46,7 @@ class SqlValueVisitor extends ExpressionVisitor * * @param \Doctrine\Common\Collections\Expr\Comparison $comparison * - * @return mixed + * @return void */ public function walkComparison(Comparison $comparison) { @@ -69,7 +69,7 @@ class SqlValueVisitor extends ExpressionVisitor * * @param \Doctrine\Common\Collections\Expr\CompositeExpression $expr * - * @return mixed + * @return void */ public function walkCompositeExpression(CompositeExpression $expr) { diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 6d874a8ad..385b8c8ea 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -19,7 +19,6 @@ namespace Doctrine\ORM; -use Doctrine\DBAL\Driver\Connection; use Doctrine\DBAL\LockMode; use Doctrine\ORM\Query\Exec\AbstractSqlExecutor; use Doctrine\ORM\Query\Parser; @@ -204,7 +203,7 @@ final class Query extends AbstractQuery */ public function getSQL() { - return $this->_parse()->getSQLExecutor()->getSQLStatements(); + return $this->_parse()->getSqlExecutor()->getSqlStatements(); } /** @@ -738,7 +737,7 @@ final class Query extends AbstractQuery ->getName(); return md5( - $this->getDql() . serialize($this->_hints) . + $this->getDQL() . serialize($this->_hints) . '&platform=' . $platform . ($this->_em->hasFilters() ? $this->_em->getFilters()->getHash() : '') . '&firstResult=' . $this->_firstResult . '&maxResult=' . $this->_maxResults . diff --git a/lib/Doctrine/ORM/Query/AST/Functions/AbsFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/AbsFunction.php index 8fade4c7a..4c6143558 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/AbsFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/AbsFunction.php @@ -41,6 +41,7 @@ class AbsFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -51,6 +52,7 @@ class AbsFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/BitAndFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/BitAndFunction.php index 3ea69c0c1..469a4b0a2 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/BitAndFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/BitAndFunction.php @@ -36,6 +36,7 @@ class BitAndFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -49,6 +50,7 @@ class BitAndFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/BitOrFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/BitOrFunction.php index 6b0d1eb4c..d3a3efc83 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/BitOrFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/BitOrFunction.php @@ -36,6 +36,7 @@ class BitOrFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -49,6 +50,7 @@ class BitOrFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php index 71da374df..b7c5ae13f 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/ConcatFunction.php @@ -42,6 +42,7 @@ class ConcatFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -58,6 +59,7 @@ class ConcatFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CurrentDateFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CurrentDateFunction.php index 8e8ce1c77..565b87581 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/CurrentDateFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/CurrentDateFunction.php @@ -36,6 +36,7 @@ class CurrentDateFunction extends FunctionNode { /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -44,6 +45,7 @@ class CurrentDateFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimeFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimeFunction.php index 4bab247c0..ec9ceb757 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimeFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimeFunction.php @@ -36,6 +36,7 @@ class CurrentTimeFunction extends FunctionNode { /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -44,6 +45,7 @@ class CurrentTimeFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimestampFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimestampFunction.php index 8a9b4185f..420307212 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimestampFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/CurrentTimestampFunction.php @@ -36,6 +36,7 @@ class CurrentTimestampFunction extends FunctionNode { /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -44,6 +45,7 @@ class CurrentTimestampFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php index 2a9aead98..859426f08 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/DateAddFunction.php @@ -41,6 +41,7 @@ class DateAddFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(SqlWalker $sqlWalker) { @@ -77,6 +78,7 @@ class DateAddFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php index a33c2d06f..53724825f 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/DateDiffFunction.php @@ -38,6 +38,7 @@ class DateDiffFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(SqlWalker $sqlWalker) { @@ -49,6 +50,7 @@ class DateDiffFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php index d0e890fa7..a6415a286 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/DateSubFunction.php @@ -35,6 +35,7 @@ class DateSubFunction extends DateAddFunction { /** * @override + * @inheritdoc */ public function getSql(SqlWalker $sqlWalker) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php index e2729feeb..3d2b1a6c9 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/LengthFunction.php @@ -38,6 +38,7 @@ class LengthFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -48,6 +49,7 @@ class LengthFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php index cba45bc1c..473aa34ee 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/LocateFunction.php @@ -44,6 +44,7 @@ class LocateFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -60,6 +61,7 @@ class LocateFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php index 5f0387e6f..5f0fb9500 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/LowerFunction.php @@ -38,6 +38,7 @@ class LowerFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -48,6 +49,7 @@ class LowerFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php index f00c6db7f..61bc9a79e 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/ModFunction.php @@ -46,6 +46,7 @@ class ModFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -57,6 +58,7 @@ class ModFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SizeFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SizeFunction.php index 7970508f1..bf0f7a4ec 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/SizeFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/SizeFunction.php @@ -41,6 +41,7 @@ class SizeFunction extends FunctionNode /** * @override + * @inheritdoc * @todo If the collection being counted is already joined, the SQL can be simpler (more efficient). */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) @@ -110,6 +111,7 @@ class SizeFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SqrtFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SqrtFunction.php index c9f1038c4..08155d25b 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/SqrtFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/SqrtFunction.php @@ -41,6 +41,7 @@ class SqrtFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -51,6 +52,7 @@ class SqrtFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php index ee80c06ac..a6a80f811 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/SubstringFunction.php @@ -48,6 +48,7 @@ class SubstringFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -65,6 +66,7 @@ class SubstringFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php index 22592a174..28e0f1627 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/UpperFunction.php @@ -38,6 +38,7 @@ class UpperFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -48,6 +49,7 @@ class UpperFunction extends FunctionNode /** * @override + * @inheritdoc */ public function parse(\Doctrine\ORM\Query\Parser $parser) { diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 54d84f3e6..34679ff61 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -197,7 +197,7 @@ class Parser { $this->query = $query; $this->em = $query->getEntityManager(); - $this->lexer = new Lexer($query->getDql()); + $this->lexer = new Lexer($query->getDQL()); $this->parserResult = new ParserResult(); } @@ -277,7 +277,7 @@ class Parser } if ($this->deferredPathExpressions) { - $this->processDeferredPathExpressions($AST); + $this->processDeferredPathExpressions(); } if ($this->deferredResultVariables) { @@ -482,7 +482,7 @@ class Parser $distance = 12; // Find a position of a final word to display in error string - $dql = $this->query->getDql(); + $dql = $this->query->getDQL(); $length = strlen($dql); $pos = $token['position'] + $distance; $pos = strpos($dql, ' ', ($length > $pos) ? $pos : $length); @@ -749,11 +749,9 @@ class Parser * SingleValuedAssociationPathExpression ::= IdentificationVariable "." SingleValuedAssociationField * CollectionValuedPathExpression ::= IdentificationVariable "." CollectionValuedAssociationField * - * @param mixed $AST - * * @return void */ - private function processDeferredPathExpressions($AST) + private function processDeferredPathExpressions() { foreach ($this->deferredPathExpressions as $deferredItem) { $pathExpression = $deferredItem['expression']; @@ -1504,7 +1502,7 @@ class Parser $glimpse = $this->lexer->glimpse(); switch (true) { - case ($this->isFunction($peek)): + case ($this->isFunction()): $expr = $this->FunctionDeclaration(); break; @@ -1795,7 +1793,7 @@ class Parser * PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet * PartialFieldSet ::= "{" SimpleStateField {"," SimpleStateField}* "}" * - * @return array + * @return \Doctrine\ORM\Query\AST\PartialObjectExpression */ public function PartialObjectExpression() { diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index b39280b39..ee57cf90b 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -1502,8 +1502,8 @@ class SqlWalker implements TreeWalker } /** - * @param AST\NewObjectExpression $newObjectExpression - * + * @param AST\NewObjectExpression $newObjectExpression + * @param null|string $newObjectResultAlias * @return string The SQL. */ public function walkNewObject($newObjectExpression, $newObjectResultAlias=null) @@ -1761,7 +1761,7 @@ class SqlWalker implements TreeWalker public function walkWhereClause($whereClause) { $condSql = null !== $whereClause ? $this->walkConditionalExpression($whereClause->conditionalExpression) : ''; - $discrSql = $this->_generateDiscriminatorColumnConditionSql($this->rootAliases); + $discrSql = $this->_generateDiscriminatorColumnConditionSQL($this->rootAliases); if ($this->em->hasFilters()) { $filterClauses = []; diff --git a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php index ee370dd0f..6c81de940 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php @@ -21,7 +21,6 @@ namespace Doctrine\ORM\Tools\Console\Command; use Symfony\Component\Console\Input\InputArgument; use Symfony\Component\Console\Input\InputOption; -use Symfony\Component\Console; use Doctrine\ORM\Tools\Export\ClassMetadataExporter; use Doctrine\ORM\Tools\ConvertDoctrine1Schema; use Doctrine\ORM\Tools\EntityGenerator; diff --git a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php index 0f5371d44..6f2761e0d 100644 --- a/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php +++ b/lib/Doctrine/ORM/Tools/Console/Command/MappingDescribeCommand.php @@ -185,7 +185,7 @@ EOT if (count($matches) > 1) { throw new \InvalidArgumentException(sprintf( - 'Entity name "%s" is ambigous, possible matches: "%s"', + 'Entity name "%s" is ambiguous, possible matches: "%s"', $entityName, implode(', ', $matches) )); } diff --git a/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php index 41927ce7a..501138261 100644 --- a/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php +++ b/lib/Doctrine/ORM/Tools/DebugUnitOfWorkListener.php @@ -143,7 +143,7 @@ class DebugUnitOfWorkListener if (is_object($var)) { $refl = new \ReflectionObject($var); - return $refl->getShortname(); + return $refl->getShortName(); } return gettype($var); @@ -176,7 +176,7 @@ class DebugUnitOfWorkListener $idstring .= " [REMOVED]"; } elseif ($state == UnitOfWork::STATE_MANAGED) { $idstring .= " [MANAGED]"; - } elseif ($state == UnitOfwork::STATE_DETACHED) { + } elseif ($state == UnitOfWork::STATE_DETACHED) { $idstring .= " [DETACHED]"; } diff --git a/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php b/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php index 52511b4b1..a9d3e5d68 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php +++ b/lib/Doctrine/ORM/Tools/Pagination/RowNumberOverFunction.php @@ -40,6 +40,7 @@ class RowNumberOverFunction extends FunctionNode /** * @override + * @inheritdoc */ public function getSql(\Doctrine\ORM\Query\SqlWalker $sqlWalker) { @@ -50,6 +51,7 @@ class RowNumberOverFunction extends FunctionNode /** * @override + * @inheritdoc * * @throws ORMException */ diff --git a/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php b/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php index 46488bf97..36f1f929b 100644 --- a/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php +++ b/lib/Doctrine/ORM/Tools/ResolveTargetEntityListener.php @@ -80,7 +80,7 @@ class ResolveTargetEntityListener implements EventSubscriber $args->setFoundMetadata( $args ->getObjectManager() - ->getClassMetadata($this->resolveTargetEntities[$args->getClassname()]['targetEntity']) + ->getClassMetadata($this->resolveTargetEntities[$args->getClassName()]['targetEntity']) ); } } diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 9acd85ffc..9ee27c84d 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -351,8 +351,7 @@ class SchemaTool * @param ClassMetadata $class * @param Table $table * - * @return array The portable column definition of the discriminator column as required by - * the DBAL. + * @return void */ private function addDiscriminatorColumnDefinition($class, Table $table) { @@ -384,7 +383,7 @@ class SchemaTool * @param ClassMetadata $class * @param Table $table * - * @return array The list of portable column definitions as required by the DBAL. + * @return void */ private function gatherColumns($class, Table $table) { @@ -410,7 +409,7 @@ class SchemaTool * @param array $mapping The field mapping. * @param Table $table * - * @return array The portable column definition as required by the DBAL. + * @return void */ private function gatherColumn($class, array $mapping, Table $table) { diff --git a/lib/Doctrine/ORM/Tools/SchemaValidator.php b/lib/Doctrine/ORM/Tools/SchemaValidator.php index 4119b9d60..ee39aed81 100644 --- a/lib/Doctrine/ORM/Tools/SchemaValidator.php +++ b/lib/Doctrine/ORM/Tools/SchemaValidator.php @@ -90,7 +90,7 @@ class SchemaValidator foreach ($class->fieldMappings as $fieldName => $mapping) { if (!Type::hasType($mapping['type'])) { - $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existant type '" . $mapping['type'] . "'."; + $ce[] = "The field '" . $class->name . "#" . $fieldName."' uses a non-existent type '" . $mapping['type'] . "'."; } } From 7a63e81c9458adc486ae22ad57ee857eae89bbba Mon Sep 17 00:00:00 2001 From: Artem Stepin Date: Thu, 8 Jun 2017 23:18:47 +0200 Subject: [PATCH 049/124] Add failing test for gh-#6314 (gh-#6356) --- .../Tests/ORM/Tools/EntityGeneratorTest.php | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 5a9f451fe..35e19cf65 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -119,7 +119,7 @@ class EntityGeneratorTest extends OrmTestCase /** * @return ClassMetadataInfo */ - private function generateIsbnEmbeddableFixture(array $embeddedClasses = []) + private function generateIsbnEmbeddableFixture(array $embeddedClasses = [], $columnPrefix = null) { $metadata = new ClassMetadataInfo($this->_namespace . '\EntityGeneratorIsbn'); $metadata->namespace = $this->_namespace; @@ -131,7 +131,7 @@ class EntityGeneratorTest extends OrmTestCase $metadata->mapField(['fieldName' => 'checkDigit', 'type' => 'integer']); foreach ($embeddedClasses as $fieldName => $embeddedClass) { - $this->mapEmbedded($fieldName, $metadata, $embeddedClass); + $this->mapEmbedded($fieldName, $metadata, $embeddedClass, $columnPrefix); } $this->_generator->writeEntityClass($metadata, $this->_tmpDir); @@ -224,6 +224,26 @@ class EntityGeneratorTest extends OrmTestCase return new $metadata->name; } + /** + * @group GH-6314 + */ + public function testEmbeddedEntityWithColumnPrefix() + { + $testMetadata = $this->generateTestEmbeddableFixture(); + $isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], 'prefix'); + $isbnEntity = $this->newInstance($isbnMetadata); + $refClass = new \ReflectionClass($isbnEntity); + + self::assertTrue($refClass->hasProperty('testEmbedded')); + + + $docComment = $refClass->getProperty('testEmbedded')->getDocComment(); + + $needle = sprintf('@Embedded(class="%s", columnPrefix=\'%s\')', $testMetadata->name,'prefix'); + self::assertContains($needle, $docComment); + + } + public function testGeneratedEntityClass() { $testMetadata = $this->generateTestEmbeddableFixture(); From 799190d5e4cb0533778969c7e22f4c7d5961d096 Mon Sep 17 00:00:00 2001 From: Artem Stepin Date: Fri, 9 Jun 2017 22:25:19 +0200 Subject: [PATCH 050/124] - fixed columnPrefix generator for the embedded annotation --- lib/Doctrine/ORM/Tools/EntityGenerator.php | 6 ++++- .../Tests/ORM/Tools/EntityGeneratorTest.php | 25 ++++++++++++++----- 2 files changed, 24 insertions(+), 7 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 5bc292a37..fafa51f3d 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -1732,7 +1732,11 @@ public function __construct() $embedded = ['class="' . $embeddedClass['class'] . '"']; if (isset($embeddedClass['columnPrefix'])) { - $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); + if (is_string($embeddedClass['columnPrefix'])) { + $embedded[] = 'columnPrefix="' . $embeddedClass['columnPrefix'] . '"'; + } else { + $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); + } } $lines[] = $this->spaces . ' * @' . diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 35e19cf65..f2d74d043 100644 --- a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php @@ -227,21 +227,34 @@ class EntityGeneratorTest extends OrmTestCase /** * @group GH-6314 */ - public function testEmbeddedEntityWithColumnPrefix() + public function testEmbeddedEntityWithNamedColumnPrefix() { + $columnPrefix = 'GH6314Prefix_'; $testMetadata = $this->generateTestEmbeddableFixture(); - $isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], 'prefix'); + $isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], $columnPrefix); $isbnEntity = $this->newInstance($isbnMetadata); $refClass = new \ReflectionClass($isbnEntity); - self::assertTrue($refClass->hasProperty('testEmbedded')); + $docComment = $refClass->getProperty('testEmbedded')->getDocComment(); + $needle = sprintf('@Embedded(class="%s", columnPrefix="%s")', $testMetadata->name, $columnPrefix); + self::assertContains($needle, $docComment); + } + + /** + * @group GH-6314 + */ + public function testEmbeddedEntityWithoutColumnPrefix() + { + $testMetadata = $this->generateTestEmbeddableFixture(); + $isbnMetadata = $this->generateIsbnEmbeddableFixture(['testEmbedded' => $testMetadata], false); + $isbnEntity = $this->newInstance($isbnMetadata); + $refClass = new \ReflectionClass($isbnEntity); + self::assertTrue($refClass->hasProperty('testEmbedded')); $docComment = $refClass->getProperty('testEmbedded')->getDocComment(); - - $needle = sprintf('@Embedded(class="%s", columnPrefix=\'%s\')', $testMetadata->name,'prefix'); + $needle = sprintf('@Embedded(class="%s", columnPrefix=false)', $testMetadata->name); self::assertContains($needle, $docComment); - } public function testGeneratedEntityClass() From 043ca69f0b7bba77f541617de9e47b1fdaa58251 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 07:59:04 +0200 Subject: [PATCH 051/124] Fix some code style issues in tests --- .../DbalTypes/NegativeToPositiveType.php | 4 +- .../Tests/DbalTypes/UpperCaseStringType.php | 4 +- .../ORM/Functional/BasicFunctionalTest.php | 1 - .../ORM/Functional/CascadeRemoveOrderTest.php | 8 +- .../Functional/ClassTableInheritanceTest.php | 73 ++++++++--------- .../ORM/Functional/DetachedEntityTest.php | 11 +-- .../Tests/ORM/Functional/Locking/LockTest.php | 35 +++++--- .../ORM/Functional/Locking/OptimisticTest.php | 10 +-- .../Tests/ORM/Functional/NativeQueryTest.php | 20 +++-- .../ORM/Functional/PersistentObjectTest.php | 5 +- .../Tests/ORM/Functional/QueryTest.php | 66 +++++++++------- .../ORM/Functional/SequenceGeneratorTest.php | 8 +- .../ORM/Functional/Ticket/DDC1113Test.php | 11 ++- .../ORM/Functional/Ticket/DDC117Test.php | 12 +-- .../ORM/Functional/Ticket/DDC1181Test.php | 6 +- .../ORM/Functional/Ticket/DDC1209Test.php | 6 +- .../ORM/Functional/Ticket/DDC1306Test.php | 4 +- .../ORM/Functional/Ticket/DDC1400Test.php | 13 ++- .../ORM/Functional/Ticket/DDC144Test.php | 24 +++--- .../ORM/Functional/Ticket/DDC1454Test.php | 12 +-- .../ORM/Functional/Ticket/DDC1925Test.php | 20 ++--- .../ORM/Functional/Ticket/DDC192Test.php | 35 +++++--- .../ORM/Functional/Ticket/DDC2106Test.php | 3 +- .../ORM/Functional/Ticket/DDC2256Test.php | 8 +- .../ORM/Functional/Ticket/DDC2775Test.php | 11 ++- .../ORM/Functional/Ticket/DDC3170Test.php | 3 +- .../ORM/Functional/Ticket/DDC3711Test.php | 1 - .../ORM/Functional/Ticket/DDC3785Test.php | 57 ++++++------- .../ORM/Functional/Ticket/DDC522Test.php | 29 ++++--- .../ORM/Functional/Ticket/DDC588Test.php | 3 +- .../ORM/Functional/Ticket/DDC742Test.php | 15 ++-- .../ORM/Functional/Ticket/DDC832Test.php | 32 ++++---- .../ORM/Functional/Ticket/DDC933Test.php | 9 ++- .../Tests/ORM/Functional/TypeTest.php | 25 +++--- .../Tests/ORM/Functional/TypeValueSqlTest.php | 14 ++-- .../ORM/Hydration/ScalarHydratorTest.php | 7 +- .../Hydration/SingleScalarHydratorTest.php | 79 ++++++++++--------- .../ORM/Mapping/AbstractMappingDriverTest.php | 19 ++--- .../Mapping/StaticPHPMappingDriverTest.php | 1 - 39 files changed, 373 insertions(+), 331 deletions(-) diff --git a/tests/Doctrine/Tests/DbalTypes/NegativeToPositiveType.php b/tests/Doctrine/Tests/DbalTypes/NegativeToPositiveType.php index 8395b6acd..f5e50fa07 100644 --- a/tests/Doctrine/Tests/DbalTypes/NegativeToPositiveType.php +++ b/tests/Doctrine/Tests/DbalTypes/NegativeToPositiveType.php @@ -7,12 +7,14 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; class NegativeToPositiveType extends Type { + const NAME = 'negative_to_positive'; + /** * {@inheritdoc} */ public function getName() { - return 'negative_to_positive'; + return self::NAME; } /** diff --git a/tests/Doctrine/Tests/DbalTypes/UpperCaseStringType.php b/tests/Doctrine/Tests/DbalTypes/UpperCaseStringType.php index 3811aa00d..866a62475 100644 --- a/tests/Doctrine/Tests/DbalTypes/UpperCaseStringType.php +++ b/tests/Doctrine/Tests/DbalTypes/UpperCaseStringType.php @@ -7,12 +7,14 @@ use Doctrine\DBAL\Platforms\AbstractPlatform; class UpperCaseStringType extends StringType { + const NAME = 'upper_case_string'; + /** * {@inheritdoc} */ public function getName() { - return 'upper_case_string'; + return self::NAME; } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index eec4844d1..016a7949f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -727,7 +727,6 @@ class BasicFunctionalTest extends OrmFunctionalTestCase */ public function testNewAssociatedEntityDuringFlushThrowsException() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $user = new CmsUser(); $user->username = "beberlei"; $user->name = "Benjamin E."; diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index cb19c2bcf..a6de137d1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php @@ -16,8 +16,8 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(CascadeRemoveOrderEntityO::class), - $this->_em->getClassMetadata(CascadeRemoveOrderEntityG::class), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityO::class), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityG::class), ] ); } @@ -28,8 +28,8 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_schemaTool->dropSchema( [ - $this->_em->getClassMetadata(CascadeRemoveOrderEntityO::class), - $this->_em->getClassMetadata(CascadeRemoveOrderEntityG::class), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityO::class), + $this->_em->getClassMetadata(CascadeRemoveOrderEntityG::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 2698c3252..02ed0a356 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -2,16 +2,16 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\Common\Collections\Criteria; use Doctrine\ORM\PersistentCollection; use Doctrine\ORM\Proxy\Proxy; -use Doctrine\Tests\Models\Company\CompanyPerson, - Doctrine\Tests\Models\Company\CompanyEmployee, - Doctrine\Tests\Models\Company\CompanyManager, - Doctrine\Tests\Models\Company\CompanyOrganization, - Doctrine\Tests\Models\Company\CompanyAuction, - Doctrine\Tests\Models\Company\CompanyRaffle; - -use Doctrine\Common\Collections\Criteria; +use Doctrine\Tests\Models\Company\CompanyAuction; +use Doctrine\Tests\Models\Company\CompanyEmployee; +use Doctrine\Tests\Models\Company\CompanyEvent; +use Doctrine\Tests\Models\Company\CompanyManager; +use Doctrine\Tests\Models\Company\CompanyOrganization; +use Doctrine\Tests\Models\Company\CompanyPerson; +use Doctrine\Tests\Models\Company\CompanyRaffle; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -24,8 +24,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase protected function setUp() { $this->useModelSet('company'); + parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); } public function testCRUD() @@ -47,7 +47,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $query = $this->_em->createQuery("select p from Doctrine\Tests\Models\Company\CompanyPerson p order by p.name desc"); + $query = $this->_em->createQuery('select p from ' . CompanyPerson::class . ' p order by p.name desc'); $entities = $query->getResult(); @@ -62,7 +62,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $query = $this->_em->createQuery("select p from Doctrine\Tests\Models\Company\CompanyEmployee p"); + $query = $this->_em->createQuery('select p from ' . CompanyEmployee::class . ' p'); $entities = $query->getResult(); @@ -80,7 +80,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $query = $this->_em->createQuery("update Doctrine\Tests\Models\Company\CompanyEmployee p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3"); + $query = $this->_em->createQuery("update " . CompanyEmployee::class . " p set p.name = ?1, p.department = ?2 where p.name='Guilherme Blanco' and p.salary = ?3"); $query->setParameter(1, 'NewName', 'string'); $query->setParameter(2, 'NewDepartment'); $query->setParameter(3, 100000); @@ -88,12 +88,13 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $numUpdated = $query->execute(); $this->assertEquals(1, $numUpdated); - $query = $this->_em->createQuery("delete from Doctrine\Tests\Models\Company\CompanyPerson p"); + $query = $this->_em->createQuery('delete from ' . CompanyPerson::class . ' p'); $numDeleted = $query->execute(); $this->assertEquals(2, $numDeleted); } - public function testMultiLevelUpdateAndFind() { + public function testMultiLevelUpdateAndFind() + { $manager = new CompanyManager; $manager->setName('Roman S. Borschel'); $manager->setSalary(100000); @@ -119,7 +120,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->assertTrue(is_numeric($manager->getId())); } - public function testFindOnBaseClass() { + public function testFindOnBaseClass() + { $manager = new CompanyManager; $manager->setName('Roman S. Borschel'); $manager->setSalary(100000); @@ -139,7 +141,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->assertTrue(is_numeric($person->getId())); } - public function testSelfReferencingOneToOne() { + public function testSelfReferencingOneToOne() + { $manager = new CompanyManager; $manager->setName('John Smith'); $manager->setSalary(100000); @@ -155,16 +158,10 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->persist($manager); $this->_em->persist($wife); - $this->_em->flush(); - - //var_dump($this->_em->getConnection()->fetchAll('select * from company_persons')); - //var_dump($this->_em->getConnection()->fetchAll('select * from company_employees')); - //var_dump($this->_em->getConnection()->fetchAll('select * from company_managers')); - $this->_em->clear(); - $query = $this->_em->createQuery('select p, s from Doctrine\Tests\Models\Company\CompanyPerson p join p.spouse s where p.name=\'Mary Smith\''); + $query = $this->_em->createQuery('select p, s from ' . CompanyPerson::class . ' p join p.spouse s where p.name=\'Mary Smith\''); $result = $query->getResult(); $this->assertEquals(1, count($result)); @@ -196,7 +193,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); - $query = $this->_em->createQuery('select p, f from Doctrine\Tests\Models\Company\CompanyPerson p join p.friends f where p.name=?1'); + $query = $this->_em->createQuery('select p, f from ' . CompanyPerson::class . ' p join p.friends f where p.name=?1'); $query->setParameter(1, 'Roman'); $result = $query->getResult(); @@ -247,7 +244,6 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase } } - public function testLazyLoading2() { $org = new CompanyOrganization; @@ -259,16 +255,16 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $q = $this->_em->createQuery('select a from Doctrine\Tests\Models\Company\CompanyEvent a where a.id = ?1'); + $q = $this->_em->createQuery('select a from ' . CompanyEvent::class . ' a where a.id = ?1'); $q->setParameter(1, $event1->getId()); $result = $q->getResult(); $this->assertEquals(1, count($result)); - $this->assertInstanceOf(CompanyAuction::class, $result[0], sprintf("Is of class %s",get_class($result[0]))); + $this->assertInstanceOf(CompanyAuction::class, $result[0], sprintf("Is of class %s", get_class($result[0]))); $this->_em->clear(); - $q = $this->_em->createQuery('select a from Doctrine\Tests\Models\Company\CompanyOrganization a where a.id = ?1'); + $q = $this->_em->createQuery('select a from ' . CompanyOrganization::class . ' a where a.id = ?1'); $q->setParameter(1, $org->getId()); $result = $q->getResult(); @@ -287,8 +283,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase */ public function testBulkUpdateIssueDDC368() { - $dql = 'UPDATE Doctrine\Tests\Models\Company\CompanyEmployee AS p SET p.salary = 1'; - $this->_em->createQuery($dql)->execute(); + $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1') + ->execute(); $this->assertTrue(count($this->_em->createQuery( 'SELECT count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p WHERE p.salary = 1') @@ -300,12 +296,10 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase */ public function testBulkUpdateNonScalarParameterDDC1341() { - $dql = 'UPDATE Doctrine\Tests\Models\Company\CompanyEmployee AS p SET p.startDate = ?0 WHERE p.department = ?1'; - $query = $this->_em->createQuery($dql) - ->setParameter(0, new \DateTime()) - ->setParameter(1, 'IT'); - - $result = $query->execute(); + $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.startDate = ?0 WHERE p.department = ?1') + ->setParameter(0, new \DateTime()) + ->setParameter(1, 'IT') + ->execute(); } @@ -314,8 +308,6 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase */ public function testDeleteJoinTableRecords() { - #$this->markTestSkipped('Nightmare! friends adds both ID 6-7 and 7-6 into two rows of the join table. How to detect this?'); - $employee1 = new CompanyEmployee(); $employee1->setName('gblanco'); $employee1->setSalary(0); @@ -361,8 +353,9 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dql = "SELECT m FROM Doctrine\Tests\Models\Company\CompanyManager m WHERE m.spouse = ?1"; - $dqlManager = $this->_em->createQuery($dql)->setParameter(1, $person->getId())->getSingleResult(); + $dqlManager = $this->_em->createQuery('SELECT m FROM ' . CompanyManager::class . ' m WHERE m.spouse = ?1') + ->setParameter(1, $person->getId()) + ->getSingleResult(); $this->assertEquals($manager->getId(), $dqlManager->getId()); $this->assertEquals($person->getId(), $dqlManager->getSpouse()->getId()); diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index b0326e542..5060f07a1 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -23,7 +23,8 @@ class DetachedEntityTest extends OrmFunctionalTestCase parent::setUp(); } - public function testSimpleDetachMerge() { + public function testSimpleDetachMerge() + { $user = new CmsUser; $user->name = 'Roman'; $user->username = 'romanb'; @@ -33,13 +34,10 @@ class DetachedEntityTest extends OrmFunctionalTestCase $this->_em->clear(); // $user is now detached - $this->assertFalse($this->_em->contains($user)); $user->name = 'Roman B.'; - //$this->assertEquals(UnitOfWork::STATE_DETACHED, $this->_em->getUnitOfWork()->getEntityState($user)); - $user2 = $this->_em->merge($user); $this->assertFalse($user === $user2); @@ -49,7 +47,6 @@ class DetachedEntityTest extends OrmFunctionalTestCase public function testSerializeUnserializeModifyMerge() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $user = new CmsUser; $user->name = 'Guilherme'; $user->username = 'gblanco'; @@ -173,7 +170,7 @@ class DetachedEntityTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->detach($user); - $dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.id = ?1"; + $dql = 'SELECT u FROM ' . CmsUser::class . ' u WHERE u.id = ?1'; $query = $this->_em->createQuery($dql); $query->setParameter(1, $user); @@ -216,7 +213,7 @@ class DetachedEntityTest extends OrmFunctionalTestCase $this->_em->detach($article); - $sql = "UPDATE cms_articles SET version = version+1 WHERE id = " . $article->id; + $sql = 'UPDATE cms_articles SET version = version + 1 WHERE id = ' . $article->id; $this->_em->getConnection()->executeUpdate($sql); $this->expectException(OptimisticLockException::class); diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php index e92b9476b..dc27d45be 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php @@ -19,6 +19,7 @@ class LockTest extends OrmFunctionalTestCase { $this->useModelSet('cms'); parent::setUp(); + $this->handles = []; } @@ -26,7 +27,8 @@ class LockTest extends OrmFunctionalTestCase * @group DDC-178 * @group locking */ - public function testLockVersionedEntity() { + public function testLockVersionedEntity() + { $article = new CmsArticle(); $article->text = "my article"; $article->topic = "Hello"; @@ -41,7 +43,8 @@ class LockTest extends OrmFunctionalTestCase * @group DDC-178 * @group locking */ - public function testLockVersionedEntity_MismatchThrowsException() { + public function testLockVersionedEntity_MismatchThrowsException() + { $article = new CmsArticle(); $article->text = "my article"; $article->topic = "Hello"; @@ -58,7 +61,8 @@ class LockTest extends OrmFunctionalTestCase * @group DDC-178 * @group locking */ - public function testLockUnversionedEntity_ThrowsException() { + public function testLockUnversionedEntity_ThrowsException() + { $user = new CmsUser(); $user->name = "foo"; $user->status = "active"; @@ -76,11 +80,12 @@ class LockTest extends OrmFunctionalTestCase * @group DDC-178 * @group locking */ - public function testLockUnmanagedEntity_ThrowsException() { + public function testLockUnmanagedEntity_ThrowsException() + { $article = new CmsArticle(); $this->expectException(\InvalidArgumentException::class); - $this->expectExceptionMessage('Entity Doctrine\Tests\Models\CMS\CmsArticle'); + $this->expectExceptionMessage('Entity ' . CmsArticle::class); $this->_em->lock($article, LockMode::OPTIMISTIC, $article->version + 1); } @@ -89,7 +94,8 @@ class LockTest extends OrmFunctionalTestCase * @group DDC-178 * @group locking */ - public function testLockPessimisticRead_NoTransaction_ThrowsException() { + public function testLockPessimisticRead_NoTransaction_ThrowsException() + { $article = new CmsArticle(); $article->text = "my article"; $article->topic = "Hello"; @@ -106,7 +112,8 @@ class LockTest extends OrmFunctionalTestCase * @group DDC-178 * @group locking */ - public function testLockPessimisticWrite_NoTransaction_ThrowsException() { + public function testLockPessimisticWrite_NoTransaction_ThrowsException() + { $article = new CmsArticle(); $article->text = "my article"; $article->topic = "Hello"; @@ -171,6 +178,7 @@ class LockTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->beginTransaction(); + try { $this->_em->lock($article, LockMode::PESSIMISTIC_READ); $this->_em->commit(); @@ -179,8 +187,9 @@ class LockTest extends OrmFunctionalTestCase throw $e; } - $query = array_pop( $this->_sqlLoggerStack->queries ); - $query = array_pop( $this->_sqlLoggerStack->queries ); + array_pop($this->_sqlLoggerStack->queries); + $query = array_pop($this->_sqlLoggerStack->queries); + $this->assertContains($readLockSql, $query['sql']); } @@ -189,13 +198,13 @@ class LockTest extends OrmFunctionalTestCase */ public function testLockOptimisticNonVersionedThrowsExceptionInDQL() { - $dql = "SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = 'gblanco'"; + $dql = "SELECT u FROM " . CmsUser::class . " u WHERE u.username = 'gblanco'"; $this->expectException(OptimisticLockException::class); $this->expectExceptionMessage('The optimistic lock on an entity failed.'); - $sql = $this->_em->createQuery($dql)->setHint( - Query::HINT_LOCK_MODE, LockMode::OPTIMISTIC - )->getSQL(); + $this->_em->createQuery($dql) + ->setHint(Query::HINT_LOCK_MODE, LockMode::OPTIMISTIC) + ->getSQL(); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php index b5aa9c0ec..3681ed95e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php @@ -16,15 +16,16 @@ class OptimisticTest extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(OptimisticJoinedParent::class), - $this->_em->getClassMetadata(OptimisticJoinedChild::class), - $this->_em->getClassMetadata(OptimisticStandard::class), - $this->_em->getClassMetadata(OptimisticTimestamp::class) + $this->_em->getClassMetadata(OptimisticJoinedParent::class), + $this->_em->getClassMetadata(OptimisticJoinedChild::class), + $this->_em->getClassMetadata(OptimisticStandard::class), + $this->_em->getClassMetadata(OptimisticTimestamp::class) ] ); } catch (\Exception $e) { // Swallow all exceptions. We do not test the schema tool here. } + $this->_conn = $this->_em->getConnection(); } @@ -168,7 +169,6 @@ class OptimisticTest extends OrmFunctionalTestCase public function testLockWorksWithProxy() { $test = new OptimisticStandard(); - $test->name = 'test'; $this->_em->persist($test); diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index 93eab2667..4e8e6c96e 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -35,6 +35,7 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->useModelSet('cms'); $this->useModelSet('company'); parent::setUp(); + $this->platform = $this->_em->getConnection()->getDatabasePlatform(); } @@ -426,9 +427,9 @@ class NativeQueryTest extends OrmFunctionalTestCase $repository = $this->_em->getRepository(CmsUser::class); - $result = $repository->createNativeNamedQuery('fetchIdAndUsernameWithResultClass') - ->setParameter(1, 'FabioBatSilva')->getResult(); + ->setParameter(1, 'FabioBatSilva') + ->getResult(); $this->assertEquals(1, count($result)); $this->assertInstanceOf(CmsUser::class, $result[0]); @@ -439,9 +440,9 @@ class NativeQueryTest extends OrmFunctionalTestCase $this->_em->clear(); - $result = $repository->createNativeNamedQuery('fetchAllColumns') - ->setParameter(1, 'FabioBatSilva')->getResult(); + ->setParameter(1, 'FabioBatSilva') + ->getResult(); $this->assertEquals(1, count($result)); $this->assertInstanceOf(CmsUser::class, $result[0]); @@ -468,19 +469,16 @@ class NativeQueryTest extends OrmFunctionalTestCase $addr->zip = 10827; $addr->city = 'São Paulo'; - $user->setAddress($addr); $this->_em->persist($user); $this->_em->flush(); - $this->_em->clear(); - $repository = $this->_em->getRepository(CmsUser::class); - - - $result = $repository->createNativeNamedQuery('fetchJoinedAddress') - ->setParameter(1, 'FabioBatSilva')->getResult(); + $result = $this->_em->getRepository(CmsUser::class) + ->createNativeNamedQuery('fetchJoinedAddress') + ->setParameter(1, 'FabioBatSilva') + ->getResult(); $this->assertEquals(1, count($result)); $this->assertInstanceOf(CmsUser::class, $result[0]); diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php index 9f73bf5e8..b611c7125 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php @@ -16,15 +16,16 @@ class PersistentObjectTest extends OrmFunctionalTestCase protected function setUp() { parent::setUp(); + try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(PersistentEntity::class), + $this->_em->getClassMetadata(PersistentEntity::class), ] ); } catch (\Exception $e) { - } + PersistentObject::setObjectManager($this->_em); } diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 805478bdf..127f06d18 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -26,6 +26,7 @@ class QueryTest extends OrmFunctionalTestCase protected function setUp() { $this->useModelSet('cms'); + parent::setUp(); } @@ -93,7 +94,7 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $query = $this->_em->createQuery("select u, a from Doctrine\Tests\Models\CMS\CmsUser u join u.articles a ORDER BY a.topic"); + $query = $this->_em->createQuery('select u, a from ' . CmsUser::class . ' u join u.articles a ORDER BY a.topic'); $users = $query->getResult(); $this->assertEquals(1, count($users)); $this->assertInstanceOf(CmsUser::class, $users[0]); @@ -112,7 +113,7 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.username = ?0'); + $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.username = ?0'); $q->setParameter(0, 'jwage'); $user = $q->getSingleResult(); @@ -124,7 +125,7 @@ class QueryTest extends OrmFunctionalTestCase $this->expectException(QueryException::class); $this->expectExceptionMessage('Invalid parameter: token 2 is not defined in the query.'); - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1'); + $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1'); $q->setParameter(2, 'jwage'); $user = $q->getSingleResult(); } @@ -134,7 +135,7 @@ class QueryTest extends OrmFunctionalTestCase $this->expectException(QueryException::class); $this->expectExceptionMessage('Too many parameters: the query defines 1 parameters and you bound 2'); - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1'); + $q = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1'); $q->setParameter(1, 'jwage'); $q->setParameter(2, 'jwage'); @@ -146,38 +147,35 @@ class QueryTest extends OrmFunctionalTestCase $this->expectException(QueryException::class); $this->expectExceptionMessage('Too few parameters: the query defines 1 parameters but you only bound 0'); - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1'); - - $user = $q->getSingleResult(); + $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1') + ->getSingleResult(); } public function testInvalidInputParameterThrowsException() { $this->expectException(QueryException::class); - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?'); - $q->setParameter(1, 'jwage'); - $user = $q->getSingleResult(); + $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?') + ->setParameter(1, 'jwage') + ->getSingleResult(); } public function testSetParameters() { - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1 AND u.status = ?2'); - $parameters = new ArrayCollection(); $parameters->add(new Parameter(1, 'jwage')); $parameters->add(new Parameter(2, 'active')); - $q->setParameters($parameters); - $users = $q->getResult(); + $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2') + ->setParameters($parameters) + ->getResult(); } public function testSetParametersBackwardsCompatible() { - $q = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = ?1 AND u.status = ?2'); - $q->setParameters([1 => 'jwage', 2 => 'active']); - - $users = $q->getResult(); + $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2') + ->setParameters([1 => 'jwage', 2 => 'active']) + ->getResult(); } /** @@ -200,18 +198,29 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->clear(); $articleId = $article1->id; - $query = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a WHERE a.topic = ?1"); + $query = $this->_em->createQuery('select a from ' . CmsArticle::class . ' a WHERE a.topic = ?1'); $articles = $query->iterate(new ArrayCollection([new Parameter(1, 'Doctrine 2')]), Query::HYDRATE_ARRAY); $found = []; + foreach ($articles AS $article) { $found[] = $article; } + $this->assertEquals(1, count($found)); $this->assertEquals( [ - [['id' => $articleId, 'topic' => 'Doctrine 2', 'text' => 'This is an introduction to Doctrine 2.', 'version' => 1]] - ], $found); + [ + [ + 'id' => $articleId, + 'topic' => 'Doctrine 2', + 'text' => 'This is an introduction to Doctrine 2.', + 'version' => 1, + ], + ], + ], + $found + ); } public function testIterateResult_IterativelyBuildUpUnitOfWork() @@ -230,11 +239,12 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $query = $this->_em->createQuery("select a from Doctrine\Tests\Models\CMS\CmsArticle a"); + $query = $this->_em->createQuery('select a from ' . CmsArticle::class . ' a'); $articles = $query->iterate(); $iteratedCount = 0; $topics = []; + foreach($articles AS $row) { $article = $row[0]; $topics[] = $article->topic; @@ -294,7 +304,7 @@ class QueryTest extends OrmFunctionalTestCase */ public function testIterateResult_FetchJoinedCollection_ThrowsException() { - $query = $this->_em->createQuery("SELECT u, a FROM Doctrine\Tests\Models\CMS\CmsUser u JOIN u.articles a"); + $query = $this->_em->createQuery("SELECT u, a FROM ' . CmsUser::class . ' u JOIN u.articles a"); $articles = $query->iterate(); } @@ -360,7 +370,7 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $data = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u') + $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u') ->setFirstResult(1) ->setMaxResults(2) ->getResult(); @@ -369,7 +379,7 @@ class QueryTest extends OrmFunctionalTestCase $this->assertEquals('gblanco1', $data[0]->username); $this->assertEquals('gblanco2', $data[1]->username); - $data = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u') + $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u') ->setFirstResult(3) ->setMaxResults(2) ->getResult(); @@ -378,7 +388,7 @@ class QueryTest extends OrmFunctionalTestCase $this->assertEquals('gblanco3', $data[0]->username); $this->assertEquals('gblanco4', $data[1]->username); - $data = $this->_em->createQuery('SELECT u FROM Doctrine\Tests\Models\CMS\CmsUser u') + $data = $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u') ->setFirstResult(3) ->setMaxResults(2) ->getScalarResult(); @@ -472,13 +482,13 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u where u.username = 'gblanco'"); + $query = $this->_em->createQuery("select u from " . CmsUser::class . " u where u.username = 'gblanco'"); $fetchedUser = $query->getOneOrNullResult(); $this->assertInstanceOf(CmsUser::class, $fetchedUser); $this->assertEquals('gblanco', $fetchedUser->username); - $query = $this->_em->createQuery("select u.username from Doctrine\Tests\Models\CMS\CmsUser u where u.username = 'gblanco'"); + $query = $this->_em->createQuery("select u.username from " . CmsUser::class . " u where u.username = 'gblanco'"); $fetchedUsername = $query->getOneOrNullResult(Query::HYDRATE_SINGLE_SCALAR); $this->assertEquals('gblanco', $fetchedUsername); } diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php index 13091c5e5..c00f8bc9f 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php @@ -14,18 +14,17 @@ class SequenceGeneratorTest extends OrmFunctionalTestCase { parent::setUp(); - if (!$this->_em->getConnection()->getDatabasePlatform()->supportsSequences()) { + if ( ! $this->_em->getConnection()->getDatabasePlatform()->supportsSequences()) { $this->markTestSkipped('Only working for Databases that support sequences.'); } try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(SequenceEntity::class), + $this->_em->getClassMetadata(SequenceEntity::class), ] ); } catch(\Exception $e) { - } } @@ -35,6 +34,7 @@ class SequenceGeneratorTest extends OrmFunctionalTestCase $e = new SequenceEntity(); $this->_em->persist($e); } + $this->_em->flush(); } } @@ -48,7 +48,7 @@ class SequenceEntity * @Id * @column(type="integer") * @GeneratedValue(strategy="SEQUENCE") - * @SequenceGenerator(allocationSize=5,sequenceName="person_id_seq") + * @SequenceGenerator(allocationSize=5, sequenceName="person_id_seq") */ public $id; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php index f3b399f98..7402972b0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php @@ -8,21 +8,20 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; */ class DDC1113Test extends \Doctrine\Tests\OrmFunctionalTestCase { - public function setUp() { parent::setUp(); + try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC1113Engine::class), - $this->_em->getClassMetadata(DDC1113Vehicle::class), - $this->_em->getClassMetadata(DDC1113Car::class), - $this->_em->getClassMetadata(DDC1113Bus::class), + $this->_em->getClassMetadata(DDC1113Engine::class), + $this->_em->getClassMetadata(DDC1113Vehicle::class), + $this->_em->getClassMetadata(DDC1113Car::class), + $this->_em->getClassMetadata(DDC1113Bus::class), ] ); } catch (\Exception $e) { - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php index 9c6740c33..c6d215cf8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php @@ -21,7 +21,8 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase private $translation; private $articleDetails; - protected function setUp() { + protected function setUp() + { $this->useModelSet('ddc117'); parent::setUp(); @@ -63,7 +64,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE r.source = ?1"; + $dql = 'SELECT r, s FROM ' . DDC117Reference::class . ' r JOIN r.source s WHERE r.source = ?1'; $dqlRef = $this->_em->createQuery($dql)->setParameter(1, 1)->getSingleResult(); $this->assertInstanceOf(DDC117Reference::class, $mapRef); @@ -73,7 +74,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; + $dql = 'SELECT r, s FROM ' . DDC117Reference::class . ' r JOIN r.source s WHERE s.title = ?1'; $dqlRef = $this->_em->createQuery($dql)->setParameter(1, 'Foo')->getSingleResult(); $this->assertInstanceOf(DDC117Reference::class, $dqlRef); @@ -81,7 +82,7 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->assertInstanceOf(DDC117Article::class, $dqlRef->source()); $this->assertSame($dqlRef, $this->_em->find(DDC117Reference::class, $idCriteria)); - $dql = "SELECT r, s FROM Doctrine\Tests\Models\DDC117\DDC117Reference r JOIN r.source s WHERE s.title = ?1"; + $dql = 'SELECT r, s FROM ' . DDC117Reference::class . ' r JOIN r.source s WHERE s.title = ?1'; $dqlRef = $this->_em->createQuery($dql)->setParameter(1, 'Foo')->getSingleResult(); $this->_em->contains($dqlRef); @@ -265,12 +266,11 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testOneToOneCascadePersist() { - if (!$this->_em->getConnection()->getDatabasePlatform()->prefersSequences()) { + if ( ! $this->_em->getConnection()->getDatabasePlatform()->prefersSequences()) { $this->markTestSkipped('Test only works with databases that prefer sequences as ID strategy.'); } $this->article1 = new DDC117Article("Foo"); - $this->articleDetails = new DDC117ArticleDetails($this->article1, "Very long text"); $this->_em->persist($this->article1); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php index d72a960f7..1c4343e40 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php @@ -11,9 +11,9 @@ class DDC1181Test extends OrmFunctionalTestCase parent::setUp(); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC1181Hotel::class), - $this->_em->getClassMetadata(DDC1181Booking::class), - $this->_em->getClassMetadata(DDC1181Room::class), + $this->_em->getClassMetadata(DDC1181Hotel::class), + $this->_em->getClassMetadata(DDC1181Booking::class), + $this->_em->getClassMetadata(DDC1181Room::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php index 77cde3262..ce53b7505 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -12,9 +12,9 @@ class DDC1209Test extends OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC1209_1::class), - $this->_em->getClassMetadata(DDC1209_2::class), - $this->_em->getClassMetadata(DDC1209_3::class) + $this->_em->getClassMetadata(DDC1209_1::class), + $this->_em->getClassMetadata(DDC1209_2::class), + $this->_em->getClassMetadata(DDC1209_3::class) ] ); } catch(\Exception $e) { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php index 4818c82ad..956c5f7d5 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\Tests\Models\CMS\CmsAddress; use Doctrine\Tests\Models\CMS\CmsUser; use Doctrine\Tests\Models\CMS\CmsPhonenumber; @@ -13,6 +14,7 @@ class DDC1306Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { $this->useModelSet('cms'); + parent::setUp(); } @@ -25,7 +27,7 @@ class DDC1306Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($phone); $this->_em->flush(); - $address = new \Doctrine\Tests\Models\CMS\CmsAddress(); + $address = new CmsAddress(); $address->city = "bonn"; $address->country = "Germany"; $address->street = "somestreet!"; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php index 4ac78d9b7..a569c1a82 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php @@ -14,9 +14,9 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC1400Article::class), - $this->_em->getClassMetadata(DDC1400User::class), - $this->_em->getClassMetadata(DDC1400UserState::class), + $this->_em->getClassMetadata(DDC1400Article::class), + $this->_em->getClassMetadata(DDC1400User::class), + $this->_em->getClassMetadata(DDC1400UserState::class), ] ); } catch (\Exception $ignored) { @@ -48,15 +48,14 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($userState1); $this->_em->persist($userState2); - $this->_em->flush(); $this->_em->clear(); $user1 = $this->_em->getReference(DDC1400User::class, $user1->id); - $q = $this->_em->createQuery("SELECT a, s FROM ".__NAMESPACE__."\DDC1400Article a JOIN a.userStates s WITH s.user = :activeUser"); - $q->setParameter('activeUser', $user1); - $articles = $q->getResult(); + $this->_em->createQuery('SELECT a, s FROM ' . DDC1400Article::class . ' a JOIN a.userStates s WITH s.user = :activeUser') + ->setParameter('activeUser', $user1) + ->getResult(); $this->_em->flush(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index f85df4a7e..064b78021 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -8,12 +8,11 @@ class DDC144Test extends OrmFunctionalTestCase { protected function setUp() { parent::setUp(); - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC144FlowElement::class), - $this->_em->getClassMetadata(DDC144Operand::class), + $this->_em->getClassMetadata(DDC144FlowElement::class), + $this->_em->getClassMetadata(DDC144Operand::class), ] ); @@ -24,10 +23,10 @@ class DDC144Test extends OrmFunctionalTestCase */ public function testIssue() { - $operand = new DDC144Operand; $operand->property = 'flowValue'; $operand->operandProperty = 'operandValue'; + $this->_em->persist($operand); $this->_em->flush(); @@ -41,23 +40,30 @@ class DDC144Test extends OrmFunctionalTestCase * @DiscriminatorColumn(type="string", name="discr") * @DiscriminatorMap({"flowelement" = "DDC144FlowElement", "operand" = "DDC144Operand"}) */ -class DDC144FlowElement { +class DDC144FlowElement +{ /** * @Id @Column(type="integer") @GeneratedValue * @var int */ public $id; + /** @Column */ public $property; } -abstract class DDC144Expression extends DDC144FlowElement { - abstract function method(); +abstract class DDC144Expression extends DDC144FlowElement +{ + abstract public function method(); } /** @Entity @Table(name="ddc144_operands") */ -class DDC144Operand extends DDC144Expression { +class DDC144Operand extends DDC144Expression +{ /** @Column */ public $operandProperty; - function method() {} + + public function method() + { + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php index 54d5dbd20..0f5509310 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php @@ -14,12 +14,11 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC1454File::class), - $this->_em->getClassMetadata(DDC1454Picture::class), + $this->_em->getClassMetadata(DDC1454File::class), + $this->_em->getClassMetadata(DDC1454Picture::class), ] ); } catch (\Exception $ignored) { - } } @@ -36,7 +35,6 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC1454Picture extends DDC1454File { - } /** @@ -53,14 +51,16 @@ class DDC1454File */ public $fileId; - public function __construct() { + public function __construct() + { $this->fileId = rand(); } /** * Get fileId */ - public function getFileId() { + public function getFileId() + { return $this->fileId; } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php index c61fae9c6..8c56951be 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php @@ -14,23 +14,25 @@ class DDC1925Test extends \Doctrine\Tests\OrmFunctionalTestCase { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC1925User::class), - $this->_em->getClassMetadata(DDC1925Product::class), + $this->_em->getClassMetadata(DDC1925User::class), + $this->_em->getClassMetadata(DDC1925Product::class), ] ); $user = new DDC1925User(); $user->setTitle("Test User"); - $this->_em->persist($user); $product = new DDC1925Product(); $product->setTitle("Test product"); + + $this->_em->persist($user); $this->_em->persist($product); $this->_em->flush(); $product->addBuyer($user); - $this->_em->getUnitOfWork()->computeChangeSets(); + $this->_em->getUnitOfWork() + ->computeChangeSets(); $this->_em->persist($product); $this->_em->flush(); @@ -104,15 +106,7 @@ class DDC1925Product } /** - * @param string $buyers - */ - public function setBuyers($buyers) - { - $this->buyers = $buyers; - } - - /** - * @return string + * @return ArrayCollection */ public function getBuyers() { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php index f6f0f173d..e90062363 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php @@ -4,27 +4,31 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\Tests\OrmFunctionalTestCase; +/** + * @group DDC-192 + */ class DDC192Test extends OrmFunctionalTestCase { public function testSchemaCreation() { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC192User::class), - $this->_em->getClassMetadata(DDC192Phonenumber::class) + $this->_em->getClassMetadata(DDC192User::class), + $this->_em->getClassMetadata(DDC192Phonenumber::class) ] ); } } - /** - * @Entity @Table(name="ddc192_users") + * @Entity + * @Table(name="ddc192_users") */ class DDC192User { /** - * @Id @Column(name="id", type="integer") + * @Id + * @Column(name="id", type="integer") * @GeneratedValue(strategy="AUTO") */ public $id; @@ -37,12 +41,14 @@ class DDC192User /** - * @Entity @Table(name="ddc192_phonenumbers") + * @Entity + * @Table(name="ddc192_phonenumbers") */ class DDC192Phonenumber { /** - * @Id @Column(name="phone", type="string", length=40) + * @Id + * @Column(name="phone", type="string", length=40) */ protected $phone; @@ -54,14 +60,23 @@ class DDC192Phonenumber protected $User; - public function setPhone($value) { $this->phone = $value; } + public function setPhone($value) + { + $this->phone = $value; + } - public function getPhone() { return $this->phone; } + public function getPhone() + { + return $this->phone; + } public function setUser(User $user) { $this->User = $user; } - public function getUser() { return $this->User; } + public function getUser() + { + return $this->User; + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php index 0fdc7f84d..c56f3fb48 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php @@ -12,9 +12,10 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); + $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC2106Entity::class), + $this->_em->getClassMetadata(DDC2106Entity::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php index 681210159..9e6f0bcca 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php @@ -13,10 +13,11 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); + $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC2256User::class), - $this->_em->getClassMetadata(DDC2256Group::class) + $this->_em->getClassMetadata(DDC2256User::class), + $this->_em->getClassMetadata(DDC2256Group::class) ] ); } @@ -55,8 +56,7 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase // Test ResultSetMappingBuilder. $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata('MyNamespace:DDC2256User', 'u'); - $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', ['id' => 'group_id', 'name' => 'group_name'] - ); + $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', ['id' => 'group_id', 'name' => 'group_name']); $this->_em->createNativeQuery($sql, $rsm)->getResult(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php index 025ee7633..3f7703385 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php @@ -17,10 +17,10 @@ class DDC2775Test extends OrmFunctionalTestCase $this->setUpEntitySchema( [ - User::class, - Role::class, - AdminRole::class, - Authorization::class, + User::class, + Role::class, + AdminRole::class, + Authorization::class, ] ); } @@ -30,9 +30,8 @@ class DDC2775Test extends OrmFunctionalTestCase */ public function testIssueCascadeRemove() { - $user = new User(); - $role = new AdminRole(); + $user = new User(); $user->addRole($role); $authorization = new Authorization(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php index ac3f10be6..88e3727d2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -38,10 +38,9 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testIssue() { - // $this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger); - $productJoined = new DDC3170ProductJoined(); $productSingleTable = new DDC3170ProductSingleTable(); + $this->_em->persist($productJoined); $this->_em->persist($productSingleTable); $this->_em->flush(); diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php index 3fc4c856b..bd2b1ba9b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3711Test.php @@ -26,6 +26,5 @@ class DDC3711Test extends YamlMappingDriverTest $this->assertEquals(['link_a_id1' => "id1", 'link_a_id2' => "id2"], $entityA->associationMappings['entityB']['relationToSourceKeyColumns']); $this->assertEquals(['link_b_id1' => "id1", 'link_b_id2' => "id2"], $entityA->associationMappings['entityB']['relationToTargetKeyColumns']); - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php index 05498db77..4fcc3932c 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php @@ -17,9 +17,9 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC3785_Asset::class), - $this->_em->getClassMetadata(DDC3785_AssetId::class), - $this->_em->getClassMetadata(DDC3785_Attribute::class) + $this->_em->getClassMetadata(DDC3785_Asset::class), + $this->_em->getClassMetadata(DDC3785_AssetId::class), + $this->_em->getClassMetadata(DDC3785_Attribute::class) ] ); } catch(\Exception $e) { @@ -31,15 +31,18 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testOwningValueObjectIdIsCorrectlyTransformedWhenRemovingOrphanedChildEntities() { - $id = new DDC3785_AssetId("919609ba-57d9-4a13-be1d-d202521e858a"); - $attributes = [ - $attribute1 = new DDC3785_Attribute("foo1", "bar1"), - $attribute2 = new DDC3785_Attribute("foo2", "bar2") + $id = new DDC3785_AssetId('919609ba-57d9-4a13-be1d-d202521e858a'); + + $attributes = [ + $attribute1 = new DDC3785_Attribute('foo1', 'bar1'), + $attribute2 = new DDC3785_Attribute('foo2', 'bar2') ]; + $this->_em->persist($asset = new DDC3785_Asset($id, $attributes)); $this->_em->flush(); - $asset->getAttributes()->removeElement($attribute1); + $asset->getAttributes() + ->removeElement($attribute1); $this->_em->persist($asset); $this->_em->flush(); @@ -68,12 +71,12 @@ class DDC3785_Asset public function __construct(DDC3785_AssetId $id, $attributes = []) { - $this->id = $id; - $this->attributes = new ArrayCollection(); + $this->id = $id; + $this->attributes = new ArrayCollection(); - foreach ($attributes as $attribute) { - $this->attributes->add($attribute); - } + foreach ($attributes as $attribute) { + $this->attributes->add($attribute); + } } public function getId() @@ -83,7 +86,7 @@ class DDC3785_Asset public function getAttributes() { - return $this->attributes; + return $this->attributes; } } @@ -93,23 +96,23 @@ class DDC3785_Asset */ class DDC3785_Attribute { - /** + /** * @Id @Column(type="integer") * @GeneratedValue */ - private $id; + private $id; - /** @Column(type = "string") */ - private $name; + /** @Column(type = "string") */ + private $name; - /** @Column(type = "string") */ - private $value; + /** @Column(type = "string") */ + private $value; - public function __construct($name, $value) - { - $this->name = $name; - $this->value = $value; - } + public function __construct($name, $value) + { + $this->name = $name; + $this->value = $value; + } } /** @Embeddable */ @@ -120,12 +123,12 @@ class DDC3785_AssetId public function __construct($id) { - $this->id = $id; + $this->id = $id; } public function __toString() { - return $this->id; + return $this->id; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php index 9818e60aa..3909b9ca0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -13,16 +13,16 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); + try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC522Customer::class), - $this->_em->getClassMetadata(DDC522Cart::class), - $this->_em->getClassMetadata(DDC522ForeignKeyTest::class) + $this->_em->getClassMetadata(DDC522Customer::class), + $this->_em->getClassMetadata(DDC522Cart::class), + $this->_em->getClassMetadata(DDC522ForeignKeyTest::class) ] ); } catch(\Exception $e) { - } } @@ -43,8 +43,8 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->clear(); - $r = $this->_em->createQuery("select ca,c from ".get_class($cart)." ca join ca.customer c") - ->getResult(); + $r = $this->_em->createQuery('select ca,c from ' . DDC522Cart::class . ' ca join ca.customer c') + ->getResult(); $this->assertInstanceOf(DDC522Cart::class, $r[0]); $this->assertInstanceOf(DDC522Customer::class, $r[0]->customer); @@ -71,7 +71,7 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testJoinColumnWithNullSameNameAssociationField() { $fkCust = new DDC522ForeignKeyTest; - $fkCust->name = "name"; + $fkCust->name = 'name'; $fkCust->cart = null; $this->_em->persist($fkCust); @@ -83,21 +83,27 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase } /** @Entity */ -class DDC522Customer { +class DDC522Customer +{ /** @Id @Column(type="integer") @GeneratedValue */ public $id; + /** @Column */ public $name; + /** @OneToOne(targetEntity="DDC522Cart", mappedBy="customer") */ public $cart; } /** @Entity */ -class DDC522Cart { +class DDC522Cart +{ /** @Id @Column(type="integer") @GeneratedValue */ public $id; + /** @Column(type="integer") */ public $total; + /** * @OneToOne(targetEntity="DDC522Customer", inversedBy="cart") * @JoinColumn(name="customer", referencedColumnName="id") @@ -106,11 +112,14 @@ class DDC522Cart { } /** @Entity */ -class DDC522ForeignKeyTest { +class DDC522ForeignKeyTest +{ /** @Id @Column(type="integer") @GeneratedValue */ public $id; + /** @Column(type="integer", name="cart_id", nullable=true) */ public $cartId; + /** * @OneToOne(targetEntity="DDC522Cart") * @JoinColumn(name="cart_id", referencedColumnName="id") diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php index 021e582e6..aa50f2cdb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php @@ -7,9 +7,10 @@ class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase protected function setUp() { parent::setUp(); + $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC588Site::class), + $this->_em->getClassMetadata(DDC588Site::class), ] ); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php index 4d03bca2a..bc465db92 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php @@ -27,8 +27,8 @@ class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC742User::class), - $this->_em->getClassMetadata(DDC742Comment::class) + $this->_em->getClassMetadata(DDC742User::class), + $this->_em->getClassMetadata(DDC742Comment::class) ] ); } catch(\Exception $e) { @@ -64,9 +64,9 @@ class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $user = $this->_em->find(get_class($user), $user->id); - $comment3 = $this->_em->find(get_class($comment3), $comment3->id); - $user->favoriteComments->add($comment3); + $user = $this->_em->find(DDC742User::class, $user->id); + $user->favoriteComments->add($this->_em->find(DDC742Comment::class, $comment3->id)); + $this->_em->flush(); } } @@ -86,11 +86,13 @@ class DDC742User * @var int */ public $id; + /** * @Column(length=100, type="string") * @var string */ public $title; + /** * @ManyToMany(targetEntity="DDC742Comment", cascade={"persist"}, fetch="EAGER") * @JoinTable( @@ -99,7 +101,7 @@ class DDC742User * inverseJoinColumns={@JoinColumn(name="comment_id", referencedColumnName="id")} * ) * - * @var Doctrine\ORM\PersistentCollection + * @var \Doctrine\ORM\PersistentCollection */ public $favoriteComments; } @@ -119,6 +121,7 @@ class DDC742Comment * @var int */ public $id; + /** * @Column(length=100, type="string") * @var string diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php index 9e674e3ca..ee46b5bc7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php @@ -7,22 +7,24 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase public function setUp() { parent::setUp(); + $platform = $this->_em->getConnection()->getDatabasePlatform(); - if ($platform->getName() == "oracle") { + + if ($platform->getName() === 'oracle') { $this->markTestSkipped('Doesnt run on Oracle.'); } $this->_em->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger()); + try { $this->_schemaTool->createSchema( [ - $this->_em->getClassMetadata(DDC832JoinedIndex::class), - $this->_em->getClassMetadata(DDC832JoinedTreeIndex::class), - $this->_em->getClassMetadata(DDC832Like::class), + $this->_em->getClassMetadata(DDC832JoinedIndex::class), + $this->_em->getClassMetadata(DDC832JoinedTreeIndex::class), + $this->_em->getClassMetadata(DDC832Like::class), ] ); } catch(\Exception $e) { - } } @@ -30,6 +32,7 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase { /* @var $sm \Doctrine\DBAL\Schema\AbstractSchemaManager */ $platform = $this->_em->getConnection()->getDatabasePlatform(); + $sm = $this->_em->getConnection()->getSchemaManager(); $sm->dropTable($platform->quoteIdentifier('TREE_INDEX')); $sm->dropTable($platform->quoteIdentifier('INDEX')); @@ -41,11 +44,11 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableBasicUpdate() { - $like = new DDC832Like("test"); + $like = new DDC832Like('test'); $this->_em->persist($like); $this->_em->flush(); - $like->word = "test2"; + $like->word = 'test2'; $this->_em->flush(); } @@ -54,7 +57,7 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableBasicRemove() { - $like = new DDC832Like("test"); + $like = new DDC832Like('test'); $this->_em->persist($like); $this->_em->flush(); @@ -67,11 +70,11 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableJoinedUpdate() { - $index = new DDC832JoinedIndex("test"); + $index = new DDC832JoinedIndex('test'); $this->_em->persist($index); $this->_em->flush(); - $index->name = "asdf"; + $index->name = 'asdf'; $this->_em->flush(); } @@ -80,7 +83,7 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableJoinedRemove() { - $index = new DDC832JoinedIndex("test"); + $index = new DDC832JoinedIndex('test'); $this->_em->persist($index); $this->_em->flush(); @@ -93,11 +96,11 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableJoinedChildUpdate() { - $index = new DDC832JoinedTreeIndex("test", 1, 2); + $index = new DDC832JoinedTreeIndex('test', 1, 2); $this->_em->persist($index); $this->_em->flush(); - $index->name = "asdf"; + $index->name = 'asdf'; $this->_em->flush(); } @@ -106,7 +109,7 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableJoinedChildRemove() { - $index = new DDC832JoinedTreeIndex("test", 1, 2); + $index = new DDC832JoinedTreeIndex('test', 1, 2); $this->_em->persist($index); $this->_em->flush(); @@ -178,6 +181,7 @@ class DDC832JoinedTreeIndex extends DDC832JoinedIndex { /** @Column(type="integer") */ public $lft; + /** @Column(type="integer") */ public $rgt; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php index e4c9d1328..039eb7ab8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\DBAL\LockMode; +use Doctrine\Tests\Models\Company\CompanyManager; use Doctrine\Tests\OrmFunctionalTestCase; class DDC933Test extends OrmFunctionalTestCase @@ -9,6 +11,7 @@ class DDC933Test extends OrmFunctionalTestCase public function setUp() { $this->useModelSet('company'); + parent::setUp(); } @@ -17,9 +20,7 @@ class DDC933Test extends OrmFunctionalTestCase */ public function testLockCTIClass() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger()); - - $manager = new \Doctrine\Tests\Models\Company\CompanyManager(); + $manager = new CompanyManager(); $manager->setName('beberlei'); $manager->setSalary(1234); $manager->setTitle('Vice President of This Test'); @@ -29,7 +30,7 @@ class DDC933Test extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->beginTransaction(); - $this->_em->lock($manager, \Doctrine\DBAL\LockMode::PESSIMISTIC_READ); + $this->_em->lock($manager, LockMode::PESSIMISTIC_READ); $this->_em->rollback(); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index 052002014..9276d74ee 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -15,6 +15,7 @@ class TypeTest extends OrmFunctionalTestCase protected function setUp() { $this->useModelSet('generic'); + parent::setUp(); } @@ -28,7 +29,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dql = "SELECT d FROM Doctrine\Tests\Models\Generic\DecimalModel d"; + $dql = 'SELECT d FROM ' . DecimalModel::class . ' d'; $decimal = $this->_em->createQuery($dql)->getSingleResult(); $this->assertEquals(0.15, $decimal->decimal); @@ -48,7 +49,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dql = "SELECT b FROM Doctrine\Tests\Models\Generic\BooleanModel b WHERE b.booleanField = true"; + $dql = 'SELECT b FROM ' . BooleanModel::class . ' b WHERE b.booleanField = true'; $bool = $this->_em->createQuery($dql)->getSingleResult(); $this->assertTrue($bool->booleanField); @@ -58,7 +59,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dql = "SELECT b FROM Doctrine\Tests\Models\Generic\BooleanModel b WHERE b.booleanField = false"; + $dql = 'SELECT b FROM ' . BooleanModel::class . ' b WHERE b.booleanField = false'; $bool = $this->_em->createQuery($dql)->getSingleResult(); $this->assertFalse($bool->booleanField); @@ -74,7 +75,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dql = "SELECT s FROM Doctrine\Tests\Models\Generic\SerializationModel s"; + $dql = 'SELECT s FROM ' . SerializationModel::class . ' s'; $serialize = $this->_em->createQuery($dql)->getSingleResult(); $this->assertEquals(["foo" => "bar", "bar" => "baz"], $serialize->array); @@ -89,7 +90,7 @@ class TypeTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $dql = "SELECT s FROM Doctrine\Tests\Models\Generic\SerializationModel s"; + $dql = 'SELECT s FROM ' . SerializationModel::class . ' s'; $serialize = $this->_em->createQuery($dql)->getSingleResult(); $this->assertInstanceOf('stdClass', $serialize->object); @@ -106,7 +107,7 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); - $this->assertInstanceOf('DateTime', $dateTimeDb->date); + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->date); $this->assertEquals('2009-10-01', $dateTimeDb->date->format('Y-m-d')); } @@ -121,12 +122,12 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); - $this->assertInstanceOf('DateTime', $dateTimeDb->datetime); + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->datetime); $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); - $articles = $this->_em->getRepository( DateTimeModel::class )->findBy( ['datetime' => new \DateTime( "now" )] - ); - $this->assertEquals( 0, count( $articles ) ); + $articles = $this->_em->getRepository(DateTimeModel::class) + ->findBy(['datetime' => new \DateTime()]); + $this->assertEquals(0, count($articles)); } public function testDqlQueryBindDateTimeInstance() @@ -175,7 +176,7 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); - $this->assertInstanceOf('DateTime', $dateTime->time); - $this->assertEquals('19:27:20', $dateTime->time->format('H:i:s')); + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->time); + $this->assertEquals('19:27:20', $dateTimeDb->time->format('H:i:s')); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php index 971af9170..3af954cfd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeValueSqlTest.php @@ -3,6 +3,8 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\DBAL\Types\Type as DBALType; +use Doctrine\Tests\DbalTypes\NegativeToPositiveType; +use Doctrine\Tests\DbalTypes\UpperCaseStringType; use Doctrine\Tests\Models\CustomType\CustomTypeChild; use Doctrine\Tests\Models\CustomType\CustomTypeParent; use Doctrine\Tests\Models\CustomType\CustomTypeUpperCase; @@ -12,16 +14,16 @@ class TypeValueSqlTest extends OrmFunctionalTestCase { protected function setUp() { - if (DBALType::hasType('upper_case_string')) { - DBALType::overrideType('upper_case_string', '\Doctrine\Tests\DbalTypes\UpperCaseStringType'); + if (DBALType::hasType(UpperCaseStringType::NAME)) { + DBALType::overrideType(UpperCaseStringType::NAME, UpperCaseStringType::class); } else { - DBALType::addType('upper_case_string', '\Doctrine\Tests\DbalTypes\UpperCaseStringType'); + DBALType::addType(UpperCaseStringType::NAME, UpperCaseStringType::class); } - if (DBALType::hasType('negative_to_positive')) { - DBALType::overrideType('negative_to_positive', '\Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + if (DBALType::hasType(NegativeToPositiveType::NAME)) { + DBALType::overrideType(NegativeToPositiveType::NAME, NegativeToPositiveType::class); } else { - DBALType::addType('negative_to_positive', '\Doctrine\Tests\DbalTypes\NegativeToPositiveType'); + DBALType::addType(NegativeToPositiveType::NAME, NegativeToPositiveType::class); } $this->useModelSet('customtype'); diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index 2ad9461ff..2c51929bc 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Hydration; +use Doctrine\ORM\Internal\Hydration\ScalarHydrator; use Doctrine\Tests\Mocks\HydratorMockStatement; use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\Tests\Models\CMS\CmsUser; @@ -32,7 +33,7 @@ class ScalarHydratorTest extends HydrationTestCase $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em); + $hydrator = new ScalarHydrator($this->_em); $result = $hydrator->hydrateAll($stmt, $rsm); @@ -63,7 +64,7 @@ class ScalarHydratorTest extends HydrationTestCase ]; $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em); + $hydrator = new ScalarHydrator($this->_em); $result = $hydrator->hydrateAll($stmt, $rsm); } @@ -93,7 +94,7 @@ class ScalarHydratorTest extends HydrationTestCase ]; $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\ScalarHydrator($this->_em); + $hydrator = new ScalarHydrator($this->_em); $result = $hydrator->hydrateAll($stmt, $rsm); } diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index d0cebbc49..694259b29 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Hydration; +use Doctrine\ORM\Internal\Hydration\SingleScalarHydrator; +use Doctrine\ORM\NonUniqueResultException; use Doctrine\Tests\Mocks\HydratorMockStatement; use Doctrine\ORM\Query\ResultSetMapping; use Doctrine\Tests\Models\CMS\CmsUser; @@ -9,48 +11,49 @@ use Doctrine\Tests\Models\CMS\CmsUser; class SingleScalarHydratorTest extends HydrationTestCase { /** Result set provider for the HYDRATE_SINGLE_SCALAR tests */ - public static function singleScalarResultSetProvider() { + public static function singleScalarResultSetProvider(): array + { return [ - // valid - [ - 'name' => 'result1', + // valid + 'valid' => [ + 'name' => 'result1', 'resultSet' => [ - [ - 'u__name' => 'romanb' - ] - ] - ], - // valid - [ - 'name' => 'result2', + [ + 'u__name' => 'romanb', + ], + ], + ], + // valid + [ + 'name' => 'result2', 'resultSet' => [ - [ - 'u__id' => '1' - ] - ] - ], - // invalid - [ - 'name' => 'result3', + [ + 'u__id' => '1', + ], + ], + ], + // invalid + [ + 'name' => 'result3', 'resultSet' => [ - [ - 'u__id' => '1', - 'u__name' => 'romanb' - ] - ] - ], - // invalid - [ - 'name' => 'result4', + [ + 'u__id' => '1', + 'u__name' => 'romanb', + ], + ], + ], + // invalid + [ + 'name' => 'result4', 'resultSet' => [ - [ - 'u__id' => '1' - ], - [ - 'u__id' => '2' - ] - ] - ], + [ + 'u__id' => '1', + ], + [ + 'u__id' => '2', + ], + ], + ], ]; } @@ -67,7 +70,7 @@ class SingleScalarHydratorTest extends HydrationTestCase $rsm->addFieldResult('u', 'u__name', 'name'); $stmt = new HydratorMockStatement($resultSet); - $hydrator = new \Doctrine\ORM\Internal\Hydration\SingleScalarHydrator($this->_em); + $hydrator = new SingleScalarHydrator($this->_em); if ($name == 'result1') { $result = $hydrator->hydrateAll($stmt, $rsm); diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index f857bed45..e13d7aa7e 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php @@ -68,17 +68,10 @@ abstract class AbstractMappingDriverTest extends OrmTestCase return $factory; } - public function testLoadMapping() + public function testEntityTableNameAndInheritance() { - return $this->createClassMetadata(User::class); - } + $class = $this->createClassMetadata(User::class); - /** - * @depends testLoadMapping - * @param ClassMetadata $class - */ - public function testEntityTableNameAndInheritance($class) - { $this->assertEquals('cms_users', $class->getTableName()); $this->assertEquals(ClassMetadata::INHERITANCE_TYPE_NONE, $class->inheritanceType); @@ -274,14 +267,12 @@ abstract class AbstractMappingDriverTest extends OrmTestCase /** * @group #6129 * - * @depends testLoadMapping - * - * @param ClassMetadata $class - * * @return ClassMetadata */ - public function testBooleanValuesForOptionIsSetCorrectly(ClassMetadata $class) + public function testBooleanValuesForOptionIsSetCorrectly() { + $class = $this->createClassMetadata(User::class); + $this->assertInternalType('bool', $class->fieldMappings['id']['options']['unsigned']); $this->assertFalse($class->fieldMappings['id']['options']['unsigned']); diff --git a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php index e374e135e..5f2f0c1d7 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php @@ -12,7 +12,6 @@ class StaticPHPMappingDriverTest extends AbstractMappingDriverTest return new StaticPHPDriver(__DIR__ . DIRECTORY_SEPARATOR . 'php'); } - /** * All class with static::loadMetadata are entities for php driver * From 8d144daf01e7daae4ae2a327beb1de25ce2036b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Mon, 12 Jun 2017 23:04:06 +0200 Subject: [PATCH 052/124] Remove duplicated tests (keeping them on unit test suite only) --- .../ORM/Functional/ManyToManyBasicAssociationTest.php | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php index 9aa044f5d..0436b2af7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ManyToManyBasicAssociationTest.php @@ -304,15 +304,6 @@ class ManyToManyBasicAssociationTest extends OrmFunctionalTestCase return $user; } - /** - * @group DDC-980 - */ - public function testUpdateDeleteSizeSubselectQueries() - { - $this->_em->createQuery("DELETE Doctrine\Tests\Models\CMS\CmsUser u WHERE SIZE(u.groups) = 10")->execute(); - $this->_em->createQuery("UPDATE Doctrine\Tests\Models\CMS\CmsUser u SET u.status = 'inactive' WHERE SIZE(u.groups) = 10")->execute(); - } - /** * @group DDC-978 */ From 1bf884970f2e4c75e817dd4db5532e8bb44a5f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 08:05:01 +0200 Subject: [PATCH 053/124] Increment assertion count manually Which is needed to test void methods that shouldn't raise any exception on a certain condition. If the interpreter gets to the point where the assertion count is incremented it means that no exceptions have been thrown and our test is successful. Important to note that some tests were slighly refactored to simplify things a bit. --- .../Doctrine/Tests/ORM/ConfigurationTest.php | 2 + .../Functional/ClassTableInheritanceTest.php | 1 + .../Tests/ORM/Functional/Locking/LockTest.php | 2 + .../ORM/Functional/Locking/OptimisticTest.php | 2 + .../ORM/Functional/PersistentObjectTest.php | 2 + .../ORM/Functional/Ticket/DDC3170Test.php | 30 +++----- .../ORM/Functional/Ticket/DDC588Test.php | 2 + .../ORM/Functional/Ticket/DDC742Test.php | 1 + .../Tests/ORM/Tools/SchemaValidatorTest.php | 70 +++++-------------- 9 files changed, 39 insertions(+), 73 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index df74c6df2..ab657c5fd 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -179,6 +179,8 @@ class ConfigurationTest extends TestCase { $this->setProductionSettings(); $this->configuration->ensureProductionSettings(); + + $this->addToAssertionCount(1); } public function testEnsureProductionSettingsQueryCache() diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 02ed0a356..c94d3d73d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -301,6 +301,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase ->setParameter(1, 'IT') ->execute(); + $this->addToAssertionCount(1); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php index dc27d45be..d515e95bf 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php @@ -37,6 +37,8 @@ class LockTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->lock($article, LockMode::OPTIMISTIC, $article->version); + + $this->addToAssertionCount(1); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php index 3681ed95e..8b8113b6a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Locking/OptimisticTest.php @@ -178,6 +178,8 @@ class OptimisticTest extends OrmFunctionalTestCase $proxy = $this->_em->getReference(OptimisticStandard::class, $test->id); $this->_em->lock($proxy, LockMode::OPTIMISTIC, 1); + + $this->addToAssertionCount(1); } public function testOptimisticTimestampSetsDefaultValue() diff --git a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php index b611c7125..0fd2b4745 100644 --- a/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/PersistentObjectTest.php @@ -36,6 +36,8 @@ class PersistentObjectTest extends OrmFunctionalTestCase $this->_em->persist($entity); $this->_em->flush(); + + $this->addToAssertionCount(1); } public function testFind() diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php index 88e3727d2..0ef1caee8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -46,27 +46,17 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - try { - $this->_em->createQueryBuilder() - ->select('p') - ->from(DDC3170ProductJoined::class, 'p') - ->getQuery() - ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); - } catch (HydrationException $e) // Thrown by SimpleObjectHydrator - { - $this->fail('Failed correct mapping of discriminator column when using simple object hydration and class table inheritance'); - } + $this->_em->createQueryBuilder() + ->select('p') + ->from(DDC3170ProductJoined::class, 'p') + ->getQuery() + ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); - try { - $this->_em->createQueryBuilder() - ->select('p') - ->from(DDC3170ProductSingleTable::class, 'p') - ->getQuery() - ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); - } catch (HydrationException $e) // Thrown by SimpleObjectHydrator - { - $this->fail('Failed correct mapping of discriminator column when using simple object hydration and single table inheritance'); - } + $this->_em->createQueryBuilder() + ->select('p') + ->from(DDC3170ProductSingleTable::class, 'p') + ->getQuery() + ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php index aa50f2cdb..7361bc4f4 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC588Test.php @@ -23,6 +23,8 @@ class DDC588Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); // Following should not result in exception $this->_em->refresh($site); + + $this->addToAssertionCount(1); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php index bc465db92..8adcb0879 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php @@ -68,6 +68,7 @@ class DDC742Test extends \Doctrine\Tests\OrmFunctionalTestCase $user->favoriteComments->add($this->_em->find(DDC742Comment::class, $comment3->id)); $this->_em->flush(); + $this->addToAssertionCount(1); } } diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index ea2826309..955a5f43d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -24,64 +24,28 @@ class SchemaValidatorTest extends OrmTestCase $this->validator = new SchemaValidator($this->em); } - public function testCmsModelSet() + /** + * @dataProvider modelSetProvider + */ + public function testCmsModelSet(string $path) { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( - [ - __DIR__ . "/../../Models/CMS" - ] - ); + $this->em->getConfiguration() + ->getMetadataDriverImpl() + ->addPaths([$path]); + $this->validator->validateMapping(); } - public function testCompanyModelSet() + public function modelSetProvider(): array { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( - [ - __DIR__ . "/../../Models/Company" - ] - ); - $this->validator->validateMapping(); - } - - public function testECommerceModelSet() - { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( - [ - __DIR__ . "/../../Models/ECommerce" - ] - ); - $this->validator->validateMapping(); - } - - public function testForumModelSet() - { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( - [ - __DIR__ . "/../../Models/Forum" - ] - ); - $this->validator->validateMapping(); - } - - public function testNavigationModelSet() - { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( - [ - __DIR__ . "/../../Models/Navigation" - ] - ); - $this->validator->validateMapping(); - } - - public function testRoutingModelSet() - { - $this->em->getConfiguration()->getMetadataDriverImpl()->addPaths( - [ - __DIR__ . "/../../Models/Routing" - ] - ); - $this->validator->validateMapping(); + return [ + 'cms' => [__DIR__ . '/../../Models/CMS'], + 'company' => [__DIR__ . '/../../Models/Company'], + 'ecommerce' => [__DIR__ . '/../../Models/ECommerce'], + 'forum' => [__DIR__ . '/../../Models/Forum'], + 'navigation' => [__DIR__ . '/../../Models/Navigation'], + 'routing' => [__DIR__ . '/../../Models/Routing'], + ]; } /** From 99df158fc8369fbca52568901bc19b734c98c4d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Mon, 12 Jun 2017 20:03:11 +0200 Subject: [PATCH 054/124] Allow passing a connection while creating an entity manager Also removing unsed arguments. --- .../Doctrine/Tests/OrmFunctionalTestCase.php | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 5716f2a50..2a5f45264 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests; use Doctrine\Common\Cache\ArrayCache; +use Doctrine\DBAL\Driver\Connection; use Doctrine\DBAL\Driver\PDOSqlite\Driver as SqliteDriver; use Doctrine\DBAL\Logging\DebugStack; use Doctrine\DBAL\Types\Type; @@ -674,12 +675,11 @@ abstract class OrmFunctionalTestCase extends OrmTestCase /** * Gets an EntityManager for testing purposes. * - * @param \Doctrine\ORM\Configuration $config The Configuration to pass to the EntityManager. - * @param \Doctrine\Common\EventManager $eventManager The EventManager to pass to the EntityManager. + * @return EntityManager * - * @return \Doctrine\ORM\EntityManager + * @throws \Doctrine\ORM\ORMException */ - protected function _getEntityManager($config = null, $eventManager = null) { + protected function _getEntityManager(Connection $connection = null) { // NOTE: Functional tests use their own shared metadata cache, because // the actual database platform used during execution has effect on some // metadata mapping behaviors (like the choice of the ID generation). @@ -732,13 +732,17 @@ abstract class OrmFunctionalTestCase extends OrmTestCase $this->isSecondLevelCacheEnabled = true; } - $config->setMetadataDriverImpl($config->newDefaultAnnotationDriver( - [ - realpath(__DIR__ . '/Models/Cache'), - realpath(__DIR__ . '/Models/GeoNames') - ], true)); + $config->setMetadataDriverImpl( + $config->newDefaultAnnotationDriver( + [ + realpath(__DIR__ . '/Models/Cache'), + realpath(__DIR__ . '/Models/GeoNames') + ], + true + ) + ); - $conn = static::$_sharedConn; + $conn = $connection ?: static::$_sharedConn; $conn->getConfiguration()->setSQLLogger($this->_sqlLoggerStack); // get rid of more global state From 19fc91482ea814f810080c6a00061c7672309b31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Mon, 12 Jun 2017 20:10:52 +0200 Subject: [PATCH 055/124] Validate if optimistic locks are released properly By trying to update an entry using a different connection. --- .../ORM/Functional/Ticket/DDC933Test.php | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php index 039eb7ab8..f6216a162 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php @@ -5,6 +5,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; use Doctrine\DBAL\LockMode; use Doctrine\Tests\Models\Company\CompanyManager; use Doctrine\Tests\OrmFunctionalTestCase; +use Doctrine\Tests\TestUtil; class DDC933Test extends OrmFunctionalTestCase { @@ -20,6 +21,10 @@ class DDC933Test extends OrmFunctionalTestCase */ public function testLockCTIClass() { + if ($this->_em->getConnection()->getDatabasePlatform()->getName() === 'sqlite') { + self::markTestSkipped('It should not run on in-memory databases'); + } + $manager = new CompanyManager(); $manager->setName('beberlei'); $manager->setSalary(1234); @@ -32,5 +37,33 @@ class DDC933Test extends OrmFunctionalTestCase $this->_em->beginTransaction(); $this->_em->lock($manager, LockMode::PESSIMISTIC_READ); $this->_em->rollback(); + + // if lock hasn't been released we'd have an exception here + $this->assertManagerCanBeUpdatedOnAnotherConnection($manager->getId(), 'Master of This Test'); + } + + /** + * @param int $id + * @param string $newName + * + * @return void + * + * @throws \Doctrine\Common\Persistence\Mapping\MappingException + * @throws \Doctrine\ORM\ORMException + * @throws \Doctrine\ORM\OptimisticLockException + * @throws \Doctrine\ORM\TransactionRequiredException + */ + private function assertManagerCanBeUpdatedOnAnotherConnection(int $id, string $newName) + { + $em = $this->_getEntityManager(TestUtil::getConnection()); + + /** @var CompanyManager $manager */ + $manager = $em->find(CompanyManager::class, $id); + $manager->setName($newName); + + $em->flush(); + $em->clear(); + + self::assertSame($newName, $em->find(CompanyManager::class, $id)->getName()); } } From 8796e2d938c391c878e5e352bff50c0190daed49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 08:14:53 +0200 Subject: [PATCH 056/124] Expect an exception instead of failing the test Since that's the assertion we're actually doing. --- .../ORM/Functional/BasicFunctionalTest.php | 34 ++++++++----------- .../ORM/Functional/DetachedEntityTest.php | 11 +++--- .../Hydration/SingleScalarHydratorTest.php | 19 +++++++---- .../Tests/ORM/Id/AssignedGeneratorTest.php | 25 ++++++++------ 4 files changed, 48 insertions(+), 41 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index 016a7949f..7bdb84653 100644 --- a/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php @@ -740,11 +740,10 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $address->user = $user; $this->_em->persist($address); - // pretend we forgot to persist $user - try { - $this->_em->flush(); // should raise an exception - $this->fail(); - } catch (\InvalidArgumentException $expected) {} + + // flushing without persisting $user should raise an exception + $this->expectException(\InvalidArgumentException::class); + $this->_em->flush(); } /** @@ -774,11 +773,10 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $u2->name = "Benjamin E."; $u2->status = 'inactive'; $address->user = $u2; - // pretend we forgot to persist $u2 - try { - $this->_em->flush(); // should raise an exception - $this->fail(); - } catch (\InvalidArgumentException $expected) {} + + // flushing without persisting $u2 should raise an exception + $this->expectException(\InvalidArgumentException::class); + $this->_em->flush(); } /** @@ -797,11 +795,10 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $art->addComment($com); $this->_em->persist($art); - // pretend we forgot to persist $com - try { - $this->_em->flush(); // should raise an exception - $this->fail(); - } catch (\InvalidArgumentException $expected) {} + + // flushing without persisting $com should raise an exception + $this->expectException(\InvalidArgumentException::class); + $this->_em->flush(); } public function testOneToOneOrphanRemoval() @@ -933,10 +930,9 @@ class BasicFunctionalTest extends OrmFunctionalTestCase $user->name = "Benjamin E."; $user->status = 'active'; $user->id = 42; - try { - $this->_em->merge($user); - $this->fail(); - } catch (EntityNotFoundException $enfe) {} + + $this->expectException(EntityNotFoundException::class); + $this->_em->merge($user); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index 5060f07a1..523c98c09 100644 --- a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional; +use Doctrine\DBAL\Exception\UniqueConstraintViolationException; use Doctrine\ORM\OptimisticLockException; use Doctrine\ORM\Proxy\Proxy; use Doctrine\Tests\Models\CMS\CmsUser; @@ -113,14 +114,16 @@ class DetachedEntityTest extends OrmFunctionalTestCase { $ph = new CmsPhonenumber(); $ph->phonenumber = '12345'; + $this->_em->persist($ph); $this->_em->flush(); $this->_em->clear(); + $this->_em->persist($ph); - try { - $this->_em->flush(); - $this->fail(); - } catch (\Exception $expected) {} + + // since it tries to insert the object twice (with the same PK) + $this->expectException(UniqueConstraintViolationException::class); + $this->_em->flush(); } public function testUninitializedLazyAssociationsAreIgnoredOnMerge() diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index 694259b29..f9d91be63 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php @@ -72,17 +72,22 @@ class SingleScalarHydratorTest extends HydrationTestCase $stmt = new HydratorMockStatement($resultSet); $hydrator = new SingleScalarHydrator($this->_em); - if ($name == 'result1') { + if ($name === 'result1') { $result = $hydrator->hydrateAll($stmt, $rsm); $this->assertEquals('romanb', $result); - } else if ($name == 'result2') { + return; + } + + if ($name === 'result2') { $result = $hydrator->hydrateAll($stmt, $rsm); $this->assertEquals(1, $result); - } else if ($name == 'result3' || $name == 'result4') { - try { - $result = $hydrator->hydrateAll($stmt, $rsm); - $this->fail(); - } catch (\Doctrine\ORM\NonUniqueResultException $e) {} + + return; + } + + if (in_array($name, ['result3', 'result4'], true)) { + $this->expectException(NonUniqueResultException::class); + $hydrator->hydrateAll($stmt, $rsm); } } } diff --git a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php index acc951c16..aa0240ebc 100644 --- a/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/AssignedGeneratorTest.php @@ -22,19 +22,22 @@ class AssignedGeneratorTest extends OrmTestCase $this->_assignedGen = new AssignedGenerator; } - public function testThrowsExceptionIfIdNotAssigned() + /** + * @dataProvider entitiesWithoutId + */ + public function testThrowsExceptionIfIdNotAssigned($entity) { - try { - $entity = new AssignedSingleIdEntity; - $this->_assignedGen->generate($this->_em, $entity); - $this->fail('Assigned generator did not throw exception even though ID was missing.'); - } catch (ORMException $expected) {} + $this->expectException(ORMException::class); - try { - $entity = new AssignedCompositeIdEntity; - $this->_assignedGen->generate($this->_em, $entity); - $this->fail('Assigned generator did not throw exception even though ID was missing.'); - } catch (ORMException $expected) {} + $this->_assignedGen->generate($this->_em, $entity); + } + + public function entitiesWithoutId(): array + { + return [ + 'single' => [new AssignedSingleIdEntity()], + 'composite' => [new AssignedCompositeIdEntity()], + ]; } public function testCorrectIdGeneration() From d8663cd9ee9bb017fa6bf07fb4a65ae821b37190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 14:05:43 +0200 Subject: [PATCH 057/124] Use a more appropriate assertion on some tests --- .../Functional/ClassTableInheritanceTest.php | 36 ++++++++++--------- .../Tests/ORM/Functional/QueryTest.php | 10 +++--- .../Tests/ORM/Functional/TypeTest.php | 15 ++++---- .../ORM/Hydration/ScalarHydratorTest.php | 4 +-- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index c94d3d73d..4ece24fa7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php @@ -51,7 +51,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $entities = $query->getResult(); - $this->assertEquals(2, count($entities)); + $this->assertCount(2, $entities); $this->assertInstanceOf(CompanyPerson::class, $entities[0]); $this->assertInstanceOf(CompanyEmployee::class, $entities[1]); $this->assertTrue(is_numeric($entities[0]->getId())); @@ -66,7 +66,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $entities = $query->getResult(); - $this->assertEquals(1, count($entities)); + $this->assertCount(1, $entities); $this->assertInstanceOf(CompanyEmployee::class, $entities[0]); $this->assertTrue(is_numeric($entities[0]->getId())); $this->assertEquals('Guilherme Blanco', $entities[0]->getName()); @@ -164,7 +164,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $query = $this->_em->createQuery('select p, s from ' . CompanyPerson::class . ' p join p.spouse s where p.name=\'Mary Smith\''); $result = $query->getResult(); - $this->assertEquals(1, count($result)); + $this->assertCount(1, $result); $this->assertInstanceOf(CompanyPerson::class, $result[0]); $this->assertEquals('Mary Smith', $result[0]->getName()); $this->assertInstanceOf(CompanyEmployee::class, $result[0]->getSpouse()); @@ -182,8 +182,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $person1->addFriend($person2); - $this->assertEquals(1, count($person1->getFriends())); - $this->assertEquals(1, count($person2->getFriends())); + $this->assertCount(1, $person1->getFriends()); + $this->assertCount(1, $person2->getFriends()); $this->_em->persist($person1); @@ -197,8 +197,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $query->setParameter(1, 'Roman'); $result = $query->getResult(); - $this->assertEquals(1, count($result)); - $this->assertEquals(1, count($result[0]->getFriends())); + $this->assertCount(1, $result); + $this->assertCount(1, $result[0]->getFriends()); $this->assertEquals('Roman', $result[0]->getName()); $friends = $result[0]->getFriends(); @@ -226,7 +226,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $result = $q->getResult(); - $this->assertEquals(1, count($result)); + $this->assertCount(1, $result); $this->assertInstanceOf(CompanyOrganization::class, $result[0]); $this->assertNull($result[0]->getMainEvent()); @@ -235,7 +235,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->assertInstanceOf(PersistentCollection::class, $events); $this->assertFalse($events->isInitialized()); - $this->assertEquals(2, count($events)); + $this->assertCount(2, $events); if ($events[0] instanceof CompanyAuction) { $this->assertInstanceOf(CompanyRaffle::class, $events[1]); } else { @@ -259,7 +259,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $q->setParameter(1, $event1->getId()); $result = $q->getResult(); - $this->assertEquals(1, count($result)); + $this->assertCount(1, $result); $this->assertInstanceOf(CompanyAuction::class, $result[0], sprintf("Is of class %s", get_class($result[0]))); $this->_em->clear(); @@ -269,7 +269,7 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $result = $q->getResult(); - $this->assertEquals(1, count($result)); + $this->assertCount(1, $result); $this->assertInstanceOf(CompanyOrganization::class, $result[0]); $mainEvent = $result[0]->getMainEvent(); @@ -286,9 +286,10 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->createQuery('UPDATE ' . CompanyEmployee::class . ' AS p SET p.salary = 1') ->execute(); - $this->assertTrue(count($this->_em->createQuery( - 'SELECT count(p.id) FROM Doctrine\Tests\Models\Company\CompanyEmployee p WHERE p.salary = 1') - ->getResult()) > 0); + $result = $this->_em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1') + ->getResult(); + + $this->assertGreaterThan(0, count($result)); } /** @@ -441,7 +442,8 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $this->_em->clear(); $manager = $this->_em->find(CompanyManager::class, $manager->getId()); - $this->assertEquals(1, count($manager->getFriends())); + + $this->assertCount(1, $manager->getFriends()); } /** @@ -481,12 +483,12 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase $users = $repository->matching(new Criteria( Criteria::expr()->eq('department', 'IT') )); - $this->assertEquals(1, count($users)); + $this->assertCount(1, $users); $repository = $this->_em->getRepository(CompanyManager::class); $users = $repository->matching(new Criteria( Criteria::expr()->eq('department', 'IT') )); - $this->assertEquals(1, count($users)); + $this->assertCount(1, $users); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 127f06d18..af4656960 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -208,7 +208,7 @@ class QueryTest extends OrmFunctionalTestCase } $this->assertEquals(1, count($found)); - $this->assertEquals( + $this->assertSame( [ [ [ @@ -256,8 +256,8 @@ class QueryTest extends OrmFunctionalTestCase $iteratedCount++; } - $this->assertEquals(["Doctrine 2", "Symfony 2"], $topics); - $this->assertEquals(2, $iteratedCount); + $this->assertSame(["Doctrine 2", "Symfony 2"], $topics); + $this->assertSame(2, $iteratedCount); $this->_em->flush(); $this->_em->clear(); @@ -293,8 +293,8 @@ class QueryTest extends OrmFunctionalTestCase $iteratedCount++; } - $this->assertEquals(["Doctrine 2", "Symfony 2"], $topics); - $this->assertEquals(2, $iteratedCount); + $this->assertSame(["Doctrine 2", "Symfony 2"], $topics); + $this->assertSame(2, $iteratedCount); $this->_em->flush(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index 9276d74ee..0f5c7e223 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -32,8 +32,8 @@ class TypeTest extends OrmFunctionalTestCase $dql = 'SELECT d FROM ' . DecimalModel::class . ' d'; $decimal = $this->_em->createQuery($dql)->getSingleResult(); - $this->assertEquals(0.15, $decimal->decimal); - $this->assertEquals(0.1515, $decimal->highScale); + $this->assertSame('0.15', $decimal->decimal); + $this->assertSame('0.1515', $decimal->highScale); } /** @@ -78,7 +78,7 @@ class TypeTest extends OrmFunctionalTestCase $dql = 'SELECT s FROM ' . SerializationModel::class . ' s'; $serialize = $this->_em->createQuery($dql)->getSingleResult(); - $this->assertEquals(["foo" => "bar", "bar" => "baz"], $serialize->array); + $this->assertSame(["foo" => "bar", "bar" => "baz"], $serialize->array); } public function testObject() @@ -108,7 +108,7 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); $this->assertInstanceOf(\DateTime::class, $dateTimeDb->date); - $this->assertEquals('2009-10-01', $dateTimeDb->date->format('Y-m-d')); + $this->assertSame('2009-10-01', $dateTimeDb->date->format('Y-m-d')); } public function testDateTime() @@ -123,11 +123,12 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); $this->assertInstanceOf(\DateTime::class, $dateTimeDb->datetime); - $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); + $this->assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); $articles = $this->_em->getRepository(DateTimeModel::class) ->findBy(['datetime' => new \DateTime()]); - $this->assertEquals(0, count($articles)); + + $this->assertEmpty($articles); } public function testDqlQueryBindDateTimeInstance() @@ -177,6 +178,6 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); $this->assertInstanceOf(\DateTime::class, $dateTimeDb->time); - $this->assertEquals('19:27:20', $dateTimeDb->time->format('H:i:s')); + $this->assertSame('19:27:20', $dateTimeDb->time->format('H:i:s')); } } diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index 2c51929bc..85a197cba 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php @@ -37,8 +37,8 @@ class ScalarHydratorTest extends HydrationTestCase $result = $hydrator->hydrateAll($stmt, $rsm); - $this->assertTrue(is_array($result)); - $this->assertEquals(2, count($result)); + $this->assertInternalType('array', $result); + $this->assertCount(2, $result); $this->assertEquals('romanb', $result[0]['u_name']); $this->assertEquals(1, $result[0]['u_id']); $this->assertEquals('jwage', $result[1]['u_name']); From 8dccd27b5232a4830a3e55f616da2f3a43b0c98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 16:36:31 +0200 Subject: [PATCH 058/124] Add the correct assertions for tests that don't have any --- .../ORM/Functional/CascadeRemoveOrderTest.php | 6 ++++ .../Tests/ORM/Functional/NativeQueryTest.php | 2 ++ .../Tests/ORM/Functional/QueryTest.php | 18 +++++++++- .../ORM/Functional/SequenceGeneratorTest.php | 7 ++-- .../ORM/Functional/Ticket/DDC1113Test.php | 5 ++- .../ORM/Functional/Ticket/DDC117Test.php | 2 ++ .../ORM/Functional/Ticket/DDC1181Test.php | 2 ++ .../ORM/Functional/Ticket/DDC1209Test.php | 33 +++++++++++++++---- .../ORM/Functional/Ticket/DDC1306Test.php | 3 ++ .../ORM/Functional/Ticket/DDC1400Test.php | 4 +++ .../ORM/Functional/Ticket/DDC144Test.php | 1 + .../ORM/Functional/Ticket/DDC1454Test.php | 6 ++-- .../ORM/Functional/Ticket/DDC1925Test.php | 6 ++++ .../ORM/Functional/Ticket/DDC192Test.php | 22 +++++++++---- .../ORM/Functional/Ticket/DDC2106Test.php | 3 +- .../ORM/Functional/Ticket/DDC2256Test.php | 4 +-- .../ORM/Functional/Ticket/DDC2775Test.php | 2 ++ .../ORM/Functional/Ticket/DDC3170Test.php | 10 ++++-- .../ORM/Functional/Ticket/DDC3785Test.php | 7 +++- .../ORM/Functional/Ticket/DDC522Test.php | 6 +++- .../ORM/Functional/Ticket/DDC832Test.php | 24 ++++++++++++++ .../Tests/ORM/Functional/TypeTest.php | 6 ++++ .../ORM/Hydration/ScalarHydratorTest.php | 4 +-- .../ORM/Mapping/AnnotationDriverTest.php | 3 +- .../ORM/Mapping/PHPMappingDriverTest.php | 2 +- .../Mapping/StaticPHPMappingDriverTest.php | 3 +- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 4 ++- .../Tests/ORM/Tools/SchemaValidatorTest.php | 2 +- tests/Doctrine/Tests/ORM/UnitOfWorkTest.php | 4 +++ 29 files changed, 167 insertions(+), 34 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index a6de137d1..8908e51e0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php @@ -47,6 +47,8 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_em->remove($eOloaded); $this->_em->flush(); + + self::assertNull($this->_em->find(CascadeRemoveOrderEntityG::class, $eG->getId())); } public function testMany() @@ -66,6 +68,10 @@ class CascadeRemoveOrderTest extends OrmFunctionalTestCase $this->_em->remove($eOloaded); $this->_em->flush(); + + self::assertNull($this->_em->find(CascadeRemoveOrderEntityG::class, $eG1->getId())); + self::assertNull($this->_em->find(CascadeRemoveOrderEntityG::class, $eG2->getId())); + self::assertNull($this->_em->find(CascadeRemoveOrderEntityG::class, $eG3->getId())); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index 4e8e6c96e..31c19a1cd 100644 --- a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php @@ -325,6 +325,8 @@ class NativeQueryTest extends OrmFunctionalTestCase { $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata(CompanyFixContract::class, 'c'); + + self::assertSame(CompanyFixContract::class, $rsm->getClassName('c')); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index af4656960..f25cd33fa 100644 --- a/tests/Doctrine/Tests/ORM/Functional/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php @@ -169,13 +169,29 @@ class QueryTest extends OrmFunctionalTestCase $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2') ->setParameters($parameters) ->getResult(); + + $extractValue = function (Parameter $parameter) { + return $parameter->getValue(); + }; + + self::assertSame( + $parameters->map($extractValue)->toArray(), + $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params'] + ); } public function testSetParametersBackwardsCompatible() { + $parameters = [1 => 'jwage', 2 => 'active']; + $this->_em->createQuery('SELECT u FROM ' . CmsUser::class . ' u WHERE u.name = ?1 AND u.status = ?2') - ->setParameters([1 => 'jwage', 2 => 'active']) + ->setParameters($parameters) ->getResult(); + + self::assertSame( + array_values($parameters), + $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params'] + ); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php index c00f8bc9f..290984f35 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php @@ -30,12 +30,13 @@ class SequenceGeneratorTest extends OrmFunctionalTestCase public function testHighAllocationSizeSequence() { - for ($i = 0; $i < 11; $i++) { - $e = new SequenceEntity(); - $this->_em->persist($e); + for ($i = 0; $i < 11; ++$i) { + $this->_em->persist(new SequenceEntity()); } $this->_em->flush(); + + self::assertCount(11, $this->_em->getRepository(SequenceEntity::class)->findAll()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php index 7402972b0..324e84812 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1113Test.php @@ -42,8 +42,11 @@ class DDC1113Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->remove($bus); $this->_em->remove($car); $this->_em->flush(); - } + self::assertEmpty($this->_em->getRepository(DDC1113Car::class)->findAll()); + self::assertEmpty($this->_em->getRepository(DDC1113Bus::class)->findAll()); + self::assertEmpty($this->_em->getRepository(DDC1113Engine::class)->findAll()); + } } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php index c6d215cf8..8478a5f66 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC117Test.php @@ -275,6 +275,8 @@ class DDC117Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($this->article1); $this->_em->flush(); + + self::assertSame($this->articleDetails, $this->_em->find(DDC117ArticleDetails::class, $this->article1)); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php index 1c4343e40..564e046e7 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1181Test.php @@ -47,6 +47,8 @@ class DDC1181Test extends OrmFunctionalTestCase $this->_em->remove($hotel); $this->_em->flush(); + + self::assertEmpty($this->_em->getRepository(DDC1181Booking::class)->findAll()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php index ce53b7505..6c54da296 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1209Test.php @@ -26,8 +26,12 @@ class DDC1209Test extends OrmFunctionalTestCase */ public function testIdentifierCanHaveCustomType() { - $this->_em->persist(new DDC1209_3()); + $entity = new DDC1209_3(); + + $this->_em->persist($entity); $this->_em->flush(); + + self::assertSame($entity, $this->_em->find(DDC1209_3::class, $entity->date)); } /** @@ -36,14 +40,27 @@ class DDC1209Test extends OrmFunctionalTestCase public function testCompositeIdentifierCanHaveCustomType() { $future1 = new DDC1209_1(); - $this->_em->persist($future1); + $this->_em->persist($future1); $this->_em->flush(); $future2 = new DDC1209_2($future1); - $this->_em->persist($future2); + $this->_em->persist($future2); $this->_em->flush(); + + self::assertSame( + $future2, + $this->_em->find( + DDC1209_2::class, + [ + 'future1' => $future1, + 'starting_datetime' => $future2->starting_datetime, + 'during_datetime' => $future2->during_datetime, + 'ending_datetime' => $future2->ending_datetime, + ] + ) + ); } } @@ -78,17 +95,19 @@ class DDC1209_2 * @Id * @Column(type="datetime", nullable=false) */ - private $starting_datetime; + public $starting_datetime; + /** * @Id * @Column(type="datetime", nullable=false) */ - private $during_datetime; + public $during_datetime; + /** * @Id * @Column(type="datetime", nullable=false) */ - private $ending_datetime; + public $ending_datetime; public function __construct(DDC1209_1 $future1) { @@ -108,7 +127,7 @@ class DDC1209_3 * @Id * @Column(type="datetime", name="somedate") */ - private $date; + public $date; public function __construct() { diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php index 956c5f7d5..03c761a95 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1306Test.php @@ -48,5 +48,8 @@ class DDC1306Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->remove($user->getAddress()); $this->_em->remove($user); $this->_em->flush(); + + self::assertEmpty($this->_em->getRepository(CmsAddress::class)->findAll()); + self::assertEmpty($this->_em->getRepository(CmsUser::class)->findAll()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php index a569c1a82..1248fe841 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1400Test.php @@ -57,7 +57,11 @@ class DDC1400Test extends \Doctrine\Tests\OrmFunctionalTestCase ->setParameter('activeUser', $user1) ->getResult(); + $queryCount = $this->getCurrentQueryCount(); + $this->_em->flush(); + + self::assertSame($queryCount, $this->getCurrentQueryCount(), 'No query should be executed during flush in this case'); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php index 064b78021..3866c588d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC144Test.php @@ -30,6 +30,7 @@ class DDC144Test extends OrmFunctionalTestCase $this->_em->persist($operand); $this->_em->flush(); + self::assertSame($operand, $this->_em->find(DDC144Operand::class, $operand->id)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php index 0f5509310..86aba5113 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1454Test.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\UnitOfWork; + /** * @group DDC-1454 */ @@ -25,9 +27,9 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase public function testFailingCase() { $pic = new DDC1454Picture(); - $this->_em->getUnitOfWork()->getEntityState($pic); - } + self::assertSame(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($pic)); + } } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php index 8c56951be..ef7d6014b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php @@ -36,6 +36,12 @@ class DDC1925Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($product); $this->_em->flush(); + $this->_em->clear(); + + /** @var DDC1925Product $persistedProduct */ + $persistedProduct = $this->_em->find(DDC1925Product::class, $product->getId()); + + self::assertEquals($user, $persistedProduct->getBuyers()->first()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php index e90062363..532e0edfe 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\OrmFunctionalTestCase; /** @@ -11,12 +12,21 @@ class DDC192Test extends OrmFunctionalTestCase { public function testSchemaCreation() { - $this->_schemaTool->createSchema( - [ - $this->_em->getClassMetadata(DDC192User::class), - $this->_em->getClassMetadata(DDC192Phonenumber::class) - ] - ); + $classes = [ + $this->_em->getClassMetadata(DDC192User::class), + $this->_em->getClassMetadata(DDC192Phonenumber::class), + ]; + + $this->_schemaTool->createSchema($classes); + + $tables = $this->_em->getConnection() + ->getSchemaManager() + ->listTableNames(); + + /** @var ClassMetadata $class */ + foreach ($classes as $class) { + self::assertContains($class->getTableName(), $tables); + } } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php index c56f3fb48..4856852ec 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php @@ -34,7 +34,8 @@ class DDC2106Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($entityWithoutId); $criteria = Criteria::create()->where(Criteria::expr()->eq('parent', $entityWithoutId)); - $entity->children->matching($criteria)->count(); + + self::assertCount(0, $entity->children->matching($criteria)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php index 9e6f0bcca..02281a5e3 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2256Test.php @@ -51,14 +51,14 @@ class DDC2256Test extends \Doctrine\Tests\OrmFunctionalTestCase $rsm->addFieldResult('g', 'group_id', 'id'); $rsm->addFieldResult('g', 'group_name', 'name'); - $this->_em->createNativeQuery($sql, $rsm)->getResult(); + self::assertCount(1, $this->_em->createNativeQuery($sql, $rsm)->getResult()); // Test ResultSetMappingBuilder. $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata('MyNamespace:DDC2256User', 'u'); $rsm->addJoinedEntityFromClassMetadata('MyNamespace:DDC2256Group', 'g', 'u', 'group', ['id' => 'group_id', 'name' => 'group_name']); - $this->_em->createNativeQuery($sql, $rsm)->getResult(); + self::assertCount(1, $this->_em->createNativeQuery($sql, $rsm)->getResult()); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php index 3f7703385..b84024f04 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2775Test.php @@ -49,6 +49,8 @@ class DDC2775Test extends OrmFunctionalTestCase $this->_em->remove($user); $this->_em->flush(); + self::assertEmpty($this->_em->getRepository(Authorization::class)->findAll()); + // With the bug, the second flush throws an error because the cascade remove didn't work correctly $this->_em->flush(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php index 0ef1caee8..45a49b7a6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -46,17 +46,23 @@ class DDC3170Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $this->_em->createQueryBuilder() + $result = $this->_em->createQueryBuilder() ->select('p') ->from(DDC3170ProductJoined::class, 'p') ->getQuery() ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); - $this->_em->createQueryBuilder() + self::assertCount(1, $result); + self::assertContainsOnly(DDC3170ProductJoined::class, $result); + + $result = $this->_em->createQueryBuilder() ->select('p') ->from(DDC3170ProductSingleTable::class, 'p') ->getQuery() ->getResult(AbstractQuery::HYDRATE_SIMPLEOBJECT); + + self::assertCount(1, $result); + self::assertContainsOnly(DDC3170ProductSingleTable::class, $result); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php index 4fcc3932c..984cda551 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3785Test.php @@ -44,8 +44,13 @@ class DDC3785Test extends \Doctrine\Tests\OrmFunctionalTestCase $asset->getAttributes() ->removeElement($attribute1); + $idToBeRemoved = $attribute1->id; + $this->_em->persist($asset); $this->_em->flush(); + + self::assertNull($this->_em->find(DDC3785_Attribute::class, $idToBeRemoved)); + self::assertNotNull($this->_em->find(DDC3785_Attribute::class, $attribute2->id)); } } @@ -100,7 +105,7 @@ class DDC3785_Attribute * @Id @Column(type="integer") * @GeneratedValue */ - private $id; + public $id; /** @Column(type = "string") */ private $name; diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php index 3909b9ca0..dc6fa2081 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC522Test.php @@ -78,7 +78,11 @@ class DDC522Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->flush(); $this->_em->clear(); - $newCust = $this->_em->find(get_class($fkCust), $fkCust->id); + $expected = clone $fkCust; + // removing dynamic field (which is not persisted) + unset($expected->name); + + self::assertEquals($expected, $this->_em->find(DDC522ForeignKeyTest::class, $fkCust->id)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php index ee46b5bc7..fdae13585 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC832Test.php @@ -50,6 +50,9 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $like->word = 'test2'; $this->_em->flush(); + $this->_em->clear(); + + self::assertEquals($like, $this->_em->find(DDC832Like::class, $like->id)); } /** @@ -61,8 +64,13 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($like); $this->_em->flush(); + $idToBeRemoved = $like->id; + $this->_em->remove($like); $this->_em->flush(); + $this->_em->clear(); + + self::assertNull($this->_em->find(DDC832Like::class, $idToBeRemoved)); } /** @@ -76,6 +84,9 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $index->name = 'asdf'; $this->_em->flush(); + $this->_em->clear(); + + self::assertEquals($index, $this->_em->find(DDC832JoinedIndex::class, $index->id)); } /** @@ -87,8 +98,13 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($index); $this->_em->flush(); + $idToBeRemoved = $index->id; + $this->_em->remove($index); $this->_em->flush(); + $this->_em->clear(); + + self::assertNull($this->_em->find(DDC832JoinedIndex::class, $idToBeRemoved)); } /** @@ -102,6 +118,9 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $index->name = 'asdf'; $this->_em->flush(); + $this->_em->clear(); + + self::assertEquals($index, $this->_em->find(DDC832JoinedTreeIndex::class, $index->id)); } /** @@ -113,8 +132,13 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase $this->_em->persist($index); $this->_em->flush(); + $idToBeRemoved = $index->id; + $this->_em->remove($index); $this->_em->flush(); + $this->_em->clear(); + + self::assertNull($this->_em->find(DDC832JoinedTreeIndex::class, $idToBeRemoved)); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index 0f5c7e223..9dd99777a 100644 --- a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php @@ -145,6 +145,9 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->createQuery('SELECT d FROM Doctrine\Tests\Models\Generic\DateTimeModel d WHERE d.datetime = ?1') ->setParameter(1, $date, DBALType::DATETIME) ->getSingleResult(); + + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->datetime); + $this->assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); } public function testDqlQueryBuilderBindDateTimeInstance() @@ -164,6 +167,9 @@ class TypeTest extends OrmFunctionalTestCase ->where('d.datetime = ?1') ->setParameter(1, $date, DBALType::DATETIME) ->getQuery()->getSingleResult(); + + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->datetime); + $this->assertSame('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); } public function testTime() diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index 85a197cba..919486cc8 100644 --- a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php +++ b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php @@ -66,7 +66,7 @@ class ScalarHydratorTest extends HydrationTestCase $stmt = new HydratorMockStatement($resultSet); $hydrator = new ScalarHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm); + self::assertCount(1, $hydrator->hydrateAll($stmt, $rsm)); } /** @@ -96,6 +96,6 @@ class ScalarHydratorTest extends HydrationTestCase $stmt = new HydratorMockStatement($resultSet); $hydrator = new ScalarHydrator($this->_em); - $result = $hydrator->hydrateAll($stmt, $rsm); + self::assertCount(1, $hydrator->hydrateAll($stmt, $rsm)); } } diff --git a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php index 89951f971..b30ed703b 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/AnnotationDriverTest.php @@ -221,10 +221,11 @@ class AnnotationDriverTest extends AbstractMappingDriverTest $em = $this->_getTestEntityManager(); $em->getConfiguration()->setMetadataDriverImpl($annotationDriver); + $factory = new ClassMetadataFactory(); $factory->setEntityManager($em); - $cm = $factory->getMetadataFor(ChildEntity::class); + self::assertInstanceOf(ClassMetadata::class, $factory->getMetadataFor(ChildEntity::class)); } public function testInvalidFetchOptionThrowsException() diff --git a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php index 39b5525b2..04493dbc4 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/PHPMappingDriverTest.php @@ -32,7 +32,7 @@ class PHPMappingDriverTest extends AbstractMappingDriverTest */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() { - $this->createClassMetadata(DDC889Class::class); + self::assertInstanceOf(ClassMetadata::class, $this->createClassMetadata(DDC889Class::class)); } /** diff --git a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php index 5f2f0c1d7..3bc5a5d5d 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/StaticPHPMappingDriverTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Mapping; use Doctrine\Common\Persistence\Mapping\Driver\StaticPHPDriver; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\Models\DDC889\DDC889Class; class StaticPHPMappingDriverTest extends AbstractMappingDriverTest @@ -19,7 +20,7 @@ class StaticPHPMappingDriverTest extends AbstractMappingDriverTest */ public function testinvalidEntityOrMappedSuperClassShouldMentionParentClasses() { - $this->createClassMetadata(DDC889Class::class); + self::assertInstanceOf(ClassMetadata::class, $this->createClassMetadata(DDC889Class::class)); } /** diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index 6b0091e9c..c5a5da411 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -6,6 +6,7 @@ use Doctrine\Common\Cache\ArrayCache; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManager; +use Doctrine\ORM\Internal\Hydration\IterableResult; use Doctrine\ORM\Query\Parameter; use Doctrine\Tests\Mocks\DriverConnectionMock; use Doctrine\Tests\Mocks\StatementArrayMock; @@ -147,7 +148,8 @@ class QueryTest extends OrmTestCase public function testIterateWithDistinct() { $q = $this->_em->createQuery("SELECT DISTINCT u from Doctrine\Tests\Models\CMS\CmsUser u LEFT JOIN u.articles a"); - $q->iterate(); + + self::assertInstanceOf(IterableResult::class, $q->iterate()); } /** diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index 955a5f43d..682ee896d 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php @@ -33,7 +33,7 @@ class SchemaValidatorTest extends OrmTestCase ->getMetadataDriverImpl() ->addPaths([$path]); - $this->validator->validateMapping(); + self::assertEmpty($this->validator->validateMapping()); } public function modelSetProvider(): array diff --git a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php index 90c621d60..ff025df4f 100644 --- a/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php +++ b/tests/Doctrine/Tests/ORM/UnitOfWorkTest.php @@ -248,8 +248,12 @@ class UnitOfWorkTest extends OrmTestCase // Schedule user for update without changes $this->_unitOfWork->scheduleForUpdate($user); + self::assertNotEmpty($this->_unitOfWork->getScheduledEntityUpdates()); + // This commit should not raise an E_NOTICE $this->_unitOfWork->commit(); + + self::assertEmpty($this->_unitOfWork->getScheduledEntityUpdates()); } /** From ee5f222c5870c166deadb27af914f4dc237b69d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 08:22:19 +0200 Subject: [PATCH 059/124] Rename data provider so that it doesn't get executed as test --- .../Tests/ORM/Internal/HydrationCompleteHandlerTest.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php index 27b23f512..e4e9bcdf7 100644 --- a/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php +++ b/tests/Doctrine/Tests/ORM/Internal/HydrationCompleteHandlerTest.php @@ -61,7 +61,7 @@ class HydrationCompleteHandlerTest extends TestCase } /** - * @dataProvider testGetValidListenerInvocationFlags + * @dataProvider invocationFlagProvider * * @param int $listenersFlag */ @@ -99,7 +99,7 @@ class HydrationCompleteHandlerTest extends TestCase } /** - * @dataProvider testGetValidListenerInvocationFlags + * @dataProvider invocationFlagProvider * * @param int $listenersFlag */ @@ -125,7 +125,7 @@ class HydrationCompleteHandlerTest extends TestCase } /** - * @dataProvider testGetValidListenerInvocationFlags + * @dataProvider invocationFlagProvider * * @param int $listenersFlag */ @@ -187,7 +187,7 @@ class HydrationCompleteHandlerTest extends TestCase $this->handler->hydrationComplete(); } - public function testGetValidListenerInvocationFlags() + public function invocationFlagProvider() { return [ [ListenersInvoker::INVOKE_LISTENERS], From a9c711ad7ea25f9eec286d0054d78299b9e82e8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 08:22:55 +0200 Subject: [PATCH 060/124] Register custom types to not skip model set validation Also removing an empty and unused model set. --- .../ORM/Functional/SchemaValidatorTest.php | 49 +++++++++++++++---- .../Doctrine/Tests/OrmFunctionalTestCase.php | 1 - 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php index d6f98af1f..5ab0f07c0 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SchemaValidatorTest.php @@ -3,7 +3,11 @@ namespace Doctrine\Tests\ORM\Functional; use Doctrine\ORM\Tools\SchemaValidator; +use Doctrine\Tests\DbalTypes\CustomIdObjectType; +use Doctrine\Tests\DbalTypes\NegativeToPositiveType; +use Doctrine\Tests\DbalTypes\UpperCaseStringType; use Doctrine\Tests\OrmFunctionalTestCase; +use Doctrine\DBAL\Types\Type as DBALType; /** * Test the validity of all modelsets @@ -12,26 +16,53 @@ use Doctrine\Tests\OrmFunctionalTestCase; */ class SchemaValidatorTest extends OrmFunctionalTestCase { - static public function dataValidateModelSets() + protected function setUp() + { + $this->registerType(CustomIdObjectType::class); + $this->registerType(UpperCaseStringType::class); + $this->registerType(NegativeToPositiveType::class); + + parent::setUp(); + } + + /** + * @param string $className + * + * @throws \Doctrine\DBAL\DBALException + * + * @return void + */ + private function registerType(string $className) + { + $type = constant($className . '::NAME'); + + if (DBALType::hasType($type)) { + DBALType::overrideType($type, $className); + return; + } + + DBALType::addType($type, $className); + } + + public static function dataValidateModelSets(): array { $modelSets = []; - foreach (self::$_modelSets as $modelSet => $classes) { - if ($modelSet == "customtype") { - continue; - } - $modelSets[] = [$modelSet]; + + foreach (array_keys(self::$_modelSets) as $modelSet) { + $modelSets[$modelSet] = [$modelSet]; } + return $modelSets; } /** * @dataProvider dataValidateModelSets */ - public function testValidateModelSets($modelSet) + public function testValidateModelSets(string $modelSet) { $validator = new SchemaValidator($this->_em); + $classes = []; - $classes = []; foreach (self::$_modelSets[$modelSet] as $className) { $classes[] = $this->_em->getClassMetadata($className); } @@ -39,7 +70,7 @@ class SchemaValidatorTest extends OrmFunctionalTestCase foreach ($classes as $class) { $ce = $validator->validateClass($class); - $this->assertEquals(0, count($ce), "Invalid Modelset: " . $modelSet . " class " . $class->name . ": ". implode("\n", $ce)); + $this->assertEmpty($ce, "Invalid Modelset: " . $modelSet . " class " . $class->name . ": ". implode("\n", $ce)); } } } diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 2a5f45264..e9299b1c6 100644 --- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php +++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php @@ -106,7 +106,6 @@ abstract class OrmFunctionalTestCase extends OrmTestCase Models\CMS\CmsArticle::class, Models\CMS\CmsComment::class, ], - 'forum' => [], 'company' => [ Models\Company\CompanyPerson::class, Models\Company\CompanyEmployee::class, From 5c02e0c1e84ce3c669cfc46043602536d93c49b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Wed, 31 May 2017 10:58:37 +0200 Subject: [PATCH 061/124] Remove APC dependency on tests By using a shared array cache so that we can reproduce different cache instances that shares the stored data. --- .../Tests/ORM/Cache/DefaultRegionTest.php | 68 +++++++++++++++++-- 1 file changed, 61 insertions(+), 7 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php b/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php index 5faed3c9e..97365dfcf 100644 --- a/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php +++ b/tests/Doctrine/Tests/ORM/Cache/DefaultRegionTest.php @@ -2,9 +2,9 @@ namespace Doctrine\Tests\ORM\Cache; -use Doctrine\Common\Cache\ApcCache; use Doctrine\Common\Cache\ArrayCache; use Doctrine\Common\Cache\Cache; +use Doctrine\Common\Cache\CacheProvider; use Doctrine\ORM\Cache\CollectionCacheEntry; use Doctrine\ORM\Cache\Region\DefaultRegion; use Doctrine\Tests\Mocks\CacheEntryMock; @@ -28,14 +28,11 @@ class DefaultRegionTest extends AbstractRegionTest public function testSharedRegion() { - if ( ! extension_loaded('apc') || false === @apc_cache_info()) { - $this->markTestSkipped('The ' . __CLASS__ .' requires the use of APC'); - } - + $cache = new SharedArrayCache(); $key = new CacheKeyMock('key'); $entry = new CacheEntryMock(['value' => 'foo']); - $region1 = new DefaultRegion('region1', new ApcCache()); - $region2 = new DefaultRegion('region2', new ApcCache()); + $region1 = new DefaultRegion('region1', $cache->createChild()); + $region2 = new DefaultRegion('region2', $cache->createChild()); $this->assertFalse($region1->contains($key)); $this->assertFalse($region2->contains($key)); @@ -99,3 +96,60 @@ class DefaultRegionTest extends AbstractRegionTest $this->assertEquals($value2, $actual[1]); } } + +/** + * Cache provider that offers child cache items (sharing the same array) + * + * Declared as a different class for readability purposes and kept in this file + * to keep its monstrosity contained. + * + * @internal + */ +final class SharedArrayCache extends ArrayCache +{ + public function createChild(): Cache + { + return new class ($this) extends CacheProvider + { + /** + * @var ArrayCache + */ + private $parent; + + public function __construct(ArrayCache $parent) + { + $this->parent = $parent; + } + + protected function doFetch($id) + { + return $this->parent->doFetch($id); + } + + protected function doContains($id) + { + return $this->parent->doContains($id); + } + + protected function doSave($id, $data, $lifeTime = 0) + { + return $this->parent->doSave($id, $data, $lifeTime); + } + + protected function doDelete($id) + { + return $this->parent->doDelete($id); + } + + protected function doFlush() + { + return $this->parent->doFlush(); + } + + protected function doGetStats() + { + return $this->parent->doGetStats(); + } + }; + } +} From 5a2a77117384be8a9dfe1c6259fa8205496c5227 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Thu, 15 Jun 2017 01:02:45 +0200 Subject: [PATCH 062/124] Clarify the impact of changing the fetch mode Seems to work for one-to-many as well, but with a negative performance impact. --- docs/en/reference/dql-doctrine-query-language.rst | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/en/reference/dql-doctrine-query-language.rst b/docs/en/reference/dql-doctrine-query-language.rst index 8950c8d4c..ee2e2fa15 100644 --- a/docs/en/reference/dql-doctrine-query-language.rst +++ b/docs/en/reference/dql-doctrine-query-language.rst @@ -935,7 +935,8 @@ the Query class. Here they are: - ``Query#getResult()``: Retrieves a collection of objects. The result is either a plain collection of objects (pure) or an array - where the objects are nested in the result rows (mixed). + where the objects are nested in the result rows ( + ). - ``Query#getSingleResult()``: Retrieves a single object. If the result contains more than one object, an ``NonUniqueResultException`` is thrown. If the result contains no objects, an ``NoResultException`` @@ -1380,7 +1381,13 @@ Given that there are 10 users and corresponding addresses in the database the ex SELECT * FROM address WHERE id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10); .. note:: - Changing the fetch mode during a query is only possible for one-to-one and many-to-one relations. + Changing the fetch mode during a query mostly makes sense for one-to-one and many-to-one relations. In that case, +   all the necessary IDs are available after the root entity (``user`` in the above example) has been loaded. So, one +   query per association can be executed to fetch all the referred-to entities (``address``). + + For one-to-many relations, changing the fetch mode to eager will cause to execute one query **for every root entity +   loaded**. This gives no improvement over the ``lazy`` fetch mode which will also initialize the associations on + a one-by-one basis once they are accessed. EBNF From 8f9f41ea89e72859bc8198777a929c382053b343 Mon Sep 17 00:00:00 2001 From: Matthias Pigulla Date: Thu, 15 Jun 2017 01:03:38 +0200 Subject: [PATCH 063/124] Fix typo --- docs/en/reference/dql-doctrine-query-language.rst | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docs/en/reference/dql-doctrine-query-language.rst b/docs/en/reference/dql-doctrine-query-language.rst index ee2e2fa15..2c2e23f9e 100644 --- a/docs/en/reference/dql-doctrine-query-language.rst +++ b/docs/en/reference/dql-doctrine-query-language.rst @@ -935,8 +935,7 @@ the Query class. Here they are: - ``Query#getResult()``: Retrieves a collection of objects. The result is either a plain collection of objects (pure) or an array - where the objects are nested in the result rows ( - ). + where the objects are nested in the result rows (mixed). - ``Query#getSingleResult()``: Retrieves a single object. If the result contains more than one object, an ``NonUniqueResultException`` is thrown. If the result contains no objects, an ``NoResultException`` From 177c48107d0cbb73f1e8aa9e68d5d78dc375de0b Mon Sep 17 00:00:00 2001 From: Baptiste Lafontaine Date: Mon, 19 Jun 2017 13:31:10 +0200 Subject: [PATCH 064/124] Fix links to api doc --- docs/en/reference/second-level-cache.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/en/reference/second-level-cache.rst b/docs/en/reference/second-level-cache.rst index b55376561..62cc5d14f 100644 --- a/docs/en/reference/second-level-cache.rst +++ b/docs/en/reference/second-level-cache.rst @@ -97,7 +97,7 @@ Defines a contract for accessing a particular region. Defines a contract for accessing a particular cache region. -`See API Doc `_. +`See API Doc `_. Concurrent cache region ~~~~~~~~~~~~~~~~~~~~~~~ @@ -111,7 +111,7 @@ If you want to use an ``READ_WRITE`` cache, you should consider providing your o Defines contract for concurrently managed data region. -`See API Doc `_. +`See API Doc `_. Timestamp region ~~~~~~~~~~~~~~~~ @@ -120,7 +120,7 @@ Timestamp region Tracks the timestamps of the most recent updates to particular entity. -`See API Doc `_. +`See API Doc `_. .. _reference-second-level-cache-mode: @@ -209,7 +209,7 @@ It allows you to provide a specific implementation of the following components : * ``EntityHydrator`` Transform an entity into a cache entry and cache entry into entities * ``CollectionHydrator`` Transform a collection into a cache entry and cache entry into collection -`See API Doc `_. +`See API Doc `_. Region Lifetime ~~~~~~~~~~~~~~~ @@ -270,7 +270,7 @@ By providing a cache logger you should be able to get information about all cach If you want to get more information you should implement ``\Doctrine\ORM\Cache\Logging\CacheLogger``. and collect all information you want. -`See API Doc `_. +`See API Doc `_. Entity cache definition From 99dc8aa2a911e375ca14f986abac3eae5098c253 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Sat, 20 May 2017 17:59:23 +0200 Subject: [PATCH 065/124] Drop HHVM support --- .scrutinizer.yml | 4 ---- .travis.yml | 34 ---------------------------------- 2 files changed, 38 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 361b21e38..bebd35350 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -27,8 +27,4 @@ tools: enabled: true filter: paths: ["lib/*", "tests/*"] - php_hhvm: - enabled: true - filter: - paths: ["lib/*", "tests/*"] sensiolabs_security_checker: true diff --git a/.travis.yml b/.travis.yml index fab92a629..78c05ab05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,6 @@ php: - 7.0 - 7.1 - nightly - - hhvm env: - DB=mysql @@ -43,42 +42,9 @@ matrix: env: - DB=sqlite - DEPENDENCIES='low' - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next Trusty update - addons: - mariadb: 10.1 - env: DB=mariadb - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next update - addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 - services: - - mysql - env: DB=mysql - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next update - services: - - postgresql - env: DB=pgsql - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next update - env: DB=sqlite allow_failures: - php: nightly - - php: hhvm cache: directories: From e123f16ec99260f6bdc9fa146ca3b255673c5fd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Mon, 19 Jun 2017 11:17:25 +0200 Subject: [PATCH 066/124] Require PHP 7.1 --- .scrutinizer.yml | 5 +++++ .travis.yml | 11 +++-------- composer.json | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index bebd35350..0f7195985 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,3 +1,8 @@ +build: + environment: + php: + version: 7.1 + before_commands: - "composer install --no-dev --prefer-source" diff --git a/.travis.yml b/.travis.yml index 78c05ab05..bd9d8b32c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ sudo: false language: php php: - - 7.0 - 7.1 - nightly @@ -12,7 +11,7 @@ env: - DB=sqlite before_script: - - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi + - if [[ $TRAVIS_PHP_VERSION = '7.1' && $DB = 'sqlite' && "$DEPENDENCIES" != "low" ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi - if [[ "$PHPUNIT_FLAGS" == "" ]]; then phpenv config-rm xdebug.ini; fi - composer self-update - composer install --prefer-source @@ -24,16 +23,12 @@ script: - ENABLE_SECOND_LEVEL_CACHE=1 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml --exclude-group performance,non-cacheable,locking_functional after_script: - - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi - - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi + - if [[ "$PHPUNIT_FLAGS" != "" ]]; then wget https://scrutinizer-ci.com/ocular.phar; fi + - if [[ "$PHPUNIT_FLAGS" != "" ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi matrix: fast_finish: true include: - - php: 7.0 - env: DB=mariadb - addons: - mariadb: 10.1 - php: 7.1 env: DB=mariadb addons: diff --git a/composer.json b/composer.json index 5c89e8f97..e76eae85e 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ ], "minimum-stability": "dev", "require": { - "php": "^7.0", + "php": "^7.1", "ext-pdo": "*", "doctrine/collections": "^1.4", "doctrine/dbal": ">=2.5-dev,<2.7-dev", From 9fa456b9f0205419ddf86fb92bc475b7f937ca54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Mon, 19 Jun 2017 11:17:44 +0200 Subject: [PATCH 067/124] Bump versions of some dependencies --- composer.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/composer.json b/composer.json index e76eae85e..a4b43de3b 100644 --- a/composer.json +++ b/composer.json @@ -20,12 +20,12 @@ "doctrine/dbal": ">=2.5-dev,<2.7-dev", "doctrine/instantiator": "~1.0.1", "doctrine/common": "^2.7.1", - "doctrine/cache": "~1.5", - "doctrine/annotations": "~1.2", - "symfony/console": "~2.5|~3.0|~4.0" + "doctrine/cache": "~1.6", + "doctrine/annotations": "~1.4", + "symfony/console": "~3.0|~4.0" }, "require-dev": { - "symfony/yaml": "~2.3|~3.0|~4.0", + "symfony/yaml": "~3.0|~4.0", "phpunit/phpunit": "^6.0" }, "suggest": { From 914c400a7d1446f4bcfc23113516a2299660352a Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Thu, 8 Jun 2017 17:22:07 +0100 Subject: [PATCH 068/124] Check for custom functions first. --- lib/Doctrine/ORM/Query/Parser.php | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 34679ff61..c8294be36 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -3376,8 +3376,13 @@ class Parser $token = $this->lexer->lookahead; $funcName = strtolower($token['value']); - // Check for built-in functions first! + $customFunctionDeclaration = $this->CustomFunctionDeclaration(); + + // Check for custom functions functions first! switch (true) { + case $customFunctionDeclaration !== null: + return $customFunctionDeclaration; + case (isset(self::$_STRING_FUNCTIONS[$funcName])): return $this->FunctionsReturningStrings(); @@ -3388,7 +3393,7 @@ class Parser return $this->FunctionsReturningDatetime(); default: - return $this->CustomFunctionDeclaration(); + $this->syntaxError('known function', $token); } } @@ -3416,7 +3421,7 @@ class Parser return $this->CustomFunctionsReturningDatetime(); default: - $this->syntaxError('known function', $token); + return null; } } From e4ff7a35a8fd82e6287afda67ac6b1499f705af0 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Fri, 9 Jun 2017 10:00:07 +0100 Subject: [PATCH 069/124] Write a test case for a custom function override. --- lib/Doctrine/ORM/Query/Parser.php | 2 +- .../ORM/Functional/CustomFunctionsTest.php | 38 +++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index c8294be36..3a917f059 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -3377,7 +3377,7 @@ class Parser $funcName = strtolower($token['value']); $customFunctionDeclaration = $this->CustomFunctionDeclaration(); - + // Check for custom functions functions first! switch (true) { case $customFunctionDeclaration !== null: diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php index 63c3e4ee9..d7231219b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php @@ -47,6 +47,24 @@ class CustomFunctionsTest extends OrmFunctionalTestCase $this->assertEquals(1, count($users)); $this->assertSame($user, $users[0]); } + + public function testCustomFunctionOverride() + { + $user = new CmsUser(); + $user->name = 'Bob'; + $user->username = 'Dylan'; + $this->_em->persist($user); + $this->_em->flush(); + + $this->_em->getConfiguration()->addCustomStringFunction('COUNT', 'Doctrine\Tests\ORM\Functional\CustomCount'); + + $query = $this->_em->createQuery('SELECT COUNT(u.id) FROM Doctrine\Tests\Models\CMS\CmsUser u'); + + $users = $query->getResult(); + + $this->assertEquals(1, count($users)); + $this->assertSame($user, $users[0]); + } } class NoOp extends FunctionNode @@ -70,3 +88,23 @@ class NoOp extends FunctionNode } } +class CustomCount extends FunctionNode +{ + /** + * @var PathExpression + */ + private $field; + + public function parse(Parser $parser) + { + $parser->match(Lexer::T_IDENTIFIER); + $parser->match(Lexer::T_OPEN_PARENTHESIS); + $this->field = $parser->StringExpression(); + $parser->match(Lexer::T_CLOSE_PARENTHESIS); + } + + public function getSql(SqlWalker $sqlWalker) + { + return $this->field->dispatch($sqlWalker); + } +} From 866418e40f38e33f2c5dcf16ab9bccd3cdffa563 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Fri, 9 Jun 2017 15:09:41 +0100 Subject: [PATCH 070/124] No longer treat aggregate functions as a special case. --- lib/Doctrine/ORM/Configuration.php | 12 ---- lib/Doctrine/ORM/ORMException.php | 10 ---- .../ORM/Query/AST/Functions/AvgFunction.php | 55 +++++++++++++++++++ .../ORM/Query/AST/Functions/CountFunction.php | 55 +++++++++++++++++++ .../ORM/Query/AST/Functions/MaxFunction.php | 55 +++++++++++++++++++ .../ORM/Query/AST/Functions/MinFunction.php | 55 +++++++++++++++++++ .../ORM/Query/AST/Functions/SumFunction.php | 55 +++++++++++++++++++ lib/Doctrine/ORM/Query/Parser.php | 45 +++------------ lib/Doctrine/ORM/Query/SqlWalker.php | 8 ++- .../Doctrine/Tests/ORM/ConfigurationTest.php | 6 -- .../ORM/Functional/CustomFunctionsTest.php | 18 +++--- 11 files changed, 295 insertions(+), 79 deletions(-) create mode 100644 lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php create mode 100644 lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php create mode 100644 lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php create mode 100644 lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php create mode 100644 lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 104a4f4b2..4af482faf 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -425,10 +425,6 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function addCustomStringFunction($name, $className) { - if (Query\Parser::isInternalFunction($name)) { - throw ORMException::overwriteInternalDQLFunctionNotAllowed($name); - } - $this->_attributes['customStringFunctions'][strtolower($name)] = $className; } @@ -483,10 +479,6 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function addCustomNumericFunction($name, $className) { - if (Query\Parser::isInternalFunction($name)) { - throw ORMException::overwriteInternalDQLFunctionNotAllowed($name); - } - $this->_attributes['customNumericFunctions'][strtolower($name)] = $className; } @@ -541,10 +533,6 @@ class Configuration extends \Doctrine\DBAL\Configuration */ public function addCustomDatetimeFunction($name, $className) { - if (Query\Parser::isInternalFunction($name)) { - throw ORMException::overwriteInternalDQLFunctionNotAllowed($name); - } - $this->_attributes['customDatetimeFunctions'][strtolower($name)] = $className; } diff --git a/lib/Doctrine/ORM/ORMException.php b/lib/Doctrine/ORM/ORMException.php index 039ef2eaa..3ce9ce9dc 100644 --- a/lib/Doctrine/ORM/ORMException.php +++ b/lib/Doctrine/ORM/ORMException.php @@ -323,16 +323,6 @@ class ORMException extends Exception ); } - /** - * @param string $functionName - * - * @return ORMException - */ - public static function overwriteInternalDQLFunctionNotAllowed($functionName) - { - return new self("It is not allowed to overwrite internal function '$functionName' in the DQL parser through user-defined functions."); - } - /** * @return ORMException */ diff --git a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php new file mode 100644 index 000000000..7d9703d0d --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php @@ -0,0 +1,55 @@ +. + */ + +namespace Doctrine\ORM\Query\AST\Functions; + +use Doctrine\ORM\Query\Parser; +use Doctrine\ORM\Query\SqlWalker; +use Doctrine\ORM\Query\AST\AggregateExpression; + +/** + * "AVG" "(" ["DISTINCT"] StringPrimary ")" + * + * @link www.doctrine-project.org + * @since 2.0 + * @author Mathew Davies + */ +class AvgFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + public $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker) + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser) + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php new file mode 100644 index 000000000..e5b7220ed --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php @@ -0,0 +1,55 @@ +. + */ + +namespace Doctrine\ORM\Query\AST\Functions; + +use Doctrine\ORM\Query\Parser; +use Doctrine\ORM\Query\SqlWalker; +use Doctrine\ORM\Query\AST\AggregateExpression; + +/** + * "COUNT" "(" ["DISTINCT"] StringPrimary ")" + * + * @link www.doctrine-project.org + * @since 2.0 + * @author Mathew Davies + */ +class CountFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + public $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker) + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser) + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php new file mode 100644 index 000000000..c01cc2d86 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php @@ -0,0 +1,55 @@ +. + */ + +namespace Doctrine\ORM\Query\AST\Functions; + +use Doctrine\ORM\Query\Parser; +use Doctrine\ORM\Query\SqlWalker; +use Doctrine\ORM\Query\AST\AggregateExpression; + +/** + * "MAX" "(" ["DISTINCT"] StringPrimary ")" + * + * @link www.doctrine-project.org + * @since 2.0 + * @author Mathew Davies + */ +class MaxFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + public $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker) + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser) + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php new file mode 100644 index 000000000..1985be2d8 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php @@ -0,0 +1,55 @@ +. + */ + +namespace Doctrine\ORM\Query\AST\Functions; + +use Doctrine\ORM\Query\Parser; +use Doctrine\ORM\Query\SqlWalker; +use Doctrine\ORM\Query\AST\AggregateExpression; + +/** + * "MIN" "(" ["DISTINCT"] StringPrimary ")" + * + * @link www.doctrine-project.org + * @since 2.0 + * @author Mathew Davies + */ +class MinFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + public $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker) + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser) + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php new file mode 100644 index 000000000..f8cd48db0 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php @@ -0,0 +1,55 @@ +. + */ + +namespace Doctrine\ORM\Query\AST\Functions; + +use Doctrine\ORM\Query\Parser; +use Doctrine\ORM\Query\SqlWalker; +use Doctrine\ORM\Query\AST\AggregateExpression; + +/** + * "SUM" "(" ["DISTINCT"] StringPrimary ")" + * + * @link www.doctrine-project.org + * @since 2.0 + * @author Mathew Davies + */ +class SumFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + public $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker) + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser) + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 3a917f059..a06cd83a6 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -65,6 +65,13 @@ class Parser 'date_diff' => Functions\DateDiffFunction::class, 'bit_and' => Functions\BitAndFunction::class, 'bit_or' => Functions\BitOrFunction::class, + + // Aggregate functions + 'min' => Functions\MinFunction::class, + 'max' => Functions\MaxFunction::class, + 'avg' => Functions\AvgFunction::class, + 'sum' => Functions\SumFunction::class, + 'count' => Functions\CountFunction::class, ]; /** @@ -171,23 +178,6 @@ class Parser */ private $identVariableExpressions = []; - /** - * Checks if a function is internally defined. Used to prevent overwriting - * of built-in functions through user-defined functions. - * - * @param string $functionName - * - * @return bool - */ - static public function isInternalFunction($functionName) - { - $functionName = strtolower($functionName); - - return isset(self::$_STRING_FUNCTIONS[$functionName]) - || isset(self::$_DATETIME_FUNCTIONS[$functionName]) - || isset(self::$_NUMERIC_FUNCTIONS[$functionName]); - } - /** * Creates a new query parser object. * @@ -1978,9 +1968,6 @@ class Parser // SUM(u.id) + COUNT(u.id) return $this->SimpleArithmeticExpression(); - case ($this->isAggregateFunction($this->lexer->lookahead['type'])): - return $this->AggregateExpression(); - default: // IDENTITY(u) return $this->FunctionDeclaration(); @@ -2209,11 +2196,6 @@ class Parser $expression = $this->ScalarExpression(); break; - case ($this->isAggregateFunction($lookaheadType)): - // COUNT(u.id) - $expression = $this->AggregateExpression(); - break; - default: // IDENTITY(u) $expression = $this->FunctionDeclaration(); @@ -2858,10 +2840,6 @@ class Parser $peek = $this->lexer->glimpse(); if ($peek['value'] == '(') { - if ($this->isAggregateFunction($this->lexer->lookahead['type'])) { - return $this->AggregateExpression(); - } - return $this->FunctionDeclaration(); } @@ -2932,11 +2910,6 @@ class Parser case Lexer::T_COALESCE: case Lexer::T_NULLIF: return $this->CaseExpression(); - - default: - if ($this->isAggregateFunction($lookaheadType)) { - return $this->AggregateExpression(); - } } $this->syntaxError( @@ -3236,10 +3209,6 @@ class Parser $expr = $this->CoalesceExpression(); break; - case $this->isAggregateFunction($this->lexer->lookahead['type']): - $expr = $this->AggregateExpression(); - break; - case $this->isFunction(): $expr = $this->FunctionDeclaration(); break; diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index ee57cf90b..206a4676e 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -1579,10 +1579,14 @@ class SqlWalker implements TreeWalker $sql .= $this->walkPathExpression($expr); break; - case ($expr instanceof AST\AggregateExpression): + case ($expr instanceof AST\Functions\AvgFunction): + case ($expr instanceof AST\Functions\CountFunction): + case ($expr instanceof AST\Functions\MaxFunction): + case ($expr instanceof AST\Functions\MinFunction): + case ($expr instanceof AST\Functions\SumFunction): $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; - $sql .= $this->walkAggregateExpression($expr) . ' AS dctrn__' . $alias; + $sql .= $expr->dispatch($this) . ' AS dctrn__' . $alias; break; case ($expr instanceof AST\Subselect): diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index ab657c5fd..92a2eeaea 100644 --- a/tests/Doctrine/Tests/ORM/ConfigurationTest.php +++ b/tests/Doctrine/Tests/ORM/ConfigurationTest.php @@ -265,8 +265,6 @@ class ConfigurationTest extends TestCase $this->assertSame(null, $this->configuration->getCustomStringFunction('NonExistingFunction')); $this->configuration->setCustomStringFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomStringFunction('OtherFunctionName')); - $this->expectException(ORMException::class); - $this->configuration->addCustomStringFunction('concat', __CLASS__); } public function testAddGetCustomNumericFunction() @@ -276,8 +274,6 @@ class ConfigurationTest extends TestCase $this->assertSame(null, $this->configuration->getCustomNumericFunction('NonExistingFunction')); $this->configuration->setCustomNumericFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomNumericFunction('OtherFunctionName')); - $this->expectException(ORMException::class); - $this->configuration->addCustomNumericFunction('abs', __CLASS__); } public function testAddGetCustomDatetimeFunction() @@ -287,8 +283,6 @@ class ConfigurationTest extends TestCase $this->assertSame(null, $this->configuration->getCustomDatetimeFunction('NonExistingFunction')); $this->configuration->setCustomDatetimeFunctions(['OtherFunctionName' => __CLASS__]); $this->assertSame(__CLASS__, $this->configuration->getCustomDatetimeFunction('OtherFunctionName')); - $this->expectException(ORMException::class); - $this->configuration->addCustomDatetimeFunction('date_add', __CLASS__); } public function testAddGetCustomHydrationMode() diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php index d7231219b..aa56e1f93 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php @@ -58,12 +58,11 @@ class CustomFunctionsTest extends OrmFunctionalTestCase $this->_em->getConfiguration()->addCustomStringFunction('COUNT', 'Doctrine\Tests\ORM\Functional\CustomCount'); - $query = $this->_em->createQuery('SELECT COUNT(u.id) FROM Doctrine\Tests\Models\CMS\CmsUser u'); + $query = $this->_em->createQuery('SELECT COUNT(DISTINCT u.id) FROM Doctrine\Tests\Models\CMS\CmsUser u'); - $users = $query->getResult(); + $usersCount = $query->getSingleScalarResult(); - $this->assertEquals(1, count($users)); - $this->assertSame($user, $users[0]); + $this->assertEquals(1, $usersCount); } } @@ -91,20 +90,17 @@ class NoOp extends FunctionNode class CustomCount extends FunctionNode { /** - * @var PathExpression + * @var Query\AST\AggregateExpression */ - private $field; + private $aggregateExpression; public function parse(Parser $parser) { - $parser->match(Lexer::T_IDENTIFIER); - $parser->match(Lexer::T_OPEN_PARENTHESIS); - $this->field = $parser->StringExpression(); - $parser->match(Lexer::T_CLOSE_PARENTHESIS); + $this->aggregateExpression = $parser->AggregateExpression(); } public function getSql(SqlWalker $sqlWalker) { - return $this->field->dispatch($sqlWalker); + return $this->aggregateExpression->dispatch($sqlWalker); } } From e4847534a4c2decb47947f7b32dced5f7ac3a5bf Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 08:54:29 +0100 Subject: [PATCH 071/124] Remove @throws in Configuration where necessary. --- lib/Doctrine/ORM/Configuration.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lib/Doctrine/ORM/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 4af482faf..6073fbe00 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -420,8 +420,6 @@ class Configuration extends \Doctrine\DBAL\Configuration * @param string|callable $className Class name or a callable that returns the function. * * @return void - * - * @throws ORMException */ public function addCustomStringFunction($name, $className) { @@ -474,8 +472,6 @@ class Configuration extends \Doctrine\DBAL\Configuration * @param string|callable $className Class name or a callable that returns the function. * * @return void - * - * @throws ORMException */ public function addCustomNumericFunction($name, $className) { @@ -528,8 +524,6 @@ class Configuration extends \Doctrine\DBAL\Configuration * @param string|callable $className Class name or a callable that returns the function. * * @return void - * - * @throws ORMException */ public function addCustomDatetimeFunction($name, $className) { From 966f9a84c26db0888bb86530264c18f8b062429e Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 09:00:00 +0100 Subject: [PATCH 072/124] phpDoc and type hint changes. --- lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php | 9 ++++----- lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php | 9 ++++----- .../Tests/ORM/Functional/CustomFunctionsTest.php | 4 ++-- 6 files changed, 22 insertions(+), 27 deletions(-) diff --git a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php index 7d9703d0d..d217eb4b7 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "AVG" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class AvgFunction extends FunctionNode @@ -35,12 +34,12 @@ class AvgFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class AvgFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php index e5b7220ed..34a9a723c 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "COUNT" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class CountFunction extends FunctionNode @@ -35,12 +34,12 @@ class CountFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class CountFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php index c01cc2d86..d430cc428 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "MAX" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class MaxFunction extends FunctionNode @@ -35,12 +34,12 @@ class MaxFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class MaxFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php index 1985be2d8..345f99a94 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "MIN" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class MinFunction extends FunctionNode @@ -35,12 +34,12 @@ class MinFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class MinFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php index f8cd48db0..d77e284c0 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php @@ -26,8 +26,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; /** * "SUM" "(" ["DISTINCT"] StringPrimary ")" * - * @link www.doctrine-project.org - * @since 2.0 + * @since 2.6 * @author Mathew Davies */ class SumFunction extends FunctionNode @@ -35,12 +34,12 @@ class SumFunction extends FunctionNode /** * @var AggregateExpression */ - public $aggregateExpression; + private $aggregateExpression; /** * @inheritDoc */ - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } @@ -48,7 +47,7 @@ class SumFunction extends FunctionNode /** * @inheritDoc */ - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } diff --git a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php index aa56e1f93..79668b8f2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php @@ -94,12 +94,12 @@ class CustomCount extends FunctionNode */ private $aggregateExpression; - public function parse(Parser $parser) + public function parse(Parser $parser): void { $this->aggregateExpression = $parser->AggregateExpression(); } - public function getSql(SqlWalker $sqlWalker) + public function getSql(SqlWalker $sqlWalker): string { return $this->aggregateExpression->dispatch($sqlWalker); } From 3e3751cfd9595fa1fdef491c53e8464992ebcd18 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 09:37:21 +0100 Subject: [PATCH 073/124] Remove aggregate function conditional in SqlWalker. --- lib/Doctrine/ORM/Query/SqlWalker.php | 10 ---------- .../Tests/ORM/Query/SelectSqlGenerationTest.php | 6 +++--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 206a4676e..a4b5089e8 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -1579,16 +1579,6 @@ class SqlWalker implements TreeWalker $sql .= $this->walkPathExpression($expr); break; - case ($expr instanceof AST\Functions\AvgFunction): - case ($expr instanceof AST\Functions\CountFunction): - case ($expr instanceof AST\Functions\MaxFunction): - case ($expr instanceof AST\Functions\MinFunction): - case ($expr instanceof AST\Functions\SumFunction): - $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; - - $sql .= $expr->dispatch($this) . ' AS dctrn__' . $alias; - break; - case ($expr instanceof AST\Subselect): $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index b674c5d38..c10afbb89 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -1031,7 +1031,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $this->assertSqlGeneration( "SELECT u.name, (SELECT COUNT(p.phonenumber) FROM Doctrine\Tests\Models\CMS\CmsPhonenumber p WHERE p.phonenumber = 1234) pcount FROM Doctrine\Tests\Models\CMS\CmsUser u WHERE u.name = 'jon'", - "SELECT c0_.name AS name_0, (SELECT COUNT(c1_.phonenumber) AS dctrn__1 FROM cms_phonenumbers c1_ WHERE c1_.phonenumber = 1234) AS sclr_1 FROM cms_users c0_ WHERE c0_.name = 'jon'" + "SELECT c0_.name AS name_0, (SELECT COUNT(c1_.phonenumber) AS sclr_2 FROM cms_phonenumbers c1_ WHERE c1_.phonenumber = 1234) AS sclr_1 FROM cms_users c0_ WHERE c0_.name = 'jon'" ); } @@ -1198,7 +1198,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $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 name_0, (SELECT COUNT(c1_.id) AS dctrn__total FROM company_contracts c1_ WHERE c1_.discr IN ('fix')) AS sclr_1 FROM cms_users c0_" + "SELECT c0_.name AS name_0, (SELECT COUNT(c1_.id) AS sclr_2 FROM company_contracts c1_ WHERE c1_.discr IN ('fix')) AS sclr_1 FROM cms_users c0_" ); } @@ -1750,7 +1750,7 @@ class SelectSqlGenerationTest extends OrmTestCase ); $this->assertSqlGeneration( 'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE COUNT(u1.id) = ( SELECT SUM(u2.id) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )', - 'SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 FROM cms_users c0_ WHERE COUNT(c0_.id) = (SELECT SUM(c1_.id) AS dctrn__1 FROM cms_users c1_)' + 'SELECT c0_.id AS id_0, c0_.status AS status_1, c0_.username AS username_2, c0_.name AS name_3 FROM cms_users c0_ WHERE COUNT(c0_.id) = (SELECT SUM(c1_.id) AS sclr_4 FROM cms_users c1_)' ); $this->assertSqlGeneration( 'SELECT u1 FROM Doctrine\Tests\Models\CMS\CmsUser u1 WHERE COUNT(u1.id) <= ( SELECT SUM(u2.id) + COUNT(u2.email) FROM Doctrine\Tests\Models\CMS\CmsUser u2 )', From 49e4b1004c04e0ace55f3dae819b881b43cac6fe Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 09:57:53 +0100 Subject: [PATCH 074/124] Update LimitSubqueryOutputWalkerTest --- .../Tools/Pagination/LimitSubqueryOutputWalkerTest.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php index 06e21173d..7e65ab7bc 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/LimitSubqueryOutputWalkerTest.php @@ -330,7 +330,7 @@ ORDER BY b.id DESC' $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( - 'SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ WHERE ((SELECT COUNT(b1_.id) AS dctrn__1 FROM BlogPost b1_) = 1)) dctrn_result ORDER BY id_0 DESC', + 'SELECT DISTINCT id_0 FROM (SELECT b0_.id AS id_0, b0_.author_id AS author_id_1, b0_.category_id AS category_id_2 FROM BlogPost b0_ WHERE ((SELECT COUNT(b1_.id) AS sclr_3 FROM BlogPost b1_) = 1)) dctrn_result ORDER BY id_0 DESC', $query->getSQL() ); } @@ -346,7 +346,7 @@ ORDER BY b.id DESC' $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( - 'SELECT DISTINCT id_0, MIN(sclr_1) AS dctrn_minrownum FROM (SELECT b0_.id AS id_0, ROW_NUMBER() OVER(ORDER BY b0_.id DESC) AS sclr_1, b0_.author_id AS author_id_2, b0_.category_id AS category_id_3 FROM BlogPost b0_ WHERE ((SELECT COUNT(b1_.id) AS dctrn__1 FROM BlogPost b1_) = 1)) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC', + 'SELECT DISTINCT id_0, MIN(sclr_1) AS dctrn_minrownum FROM (SELECT b0_.id AS id_0, ROW_NUMBER() OVER(ORDER BY b0_.id DESC) AS sclr_1, b0_.author_id AS author_id_2, b0_.category_id AS category_id_3 FROM BlogPost b0_ WHERE ((SELECT COUNT(b1_.id) AS sclr_4 FROM BlogPost b1_) = 1)) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC', $query->getSQL() ); } @@ -390,7 +390,7 @@ ORDER BY b.id DESC' $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( - 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, (SELECT MIN(m1_.title) AS dctrn__1 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS sclr_2 FROM Author a0_) dctrn_result ORDER BY sclr_2 DESC', + 'SELECT DISTINCT id_0 FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, (SELECT MIN(m1_.title) AS sclr_3 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS sclr_2 FROM Author a0_) dctrn_result ORDER BY sclr_2 DESC', $query->getSQL() ); } @@ -415,7 +415,7 @@ ORDER BY b.id DESC' $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( - 'SELECT DISTINCT id_0, MIN(sclr_3) AS dctrn_minrownum FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, (SELECT MIN(m1_.title) AS dctrn__1 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS sclr_2, ROW_NUMBER() OVER(ORDER BY (SELECT MIN(m1_.title) AS dctrn__2 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) DESC) AS sclr_3 FROM Author a0_) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC', + 'SELECT DISTINCT id_0, MIN(sclr_4) AS dctrn_minrownum FROM (SELECT a0_.id AS id_0, a0_.name AS name_1, (SELECT MIN(m1_.title) AS sclr_3 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS sclr_2, ROW_NUMBER() OVER(ORDER BY (SELECT MIN(m1_.title) AS sclr_5 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) DESC) AS sclr_4 FROM Author a0_) dctrn_result GROUP BY id_0 ORDER BY dctrn_minrownum ASC', $query->getSQL() ); } @@ -440,7 +440,7 @@ ORDER BY b.id DESC' $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, LimitSubqueryOutputWalker::class); $this->assertEquals( - 'SELECT DISTINCT ID_0, MIN(SCLR_3) AS dctrn_minrownum FROM (SELECT a0_.id AS ID_0, a0_.name AS NAME_1, (SELECT MIN(m1_.title) AS dctrn__1 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS SCLR_2, ROW_NUMBER() OVER(ORDER BY (SELECT MIN(m1_.title) AS dctrn__2 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) DESC) AS SCLR_3 FROM Author a0_) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC', + 'SELECT DISTINCT ID_0, MIN(SCLR_4) AS dctrn_minrownum FROM (SELECT a0_.id AS ID_0, a0_.name AS NAME_1, (SELECT MIN(m1_.title) AS SCLR_3 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) AS SCLR_2, ROW_NUMBER() OVER(ORDER BY (SELECT MIN(m1_.title) AS SCLR_5 FROM MyBlogPost m1_ WHERE m1_.author_id = a0_.id) DESC) AS SCLR_4 FROM Author a0_) dctrn_result GROUP BY ID_0 ORDER BY dctrn_minrownum ASC', $query->getSQL() ); } From 05758f45647861f03cae4e0e9cf926354626e809 Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 10:07:58 +0100 Subject: [PATCH 075/124] Documented changes in UPGRADE.md --- UPGRADE.md | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index 3592fe5b6..8aba870c6 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,3 +1,17 @@ +# Upgrade to 2.6 + +## Minor BC BREAK: removed `Doctrine\ORM\Query\Parser#isInternalFunction` + +Method `Doctrine\ORM\Query\Parser#isInternalFunction` was removed because +the distinction between internal function and user defined DQL was removed. +[#6500](https://github.com/doctrine/doctrine2/pull/6500) + +## Minor BC BREAK: removed `Doctrine\ORM\ORMException#overwriteInternalDQLFunctionNotAllowed` + +Method `Doctrine\ORM\Query\Parser#overwriteInternalDQLFunctionNotAllowed` was +removed because of the choice to allow users to overwrite internal functions, ie +`AVG`, `SUM`, `COUNT`, `MIN` and `MAX`. [#6500](https://github.com/doctrine/doctrine2/pull/6500) + # Upgrade to 2.5 ## Minor BC BREAK: removed `Doctrine\ORM\Query\SqlWalker#walkCaseExpression()` From 747c1857d63fc86f76c730a1eb0f4f591835dbad Mon Sep 17 00:00:00 2001 From: Mathew Davies Date: Mon, 19 Jun 2017 11:11:42 +0100 Subject: [PATCH 076/124] Make the new aggregate function definitions final. --- lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php | 2 +- lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php | 2 +- lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php | 2 +- lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php | 2 +- lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php index d217eb4b7..6cb8d92b6 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php @@ -29,7 +29,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; * @since 2.6 * @author Mathew Davies */ -class AvgFunction extends FunctionNode +final class AvgFunction extends FunctionNode { /** * @var AggregateExpression diff --git a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php index 34a9a723c..f232cf43f 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php @@ -29,7 +29,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; * @since 2.6 * @author Mathew Davies */ -class CountFunction extends FunctionNode +final class CountFunction extends FunctionNode { /** * @var AggregateExpression diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php index d430cc428..eba9b8639 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php @@ -29,7 +29,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; * @since 2.6 * @author Mathew Davies */ -class MaxFunction extends FunctionNode +final class MaxFunction extends FunctionNode { /** * @var AggregateExpression diff --git a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php index 345f99a94..e1c086913 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php @@ -29,7 +29,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; * @since 2.6 * @author Mathew Davies */ -class MinFunction extends FunctionNode +final class MinFunction extends FunctionNode { /** * @var AggregateExpression diff --git a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php index d77e284c0..c9fcf7b04 100644 --- a/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php +++ b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php @@ -29,7 +29,7 @@ use Doctrine\ORM\Query\AST\AggregateExpression; * @since 2.6 * @author Mathew Davies */ -class SumFunction extends FunctionNode +final class SumFunction extends FunctionNode { /** * @var AggregateExpression From 1bdc61f932ba354b5eef47c1992175f8e314ff9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 20 Jun 2017 09:43:43 +0200 Subject: [PATCH 077/124] Remove tools that are not supported anymore --- .scrutinizer.yml | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 0f7195985..1ee7ad79f 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -9,27 +9,3 @@ before_commands: tools: external_code_coverage: timeout: 3600 - php_code_coverage: - enabled: true - php_code_sniffer: - enabled: false - php_cpd: - enabled: true - excluded_dirs: ["bin", "docs", "tests", "tools", "vendor"] - php_cs_fixer: - enabled: false - php_loc: - enabled: true - excluded_dirs: ["bin", "docs", "tests", "tools", "vendor"] - php_mess_detector: - enabled: true - filter: - paths: ["lib/*"] - php_pdepend: - enabled: true - excluded_dirs: ["docs", "examples", "tests", "vendor"] - php_analyzer: - enabled: true - filter: - paths: ["lib/*", "tests/*"] - sensiolabs_security_checker: true From aa9f34b6009b3f2df0cefc6f101a67e11d6e6c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Tue, 20 Jun 2017 09:46:10 +0200 Subject: [PATCH 078/124] Configure build failure conditions So that contributors receive some automated feedback in case maintainers are not fast enough. --- .scrutinizer.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 1ee7ad79f..4ba463511 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -9,3 +9,16 @@ before_commands: tools: external_code_coverage: timeout: 3600 + +filter: + excluded_paths: + - docs + - tools + +build_failure_conditions: + - 'elements.rating(<= C).new.exists' # No new classes/methods with a rating of C or worse allowed + - 'issues.label("coding-style").new.exists' # No new coding style issues allowed + - 'issues.severity(>= MAJOR).new.exists' # New issues of major or higher severity + - 'project.metric_change("scrutinizer.test_coverage", < 0)' # Code Coverage decreased from previous inspection + - 'patches.label("Doc Comments").new.exists' # No new doc comments patches allowed + - 'patches.label("Unused Use Statements").new.exists' # No new unused imports patches allowed From f5d4db7d9c989a1b8f10d8ff1ea2e9f5d6020367 Mon Sep 17 00:00:00 2001 From: SimonHeimberg Date: Tue, 22 Nov 2016 09:03:01 +0100 Subject: [PATCH 079/124] Report that FROM and JOIN do not support Subqueries --- lib/Doctrine/ORM/Query/Parser.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index a06cd83a6..c63148654 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -1715,6 +1715,9 @@ class Parser */ public function RangeVariableDeclaration() { + if ($this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS) && $this->lexer->glimpse()['type'] === Lexer::T_SELECT) { + $this->semanticalError('Subquery is not supported here', $this->lexer->token); + } $abstractSchemaName = $this->AbstractSchemaName(); $this->validateAbstractSchemaName($abstractSchemaName); From 5b6d766961e60e2d9dcf4a14ca6e2b7d20591bab Mon Sep 17 00:00:00 2001 From: SimonHeimberg Date: Tue, 27 Dec 2016 09:47:03 +0100 Subject: [PATCH 080/124] Tests for not supported Subqueries in FROM and JOIN --- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index c5a5da411..c97929f9d 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -278,4 +278,24 @@ class QueryTest extends OrmTestCase // Retrieves cached data since expire flag is false and we have a cached result set self::assertCount(2, $query->expireResultCache(false)->getResult()); } + + /** + * @expectedException Doctrine\ORM\Query\QueryException + * @exptectedExcepionMessage Subquery + */ + public function testSelectJoinSubquery() + { + $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u JOIN (SELECT )"); + $query->getResult(); + } + + /** + * @expectedException Doctrine\ORM\Query\QueryException + * @exptectedExcepionMessage Subquery + */ + public function testSelectFromSubquery() + { + $query = $this->_em->createQuery("select u from (select Doctrine\Tests\Models\CMS\CmsUser c) as u"); + $query->getResult(); + } } From 1dbc67cce16216e3ffcbc165ef4c52da0dddd7ec Mon Sep 17 00:00:00 2001 From: SimonHeimberg Date: Wed, 19 Apr 2017 17:06:48 +0200 Subject: [PATCH 081/124] Tests for Subqueries set expectations directly before their occurrence --- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index c97929f9d..dd7ad3fa5 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -8,6 +8,7 @@ use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManager; use Doctrine\ORM\Internal\Hydration\IterableResult; use Doctrine\ORM\Query\Parameter; +use Doctrine\ORM\Query\QueryException; use Doctrine\Tests\Mocks\DriverConnectionMock; use Doctrine\Tests\Mocks\StatementArrayMock; use Doctrine\Tests\Models\CMS\CmsAddress; @@ -279,23 +280,19 @@ class QueryTest extends OrmTestCase self::assertCount(2, $query->expireResultCache(false)->getResult()); } - /** - * @expectedException Doctrine\ORM\Query\QueryException - * @exptectedExcepionMessage Subquery - */ public function testSelectJoinSubquery() { $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u JOIN (SELECT )"); + $this->expectException(QueryException::class); + $this->expectExceptionMessage('Subquery'); $query->getResult(); } - /** - * @expectedException Doctrine\ORM\Query\QueryException - * @exptectedExcepionMessage Subquery - */ public function testSelectFromSubquery() { $query = $this->_em->createQuery("select u from (select Doctrine\Tests\Models\CMS\CmsUser c) as u"); + $this->expectException(QueryException::class); + $this->expectExceptionMessage('Subquery'); $query->getResult(); } } From a7dcdd8d48c502f1374bc8b097b714f5f94970e3 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 05:35:58 +0200 Subject: [PATCH 082/124] Documenting thrown exception type, spacing #6162 --- lib/Doctrine/ORM/Query/Parser.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index c63148654..c21b2de96 100644 --- a/lib/Doctrine/ORM/Query/Parser.php +++ b/lib/Doctrine/ORM/Query/Parser.php @@ -1712,12 +1712,15 @@ class Parser * RangeVariableDeclaration ::= AbstractSchemaName ["AS"] AliasIdentificationVariable * * @return \Doctrine\ORM\Query\AST\RangeVariableDeclaration + * + * @throws QueryException */ public function RangeVariableDeclaration() { if ($this->lexer->isNextToken(Lexer::T_OPEN_PARENTHESIS) && $this->lexer->glimpse()['type'] === Lexer::T_SELECT) { $this->semanticalError('Subquery is not supported here', $this->lexer->token); } + $abstractSchemaName = $this->AbstractSchemaName(); $this->validateAbstractSchemaName($abstractSchemaName); From 3260d220e852970fdee68d840a235af4337e51a1 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 05:38:42 +0200 Subject: [PATCH 083/124] #6162 adding `@group` annotation, spacing --- tests/Doctrine/Tests/ORM/Query/QueryTest.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index dd7ad3fa5..5a2a295fe 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -280,19 +280,27 @@ class QueryTest extends OrmTestCase self::assertCount(2, $query->expireResultCache(false)->getResult()); } + /** + * @group #6162 + */ public function testSelectJoinSubquery() { $query = $this->_em->createQuery("select u from Doctrine\Tests\Models\CMS\CmsUser u JOIN (SELECT )"); + $this->expectException(QueryException::class); $this->expectExceptionMessage('Subquery'); - $query->getResult(); + $query->getSQL(); } + /** + * @group #6162 + */ public function testSelectFromSubquery() { $query = $this->_em->createQuery("select u from (select Doctrine\Tests\Models\CMS\CmsUser c) as u"); + $this->expectException(QueryException::class); $this->expectExceptionMessage('Subquery'); - $query->getResult(); + $query->getSQL(); } } From 60b6073643e8fdf33efeb98148632dbb75e4059d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kurzeja?= Date: Fri, 9 Dec 2016 21:48:43 +0100 Subject: [PATCH 084/124] Fixes #6167 - nextval issue on master-slave PostgreSQL setup --- lib/Doctrine/ORM/Id/SequenceGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php index a27edae90..18d238499 100644 --- a/lib/Doctrine/ORM/Id/SequenceGenerator.php +++ b/lib/Doctrine/ORM/Id/SequenceGenerator.php @@ -76,7 +76,7 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable $conn = $em->getConnection(); $sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName); - $this->_nextValue = (int) $conn->fetchColumn($sql); + $this->_nextValue = (int) $conn->query($sql)->fetchColumn(0); $this->_maxValue = $this->_nextValue + $this->_allocationSize; } From edffb4d44914761f2b9e0d17af942ad0b5d2b1d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kurzeja?= Date: Mon, 12 Dec 2016 07:45:25 +0100 Subject: [PATCH 085/124] #6167 - fixed tests and added info why query is used in SequenceGenerator --- lib/Doctrine/ORM/Id/SequenceGenerator.php | 3 ++- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 22 +++++++++++++++++++ .../Tests/ORM/Id/SequenceGeneratorTest.php | 6 ++--- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php index 18d238499..7db8e9083 100644 --- a/lib/Doctrine/ORM/Id/SequenceGenerator.php +++ b/lib/Doctrine/ORM/Id/SequenceGenerator.php @@ -76,7 +76,8 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable $conn = $em->getConnection(); $sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName); - $this->_nextValue = (int) $conn->query($sql)->fetchColumn(0); + // Use query to force master in MasterSlaveConnection + $this->_nextValue = (int) $conn->query($sql)->fetchColumn(); $this->_maxValue = $this->_nextValue + $this->_allocationSize; } diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 5a28ffa5a..11d08d480 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\Mocks; use Doctrine\DBAL\Connection; +use Doctrine\DBAL\Driver\Statement; /** * Mock class for Connection. @@ -13,6 +14,11 @@ class ConnectionMock extends Connection */ private $_fetchOneResult; + /** + * @var Statement + */ + private $_queryResult; + /** * @var DatabasePlatformMock */ @@ -89,6 +95,14 @@ class ConnectionMock extends Connection return $this->_fetchOneResult; } + /** + * {@inheritdoc} + */ + public function query() + { + return $this->_queryResult; + } + /** * {@inheritdoc} */ @@ -132,6 +146,14 @@ class ConnectionMock extends Connection $this->_lastInsertId = $id; } + /** + * @param Statement $result + */ + public function setQueryResult($result) + { + $this->_queryResult = $result; + } + /** * @return array */ diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php index 5d7f7a59b..c87547934 100644 --- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php @@ -3,6 +3,7 @@ namespace Doctrine\Tests\ORM\Id; use Doctrine\ORM\Id\SequenceGenerator; +use Doctrine\Tests\Mocks\StatementArrayMock; use Doctrine\Tests\OrmTestCase; /** @@ -25,15 +26,14 @@ class SequenceGeneratorTest extends OrmTestCase { for ($i=0; $i < 42; ++$i) { if ($i % 10 == 0) { - $this->_em->getConnection()->setFetchOneResult((int)($i / 10) * 10); + $nextId = array(array((int)($i / 10) * 10)); + $this->_em->getConnection()->setQueryResult(new StatementArrayMock($nextId)); } $id = $this->_seqGen->generate($this->_em, null); $this->assertEquals($i, $id); $this->assertEquals((int)($i / 10) * 10 + 10, $this->_seqGen->getCurrentMaxValue()); $this->assertEquals($i + 1, $this->_seqGen->getNextValue()); } - - } } From 71b040c8497bcf5f60c2ad120d5a8283e4e41bdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kurzeja?= Date: Mon, 12 Dec 2016 12:29:29 +0100 Subject: [PATCH 086/124] #6167 - tests - throw exception if wrong method used to get sequence nextval --- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 19 +++++++++++++++++++ .../Tests/ORM/Id/SequenceGeneratorTest.php | 4 ++++ 2 files changed, 23 insertions(+) diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 11d08d480..ba0be9ee4 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -14,6 +14,11 @@ class ConnectionMock extends Connection */ private $_fetchOneResult; + /** + * @var \Exception + */ + private $_fetchOneException; + /** * @var Statement */ @@ -92,6 +97,10 @@ class ConnectionMock extends Connection */ public function fetchColumn($statement, array $params = [], $colnum = 0, array $types = []) { + if ($this->_fetchOneException != null) { + throw $this->_fetchOneException; + } + return $this->_fetchOneResult; } @@ -126,6 +135,16 @@ class ConnectionMock extends Connection $this->_fetchOneResult = $fetchOneResult; } + /** + * @param \Exception $exception + * + * @return void + */ + public function setFetchOneException(\Exception $exception = null) + { + $this->_fetchOneException = $exception; + } + /** * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform * diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php index c87547934..b972d0640 100644 --- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php @@ -24,6 +24,10 @@ class SequenceGeneratorTest extends OrmTestCase public function testGeneration() { + $this->_em->getConnection()->setFetchOneException( + new \Exception('Fetch* method used. Query method should be used instead, as NEXTVAL should be run on a master server in master-slave setup.') + ); + for ($i=0; $i < 42; ++$i) { if ($i % 10 == 0) { $nextId = array(array((int)($i / 10) * 10)); From 571115cf18be0f63edb4868fe03f13f4cb8297e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kurzeja?= Date: Mon, 12 Dec 2016 20:03:25 +0100 Subject: [PATCH 087/124] #6167 Code review updates, better readability --- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 6 +++--- tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index ba0be9ee4..0b5685d2a 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -97,7 +97,7 @@ class ConnectionMock extends Connection */ public function fetchColumn($statement, array $params = [], $colnum = 0, array $types = []) { - if ($this->_fetchOneException != null) { + if (null !== $this->_fetchOneException) { throw $this->_fetchOneException; } @@ -136,7 +136,7 @@ class ConnectionMock extends Connection } /** - * @param \Exception $exception + * @param \Exception|null $exception * * @return void */ @@ -168,7 +168,7 @@ class ConnectionMock extends Connection /** * @param Statement $result */ - public function setQueryResult($result) + public function setQueryResult(Statement $result) { $this->_queryResult = $result; } diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php index b972d0640..f7ec2ffc7 100644 --- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php @@ -25,12 +25,12 @@ class SequenceGeneratorTest extends OrmTestCase public function testGeneration() { $this->_em->getConnection()->setFetchOneException( - new \Exception('Fetch* method used. Query method should be used instead, as NEXTVAL should be run on a master server in master-slave setup.') + new \RuntimeException('Fetch* method used. Query method should be used instead, as NEXTVAL should be run on a master server in master-slave setup.') ); for ($i=0; $i < 42; ++$i) { if ($i % 10 == 0) { - $nextId = array(array((int)($i / 10) * 10)); + $nextId = [[(int)($i / 10) * 10]]; $this->_em->getConnection()->setQueryResult(new StatementArrayMock($nextId)); } $id = $this->_seqGen->generate($this->_em, null); From d2be4a2b484073bceaf1cc540c80a2ca45a3c90a Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 05:44:58 +0200 Subject: [PATCH 088/124] #6167 #6168 - clarifying on the reasoning why `query` is used instead of `fetchColumn` --- lib/Doctrine/ORM/Id/SequenceGenerator.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php index 7db8e9083..9d8e9eb75 100644 --- a/lib/Doctrine/ORM/Id/SequenceGenerator.php +++ b/lib/Doctrine/ORM/Id/SequenceGenerator.php @@ -76,7 +76,7 @@ class SequenceGenerator extends AbstractIdGenerator implements Serializable $conn = $em->getConnection(); $sql = $conn->getDatabasePlatform()->getSequenceNextValSQL($this->_sequenceName); - // Use query to force master in MasterSlaveConnection + // Using `query` to force usage of the master server in MasterSlaveConnection $this->_nextValue = (int) $conn->query($sql)->fetchColumn(); $this->_maxValue = $this->_nextValue + $this->_allocationSize; } From 462481ebbe1d57eff6bb39314704e788816f87f8 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 05:47:19 +0200 Subject: [PATCH 089/124] #6167 #6168 - better connection mock documentation/docblocks/return-types --- tests/Doctrine/Tests/Mocks/ConnectionMock.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/Doctrine/Tests/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 0b5685d2a..af8fc252e 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -1,6 +1,7 @@ _queryResult; } From a97c2659fc2e731bdc88070dce09dbc2cc03512b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:04:06 +0200 Subject: [PATCH 090/124] #6167 #6168 rewrote `SequenceGeneratorTest` for better readability and error messages --- .../Tests/ORM/Id/SequenceGeneratorTest.php | 58 ++++++++++++------- 1 file changed, 37 insertions(+), 21 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php index f7ec2ffc7..5e4247715 100644 --- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php @@ -2,41 +2,57 @@ namespace Doctrine\Tests\ORM\Id; +use Doctrine\ORM\EntityManager; use Doctrine\ORM\Id\SequenceGenerator; +use Doctrine\Tests\Mocks\ConnectionMock; use Doctrine\Tests\Mocks\StatementArrayMock; use Doctrine\Tests\OrmTestCase; -/** - * Description of SequenceGeneratorTest - * - * @author robo - */ class SequenceGeneratorTest extends OrmTestCase { - private $_em; - private $_seqGen; + /** + * @var EntityManager + */ + private $entityManager; - protected function setUp() + /** + * @var SequenceGenerator + */ + private $sequenceGenerator; + + /** + * @var ConnectionMock + */ + private $connection; + + protected function setUp() : void { - $this->_em = $this->_getTestEntityManager(); - $this->_seqGen = new SequenceGenerator('seq', 10); + parent::setUp(); + + $this->entityManager = $this->_getTestEntityManager(); + $this->sequenceGenerator = new SequenceGenerator('seq', 10); + $this->connection = $this->entityManager->getConnection(); + + self::assertInstanceOf(ConnectionMock::class, $this->connection); } - public function testGeneration() + public function testGeneration() : void { - $this->_em->getConnection()->setFetchOneException( - new \RuntimeException('Fetch* method used. Query method should be used instead, as NEXTVAL should be run on a master server in master-slave setup.') - ); + $this->connection->setFetchOneException(new \BadMethodCallException( + 'Fetch* method used. Query method should be used instead, ' + . 'as NEXTVAL should be run on a master server in master-slave setup.' + )); - for ($i=0; $i < 42; ++$i) { + for ($i = 0; $i < 42; ++$i) { if ($i % 10 == 0) { - $nextId = [[(int)($i / 10) * 10]]; - $this->_em->getConnection()->setQueryResult(new StatementArrayMock($nextId)); + $this->connection->setQueryResult(new StatementArrayMock([[(int)($i / 10) * 10]])); } - $id = $this->_seqGen->generate($this->_em, null); - $this->assertEquals($i, $id); - $this->assertEquals((int)($i / 10) * 10 + 10, $this->_seqGen->getCurrentMaxValue()); - $this->assertEquals($i + 1, $this->_seqGen->getNextValue()); + + $id = $this->sequenceGenerator->generate($this->entityManager, null); + + self::assertSame($i, $id); + self::assertSame((int)($i / 10) * 10 + 10, $this->sequenceGenerator->getCurrentMaxValue()); + self::assertSame($i + 1, $this->sequenceGenerator->getNextValue()); } } } From 652358a4de7766d4588b1a9b8992437cc085e98c Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:14:26 +0200 Subject: [PATCH 091/124] Add failing test for #5715 (unit test for MetadataFilter) --- .../ORM/Tools/Console/MetadataFilterTest.php | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php new file mode 100644 index 000000000..7922f9006 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -0,0 +1,78 @@ +createAnnotationDriver(); + $em = $this->_getTestEntityManager(); + $em->getConfiguration()->setMetadataDriverImpl($driver); + + $this->cmf = new DisconnectedClassMetadataFactory(); + $this->cmf->setEntityManager($em); + } + + public function testFilterWithArray() + { + $originalMetadatas = array( + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, array( + 'MetadataFilterTestEntityAaa', + 'MetadataFilterTestEntityCcc', + )); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertContains($metadataCcc, $metadatas); + $this->assertCount(2, $metadatas); + } +} + +/** @Entity */ +class MetadataFilterTestEntityAaa +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityBbb +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityCcc +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} From 87e9879edddefaa7b56f131aff9c9e2540633a16 Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:16:00 +0200 Subject: [PATCH 092/124] Fix MetadataFilter not testing filters after first --- lib/Doctrine/ORM/Tools/Console/MetadataFilter.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php b/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php index f480c3063..88357e35c 100644 --- a/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php +++ b/lib/Doctrine/ORM/Tools/Console/MetadataFilter.php @@ -84,10 +84,6 @@ class MetadataFilter extends \FilterIterator implements \Countable ); } - if ($pregResult === 0) { - return false; - } - if ($pregResult) { return true; } From 1afa8a915db68abd1295d20f517c7d076ce4729c Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:16:44 +0200 Subject: [PATCH 093/124] Add more basic tests for MetadataFilter --- .../ORM/Tools/Console/MetadataFilterTest.php | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 7922f9006..fac23bc01 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -29,6 +29,54 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->cmf->setEntityManager($em); } + public function testFilterWithEmptyArray() + { + $originalMetadatas = array( + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, array()); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertContains($metadataBbb, $metadatas); + $this->assertCount(count($originalMetadatas), $metadatas); + } + + public function testFilterWithString() + { + $originalMetadatas = array( + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityAaa'); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertNotContains($metadataCcc, $metadatas); + $this->assertCount(1, $metadatas); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityBbb'); + + $this->assertNotContains($metadataAaa, $metadatas); + $this->assertContains($metadataBbb, $metadatas); + $this->assertNotContains($metadataCcc, $metadatas); + $this->assertCount(1, $metadatas); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityCcc'); + + $this->assertNotContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertContains($metadataCcc, $metadatas); + $this->assertCount(1, $metadatas); + } + public function testFilterWithArray() { $originalMetadatas = array( From a9cc522e8ae9b06c09f3a00760b3d95110e74169 Mon Sep 17 00:00:00 2001 From: Guilliam Xavier Date: Sat, 25 Jun 2016 18:21:42 +0200 Subject: [PATCH 094/124] Add regex tests for MetadataFilter (PR #507) --- .../ORM/Tools/Console/MetadataFilterTest.php | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index fac23bc01..aed184e4c 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -77,6 +77,23 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(1, $metadatas); } + public function testFilterWithString2() + { + $originalMetadatas = array( + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityFoo'); + + $this->assertContains($metadataFoo, $metadatas); + $this->assertContains($metadataFooBar, $metadatas); + $this->assertNotContains($metadataBar, $metadatas); + $this->assertCount(2, $metadatas); + } + public function testFilterWithArray() { $originalMetadatas = array( @@ -96,6 +113,31 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertContains($metadataCcc, $metadatas); $this->assertCount(2, $metadatas); } + + public function testFilterWithRegex() + { + $originalMetadatas = array( + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + ); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'Foo$'); + + $this->assertContains($metadataFoo, $metadatas); + $this->assertNotContains($metadataFooBar, $metadatas); + $this->assertNotContains($metadataBar, $metadatas); + $this->assertCount(1, $metadatas); + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, 'Bar$'); + + $this->assertNotContains($metadataFoo, $metadatas); + $this->assertContains($metadataFooBar, $metadatas); + $this->assertContains($metadataBar, $metadatas); + $this->assertCount(2, $metadatas); + } } /** @Entity */ @@ -124,3 +166,30 @@ class MetadataFilterTestEntityCcc /** @Id @Column(type="integer") */ protected $id; } + +/** @Entity */ +class MetadataFilterTestEntityFoo +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityBar +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityFooBar +{ + const CLASSNAME = __CLASS__; + + /** @Id @Column(type="integer") */ + protected $id; +} From f0e403211b62fb53a1671d8a6a42eadc469454dc Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:17:18 +0200 Subject: [PATCH 095/124] #5715 adding return hints \(void\) to test methods --- .../Tests/ORM/Tools/Console/MetadataFilterTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index aed184e4c..1972b3fd1 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -17,7 +17,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase */ private $cmf; - protected function setUp() + protected function setUp() : void { parent::setUp(); @@ -29,7 +29,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->cmf->setEntityManager($em); } - public function testFilterWithEmptyArray() + public function testFilterWithEmptyArray() : void { $originalMetadatas = array( $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), @@ -44,7 +44,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(count($originalMetadatas), $metadatas); } - public function testFilterWithString() + public function testFilterWithString() : void { $originalMetadatas = array( $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), @@ -77,7 +77,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(1, $metadatas); } - public function testFilterWithString2() + public function testFilterWithString2() : void { $originalMetadatas = array( $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), @@ -94,7 +94,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(2, $metadatas); } - public function testFilterWithArray() + public function testFilterWithArray() : void { $originalMetadatas = array( $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), @@ -114,7 +114,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $this->assertCount(2, $metadatas); } - public function testFilterWithRegex() + public function testFilterWithRegex() : void { $originalMetadatas = array( $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), From 2ce40a6aebb5e274ebca50bb619619cf1c9a7a86 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:18:24 +0200 Subject: [PATCH 096/124] #5715 s/CLASSNAME/class --- .../ORM/Tools/Console/MetadataFilterTest.php | 40 +++++++------------ 1 file changed, 14 insertions(+), 26 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 1972b3fd1..2cc4e5f32 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -32,8 +32,8 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithEmptyArray() : void { $originalMetadatas = array( - $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), - $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), ); $metadatas = $originalMetadatas; @@ -47,9 +47,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString() : void { $originalMetadatas = array( - $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), - $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), - $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), ); $metadatas = $originalMetadatas; @@ -80,9 +80,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString2() : void { $originalMetadatas = array( - $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), - $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), - $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), ); $metadatas = $originalMetadatas; @@ -97,9 +97,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithArray() : void { $originalMetadatas = array( - $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::CLASSNAME), - $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::CLASSNAME), - $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::CLASSNAME), + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), + $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), ); $metadatas = $originalMetadatas; @@ -117,9 +117,9 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithRegex() : void { $originalMetadatas = array( - $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::CLASSNAME), - $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::CLASSNAME), - $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::CLASSNAME), + $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), + $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), + $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), ); $metadatas = $originalMetadatas; @@ -143,8 +143,6 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase /** @Entity */ class MetadataFilterTestEntityAaa { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -152,8 +150,6 @@ class MetadataFilterTestEntityAaa /** @Entity */ class MetadataFilterTestEntityBbb { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -161,8 +157,6 @@ class MetadataFilterTestEntityBbb /** @Entity */ class MetadataFilterTestEntityCcc { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -170,8 +164,6 @@ class MetadataFilterTestEntityCcc /** @Entity */ class MetadataFilterTestEntityFoo { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -179,8 +171,6 @@ class MetadataFilterTestEntityFoo /** @Entity */ class MetadataFilterTestEntityBar { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } @@ -188,8 +178,6 @@ class MetadataFilterTestEntityBar /** @Entity */ class MetadataFilterTestEntityFooBar { - const CLASSNAME = __CLASS__; - /** @Id @Column(type="integer") */ protected $id; } From 29fe76cced3adf0f8790e976f17846a80053ab09 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:20:30 +0200 Subject: [PATCH 097/124] #5715 short array notation --- .../ORM/Tools/Console/MetadataFilterTest.php | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 2cc4e5f32..4873e6ae9 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -23,6 +23,7 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase $driver = $this->createAnnotationDriver(); $em = $this->_getTestEntityManager(); + $em->getConfiguration()->setMetadataDriverImpl($driver); $this->cmf = new DisconnectedClassMetadataFactory(); @@ -31,13 +32,13 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithEmptyArray() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), - ); + ]; $metadatas = $originalMetadatas; - $metadatas = MetadataFilter::filter($metadatas, array()); + $metadatas = MetadataFilter::filter($metadatas, []); $this->assertContains($metadataAaa, $metadatas); $this->assertContains($metadataBbb, $metadatas); @@ -46,11 +47,11 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), - ); + ]; $metadatas = $originalMetadatas; $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityAaa'); @@ -79,11 +80,11 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithString2() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), - ); + ]; $metadatas = $originalMetadatas; $metadatas = MetadataFilter::filter($metadatas, 'MetadataFilterTestEntityFoo'); @@ -96,17 +97,17 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithArray() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), $metadataCcc = $this->cmf->getMetadataFor(MetadataFilterTestEntityCcc::class), - ); + ]; $metadatas = $originalMetadatas; - $metadatas = MetadataFilter::filter($metadatas, array( + $metadatas = MetadataFilter::filter($metadatas, [ 'MetadataFilterTestEntityAaa', 'MetadataFilterTestEntityCcc', - )); + ]); $this->assertContains($metadataAaa, $metadatas); $this->assertNotContains($metadataBbb, $metadatas); @@ -116,11 +117,11 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase public function testFilterWithRegex() : void { - $originalMetadatas = array( + $originalMetadatas = [ $metadataFoo = $this->cmf->getMetadataFor(MetadataFilterTestEntityFoo::class), $metadataFooBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityFooBar::class), $metadataBar = $this->cmf->getMetadataFor(MetadataFilterTestEntityBar::class), - ); + ]; $metadatas = $originalMetadatas; $metadatas = MetadataFilter::filter($metadatas, 'Foo$'); From 01d226aff0b9688141e5c5a5bb79f916e0667f91 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:21:22 +0200 Subject: [PATCH 098/124] #5715 removed superfluous mapping information --- .../Tests/ORM/Tools/Console/MetadataFilterTest.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php index 4873e6ae9..24f3b54a3 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -144,41 +144,41 @@ class MetadataFilterTest extends \Doctrine\Tests\OrmTestCase /** @Entity */ class MetadataFilterTestEntityAaa { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityBbb { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityCcc { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityFoo { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityBar { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } /** @Entity */ class MetadataFilterTestEntityFooBar { - /** @Id @Column(type="integer") */ + /** @Id @Column */ protected $id; } From d13327eca23a8cbf39384470cdd48aeddc2ddd3c Mon Sep 17 00:00:00 2001 From: Sergey Fedotov Date: Thu, 21 Apr 2016 18:28:04 +0300 Subject: [PATCH 099/124] Fix undefined index for discriminator column in SchemaTool --- lib/Doctrine/ORM/Tools/SchemaTool.php | 2 +- .../Tests/ORM/Tools/SchemaToolTest.php | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php index 9ee27c84d..007ac85a8 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -358,7 +358,7 @@ class SchemaTool $discrColumn = $class->discriminatorColumn; if ( ! isset($discrColumn['type']) || - (strtolower($discrColumn['type']) == 'string' && $discrColumn['length'] === null) + (strtolower($discrColumn['type']) == 'string' && ! isset($discrColumn['length'])) ) { $discrColumn['type'] = 'string'; $discrColumn['length'] = 255; diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php index 7bae933a6..50ae0347f 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php @@ -2,6 +2,7 @@ namespace Doctrine\Tests\ORM\Tools; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\ORM\Tools\Event\GenerateSchemaEventArgs; use Doctrine\ORM\Tools\Event\GenerateSchemaTableEventArgs; use Doctrine\ORM\Tools\SchemaTool; @@ -163,6 +164,26 @@ class SchemaToolTest extends OrmTestCase $this->assertCount(1, $indexes, "there should be only one index"); $this->assertTrue(current($indexes)->isPrimary(), "index should be primary"); } + + public function testSetDiscriminatorColumnWithoutLength() + { + $em = $this->_getTestEntityManager(); + $schemaTool = new SchemaTool($em); + $metadata = $em->getClassMetadata(__NAMESPACE__ . '\\FirstEntity'); + + $metadata->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_SINGLE_TABLE); + $metadata->setDiscriminatorColumn(['name' => 'discriminator', 'type' => 'string']); + + $schema = $schemaTool->getSchemaFromMetadata([$metadata]); + + $this->assertTrue($schema->hasTable('first_entity')); + $table = $schema->getTable('first_entity'); + + $this->assertTrue($table->hasColumn('discriminator')); + $column = $table->getColumn('discriminator'); + + $this->assertEquals(255, $column->getLength()); + } } /** From 6e9c1d8a4bc6958d9dd1b11204260d5efc41304a Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 06:34:45 +0200 Subject: [PATCH 100/124] #5798 adding `void` test method return declaration, using `::class` reference over string reference --- tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php index 50ae0347f..1164ae219 100644 --- a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php @@ -165,11 +165,11 @@ class SchemaToolTest extends OrmTestCase $this->assertTrue(current($indexes)->isPrimary(), "index should be primary"); } - public function testSetDiscriminatorColumnWithoutLength() + public function testSetDiscriminatorColumnWithoutLength() : void { $em = $this->_getTestEntityManager(); $schemaTool = new SchemaTool($em); - $metadata = $em->getClassMetadata(__NAMESPACE__ . '\\FirstEntity'); + $metadata = $em->getClassMetadata(FirstEntity::class); $metadata->setInheritanceType(ClassMetadata::INHERITANCE_TYPE_SINGLE_TABLE); $metadata->setDiscriminatorColumn(['name' => 'discriminator', 'type' => 'string']); From 633a4420465cd1da4d75b21448562cece32ac50e Mon Sep 17 00:00:00 2001 From: Tomasz Darmetko Date: Mon, 6 Mar 2017 19:39:27 +0100 Subject: [PATCH 101/124] Add path expresion to QueryException::associationPathInverseSideNotSupported() --- lib/Doctrine/ORM/Query/QueryException.php | 8 +++++--- lib/Doctrine/ORM/Query/SqlWalker.php | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Query/QueryException.php b/lib/Doctrine/ORM/Query/QueryException.php index 8245722a9..bde84579e 100644 --- a/lib/Doctrine/ORM/Query/QueryException.php +++ b/lib/Doctrine/ORM/Query/QueryException.php @@ -204,13 +204,15 @@ class QueryException extends \Doctrine\ORM\ORMException } /** + * @param object $pathExpr + * * @return QueryException */ - public static function associationPathInverseSideNotSupported() + public static function associationPathInverseSideNotSupported($pathExpr) { return new self( - "A single-valued association path expression to an inverse side is not supported". - " in DQL queries. Use an explicit join instead." + "A single-valued association path expression to an inverse side is not supported in DQL queries. " . + "Instead of '" . $pathExpr->identificationVariable . "." . $pathExpr->field . "' use an explicit join." ); } diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index a4b5089e8..269859528 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -671,7 +671,7 @@ class SqlWalker implements TreeWalker $assoc = $class->associationMappings[$fieldName]; if ( ! $assoc['isOwningSide']) { - throw QueryException::associationPathInverseSideNotSupported(); + throw QueryException::associationPathInverseSideNotSupported($pathExpr); } // COMPOSITE KEYS NOT (YET?) SUPPORTED From b21cb3e2a0ef3e2da8fee00ea3bb157ef6a6ce7b Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 08:16:24 +0200 Subject: [PATCH 102/124] #6325 adding IDE hints, type hints, replacing double quotes with single quotes --- lib/Doctrine/ORM/Query/QueryException.php | 10 ++++++---- lib/Doctrine/ORM/Query/SqlWalker.php | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/Doctrine/ORM/Query/QueryException.php b/lib/Doctrine/ORM/Query/QueryException.php index bde84579e..b78e27bcf 100644 --- a/lib/Doctrine/ORM/Query/QueryException.php +++ b/lib/Doctrine/ORM/Query/QueryException.php @@ -19,6 +19,8 @@ namespace Doctrine\ORM\Query; +use Doctrine\ORM\Query\AST\PathExpression; + /** * Description of QueryException. * @@ -204,15 +206,15 @@ class QueryException extends \Doctrine\ORM\ORMException } /** - * @param object $pathExpr + * @param PathExpression $pathExpr * * @return QueryException */ - public static function associationPathInverseSideNotSupported($pathExpr) + public static function associationPathInverseSideNotSupported(PathExpression $pathExpr) { return new self( - "A single-valued association path expression to an inverse side is not supported in DQL queries. " . - "Instead of '" . $pathExpr->identificationVariable . "." . $pathExpr->field . "' use an explicit join." + 'A single-valued association path expression to an inverse side is not supported in DQL queries. ' . + 'Instead of "' . $pathExpr->identificationVariable . '.' . $pathExpr->field . '" use an explicit join.' ); } diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 269859528..98f58ad8c 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -644,6 +644,7 @@ class SqlWalker implements TreeWalker { $sql = ''; + /* @var $pathExpr Query\AST\PathExpression */ switch ($pathExpr->type) { case AST\PathExpression::TYPE_STATE_FIELD: $fieldName = $pathExpr->field; From 9cfdf1ef811be8bb55e33617c935c16ebe3e2c35 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Wed, 21 Jun 2017 08:20:20 +0200 Subject: [PATCH 103/124] #6325 documenting minor BC break introduced by adding a required parameter to the exception named constructor --- UPGRADE.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/UPGRADE.md b/UPGRADE.md index 8aba870c6..a502c872e 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -2,6 +2,11 @@ ## Minor BC BREAK: removed `Doctrine\ORM\Query\Parser#isInternalFunction` +Method `Doctrine\ORM\Query\QueryException::associationPathInverseSideNotSupported` +now has a required parameter `$pathExpr`. + +## Minor BC BREAK: removed `Doctrine\ORM\Query\Parser#isInternalFunction` + Method `Doctrine\ORM\Query\Parser#isInternalFunction` was removed because the distinction between internal function and user defined DQL was removed. [#6500](https://github.com/doctrine/doctrine2/pull/6500) From b446afd93716ea0e5a388d1b929d14ef41c51035 Mon Sep 17 00:00:00 2001 From: NateC Date: Wed, 24 Feb 2016 17:13:25 -0600 Subject: [PATCH 104/124] Updating the Getting Started guide's documentation --- docs/en/tutorials/getting-started.rst | 262 ++++++++++++-------------- 1 file changed, 125 insertions(+), 137 deletions(-) diff --git a/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst index 5cbcfb170..605b1a017 100644 --- a/docs/en/tutorials/getting-started.rst +++ b/docs/en/tutorials/getting-started.rst @@ -14,7 +14,7 @@ Guide Assumptions ----------------- This guide is designed for beginners that haven't worked with Doctrine ORM -before. There are some prerequesites for the tutorial that have to be +before. There are some prerequisites for the tutorial that have to be installed: - PHP (latest stable version) @@ -118,8 +118,8 @@ Add the following directories: Obtaining the EntityManager --------------------------- -Doctrine's public interface is the EntityManager, it provides the -access point to the complete lifecycle management of your entities +Doctrine's public interface is through the ``EntityManager``. This class +provides access points to the complete lifecycle management for your entities, and transforms entities from and back to persistence. You have to configure and create it to use your entities with Doctrine 2. I will show the configuration steps and then discuss them step by @@ -150,8 +150,8 @@ step: // obtaining the entity manager $entityManager = EntityManager::create($conn, $config); -The first require statement sets up the autoloading capabilities of Doctrine -using the Composer autoload. +The require_once statement sets up the class autoloading for Doctrine and +its dependencies using Composer's autoloader. The second block consists of the instantiation of the ORM ``Configuration`` object using the Setup helper. It assumes a bunch @@ -159,8 +159,8 @@ of defaults that you don't have to bother about for now. You can read up on the configuration details in the :doc:`reference chapter on configuration <../reference/configuration>`. -The third block shows the configuration options required to connect -to a database, in my case a file-based sqlite database. All the +The third block shows the configuration options required to connect to +a database. In this case, we'll use a file-based SQLite database. All the configuration options for all the shipped drivers are given in the `DBAL Configuration section of the manual `_. @@ -170,15 +170,10 @@ factory method. Generating the Database Schema ------------------------------ -Now that we have defined the Metadata mappings and bootstrapped the -EntityManager we want to generate the relational database schema -from it. Doctrine has a Command-Line Interface that allows you to -access the SchemaTool, a component that generates the required -tables to work with the metadata. - -For the command-line tool to work a cli-config.php file has to be -present in the project root directory, where you will execute the -doctrine command. Its a fairly simple file: +Doctrine has a command-line interface that allows you to access the SchemaTool, +a component that can generate a relational database schema based entirely on the +defined entity classes and their metadata. For this tool to work, a +cli-config.php file must exist in the project root directory: .. code-block:: php @@ -188,40 +183,38 @@ doctrine command. Its a fairly simple file: return \Doctrine\ORM\Tools\Console\ConsoleRunner::createHelperSet($entityManager); -You can then change into your project directory and call the -Doctrine command-line tool: +Change into your project directory and call the Doctrine command-line tool: :: $ cd project/ $ vendor/bin/doctrine orm:schema-tool:create -At this point no entity metadata exists in `src` so you will see a message like -"No Metadata Classes to process." Don't worry, we'll create a Product entity and -corresponding metadata in the next section. +Since we haven't added any entity metadata in `src` yet, you'll see a message +stating "No Metadata Classes to process." In the next section, we'll create a +Product entity along with the corresponding metadata, and run this command again. -You should be aware that during the development process you'll periodically need -to update your database schema to be in sync with your Entities metadata. - -You can easily recreate the database: +Note that as you modify your entities' metadata during the development process, +you'll need to update your database schema to stay in sync with the metadata. +You can rasily recreate the database using the following commands: :: $ vendor/bin/doctrine orm:schema-tool:drop --force $ vendor/bin/doctrine orm:schema-tool:create -Or use the update functionality: +Or you can use the update functionality: :: $ vendor/bin/doctrine orm:schema-tool:update --force The updating of databases uses a Diff Algorithm for a given -Database Schema, a cornerstone of the ``Doctrine\DBAL`` package, +Database Schema. This is a cornerstone of the ``Doctrine\DBAL`` package, which can even be used without the Doctrine ORM package. -Starting with the Product -------------------------- +Starting with the Product Entity +-------------------------------- We start with the simplest entity, the Product. Create a ``src/Product.php`` file to contain the ``Product`` entity definition: @@ -257,9 +250,9 @@ entity definition: } } -Note that all fields are set to protected (not public) with a -mutator (getter and setter) defined for every field except $id. -The use of mutators allows Doctrine to hook into calls which +When creating entity classes, all of the fields should be protected or private +(not public), with getter and setter methods for each one (except $id). +The use of mutators allows Doctrine to hook into calls which manipulate the entities in ways that it could not if you just directly set the values with ``entity#field = foo;`` @@ -274,9 +267,10 @@ language. The metadata language describes how entities, their properties and references should be persisted and what constraints should be applied to them. -Metadata for entities are configured using a XML, YAML or Docblock Annotations. -This Getting Started Guide will show the mappings for all Mapping Drivers. -References in the text will be made to the XML mapping. +Metadata for an Entity can be configured using DocBlock annotations directly +in the Entity class itself, or in an external XML or YAML file. This Getting +Started guide will demonstrate metadata mappings using all three methods, +but you only need to choose one. .. configuration-block:: @@ -332,27 +326,28 @@ References in the text will be made to the XML mapping. The top-level ``entity`` definition tag specifies information about the class and table-name. The primitive type ``Product#name`` is defined as a ``field`` attribute. The ``id`` property is defined with -the ``id`` tag, this has a ``generator`` tag nested inside which -defines that the primary key generation mechanism automatically -uses the database platforms native id generation strategy (for -example AUTO INCREMENT in the case of MySql or Sequences in the +the ``id`` tag. It has a ``generator`` tag nested inside, which +specifies that the primary key generation mechanism should automatically +use the database platform's native id generation strategy (for +example, AUTO INCREMENT in the case of MySql, or Sequences in the case of PostgreSql and Oracle). -Now that we have defined our first entity, let's update the database: +Now that we have defined our first entity and its metadata, +let's update the database schema: :: $ vendor/bin/doctrine orm:schema-tool:update --force --dump-sql -Specifying both flags ``--force`` and ``--dump-sql`` prints and executes the DDL -statements. +Specifying both flags ``--force`` and ``--dump-sql`` will cause the DDL +statements to be executed and then printed to the screen. -Now create a new script that will insert products into the database: +Now, we'll create a new script to insert products into the database: .. code-block:: php require_once "bootstrap.php"; $newProductName = $argv[1]; @@ -372,22 +367,19 @@ Call this script from the command-line to see how new products are created: $ php create_product.php ORM $ php create_product.php DBAL -What is happening here? Using the ``Product`` is pretty standard OOP. +What is happening here? Using the ``Product`` class is pretty standard OOP. The interesting bits are the use of the ``EntityManager`` service. To -notify the EntityManager that a new entity should be inserted into the database -you have to call ``persist()``. To initiate a transaction to actually perform -the insertion, You have to explicitly call ``flush()`` on the ``EntityManager``. +notify the EntityManager that a new entity should be inserted into the database, +you have to call ``persist()``. To initiate a transaction to actually *perform* +the insertion, you have to explicitly call ``flush()`` on the ``EntityManager``. -This distinction between persist and flush is allows to aggregate all writes -(INSERT, UPDATE, DELETE) into one single transaction, which is executed when -flush is called. Using this approach the write-performance is significantly -better than in a scenario where updates are done for each entity in isolation. +This distinction between persist and flush is what allows the aggregation of +all database writes (INSERT, UPDATE, DELETE) into one single transaction, which +is executed when ``flush()`` is called. Using this approach, the write-performance +is significantly better than in a scenario in which writes are performed on +each entity in isolation. -Doctrine follows the UnitOfWork pattern which additionally detects all entities -that were fetched and have changed during the request. You don't have to keep track of -entities yourself, when Doctrine already knows about them. - -As a next step we want to fetch a list of all the Products. Let's create a +Next, we'll fetch a list of all the Products in the database. Let's create a new script for this: .. code-block:: php @@ -404,10 +396,10 @@ new script for this: } The ``EntityManager#getRepository()`` method can create a finder object (called -a repository) for every entity. It is provided by Doctrine and contains some -finder methods such as ``findAll()``. +a repository) for every type of entity. It is provided by Doctrine and contains +some finder methods like ``findAll()``. -Let's continue with displaying the name of a product based on its ID: +Let's continue by creating a script to display the name of a product based on its ID: .. code-block:: php @@ -425,9 +417,13 @@ Let's continue with displaying the name of a product based on its ID: echo sprintf("-%s\n", $product->getName()); -Updating a product name demonstrates the functionality UnitOfWork of pattern -discussed before. We only need to find a product entity and all changes to its -properties are written to the database: +Next we'll update a product's name, given its id. This simple example will +help demonstrate Doctrine's implementation of the UnitOfWork pattern. Doctrine +keeps track of all the entities that were retrieved from the Entity Manager, +and can detect when any of those entities' properties have been modified. +As a result, rather than needing to call ``persist($entity)`` for each individual +entity whose properties were changed, a single call to ``flush()`` at the end of a +request is sufficient to update the database for all of the modified entities. .. code-block:: php @@ -455,9 +451,8 @@ product name changed by calling the ``show_product.php`` script. Adding Bug and User Entities ---------------------------- -We continue with the bug tracker domain, by creating the missing classes -``Bug`` and ``User`` and putting them into ``src/Bug.php`` and -``src/User.php`` respectively. +We continue with the bug tracker example by creating the ``Bug`` and ``User`` +classes. We'll store them in ``src/Bug.php`` and ``src/User.php``, respectively. .. code-block:: php @@ -561,14 +556,15 @@ We continue with the bug tracker domain, by creating the missing classes } } -All of the properties discussed so far are simple string and integer values, -for example the id fields of the entities, their names, description, status and -change dates. Next we will model the dynamic relationships between the entities -by defining the references between entities. +All of the properties we've seen so far are of simple types (integer, string, +and datetime). But now, we'll add properties that will store objects of +specific *entity types* in order to model the relationships between different +entities. -References between objects are foreign keys in the database. You never have to -(and never should) work with the foreign keys directly, only with the objects -that represent the foreign key through their own identity. +At the database level, relationships between entities are represented by foreign +keys. But with Doctrine, you'll never have to (and never should) work with +the foreign keys directly. You should only work with objects that represent +foreign keys through their own identities. For every foreign key you either have a Doctrine ManyToOne or OneToOne association. On the inverse sides of these foreign keys you can have @@ -602,6 +598,7 @@ domain model to match the requirements: assignedToBug($this); $this->engineer = $engineer; } - public function setReporter($reporter) + public function setReporter(User $reporter) { $reporter->addReportedBug($this); $this->reporter = $reporter; @@ -717,15 +713,15 @@ the bi-directional reference: { // ... (previous code) - protected $reportedBugs = null; - protected $assignedBugs = null; + protected $reportedBugs; + protected $assignedBugs; - public function addReportedBug($bug) + public function addReportedBug(Bug $bug) { $this->reportedBugs[] = $bug; } - public function assignedToBug($bug) + public function assignedToBug(Bug $bug) { $this->assignedBugs[] = $bug; } @@ -741,7 +737,7 @@ You can see from ``User#addReportedBug()`` and ``User#assignedToBug()`` that using this method in userland alone would not add the Bug to the collection of the owning side in ``Bug#reporter`` or ``Bug#engineer``. Using these methods and -calling Doctrine for persistence would not update the collections +calling Doctrine for persistence would not update the Collections' representation in the database. Only using ``Bug#setEngineer()`` or ``Bug#setReporter()`` @@ -749,7 +745,7 @@ correctly saves the relation information. The ``Bug#reporter`` and ``Bug#engineer`` properties are Many-To-One relations, which point to a User. In a normalized -relational model the foreign key is saved on the Bug's table, hence +relational model, the foreign key is saved on the Bug's table, hence in our object-relation model the Bug is at the owning side of the relation. You should always make sure that the use-cases of your domain model should drive which side is an inverse or owning one in @@ -758,7 +754,7 @@ or an engineer is assigned to the bug, we don't want to update the User to persist the reference, but the Bug. This is the case with the Bug being at the owning side of the relation. -Bugs reference Products by an uni-directional ManyToMany relation in +Bugs reference Products by a uni-directional ManyToMany relation in the database that points from Bugs to Products. .. code-block:: php @@ -771,7 +767,7 @@ the database that points from Bugs to Products. protected $products = null; - public function assignToProduct($product) + public function assignToProduct(Product $product) { $this->products[] = $product; } @@ -783,7 +779,7 @@ the database that points from Bugs to Products. } We are now finished with the domain model given the requirements. -Lets add metadata mappings for the ``User`` and ``Bug`` as we did for +Lets add metadata mappings for the ``Bug`` entity, as we did for the ``Product`` before: .. configuration-block:: @@ -890,13 +886,13 @@ For the "created" field we have used the ``datetime`` type, which translates the YYYY-mm-dd HH:mm:ss database format into a PHP DateTime instance and back. -After the field definitions the two qualified references to the +After the field definitions, the two qualified references to the user entity are defined. They are created by the ``many-to-one`` tag. The class name of the related entity has to be specified with the ``target-entity`` attribute, which is enough information for the database mapper to access the foreign-table. Since ``reporter`` and ``engineer`` are on the owning side of a -bi-directional relation we also have to specify the ``inversed-by`` +bi-directional relation, we also have to specify the ``inversed-by`` attribute. They have to point to the field names on the inverse side of the relationship. We will see in the next example that the ``inversed-by`` attribute has a counterpart ``mapped-by`` which makes that @@ -907,7 +903,7 @@ holds all products where the specific bug occurs. Again you have to define the ``target-entity`` and ``field`` attributes on the ``many-to-many`` tag. -The last missing definition is that of the User entity: +Finally, we'll add metadata mappings for the ``User`` entity. .. configuration-block:: @@ -934,13 +930,13 @@ The last missing definition is that of the User entity: /** * @OneToMany(targetEntity="Bug", mappedBy="reporter") - * @var Bug[] + * @var Bug[] An ArrayCollection of Bug objects. **/ protected $reportedBugs = null; /** * @OneToMany(targetEntity="Bug", mappedBy="engineer") - * @var Bug[] + * @var Bug[] An ArrayCollection of Bug objects. **/ protected $assignedBugs = null; @@ -996,10 +992,7 @@ means the join details have already been defined on the owning side. Therefore we only have to specify the property on the Bug class that holds the owning sides. -This example has a fair overview of the most basic features of the -metadata definition language. - -Update your database running: +Update your database schema by running: :: $ vendor/bin/doctrine orm:schema-tool:update --force @@ -1008,7 +1001,8 @@ Update your database running: Implementing more Requirements ------------------------------ -For starters we need to create user entities: +So far, we've seen the most basic features of the metadata definition language. +To explore additional functionality, let's first create new ``User`` entities: .. code-block:: php @@ -1032,23 +1026,22 @@ Now call: $ php create_user.php beberlei -We now have the data to create a bug and the code for this scenario may look -like this: +We now have the necessary data to create a new Bug entity: .. code-block:: php require_once "bootstrap.php"; - $theReporterId = $argv[1]; - $theDefaultEngineerId = $argv[2]; + $reporterId = $argv[1]; + $engineerId = $argv[2]; $productIds = explode(",", $argv[3]); - $reporter = $entityManager->find("User", $theReporterId); - $engineer = $entityManager->find("User", $theDefaultEngineerId); + $reporter = $entityManager->find("User", $reporterId); + $engineer = $entityManager->find("User", $engineerId); if (!$reporter || !$engineer) { - echo "No reporter and/or engineer found for the input.\n"; + echo "No reporter and/or engineer found for the given id(s).\n"; exit(1); } @@ -1070,22 +1063,17 @@ like this: echo "Your new Bug Id: ".$bug->getId()."\n"; -Since we only have one user and product, probably with the ID of 1, we can call this script with: +Since we only have one user and product, probably with the ID of 1, we can +call this script as follows: :: php create_bug.php 1 1 1 -This is the first contact with the read API of the EntityManager, -showing that a call to ``EntityManager#find($name, $id)`` returns a -single instance of an entity queried by primary key. Besides this -we see the persist + flush pattern again to save the Bug into the -database. - -See how simple relating Bug, Reporter, Engineer and Products is -done by using the discussed methods in the "A first prototype" -section. The UnitOfWork will detect this relationship when flush is -called and relate them in the database appropriately. +See how simple it is to relate a Bug, Reporter, Engineer and Products? +Also recall that thanks to the UnitOfWork pattern, Doctrine will detect +these relations and update all of the modified entities in the database +automatically when ``flush()`` is called. Queries for Application Use-Cases --------------------------------- @@ -1094,7 +1082,7 @@ List of Bugs ~~~~~~~~~~~~ Using the previous examples we can fill up the database quite a -bit, however we now need to discuss how to query the underlying +bit. However, we now need to discuss how to query the underlying mapper for the required view representations. When opening the application, bugs can be paginated through a list-view, which is the first read-only use-case: @@ -1225,7 +1213,7 @@ write scenarios: .. code-block:: php require_once "bootstrap.php"; $theBugId = $argv[1]; @@ -1300,7 +1288,7 @@ and usage of bound parameters: .. code-block:: php require_once "bootstrap.php"; $theUserId = $argv[1]; @@ -1366,7 +1354,7 @@ should be able to close a bug. This looks like: .. code-block:: php require_once "bootstrap.php"; $theBugId = $argv[1]; From fc609271e0fd1da203555ab80e3d91c298dfb448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1chym=20Tou=C5=A1ek?= Date: Thu, 19 Jan 2017 12:54:10 +0100 Subject: [PATCH 105/124] Fix CountOutputWalker for queries with GROUP BY --- .../ORM/Tools/Pagination/CountOutputWalker.php | 8 ++++++++ .../Tools/Pagination/CountOutputWalkerTest.php | 18 +++++++++++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php b/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php index 8d3163043..f3db053ca 100644 --- a/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php +++ b/lib/Doctrine/ORM/Tools/Pagination/CountOutputWalker.php @@ -91,6 +91,14 @@ class CountOutputWalker extends SqlWalker $sql = parent::walkSelectStatement($AST); + if ($AST->groupByClause) { + return sprintf( + 'SELECT %s AS dctrn_count FROM (%s) dctrn_table', + $this->platform->getCountExpression('*'), + $sql + ); + } + // Find out the SQL alias of the identifier column of the root entity // It may be possible to make this work with multiple root entities but that // would probably require issuing multiple queries or doing a UNION SELECT diff --git a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php index 5f999f28a..df7f73f78 100644 --- a/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php +++ b/tests/Doctrine/Tests/ORM/Tools/Pagination/CountOutputWalkerTest.php @@ -31,15 +31,27 @@ class CountOutputWalkerTest extends PaginationTestCase ); } - public function testCountQuery_Having() + public function testCountQuery_GroupBy(): void + { + $query = $this->entityManager->createQuery( + 'SELECT p.name FROM Doctrine\Tests\ORM\Tools\Pagination\Person p GROUP BY p.name'); + $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); + $query->setFirstResult(null)->setMaxResults(null); + + $this->assertSame( + "SELECT COUNT(*) AS dctrn_count FROM (SELECT p0_.name AS name_0 FROM Person p0_ GROUP BY p0_.name) dctrn_table", $query->getSQL() + ); + } + + public function testCountQuery_Having(): void { $query = $this->entityManager->createQuery( 'SELECT g, u, count(u.id) AS userCount FROM Doctrine\Tests\ORM\Tools\Pagination\Group g LEFT JOIN g.users u GROUP BY g.id HAVING userCount > 0'); $query->setHint(Query::HINT_CUSTOM_OUTPUT_WALKER, CountOutputWalker::class); $query->setFirstResult(null)->setMaxResults(null); - $this->assertEquals( - "SELECT COUNT(*) AS dctrn_count FROM (SELECT DISTINCT id_1 FROM (SELECT count(u0_.id) AS sclr_0, g1_.id AS id_1, u0_.id AS id_2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr_0 > 0) dctrn_result) dctrn_table", $query->getSQL() + $this->assertSame( + "SELECT COUNT(*) AS dctrn_count FROM (SELECT count(u0_.id) AS sclr_0, g1_.id AS id_1, u0_.id AS id_2 FROM groups g1_ LEFT JOIN user_group u2_ ON g1_.id = u2_.group_id LEFT JOIN User u0_ ON u0_.id = u2_.user_id GROUP BY g1_.id HAVING sclr_0 > 0) dctrn_table", $query->getSQL() ); } From e8332a45dec7cd742bdafaef7fc1062ed58c8e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 22 Jun 2017 07:55:44 +0200 Subject: [PATCH 106/124] Use the Travis' Trusty build environment To see if that solves the XML validation issues (since the issues are possibly happening due to old libxml versions). --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bd9d8b32c..8f9d11692 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +dist: trusty sudo: false language: php From 21ad7a1913ae2cedc98f38c2307cc96a05544b6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Cobucci?= Date: Thu, 22 Jun 2017 08:30:27 +0200 Subject: [PATCH 107/124] Create schema based on config file (on MySQL & MariaDB) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8f9d11692..667d3f2d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,6 +18,7 @@ before_script: - composer install --prefer-source - if [ "$DEPENDENCIES" != "low" ]; then composer update; fi; - if [ "$DEPENDENCIES" == "low" ]; then composer update --prefer-lowest; fi; + - if [[ $DB == "mysql" || $DB == "mariadb" ]]; then mysql -e "CREATE SCHEMA doctrine_tests; GRANT ALL PRIVILEGES ON doctrine_tests.* to travis@'%'"; fi; script: - ENABLE_SECOND_LEVEL_CACHE=0 ./vendor/bin/phpunit -v -c tests/travis/$DB.travis.xml $PHPUNIT_FLAGS From 9eb2d6139efe8b8d1ae77d5b47c1e38ae109bc95 Mon Sep 17 00:00:00 2001 From: Emiel Nijpels Date: Thu, 24 Sep 2015 10:26:10 +0200 Subject: [PATCH 108/124] DDC-3146 remove event listener from event listener in abstract hydrator in cleanup function --- .../Internal/Hydration/AbstractHydrator.php | 3 + .../ORM/Functional/Ticket/DDC3146Test.php | 65 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php index ee9385c81..d462421ac 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php @@ -211,6 +211,9 @@ abstract class AbstractHydrator $this->_rsm = null; $this->_cache = []; $this->_metadataCache = []; + + $evm = $this->_em->getEventManager(); + $evm->removeEventListener(array(Events::onClear), $this); } /** diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php new file mode 100644 index 000000000..7e09642c2 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php @@ -0,0 +1,65 @@ + + */ +class DDC3146Test extends \Doctrine\Tests\OrmFunctionalTestCase +{ + /** + * Verify that the number of added events to the event listener from the abstract hydrator class is equal to the number of removed events + */ + public function testEventListeners() + { + // Create mock connection to be returned from the entity manager interface + $mockConnection = $this->getMockBuilder('Doctrine\DBAL\Connection')->disableOriginalConstructor()->getMock(); + $mockEntityManagerInterface = $this->getMockBuilder('Doctrine\ORM\EntityManagerInterface')->disableOriginalConstructor()->getMock(); + $mockEntityManagerInterface->expects($this->any())->method('getConnection')->will($this->returnValue($mockConnection)); + + // Create mock event manager to be returned from the entity manager interface + $mockEventManager = $this->getMockBuilder('Doctrine\Common\EventManager')->disableOriginalConstructor()->getMock(); + $mockEntityManagerInterface->expects($this->any())->method('getEventManager')->will($this->returnValue($mockEventManager)); + + // Create mock statement and result mapping + $mockStatement = $this->getMockBuilder('Doctrine\DBAL\Driver\Statement')->disableOriginalConstructor()->getMock(); + $mockStatement->expects($this->once())->method('fetch')->will($this->returnValue(false)); + $mockResultMapping = $this->getMockBuilder('Doctrine\ORM\Query\ResultSetMapping')->disableOriginalConstructor()->getMock(); + + // Create mock abstract hydrator + $mockAbstractHydrator = $this->getMockBuilder('Doctrine\ORM\Internal\Hydration\AbstractHydrator') + ->setConstructorArgs(array($mockEntityManagerInterface)) + ->setMethods(array('hydrateAllData')) + ->getMock(); + + // Increase counter every time the event listener is added and decrease the counter every time the event listener is removed + $eventCounter = 0; + $mockEventManager->expects($this->any()) + ->method('addEventListener') + ->will( + $this->returnCallback( + function () use (&$eventCounter) { + $eventCounter++; + } + ) + ); + + $mockEventManager->expects($this->any()) + ->method('removeEventListener') + ->will( + $this->returnCallback( + function () use (&$eventCounter) { + $eventCounter--; + } + ) + ); + + // Create iterable result + $iterableResult = $mockAbstractHydrator->iterate($mockStatement, $mockResultMapping, array()); + $iterableResult->next(); + + // Number of added events listeners should be equal or less than the number of removed events + $this->assertLessThanOrEqual(0, $eventCounter, 'More events added to the event listener than removed; this can create a memory leak when references are not cleaned up'); + } +} From aba486ea2d5a189ac1673aed4b2174a7938bc554 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Jun 2017 03:27:12 +0200 Subject: [PATCH 109/124] #1515 removing redundant assignment, short array notation --- lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php index d462421ac..6a7061285 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php @@ -212,8 +212,10 @@ abstract class AbstractHydrator $this->_cache = []; $this->_metadataCache = []; - $evm = $this->_em->getEventManager(); - $evm->removeEventListener(array(Events::onClear), $this); + $this + ->_em + ->getEventManager() + ->removeEventListener([Events::onClear], $this); } /** From 067e01e0d7fd550d726fc5e448188e2c02962406 Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Jun 2017 03:32:58 +0200 Subject: [PATCH 110/124] #1515 cleaning up test case, since the PHPUnit 5.4+ API is much nicer --- .../ORM/Functional/Ticket/DDC3146Test.php | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php index 7e09642c2..cdf7b1234 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php @@ -2,64 +2,59 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\DBAL\Connection; +use Doctrine\ORM\EntityManagerInterface; +use Doctrine\Common\EventManager; +use Doctrine\DBAL\Driver\Statement; +use Doctrine\ORM\Query\ResultSetMapping; +use Doctrine\ORM\Internal\Hydration\AbstractHydrator; +use Doctrine\Tests\OrmFunctionalTestCase; + /** * @group DDC-3146 * @author Emiel Nijpels */ -class DDC3146Test extends \Doctrine\Tests\OrmFunctionalTestCase +class DDC3146Test extends OrmFunctionalTestCase { /** * Verify that the number of added events to the event listener from the abstract hydrator class is equal to the number of removed events */ public function testEventListeners() { - // Create mock connection to be returned from the entity manager interface - $mockConnection = $this->getMockBuilder('Doctrine\DBAL\Connection')->disableOriginalConstructor()->getMock(); - $mockEntityManagerInterface = $this->getMockBuilder('Doctrine\ORM\EntityManagerInterface')->disableOriginalConstructor()->getMock(); - $mockEntityManagerInterface->expects($this->any())->method('getConnection')->will($this->returnValue($mockConnection)); + $mockConnection = $this->createMock(Connection::class); + $mockEntityManagerInterface = $this->createMock(EntityManagerInterface::class); + $mockEventManager = $this->createMock(EventManager::class); + $mockStatement = $this->createMock(Statement::class); + $mockResultMapping = $this->getMockBuilder(ResultSetMapping::class); - // Create mock event manager to be returned from the entity manager interface - $mockEventManager = $this->getMockBuilder('Doctrine\Common\EventManager')->disableOriginalConstructor()->getMock(); - $mockEntityManagerInterface->expects($this->any())->method('getEventManager')->will($this->returnValue($mockEventManager)); + $mockEntityManagerInterface->expects(self::any())->method('getEventManager')->willReturn($mockEventManager); + $mockEntityManagerInterface->expects(self::any())->method('getConnection')->willReturn($mockConnection); + $mockStatement->expects(self::once())->method('fetch')->willReturn(false); - // Create mock statement and result mapping - $mockStatement = $this->getMockBuilder('Doctrine\DBAL\Driver\Statement')->disableOriginalConstructor()->getMock(); - $mockStatement->expects($this->once())->method('fetch')->will($this->returnValue(false)); - $mockResultMapping = $this->getMockBuilder('Doctrine\ORM\Query\ResultSetMapping')->disableOriginalConstructor()->getMock(); - - // Create mock abstract hydrator - $mockAbstractHydrator = $this->getMockBuilder('Doctrine\ORM\Internal\Hydration\AbstractHydrator') + $mockAbstractHydrator = $this->getMockBuilder(AbstractHydrator::class) ->setConstructorArgs(array($mockEntityManagerInterface)) - ->setMethods(array('hydrateAllData')) + ->setMethods(['hydrateAllData']) ->getMock(); // Increase counter every time the event listener is added and decrease the counter every time the event listener is removed $eventCounter = 0; - $mockEventManager->expects($this->any()) + $mockEventManager->expects(self::atLeastOnce()) ->method('addEventListener') - ->will( - $this->returnCallback( - function () use (&$eventCounter) { - $eventCounter++; - } - ) - ); + ->willReturnCallback(function () use (&$eventCounter) { + $eventCounter++; + }); - $mockEventManager->expects($this->any()) + $mockEventManager->expects(self::atLeastOnce()) ->method('removeEventListener') - ->will( - $this->returnCallback( - function () use (&$eventCounter) { - $eventCounter--; - } - ) - ); + ->willReturnCallback(function () use (&$eventCounter) { + $eventCounter--; + }); // Create iterable result $iterableResult = $mockAbstractHydrator->iterate($mockStatement, $mockResultMapping, array()); $iterableResult->next(); // Number of added events listeners should be equal or less than the number of removed events - $this->assertLessThanOrEqual(0, $eventCounter, 'More events added to the event listener than removed; this can create a memory leak when references are not cleaned up'); + self::assertSame(0, $eventCounter, 'More events added to the event listener than removed; this can create a memory leak when references are not cleaned up'); } } From 0b5d877d5f61aee70c2cc80cdd500a0881f7ea5a Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Jun 2017 03:40:12 +0200 Subject: [PATCH 111/124] Migrating #1515 tests to `AbstractHydratorTest` --- .../ORM/Hydration/AbstractHydratorTest.php | 57 +++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php diff --git a/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php new file mode 100644 index 000000000..1cd49d5ca --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Hydration/AbstractHydratorTest.php @@ -0,0 +1,57 @@ +createMock(Connection::class); + $mockEntityManagerInterface = $this->createMock(EntityManagerInterface::class); + $mockEventManager = $this->createMock(EventManager::class); + $mockStatement = $this->createMock(Statement::class); + $mockResultMapping = $this->getMockBuilder(ResultSetMapping::class); + + $mockEntityManagerInterface->expects(self::any())->method('getEventManager')->willReturn($mockEventManager); + $mockEntityManagerInterface->expects(self::any())->method('getConnection')->willReturn($mockConnection); + $mockStatement->expects(self::once())->method('fetch')->willReturn(false); + + /* @var $mockAbstractHydrator AbstractHydrator */ + $mockAbstractHydrator = $this + ->getMockBuilder(AbstractHydrator::class) + ->setConstructorArgs([$mockEntityManagerInterface]) + ->setMethods(['hydrateAllData']) + ->getMock(); + + $mockEventManager + ->expects(self::at(0)) + ->method('addEventListener') + ->with([Events::onClear], $mockAbstractHydrator); + + $mockEventManager + ->expects(self::at(1)) + ->method('removeEventListener') + ->with([Events::onClear], $mockAbstractHydrator); + + iterator_to_array($mockAbstractHydrator->iterate($mockStatement, $mockResultMapping)); + } +} From 995054d884e68cbc15d9f85e126dc1b6682aa2bf Mon Sep 17 00:00:00 2001 From: Marco Pivetta Date: Sat, 24 Jun 2017 03:40:46 +0200 Subject: [PATCH 112/124] #1515 dropping DDC-3146 test, which was moved to the hydration tests --- .../ORM/Functional/Ticket/DDC3146Test.php | 60 ------------------- 1 file changed, 60 deletions(-) delete mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php deleted file mode 100644 index cdf7b1234..000000000 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3146Test.php +++ /dev/null @@ -1,60 +0,0 @@ - - */ -class DDC3146Test extends OrmFunctionalTestCase -{ - /** - * Verify that the number of added events to the event listener from the abstract hydrator class is equal to the number of removed events - */ - public function testEventListeners() - { - $mockConnection = $this->createMock(Connection::class); - $mockEntityManagerInterface = $this->createMock(EntityManagerInterface::class); - $mockEventManager = $this->createMock(EventManager::class); - $mockStatement = $this->createMock(Statement::class); - $mockResultMapping = $this->getMockBuilder(ResultSetMapping::class); - - $mockEntityManagerInterface->expects(self::any())->method('getEventManager')->willReturn($mockEventManager); - $mockEntityManagerInterface->expects(self::any())->method('getConnection')->willReturn($mockConnection); - $mockStatement->expects(self::once())->method('fetch')->willReturn(false); - - $mockAbstractHydrator = $this->getMockBuilder(AbstractHydrator::class) - ->setConstructorArgs(array($mockEntityManagerInterface)) - ->setMethods(['hydrateAllData']) - ->getMock(); - - // Increase counter every time the event listener is added and decrease the counter every time the event listener is removed - $eventCounter = 0; - $mockEventManager->expects(self::atLeastOnce()) - ->method('addEventListener') - ->willReturnCallback(function () use (&$eventCounter) { - $eventCounter++; - }); - - $mockEventManager->expects(self::atLeastOnce()) - ->method('removeEventListener') - ->willReturnCallback(function () use (&$eventCounter) { - $eventCounter--; - }); - - // Create iterable result - $iterableResult = $mockAbstractHydrator->iterate($mockStatement, $mockResultMapping, array()); - $iterableResult->next(); - - // Number of added events listeners should be equal or less than the number of removed events - self::assertSame(0, $eventCounter, 'More events added to the event listener than removed; this can create a memory leak when references are not cleaned up'); - } -} From 7d981350846118513fc0df3db350cc4f9968fdf6 Mon Sep 17 00:00:00 2001 From: Sergio Santoro Date: Mon, 29 Jun 2015 22:05:26 +0200 Subject: [PATCH 113/124] [QUERY] "INSTANCE OF" now behaves correctly with subclasses There was a bug in the "INSTANCE OF" operator as described in https://groups.google.com/forum/#!topic/doctrine-user/B8raq8CNMgg "INSTANCE OF" was not taking into account subclasses. It was merely translating the class to its discriminator. This is not correct since the class can have subtypes and those are, indeed, still instance of the superclass. Also, classes may not have a discriminator (e.g. abstract classes). This commit also provides useful tests to avoid regression. --- lib/Doctrine/ORM/Query/SqlWalker.php | 38 +++-- .../ORM/Functional/InstanceOfAbstractTest.php | 113 +++++++++++++ .../Functional/InstanceOfMultiLevelTest.php | 153 ++++++++++++++++++ .../Tests/ORM/Functional/InstanceOfTest.php | 119 ++++++++++++++ .../ORM/Query/SelectSqlGenerationTest.php | 6 +- 5 files changed, 413 insertions(+), 16 deletions(-) create mode 100644 tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php create mode 100644 tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php create mode 100644 tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 98f58ad8c..645a6c21f 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -2035,8 +2035,10 @@ class SqlWalker implements TreeWalker $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN '); - $sqlParameterList = []; + $knownSubclasses = array_flip($discrClass->subClasses); + $sqlParameterList = []; + $discriminators = []; foreach ($instanceOfExpr->value as $parameter) { if ($parameter instanceof AST\InputParameter) { $this->rsm->addMetadataParameterMapping($parameter->name, 'discriminatorValue'); @@ -2046,21 +2048,31 @@ class SqlWalker implements TreeWalker continue; } - // Get name from ClassMetadata to resolve aliases. - $entityClassName = $this->em->getClassMetadata($parameter)->name; - $discriminatorValue = $class->discriminatorValue; + // Trim first backslash + $parameter = ltrim($parameter, '\\'); - if ($entityClassName !== $class->name) { - $discrMap = array_flip($class->discriminatorMap); - - if ( ! isset($discrMap[$entityClassName])) { - throw QueryException::instanceOfUnrelatedClass($entityClassName, $class->rootEntityName); - } - - $discriminatorValue = $discrMap[$entityClassName]; + // Check parameter is really in the hierarchy + if ($parameter !== $discrClass->name && ! array_key_exists($parameter, $knownSubclasses)) { + throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); } - $sqlParameterList[] = $this->conn->quote($discriminatorValue); + // Include discriminators for parameter class and its subclass + $metadata = $this->em->getClassMetadata($parameter); + $hierarchyClasses = $metadata->subClasses; + $hierarchyClasses[] = $metadata->name; + + foreach ($hierarchyClasses as $class) { + $currentMetadata = $this->em->getClassMetadata($class); + $currentDiscriminator = $currentMetadata->discriminatorValue; + + if (is_string($currentDiscriminator) && ! array_key_exists($currentDiscriminator, $discriminators)) { + $discriminators[$currentDiscriminator] = true; + } + } + } + + foreach (array_keys($discriminators) as $dis) { + $sqlParameterList[] = $this->conn->quote($dis); } $sql .= '(' . implode(', ', $sqlParameterList) . ')'; diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php new file mode 100644 index 000000000..a84643f84 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php @@ -0,0 +1,113 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfAbstractTest\Person'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfAbstractTest\Employee'), + )); + } + + public function testInstanceOf() + { + $this->loadData(); + + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person p + WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person'; + $query = $this->_em->createQuery($dql); + $result = $query->getResult(); + + $this->assertCount(1, $result); + + foreach ($result as $r) { + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person', $r); + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee', $r); + $this->assertEquals('bar', $r->getName()); + } + } + + private function loadData() + { + $employee = new InstanceOfAbstractTest\Employee(); + $employee->setName('bar'); + $employee->setDepartement('qux'); + + $this->_em->persist($employee); + + $this->_em->flush($employee); + } + } +} + +namespace Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest { + + /** + * @Entity() + * @Table(name="instance_of_abstract_test_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "employee": "Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee" + * }) + */ + abstract class Person + { + /** + * @Id() + * @GeneratedValue() + * @Column(type="integer") + */ + private $id; + + /** + * @Column(type="string") + */ + private $name; + + public function getId() + { + return $this->id; + } + + public function getName() + { + return $this->name; + } + + public function setName($name) + { + $this->name = $name; + } + } + + /** + * @Entity() + * @Table(name="instance_of_abstract_test_employee") + */ + class Employee extends Person + { + /** + * @Column(type="string") + */ + private $departement; + + public function getDepartement() + { + return $this->departement; + } + + public function setDepartement($departement) + { + $this->departement = $departement; + } + } + +} diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php new file mode 100644 index 000000000..c4b5bbcd2 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php @@ -0,0 +1,153 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Person'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Employee'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Engineer'), + )); + } + + public function testInstanceOf() + { + $this->loadData(); + + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person p + WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person'; + $query = $this->_em->createQuery($dql); + $result = $query->getResult(); + + $this->assertCount(3, $result); + + foreach ($result as $r) { + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person', $r); + if ($r instanceof InstanceOfMultiLevelTest\Engineer) { + $this->assertEquals('foobar', $r->getName()); + $this->assertEquals('doctrine', $r->getSpecialization()); + } elseif ($r instanceof InstanceOfMultiLevelTest\Employee) { + $this->assertEquals('bar', $r->getName()); + $this->assertEquals('qux', $r->getDepartement()); + } else { + $this->assertEquals('foo', $r->getName()); + } + } + } + + private function loadData() + { + $person = new InstanceOfMultiLevelTest\Person(); + $person->setName('foo'); + + $employee = new InstanceOfMultiLevelTest\Employee(); + $employee->setName('bar'); + $employee->setDepartement('qux'); + + $engineer = new InstanceOfMultiLevelTest\Engineer(); + $engineer->setName('foobar'); + $engineer->setDepartement('dep'); + $engineer->setSpecialization('doctrine'); + + $this->_em->persist($person); + $this->_em->persist($employee); + $this->_em->persist($engineer); + + $this->_em->flush(array($person, $employee, $engineer)); + } + } +} + +namespace Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest { + /** + * @Entity() + * @Table(name="instance_of_multi_level_test_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "person": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person", + * "employee": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Employee", + * "engineer": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Engineer", + * }) + */ + class Person + { + /** + * @Id() + * @GeneratedValue() + * @Column(type="integer") + */ + private $id; + + /** + * @Column(type="string") + */ + private $name; + + public function getId() + { + return $this->id; + } + + public function getName() + { + return $this->name; + } + + public function setName($name) + { + $this->name = $name; + } + } + + /** + * @Entity() + * @Table(name="instance_of_multi_level_employee") + */ + class Employee extends Person + { + /** + * @Column(type="string") + */ + private $departement; + + public function getDepartement() + { + return $this->departement; + } + + public function setDepartement($departement) + { + $this->departement = $departement; + } + } + + /** + * @Entity() + * @Table(name="instance_of_multi_level_engineer") + */ + class Engineer extends Employee + { + /** + * @Column(type="string") + */ + private $specialization; + + public function getSpecialization() + { + return $this->specialization; + } + + public function setSpecialization($specialization) + { + $this->specialization = $specialization; + } + } +} diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php new file mode 100644 index 000000000..7f593c3f4 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php @@ -0,0 +1,119 @@ +_schemaTool->createSchema(array( + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Person'), + $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Employee'), + )); + } + + public function testInstanceOf() + { + $this->loadData(); + + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfTest\Person p + WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfTest\Person'; + $query = $this->_em->createQuery($dql); + $result = $query->getResult(); + + $this->assertCount(2, $result); + + foreach ($result as $r) { + $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfTest\Person', $r); + if ($r instanceof InstanceOfTest\Employee) { + $this->assertEquals('bar', $r->getName()); + } else { + $this->assertEquals('foo', $r->getName()); + } + } + } + + private function loadData() + { + $person = new InstanceOfTest\Person(); + $person->setName('foo'); + + $employee = new InstanceOfTest\Employee(); + $employee->setName('bar'); + $employee->setDepartement('qux'); + + $this->_em->persist($person); + $this->_em->persist($employee); + + $this->_em->flush(array($person, $employee)); + } + } +} + +namespace Doctrine\Tests\ORM\Functional\InstanceOfTest { + /** + * @Entity() + * @Table(name="instance_of_test_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "person": "Doctrine\Tests\ORM\Functional\InstanceOfTest\Person", + * "employee": "Doctrine\Tests\ORM\Functional\InstanceOfTest\Employee" + * }) + */ + class Person + { + /** + * @Id() + * @GeneratedValue() + * @Column(type="integer") + */ + private $id; + + /** + * @Column(type="string") + */ + private $name; + + public function getId() + { + return $this->id; + } + + public function getName() + { + return $this->name; + } + + public function setName($name) + { + $this->name = $name; + } + } + + /** + * @Entity() + * @Table(name="instance_of_test_employee") + */ + class Employee extends Person + { + /** + * @Column(type="string") + */ + private $departement; + + public function getDepartement() + { + return $this->departement; + } + + public function setDepartement($departement) + { + $this->departement = $departement; + } + } +} diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index c10afbb89..82facdb49 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -500,7 +500,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF Doctrine\Tests\Models\Company\CompanyEmployee", - "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')" + "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN ('manager', 'employee')" ); } @@ -509,7 +509,7 @@ class SelectSqlGenerationTest extends OrmTestCase // This also uses FQCNs starting with or without a backslash in the INSTANCE OF parameter $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF (Doctrine\Tests\Models\Company\CompanyEmployee, \Doctrine\Tests\Models\Company\CompanyManager)", - "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN ('employee', 'manager')" + "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN ('manager', 'employee')" ); } @@ -520,7 +520,7 @@ class SelectSqlGenerationTest extends OrmTestCase { $this->assertSqlGeneration( "SELECT u FROM Doctrine\Tests\Models\Company\CompanyPerson u WHERE u INSTANCE OF \Doctrine\Tests\Models\Company\CompanyEmployee", - "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN ('employee')" + "SELECT c0_.id AS id_0, c0_.name AS name_1, c0_.discr AS discr_2 FROM company_persons c0_ WHERE c0_.discr IN ('manager', 'employee')" ); } From 04acde667a517db81ed5798d58ccdf39bbb82d06 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Tue, 18 Apr 2017 11:57:49 +0200 Subject: [PATCH 114/124] Fix as per review --- .../Tests/ORM/Functional/InstanceOfAbstractTest.php | 7 +++---- tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php index a84643f84..3a52d93f9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php @@ -28,9 +28,9 @@ namespace Doctrine\Tests\ORM\Functional { $this->assertCount(1, $result); foreach ($result as $r) { - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person', $r); - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee', $r); - $this->assertEquals('bar', $r->getName()); + $this->assertInstanceOf(InstanceOfAbstractTest\Person::class, $r); + $this->assertInstanceOf(InstanceOfAbstractTest\Employee::class, $r); + $this->assertSame('bar', $r->getName()); } } @@ -109,5 +109,4 @@ namespace Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest { $this->departement = $departement; } } - } diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php index 7f593c3f4..fce0075b6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php @@ -10,10 +10,10 @@ namespace Doctrine\Tests\ORM\Functional { { parent::setUp(); - $this->_schemaTool->createSchema(array( + $this->_schemaTool->createSchema([ $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Person'), $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Employee'), - )); + ]); } public function testInstanceOf() @@ -28,7 +28,7 @@ namespace Doctrine\Tests\ORM\Functional { $this->assertCount(2, $result); foreach ($result as $r) { - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfTest\Person', $r); + $this->assertInstanceOf(InstanceOfTest\Person::class, $r); if ($r instanceof InstanceOfTest\Employee) { $this->assertEquals('bar', $r->getName()); } else { From aa233f8e57f8ae313eb7119174ce26377ec63cd5 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 3 May 2017 10:46:24 +0200 Subject: [PATCH 115/124] Fix small CS issues as per review --- .../ORM/Functional/InstanceOfAbstractTest.php | 12 ++++++---- .../Functional/InstanceOfMultiLevelTest.php | 23 +++++++++++-------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php index 3a52d93f9..1b826a461 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php @@ -2,6 +2,8 @@ namespace Doctrine\Tests\ORM\Functional { + use Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee; + use Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person; use Doctrine\Tests\OrmFunctionalTestCase; class InstanceOfAbstractTest extends OrmFunctionalTestCase @@ -10,10 +12,10 @@ namespace Doctrine\Tests\ORM\Functional { { parent::setUp(); - $this->_schemaTool->createSchema(array( - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfAbstractTest\Person'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfAbstractTest\Employee'), - )); + $this->_schemaTool->createSchema([ + $this->_em->getClassMetadata(Person::class), + $this->_em->getClassMetadata(Employee::class), + ]); } public function testInstanceOf() @@ -55,7 +57,7 @@ namespace Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest { * @InheritanceType(value="JOINED") * @DiscriminatorColumn(name="kind", type="string") * @DiscriminatorMap(value={ - * "employee": "Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Employee" + * "employee": Employee::class * }) */ abstract class Person diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php index c4b5bbcd2..131f053a2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php @@ -2,6 +2,9 @@ namespace Doctrine\Tests\ORM\Functional { + use Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Employee; + use Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Engineer; + use Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person; use Doctrine\Tests\OrmFunctionalTestCase; class InstanceOfMultiLevelTest extends OrmFunctionalTestCase @@ -10,11 +13,11 @@ namespace Doctrine\Tests\ORM\Functional { { parent::setUp(); - $this->_schemaTool->createSchema(array( - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Person'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Employee'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfMultiLevelTest\Engineer'), - )); + $this->_schemaTool->createSchema([ + $this->_em->getClassMetadata(Person::class), + $this->_em->getClassMetadata(Employee::class), + $this->_em->getClassMetadata(Engineer::class), + ]); } public function testInstanceOf() @@ -29,11 +32,11 @@ namespace Doctrine\Tests\ORM\Functional { $this->assertCount(3, $result); foreach ($result as $r) { - $this->assertInstanceOf('Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person', $r); + $this->assertInstanceOf(Person::class, $r); if ($r instanceof InstanceOfMultiLevelTest\Engineer) { $this->assertEquals('foobar', $r->getName()); $this->assertEquals('doctrine', $r->getSpecialization()); - } elseif ($r instanceof InstanceOfMultiLevelTest\Employee) { + } elseif ($r instanceof Employee) { $this->assertEquals('bar', $r->getName()); $this->assertEquals('qux', $r->getDepartement()); } else { @@ -44,14 +47,14 @@ namespace Doctrine\Tests\ORM\Functional { private function loadData() { - $person = new InstanceOfMultiLevelTest\Person(); + $person = new Person(); $person->setName('foo'); - $employee = new InstanceOfMultiLevelTest\Employee(); + $employee = new Employee(); $employee->setName('bar'); $employee->setDepartement('qux'); - $engineer = new InstanceOfMultiLevelTest\Engineer(); + $engineer = new Engineer(); $engineer->setName('foobar'); $engineer->setDepartement('dep'); $engineer->setSpecialization('doctrine'); From 0e88f1b654f963c1e7623ab77d11d9d3c21226e8 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 3 May 2017 11:00:26 +0200 Subject: [PATCH 116/124] Split SqlWalker::walkInstanceOfExpression method --- lib/Doctrine/ORM/Query/SqlWalker.php | 94 +++++++++++++++------------- 1 file changed, 51 insertions(+), 43 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 645a6c21f..baf05ffca 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -37,7 +37,6 @@ use Doctrine\ORM\Utility\PersisterHelper; * @author Alexander * @author Fabio B. Silva * @since 2.0 - * @todo Rename: SQLWalker */ class SqlWalker implements TreeWalker { @@ -2017,6 +2016,7 @@ class SqlWalker implements TreeWalker /** * {@inheritdoc} + * @throws \Doctrine\ORM\Query\QueryException */ public function walkInstanceOfExpression($instanceOfExpr) { @@ -2034,48 +2034,7 @@ class SqlWalker implements TreeWalker } $sql .= $class->discriminatorColumn['name'] . ($instanceOfExpr->not ? ' NOT IN ' : ' IN '); - - $knownSubclasses = array_flip($discrClass->subClasses); - - $sqlParameterList = []; - $discriminators = []; - foreach ($instanceOfExpr->value as $parameter) { - if ($parameter instanceof AST\InputParameter) { - $this->rsm->addMetadataParameterMapping($parameter->name, 'discriminatorValue'); - - $sqlParameterList[] = $this->walkInputParameter($parameter); - - continue; - } - - // Trim first backslash - $parameter = ltrim($parameter, '\\'); - - // Check parameter is really in the hierarchy - if ($parameter !== $discrClass->name && ! array_key_exists($parameter, $knownSubclasses)) { - throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); - } - - // Include discriminators for parameter class and its subclass - $metadata = $this->em->getClassMetadata($parameter); - $hierarchyClasses = $metadata->subClasses; - $hierarchyClasses[] = $metadata->name; - - foreach ($hierarchyClasses as $class) { - $currentMetadata = $this->em->getClassMetadata($class); - $currentDiscriminator = $currentMetadata->discriminatorValue; - - if (is_string($currentDiscriminator) && ! array_key_exists($currentDiscriminator, $discriminators)) { - $discriminators[$currentDiscriminator] = true; - } - } - } - - foreach (array_keys($discriminators) as $dis) { - $sqlParameterList[] = $this->conn->quote($dis); - } - - $sql .= '(' . implode(', ', $sqlParameterList) . ')'; + $sql .= $this->getChildDiscriminatorsFromClassMetadata($discrClass, $instanceOfExpr); return $sql; } @@ -2309,4 +2268,53 @@ class SqlWalker implements TreeWalker return $resultAlias; } + + /** + * @param ClassMetadataInfo $discrClass + * @param AST\InstanceOfExpression $instanceOfExpr + * @return string The list in parentheses of valid child discriminators from the given class + * @throws QueryException + */ + private function getChildDiscriminatorsFromClassMetadata(ClassMetadataInfo $discrClass, AST\InstanceOfExpression $instanceOfExpr) + { + $knownSubclasses = array_flip($discrClass->subClasses); + $sqlParameterList = []; + $discriminators = []; + foreach ($instanceOfExpr->value as $parameter) { + if ($parameter instanceof AST\InputParameter) { + $this->rsm->addMetadataParameterMapping($parameter->name, 'discriminatorValue'); + + $sqlParameterList[] = $this->walkInputParameter($parameter); + + continue; + } + + // Trim first backslash + $parameter = ltrim($parameter, '\\'); + + if ($parameter !== $discrClass->name && ! array_key_exists($parameter, $knownSubclasses)) { + throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); + } + + // Include discriminators for parameter class and its subclass + $metadata = $this->em->getClassMetadata($parameter); + $hierarchyClasses = $metadata->subClasses; + $hierarchyClasses[] = $metadata->name; + + foreach ($hierarchyClasses as $class) { + $currentMetadata = $this->em->getClassMetadata($class); + $currentDiscriminator = $currentMetadata->discriminatorValue; + + if (is_string($currentDiscriminator) && ! array_key_exists($currentDiscriminator, $discriminators)) { + $discriminators[$currentDiscriminator] = true; + } + } + } + + foreach (array_keys($discriminators) as $dis) { + $sqlParameterList[] = $this->conn->quote($dis); + } + + return '(' . implode(', ', $sqlParameterList) . ')'; + } } From bd47ec95a10d0d5f358a3de299ba8fd0e9f114a5 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 3 May 2017 11:06:43 +0200 Subject: [PATCH 117/124] Move tests to ticket namespace (and rename them) --- .../Ticket4646InstanceOfAbstractTest.php} | 10 +++++----- .../Ticket4646InstanceOfMultiLevelTest.php} | 6 +++--- .../Ticket4646InstanceOfTest.php} | 14 ++++++++------ 3 files changed, 16 insertions(+), 14 deletions(-) rename tests/Doctrine/Tests/ORM/Functional/{InstanceOfAbstractTest.php => Ticket/Ticket4646InstanceOfAbstractTest.php} (88%) rename tests/Doctrine/Tests/ORM/Functional/{InstanceOfMultiLevelTest.php => Ticket/Ticket4646InstanceOfMultiLevelTest.php} (95%) rename tests/Doctrine/Tests/ORM/Functional/{InstanceOfTest.php => Ticket/Ticket4646InstanceOfTest.php} (86%) diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php similarity index 88% rename from tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php rename to tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php index 1b826a461..b17ca2c2d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php @@ -1,12 +1,12 @@ assertCount(1, $result); foreach ($result as $r) { - $this->assertInstanceOf(InstanceOfAbstractTest\Person::class, $r); - $this->assertInstanceOf(InstanceOfAbstractTest\Employee::class, $r); + $this->assertInstanceOf(Person::class, $r); + $this->assertInstanceOf(Employee::class, $r); $this->assertSame('bar', $r->getName()); } } private function loadData() { - $employee = new InstanceOfAbstractTest\Employee(); + $employee = new Employee(); $employee->setName('bar'); $employee->setDepartement('qux'); diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php similarity index 95% rename from tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php rename to tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php index 131f053a2..79f0d5363 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfMultiLevelTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php @@ -1,13 +1,13 @@ assertInstanceOf(Person::class, $r); - if ($r instanceof InstanceOfMultiLevelTest\Engineer) { + if ($r instanceof Engineer) { $this->assertEquals('foobar', $r->getName()); $this->assertEquals('doctrine', $r->getSpecialization()); } elseif ($r instanceof Employee) { diff --git a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php similarity index 86% rename from tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php rename to tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php index fce0075b6..326b83393 100644 --- a/tests/Doctrine/Tests/ORM/Functional/InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php @@ -1,10 +1,12 @@ assertCount(2, $result); foreach ($result as $r) { - $this->assertInstanceOf(InstanceOfTest\Person::class, $r); - if ($r instanceof InstanceOfTest\Employee) { + $this->assertInstanceOf(Person::class, $r); + if ($r instanceof Employee) { $this->assertEquals('bar', $r->getName()); } else { $this->assertEquals('foo', $r->getName()); @@ -39,10 +41,10 @@ namespace Doctrine\Tests\ORM\Functional { private function loadData() { - $person = new InstanceOfTest\Person(); + $person = new Person(); $person->setName('foo'); - $employee = new InstanceOfTest\Employee(); + $employee = new Employee(); $employee->setName('bar'); $employee->setDepartement('qux'); From 31d2d841601c64d686385ac58cc63778d24c8751 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 3 May 2017 11:42:51 +0200 Subject: [PATCH 118/124] Fix test --- .../Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php index 326b83393..35d4afdac 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php @@ -13,8 +13,8 @@ namespace Doctrine\Tests\ORM\Functional\Ticket { parent::setUp(); $this->_schemaTool->createSchema([ - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Person'), - $this->_em->getClassMetadata(__NAMESPACE__ . '\InstanceOfTest\Employee'), + $this->_em->getClassMetadata(Person::class), + $this->_em->getClassMetadata(Employee::class), ]); } From 5181eae8d683ffc0367229df40d52da9895568a6 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 21 Jun 2017 09:34:16 +0200 Subject: [PATCH 119/124] Refactor a bit the SqlWalker modifications --- lib/Doctrine/ORM/Query/SqlWalker.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index baf05ffca..33ee45d19 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -2277,7 +2277,6 @@ class SqlWalker implements TreeWalker */ private function getChildDiscriminatorsFromClassMetadata(ClassMetadataInfo $discrClass, AST\InstanceOfExpression $instanceOfExpr) { - $knownSubclasses = array_flip($discrClass->subClasses); $sqlParameterList = []; $discriminators = []; foreach ($instanceOfExpr->value as $parameter) { @@ -2289,15 +2288,13 @@ class SqlWalker implements TreeWalker continue; } - // Trim first backslash - $parameter = ltrim($parameter, '\\'); + $metadata = $this->em->getClassMetadata($parameter); - if ($parameter !== $discrClass->name && ! array_key_exists($parameter, $knownSubclasses)) { + if ($metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); } // Include discriminators for parameter class and its subclass - $metadata = $this->em->getClassMetadata($parameter); $hierarchyClasses = $metadata->subClasses; $hierarchyClasses[] = $metadata->name; @@ -2305,15 +2302,13 @@ class SqlWalker implements TreeWalker $currentMetadata = $this->em->getClassMetadata($class); $currentDiscriminator = $currentMetadata->discriminatorValue; - if (is_string($currentDiscriminator) && ! array_key_exists($currentDiscriminator, $discriminators)) { - $discriminators[$currentDiscriminator] = true; + if (null !== $currentDiscriminator && ! array_key_exists($currentDiscriminator, $discriminators)) { + $discriminators[$currentDiscriminator] = null; } } } - foreach (array_keys($discriminators) as $dis) { - $sqlParameterList[] = $this->conn->quote($dis); - } + $sqlParameterList = array_map([$this->conn, 'quote'], array_keys($discriminators)); return '(' . implode(', ', $sqlParameterList) . ')'; } From 167dfde00f047a99495e1098db114f96d4f892f3 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 21 Jun 2017 10:11:31 +0200 Subject: [PATCH 120/124] Apply additional fixes to the SqlWalker to fix tests --- lib/Doctrine/ORM/Query/SqlWalker.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 33ee45d19..78179d367 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -2290,7 +2290,7 @@ class SqlWalker implements TreeWalker $metadata = $this->em->getClassMetadata($parameter); - if ($metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { + if (! $metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); } @@ -2302,13 +2302,15 @@ class SqlWalker implements TreeWalker $currentMetadata = $this->em->getClassMetadata($class); $currentDiscriminator = $currentMetadata->discriminatorValue; - if (null !== $currentDiscriminator && ! array_key_exists($currentDiscriminator, $discriminators)) { + if (null !== $currentDiscriminator) { $discriminators[$currentDiscriminator] = null; } } } - $sqlParameterList = array_map([$this->conn, 'quote'], array_keys($discriminators)); + foreach (array_keys($discriminators) as $dis) { + $sqlParameterList[] = $this->conn->quote($dis); + } return '(' . implode(', ', $sqlParameterList) . ')'; } From d2f75142486ef8e7fe60e87692ab82f765086b03 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 21 Jun 2017 10:26:31 +0200 Subject: [PATCH 121/124] Put all tests classes in a single namespace --- lib/Doctrine/ORM/Query/SqlWalker.php | 2 +- .../Ticket4646InstanceOfAbstractTest.php | 176 ++++++------- .../Ticket4646InstanceOfMultiLevelTest.php | 244 +++++++++--------- .../Ticket/Ticket4646InstanceOfTest.php | 181 +++++++------ 4 files changed, 293 insertions(+), 310 deletions(-) diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 78179d367..8c8ef30d1 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -2290,7 +2290,7 @@ class SqlWalker implements TreeWalker $metadata = $this->em->getClassMetadata($parameter); - if (! $metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { + if ($metadata->getName() !== $discrClass->name && ! $metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php index b17ca2c2d..090a172a9 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php @@ -1,114 +1,108 @@ _schemaTool->createSchema([ - $this->_em->getClassMetadata(Person::class), - $this->_em->getClassMetadata(Employee::class), - ]); + $this->_schemaTool->createSchema([ + $this->_em->getClassMetadata(PersonTicket4646Abstract::class), + $this->_em->getClassMetadata(EmployeeTicket4646Abstract::class), + ]); + } + + public function testInstanceOf() + { + $this->loadData(); + + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Abstract p + WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Abstract'; + $query = $this->_em->createQuery($dql); + $result = $query->getResult(); + + $this->assertCount(1, $result); + + foreach ($result as $r) { + $this->assertInstanceOf(PersonTicket4646Abstract::class, $r); + $this->assertInstanceOf(EmployeeTicket4646Abstract::class, $r); + $this->assertSame('bar', $r->getName()); } + } - public function testInstanceOf() - { - $this->loadData(); + private function loadData() + { + $employee = new EmployeeTicket4646Abstract(); + $employee->setName('bar'); + $employee->setDepartement('qux'); - $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person p - WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest\Person'; - $query = $this->_em->createQuery($dql); - $result = $query->getResult(); + $this->_em->persist($employee); - $this->assertCount(1, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(Person::class, $r); - $this->assertInstanceOf(Employee::class, $r); - $this->assertSame('bar', $r->getName()); - } - } - - private function loadData() - { - $employee = new Employee(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $this->_em->persist($employee); - - $this->_em->flush($employee); - } + $this->_em->flush($employee); } } -namespace Doctrine\Tests\ORM\Functional\InstanceOfAbstractTest { +/** + * @Entity() + * @Table(name="instance_of_abstract_test_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "employee": EmployeeTicket4646Abstract::class + * }) + */ +abstract class PersonTicket4646Abstract +{ + /** + * @Id() + * @GeneratedValue() + * @Column(type="integer") + */ + private $id; /** - * @Entity() - * @Table(name="instance_of_abstract_test_person") - * @InheritanceType(value="JOINED") - * @DiscriminatorColumn(name="kind", type="string") - * @DiscriminatorMap(value={ - * "employee": Employee::class - * }) + * @Column(type="string") */ - abstract class Person + private $name; + + public function getId() { - /** - * @Id() - * @GeneratedValue() - * @Column(type="integer") - */ - private $id; - - /** - * @Column(type="string") - */ - private $name; - - public function getId() - { - return $this->id; - } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } + return $this->id; } - /** - * @Entity() - * @Table(name="instance_of_abstract_test_employee") - */ - class Employee extends Person + public function getName() { - /** - * @Column(type="string") - */ - private $departement; + return $this->name; + } - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } + public function setName($name) + { + $this->name = $name; + } +} + +/** + * @Entity() + * @Table(name="instance_of_abstract_test_employee") + */ +class EmployeeTicket4646Abstract extends PersonTicket4646Abstract +{ + /** + * @Column(type="string") + */ + private $departement; + + public function getDepartement() + { + return $this->departement; + } + + public function setDepartement($departement) + { + $this->departement = $departement; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php index 79f0d5363..649de27bb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php @@ -1,156 +1,150 @@ _schemaTool->createSchema([ - $this->_em->getClassMetadata(Person::class), - $this->_em->getClassMetadata(Employee::class), - $this->_em->getClassMetadata(Engineer::class), - ]); - } + $this->_schemaTool->createSchema([ + $this->_em->getClassMetadata(PersonTicket4646MultiLevel::class), + $this->_em->getClassMetadata(EmployeeTicket4646MultiLevel::class), + $this->_em->getClassMetadata(EngineerTicket4646MultiLevel::class), + ]); + } - public function testInstanceOf() - { - $this->loadData(); + public function testInstanceOf() + { + $this->loadData(); - $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person p - WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person'; - $query = $this->_em->createQuery($dql); - $result = $query->getResult(); + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel p + WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel'; + $query = $this->_em->createQuery($dql); + $result = $query->getResult(); - $this->assertCount(3, $result); + $this->assertCount(3, $result); - foreach ($result as $r) { - $this->assertInstanceOf(Person::class, $r); - if ($r instanceof Engineer) { - $this->assertEquals('foobar', $r->getName()); - $this->assertEquals('doctrine', $r->getSpecialization()); - } elseif ($r instanceof Employee) { - $this->assertEquals('bar', $r->getName()); - $this->assertEquals('qux', $r->getDepartement()); - } else { - $this->assertEquals('foo', $r->getName()); - } + foreach ($result as $r) { + $this->assertInstanceOf(PersonTicket4646MultiLevel::class, $r); + if ($r instanceof EngineerTicket4646MultiLevel) { + $this->assertEquals('foobar', $r->getName()); + $this->assertEquals('doctrine', $r->getSpecialization()); + } elseif ($r instanceof EmployeeTicket4646MultiLevel) { + $this->assertEquals('bar', $r->getName()); + $this->assertEquals('qux', $r->getDepartement()); + } else { + $this->assertEquals('foo', $r->getName()); } } + } - private function loadData() - { - $person = new Person(); - $person->setName('foo'); + private function loadData() + { + $person = new PersonTicket4646MultiLevel(); + $person->setName('foo'); - $employee = new Employee(); - $employee->setName('bar'); - $employee->setDepartement('qux'); + $employee = new EmployeeTicket4646MultiLevel(); + $employee->setName('bar'); + $employee->setDepartement('qux'); - $engineer = new Engineer(); - $engineer->setName('foobar'); - $engineer->setDepartement('dep'); - $engineer->setSpecialization('doctrine'); + $engineer = new EngineerTicket4646MultiLevel(); + $engineer->setName('foobar'); + $engineer->setDepartement('dep'); + $engineer->setSpecialization('doctrine'); - $this->_em->persist($person); - $this->_em->persist($employee); - $this->_em->persist($engineer); + $this->_em->persist($person); + $this->_em->persist($employee); + $this->_em->persist($engineer); - $this->_em->flush(array($person, $employee, $engineer)); - } + $this->_em->flush(array($person, $employee, $engineer)); } } -namespace Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest { +/** + * @Entity() + * @Table(name="instance_of_multi_level_test_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "person": "Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel", + * "employee": "Doctrine\Tests\ORM\Functional\Ticket\EmployeeTicket4646MultiLevel", + * "engineer": "Doctrine\Tests\ORM\Functional\Ticket\EngineerTicket4646MultiLevel", + * }) + */ +class PersonTicket4646MultiLevel +{ /** - * @Entity() - * @Table(name="instance_of_multi_level_test_person") - * @InheritanceType(value="JOINED") - * @DiscriminatorColumn(name="kind", type="string") - * @DiscriminatorMap(value={ - * "person": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Person", - * "employee": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Employee", - * "engineer": "Doctrine\Tests\ORM\Functional\InstanceOfMultiLevelTest\Engineer", - * }) + * @Id() + * @GeneratedValue() + * @Column(type="integer") */ - class Person + private $id; + + /** + * @Column(type="string") + */ + private $name; + + public function getId() { - /** - * @Id() - * @GeneratedValue() - * @Column(type="integer") - */ - private $id; - - /** - * @Column(type="string") - */ - private $name; - - public function getId() - { - return $this->id; - } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } + return $this->id; } - /** - * @Entity() - * @Table(name="instance_of_multi_level_employee") - */ - class Employee extends Person + public function getName() { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } + return $this->name; } - /** - * @Entity() - * @Table(name="instance_of_multi_level_engineer") - */ - class Engineer extends Employee + public function setName($name) { - /** - * @Column(type="string") - */ - private $specialization; - - public function getSpecialization() - { - return $this->specialization; - } - - public function setSpecialization($specialization) - { - $this->specialization = $specialization; - } + $this->name = $name; + } +} + +/** + * @Entity() + * @Table(name="instance_of_multi_level_employee") + */ +class EmployeeTicket4646MultiLevel extends PersonTicket4646MultiLevel +{ + /** + * @Column(type="string") + */ + private $departement; + + public function getDepartement() + { + return $this->departement; + } + + public function setDepartement($departement) + { + $this->departement = $departement; + } +} + +/** + * @Entity() + * @Table(name="instance_of_multi_level_engineer") + */ +class EngineerTicket4646MultiLevel extends EmployeeTicket4646MultiLevel +{ + /** + * @Column(type="string") + */ + private $specialization; + + public function getSpecialization() + { + return $this->specialization; + } + + public function setSpecialization($specialization) + { + $this->specialization = $specialization; } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php index 35d4afdac..a83e6e733 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php @@ -1,121 +1,116 @@ _schemaTool->createSchema([ - $this->_em->getClassMetadata(Person::class), - $this->_em->getClassMetadata(Employee::class), - ]); - } + $this->_schemaTool->createSchema([ + $this->_em->getClassMetadata(PersonTicket4646::class), + $this->_em->getClassMetadata(EmployeeTicket4646::class), + ]); + } - public function testInstanceOf() - { - $this->loadData(); + public function testInstanceOf() + { + $this->loadData(); - $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\InstanceOfTest\Person p - WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\InstanceOfTest\Person'; - $query = $this->_em->createQuery($dql); - $result = $query->getResult(); + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646 p + WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646'; + $query = $this->_em->createQuery($dql); + $result = $query->getResult(); - $this->assertCount(2, $result); + $this->assertCount(2, $result); - foreach ($result as $r) { - $this->assertInstanceOf(Person::class, $r); - if ($r instanceof Employee) { - $this->assertEquals('bar', $r->getName()); - } else { - $this->assertEquals('foo', $r->getName()); - } + foreach ($result as $r) { + $this->assertInstanceOf(PersonTicket4646::class, $r); + if ($r instanceof EmployeeTicket4646) { + $this->assertEquals('bar', $r->getName()); + } else { + $this->assertEquals('foo', $r->getName()); } } + } - private function loadData() - { - $person = new Person(); - $person->setName('foo'); + private function loadData() + { + $person = new PersonTicket4646(); + $person->setName('foo'); - $employee = new Employee(); - $employee->setName('bar'); - $employee->setDepartement('qux'); + $employee = new EmployeeTicket4646(); + $employee->setName('bar'); + $employee->setDepartement('qux'); - $this->_em->persist($person); - $this->_em->persist($employee); + $this->_em->persist($person); + $this->_em->persist($employee); - $this->_em->flush(array($person, $employee)); - } + $this->_em->flush(array($person, $employee)); } } -namespace Doctrine\Tests\ORM\Functional\InstanceOfTest { +/** + * @Entity() + * @Table(name="instance_of_test_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "person": "Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646", + * "employee": "Doctrine\Tests\ORM\Functional\Ticket\EmployeeTicket4646" + * }) + */ +class PersonTicket4646 +{ /** - * @Entity() - * @Table(name="instance_of_test_person") - * @InheritanceType(value="JOINED") - * @DiscriminatorColumn(name="kind", type="string") - * @DiscriminatorMap(value={ - * "person": "Doctrine\Tests\ORM\Functional\InstanceOfTest\Person", - * "employee": "Doctrine\Tests\ORM\Functional\InstanceOfTest\Employee" - * }) + * @Id() + * @GeneratedValue() + * @Column(type="integer") */ - class Person + private $id; + + /** + * @Column(type="string") + */ + private $name; + + public function getId() { - /** - * @Id() - * @GeneratedValue() - * @Column(type="integer") - */ - private $id; - - /** - * @Column(type="string") - */ - private $name; - - public function getId() - { - return $this->id; - } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } + return $this->id; } - /** - * @Entity() - * @Table(name="instance_of_test_employee") - */ - class Employee extends Person + public function getName() { - /** - * @Column(type="string") - */ - private $departement; + return $this->name; + } - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } + public function setName($name) + { + $this->name = $name; + } +} + +/** + * @Entity() + * @Table(name="instance_of_test_employee") + */ +class EmployeeTicket4646 extends PersonTicket4646 +{ + /** + * @Column(type="string") + */ + private $departement; + + public function getDepartement() + { + return $this->departement; + } + + public function setDepartement($departement) + { + $this->departement = $departement; } } From 2fd875281809ce1de4fa33070c7dc11895312f0e Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 21 Jun 2017 13:25:31 +0200 Subject: [PATCH 122/124] Simplify stubs used in tests --- .../Ticket4646InstanceOfAbstractTest.php | 50 +---------- .../Ticket4646InstanceOfMultiLevelTest.php | 83 ++----------------- .../Ticket/Ticket4646InstanceOfTest.php | 58 +------------ 3 files changed, 12 insertions(+), 179 deletions(-) diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php index 090a172a9..f0ea53fe8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfAbstractTest.php @@ -18,7 +18,8 @@ class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase public function testInstanceOf() { - $this->loadData(); + $this->_em->persist(new EmployeeTicket4646Abstract()); + $this->_em->flush(); $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Abstract p WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Abstract'; @@ -26,23 +27,7 @@ class Ticket4646InstanceOfAbstractTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertCount(1, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(PersonTicket4646Abstract::class, $r); - $this->assertInstanceOf(EmployeeTicket4646Abstract::class, $r); - $this->assertSame('bar', $r->getName()); - } - } - - private function loadData() - { - $employee = new EmployeeTicket4646Abstract(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $this->_em->persist($employee); - - $this->_em->flush($employee); + $this->assertContainsOnlyInstancesOf(PersonTicket4646Abstract::class, $result); } } @@ -64,25 +49,10 @@ abstract class PersonTicket4646Abstract */ private $id; - /** - * @Column(type="string") - */ - private $name; - public function getId() { return $this->id; } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } } /** @@ -91,18 +61,4 @@ abstract class PersonTicket4646Abstract */ class EmployeeTicket4646Abstract extends PersonTicket4646Abstract { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php index 649de27bb..6e4160b24 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfMultiLevelTest.php @@ -19,7 +19,10 @@ class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase public function testInstanceOf() { - $this->loadData(); + $this->_em->persist(new PersonTicket4646MultiLevel()); + $this->_em->persist(new EmployeeTicket4646MultiLevel()); + $this->_em->persist(new EngineerTicket4646MultiLevel()); + $this->_em->flush(); $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel p WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646MultiLevel'; @@ -27,40 +30,7 @@ class Ticket4646InstanceOfMultiLevelTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertCount(3, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(PersonTicket4646MultiLevel::class, $r); - if ($r instanceof EngineerTicket4646MultiLevel) { - $this->assertEquals('foobar', $r->getName()); - $this->assertEquals('doctrine', $r->getSpecialization()); - } elseif ($r instanceof EmployeeTicket4646MultiLevel) { - $this->assertEquals('bar', $r->getName()); - $this->assertEquals('qux', $r->getDepartement()); - } else { - $this->assertEquals('foo', $r->getName()); - } - } - } - - private function loadData() - { - $person = new PersonTicket4646MultiLevel(); - $person->setName('foo'); - - $employee = new EmployeeTicket4646MultiLevel(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $engineer = new EngineerTicket4646MultiLevel(); - $engineer->setName('foobar'); - $engineer->setDepartement('dep'); - $engineer->setSpecialization('doctrine'); - - $this->_em->persist($person); - $this->_em->persist($employee); - $this->_em->persist($engineer); - - $this->_em->flush(array($person, $employee, $engineer)); + $this->assertContainsOnlyInstancesOf(PersonTicket4646MultiLevel::class, $result); } } @@ -84,25 +54,10 @@ class PersonTicket4646MultiLevel */ private $id; - /** - * @Column(type="string") - */ - private $name; - public function getId() { return $this->id; } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } } /** @@ -111,20 +66,6 @@ class PersonTicket4646MultiLevel */ class EmployeeTicket4646MultiLevel extends PersonTicket4646MultiLevel { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } } /** @@ -133,18 +74,4 @@ class EmployeeTicket4646MultiLevel extends PersonTicket4646MultiLevel */ class EngineerTicket4646MultiLevel extends EmployeeTicket4646MultiLevel { - /** - * @Column(type="string") - */ - private $specialization; - - public function getSpecialization() - { - return $this->specialization; - } - - public function setSpecialization($specialization) - { - $this->specialization = $specialization; - } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php index a83e6e733..363611d4d 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfTest.php @@ -18,7 +18,9 @@ class Ticket4646InstanceOfTest extends OrmFunctionalTestCase public function testInstanceOf() { - $this->loadData(); + $this->_em->persist(new PersonTicket4646()); + $this->_em->persist(new EmployeeTicket4646()); + $this->_em->flush(); $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646 p WHERE p INSTANCE OF Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646'; @@ -26,30 +28,7 @@ class Ticket4646InstanceOfTest extends OrmFunctionalTestCase $result = $query->getResult(); $this->assertCount(2, $result); - - foreach ($result as $r) { - $this->assertInstanceOf(PersonTicket4646::class, $r); - if ($r instanceof EmployeeTicket4646) { - $this->assertEquals('bar', $r->getName()); - } else { - $this->assertEquals('foo', $r->getName()); - } - } - } - - private function loadData() - { - $person = new PersonTicket4646(); - $person->setName('foo'); - - $employee = new EmployeeTicket4646(); - $employee->setName('bar'); - $employee->setDepartement('qux'); - - $this->_em->persist($person); - $this->_em->persist($employee); - - $this->_em->flush(array($person, $employee)); + $this->assertContainsOnlyInstancesOf(PersonTicket4646::class, $result); } } @@ -72,25 +51,10 @@ class PersonTicket4646 */ private $id; - /** - * @Column(type="string") - */ - private $name; - public function getId() { return $this->id; } - - public function getName() - { - return $this->name; - } - - public function setName($name) - { - $this->name = $name; - } } /** @@ -99,18 +63,4 @@ class PersonTicket4646 */ class EmployeeTicket4646 extends PersonTicket4646 { - /** - * @Column(type="string") - */ - private $departement; - - public function getDepartement() - { - return $this->departement; - } - - public function setDepartement($departement) - { - $this->departement = $departement; - } } From b1f7c59ed560af7770d2ff649d7461605253d1cd Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Thu, 22 Jun 2017 09:50:53 +0200 Subject: [PATCH 123/124] Adding a failing test case for parameter binding using metadata with INSTANCE OF --- .../Ticket4646InstanceOfParametricTest.php | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfParametricTest.php diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfParametricTest.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfParametricTest.php new file mode 100644 index 000000000..302934e8c --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/Ticket4646InstanceOfParametricTest.php @@ -0,0 +1,67 @@ +_schemaTool->createSchema([ + $this->_em->getClassMetadata(PersonTicket4646Parametric::class), + $this->_em->getClassMetadata(EmployeeTicket4646Parametric::class), + ]); + } + + public function testInstanceOf() + { + $this->_em->persist(new PersonTicket4646Parametric()); + $this->_em->persist(new EmployeeTicket4646Parametric()); + $this->_em->flush(); + $dql = 'SELECT p FROM Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Parametric p + WHERE p INSTANCE OF :parameter'; + $query = $this->_em->createQuery($dql); + $query->setParameter( + 'parameter', + $this->_em->getClassMetadata(PersonTicket4646Parametric::class) + ); + $result = $query->getResult(); + $this->assertCount(2, $result); + $this->assertContainsOnlyInstancesOf(PersonTicket4646Parametric::class, $result); + } +} + +/** + * @Entity() + * @Table(name="instance_of_parametric_person") + * @InheritanceType(value="JOINED") + * @DiscriminatorColumn(name="kind", type="string") + * @DiscriminatorMap(value={ + * "person": "Doctrine\Tests\ORM\Functional\Ticket\PersonTicket4646Parametric", + * "employee": "Doctrine\Tests\ORM\Functional\Ticket\EmployeeTicket4646Parametric" + * }) + */ +class PersonTicket4646Parametric +{ + /** + * @Id() + * @GeneratedValue() + * @Column(type="integer") + */ + private $id; + + public function getId() + { + return $this->id; + } +} + +/** + * @Entity() + * @Table(name="instance_of_parametric_employee") + */ +class EmployeeTicket4646Parametric extends PersonTicket4646Parametric +{ +} From e91dcf8fb44c2e15afdcdbf403ef62af88547b45 Mon Sep 17 00:00:00 2001 From: Sergio Santoro Date: Sat, 24 Jun 2017 13:35:44 +0200 Subject: [PATCH 124/124] Fix discriminator resolution when using parameters --- lib/Doctrine/ORM/Query.php | 23 ++++++++++ lib/Doctrine/ORM/Query/ResultSetMapping.php | 7 +++ lib/Doctrine/ORM/Query/SqlWalker.php | 46 +++++++++++-------- .../ORM/Functional/Ticket/DDC1995Test.php | 5 +- 4 files changed, 58 insertions(+), 23 deletions(-) diff --git a/lib/Doctrine/ORM/Query.php b/lib/Doctrine/ORM/Query.php index 385b8c8ea..a86cf6201 100644 --- a/lib/Doctrine/ORM/Query.php +++ b/lib/Doctrine/ORM/Query.php @@ -371,6 +371,25 @@ final class Query extends AbstractQuery $this->_em->getCache()->evictEntityRegion($className); } + private function getAllDiscriminators(ClassMetadata $classMetadata) + { + // FIXME: this code is copied from SqlWalker->getAllDiscriminators() + $hierarchyClasses = $classMetadata->subClasses; + $hierarchyClasses[] = $classMetadata->name; + + $discriminators = []; + foreach ($hierarchyClasses as $class) { + $currentMetadata = $this->getEntityManager()->getClassMetadata($class); + $currentDiscriminator = $currentMetadata->discriminatorValue; + + if (null !== $currentDiscriminator) { + $discriminators[$currentDiscriminator] = null; + } + } + + return $discriminators; + } + /** * Processes query parameter mappings. * @@ -398,6 +417,10 @@ final class Query extends AbstractQuery $value = $value->getMetadataValue($rsm->metadataParameterMapping[$key]); } + if (isset($rsm->discriminatorParameters[$key]) && $value instanceof ClassMetadata) { + $value = array_keys($this->getAllDiscriminators($value)); + } + $value = $this->processParameterValue($value); $type = ($parameter->getValue() === $value) ? $parameter->getType() diff --git a/lib/Doctrine/ORM/Query/ResultSetMapping.php b/lib/Doctrine/ORM/Query/ResultSetMapping.php index 5c4550980..058ae8d4c 100644 --- a/lib/Doctrine/ORM/Query/ResultSetMapping.php +++ b/lib/Doctrine/ORM/Query/ResultSetMapping.php @@ -168,6 +168,13 @@ class ResultSetMapping */ public $metadataParameterMapping = []; + /** + * Contains query parameter names to be resolved as discriminator values + * + * @var array + */ + public $discriminatorParameters = []; + /** * Adds an entity result to this ResultSetMapping. * diff --git a/lib/Doctrine/ORM/Query/SqlWalker.php b/lib/Doctrine/ORM/Query/SqlWalker.php index 8c8ef30d1..3407b0a8b 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -2270,42 +2270,29 @@ class SqlWalker implements TreeWalker } /** - * @param ClassMetadataInfo $discrClass + * @param ClassMetadataInfo $rootClass * @param AST\InstanceOfExpression $instanceOfExpr * @return string The list in parentheses of valid child discriminators from the given class * @throws QueryException */ - private function getChildDiscriminatorsFromClassMetadata(ClassMetadataInfo $discrClass, AST\InstanceOfExpression $instanceOfExpr) + private function getChildDiscriminatorsFromClassMetadata(ClassMetadataInfo $rootClass, AST\InstanceOfExpression $instanceOfExpr) { $sqlParameterList = []; $discriminators = []; foreach ($instanceOfExpr->value as $parameter) { if ($parameter instanceof AST\InputParameter) { - $this->rsm->addMetadataParameterMapping($parameter->name, 'discriminatorValue'); - - $sqlParameterList[] = $this->walkInputParameter($parameter); - + $this->rsm->discriminatorParameters[$parameter->name] = $parameter->name; + $sqlParameterList[] = $this->walkInParameter($parameter); continue; } $metadata = $this->em->getClassMetadata($parameter); - if ($metadata->getName() !== $discrClass->name && ! $metadata->getReflectionClass()->isSubclassOf($discrClass->name)) { - throw QueryException::instanceOfUnrelatedClass($parameter, $discrClass->name); + if ($metadata->getName() !== $rootClass->name && ! $metadata->getReflectionClass()->isSubclassOf($rootClass->name)) { + throw QueryException::instanceOfUnrelatedClass($parameter, $rootClass->name); } - // Include discriminators for parameter class and its subclass - $hierarchyClasses = $metadata->subClasses; - $hierarchyClasses[] = $metadata->name; - - foreach ($hierarchyClasses as $class) { - $currentMetadata = $this->em->getClassMetadata($class); - $currentDiscriminator = $currentMetadata->discriminatorValue; - - if (null !== $currentDiscriminator) { - $discriminators[$currentDiscriminator] = null; - } - } + $discriminators = $discriminators + $this->getAllDiscriminators($metadata); } foreach (array_keys($discriminators) as $dis) { @@ -2314,4 +2301,23 @@ class SqlWalker implements TreeWalker return '(' . implode(', ', $sqlParameterList) . ')'; } + + private function getAllDiscriminators(ClassMetadata $classMetadata) + { + // FIXME: this code is identical to Query->getAllDiscriminators() + $hierarchyClasses = $classMetadata->subClasses; + $hierarchyClasses[] = $classMetadata->name; + + $discriminators = []; + foreach ($hierarchyClasses as $class) { + $currentMetadata = $this->em->getClassMetadata($class); + $currentDiscriminator = $currentMetadata->discriminatorValue; + + if (null !== $currentDiscriminator) { + $discriminators[$currentDiscriminator] = null; + } + } + + return $discriminators; + } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php index fb32b99fe..8bb975a05 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1995Test.php @@ -72,10 +72,9 @@ class DDC1995Test extends \Doctrine\Tests\OrmFunctionalTestCase ->getResult(); $this->assertCount(1, $result1); - $this->assertCount(1, $result2); + $this->assertCount(2, $result2); $this->assertInstanceOf(CompanyEmployee::class, $result1[0]); - $this->assertInstanceOf(CompanyPerson::class, $result2[0]); - $this->assertNotInstanceOf(CompanyEmployee::class, $result2[0]); + $this->assertContainsOnlyInstancesOf(CompanyPerson::class, $result2); } }