diff --git a/.scrutinizer.yml b/.scrutinizer.yml index 361b21e38..4ba463511 100644 --- a/.scrutinizer.yml +++ b/.scrutinizer.yml @@ -1,34 +1,24 @@ +build: + environment: + php: + version: 7.1 + before_commands: - "composer install --no-dev --prefer-source" 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/*"] - php_hhvm: - enabled: true - filter: - paths: ["lib/*", "tests/*"] - sensiolabs_security_checker: true + +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 diff --git a/.travis.yml b/.travis.yml index 5509e3970..667d3f2d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,10 @@ +dist: trusty sudo: false language: php php: - - 7.0 - 7.1 - nightly - - hhvm env: - DB=mysql @@ -13,28 +12,25 @@ 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 -lt '7.0' && $TRAVIS_PHP_VERSION != 'hhv*' ]]; then phpenv config-rm xdebug.ini; 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 - 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 - 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: @@ -43,42 +39,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: diff --git a/UPGRADE.md b/UPGRADE.md index 3592fe5b6..a502c872e 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,3 +1,22 @@ +# Upgrade to 2.6 + +## 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) + +## 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()` diff --git a/composer.json b/composer.json index 5c0bf5958..a4b43de3b 100644 --- a/composer.json +++ b/composer.json @@ -14,18 +14,18 @@ ], "minimum-stability": "dev", "require": { - "php": "^7.0", + "php": "^7.1", "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", - "doctrine/cache": "~1.5", - "doctrine/annotations": "~1.2", - "symfony/console": "~2.5|~3.0" + "doctrine/cache": "~1.6", + "doctrine/annotations": "~1.4", + "symfony/console": "~3.0|~4.0" }, "require-dev": { - "symfony/yaml": "~2.3|~3.0", + "symfony/yaml": "~3.0|~4.0", "phpunit/phpunit": "^6.0" }, "suggest": { 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 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/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 diff --git a/docs/en/reference/dql-doctrine-query-language.rst b/docs/en/reference/dql-doctrine-query-language.rst index 8950c8d4c..2c2e23f9e 100644 --- a/docs/en/reference/dql-doctrine-query-language.rst +++ b/docs/en/reference/dql-doctrine-query-language.rst @@ -1380,7 +1380,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 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/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. diff --git a/docs/en/reference/query-builder.rst b/docs/en/reference/query-builder.rst index 17638305a..f57b8ad2f 100644 --- a/docs/en/reference/query-builder.rst +++ b/docs/en/reference/query-builder.rst @@ -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'); @@ -580,4 +580,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. - 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 diff --git a/docs/en/reference/tools.rst b/docs/en/reference/tools.rst index 27c6bc006..c3580b36d 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 diff --git a/docs/en/reference/transactions-and-concurrency.rst b/docs/en/reference/transactions-and-concurrency.rst index 1b79adc57..5ce0852b2 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): @@ -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 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/docs/en/tutorials/getting-started.rst b/docs/en/tutorials/getting-started.rst index c8247e21c..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,10 +159,10 @@ 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 `_. +`DBAL Configuration section of the manual `_. The last block shows how the ``EntityManager`` is obtained from a factory method. @@ -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]; diff --git a/doctrine-mapping.xsd b/doctrine-mapping.xsd index bb8624190..9524c79d1 100644 --- a/doctrine-mapping.xsd +++ b/doctrine-mapping.xsd @@ -167,7 +167,7 @@ - + @@ -189,9 +189,9 @@ - + - + @@ -200,6 +200,13 @@ + + + + + + + @@ -412,9 +419,16 @@ - + + + + + + + + @@ -567,6 +581,7 @@ + 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/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/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/Configuration.php b/lib/Doctrine/ORM/Configuration.php index 104a4f4b2..6073fbe00 100644 --- a/lib/Doctrine/ORM/Configuration.php +++ b/lib/Doctrine/ORM/Configuration.php @@ -420,15 +420,9 @@ 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) { - if (Query\Parser::isInternalFunction($name)) { - throw ORMException::overwriteInternalDQLFunctionNotAllowed($name); - } - $this->_attributes['customStringFunctions'][strtolower($name)] = $className; } @@ -478,15 +472,9 @@ 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) { - if (Query\Parser::isInternalFunction($name)) { - throw ORMException::overwriteInternalDQLFunctionNotAllowed($name); - } - $this->_attributes['customNumericFunctions'][strtolower($name)] = $className; } @@ -536,15 +524,9 @@ 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) { - if (Query\Parser::isInternalFunction($name)) { - throw ORMException::overwriteInternalDQLFunctionNotAllowed($name); - } - $this->_attributes['customDatetimeFunctions'][strtolower($name)] = $className; } 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/Id/SequenceGenerator.php b/lib/Doctrine/ORM/Id/SequenceGenerator.php index a27edae90..9d8e9eb75 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->fetchColumn($sql); + // Using `query` to force usage of the master server in MasterSlaveConnection + $this->_nextValue = (int) $conn->query($sql)->fetchColumn(); $this->_maxValue = $this->_nextValue + $this->_allocationSize; } diff --git a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php index ee9385c81..6a7061285 100644 --- a/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php +++ b/lib/Doctrine/ORM/Internal/Hydration/AbstractHydrator.php @@ -211,6 +211,11 @@ abstract class AbstractHydrator $this->_rsm = null; $this->_cache = []; $this->_metadataCache = []; + + $this + ->_em + ->getEventManager() + ->removeEventListener([Events::onClear], $this); } /** diff --git a/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php b/lib/Doctrine/ORM/Internal/Hydration/ObjectHydrator.php index 9d8ee329a..42f599739 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 { @@ -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/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 9a5811163..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 */ @@ -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; } @@ -1796,7 +1796,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 getSingleIdentifierFieldName() { @@ -1804,6 +1804,10 @@ class ClassMetadataInfo implements ClassMetadata 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() { @@ -1848,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]); } /** @@ -2030,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) @@ -2149,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; @@ -2299,6 +2307,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']; } diff --git a/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php b/lib/Doctrine/ORM/Mapping/Driver/AnnotationDriver.php index b5a5b714c..d59fd3bb7 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(Mapping\ClassMetadata::class . '::FETCH_' . $associationOverride->fetch); + } + $metadata->setAssociationOverride($fieldName, $override); } } 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 d7099663f..39af412c9 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. @@ -165,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'}; @@ -621,6 +622,11 @@ class XmlDriver extends FileDriver $override['inversedBy'] = (string) $overrideElement->{'inversed-by'}['name']; } + // Check for `fetch` + if (isset($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 8793c070b..c4fb45ece 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; @@ -174,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']; @@ -622,6 +623,11 @@ class YamlDriver extends FileDriver $override['inversedBy'] = (string) $associationOverrideElement['inversedBy']; } + // Check for `fetch` + if (isset($associationOverrideElement['fetch'])) { + $override['fetch'] = constant(Metadata::class . '::FETCH_' . $associationOverrideElement['fetch']); + } + $metadata->setAssociationOverride($fieldName, $override); } } @@ -800,6 +806,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)); } } 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/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/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/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/BasicEntityPersister.php b/lib/Doctrine/ORM/Persisters/Entity/BasicEntityPersister.php index e3d0a165f..6af159fc7 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', ]; /** @@ -783,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]); @@ -1062,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; } @@ -1327,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); } @@ -1518,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; } @@ -1868,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 8fe679ad4..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; } @@ -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/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 2b3bdedc4..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) { @@ -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.php b/lib/Doctrine/ORM/Query.php index 12fb3f560..a86cf6201 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; @@ -202,7 +203,7 @@ final class Query extends AbstractQuery */ public function getSQL() { - return $this->_parse()->getSQLExecutor()->getSQLStatements(); + return $this->_parse()->getSqlExecutor()->getSqlStatements(); } /** @@ -322,9 +323,36 @@ final class Query extends AbstractQuery list($sqlParams, $types) = $this->processParameterMappings($paramMappings); + $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, + array $connectionParams + ) { + 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, $connectionParams); + + $cacheDriver->delete(reset($cacheKeys)); + } + } + /** * Evict entity cache region */ @@ -343,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. * @@ -370,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() @@ -709,7 +760,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/AvgFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php new file mode 100644 index 000000000..6cb8d92b6 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/AvgFunction.php @@ -0,0 +1,54 @@ +. + */ + +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 ")" + * + * @since 2.6 + * @author Mathew Davies + */ +final class AvgFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + private $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker): string + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser): void + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} 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/CountFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php new file mode 100644 index 000000000..f232cf43f --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/CountFunction.php @@ -0,0 +1,54 @@ +. + */ + +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 ")" + * + * @since 2.6 + * @author Mathew Davies + */ +final class CountFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + private $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker): string + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser): void + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} 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/MaxFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php new file mode 100644 index 000000000..eba9b8639 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/MaxFunction.php @@ -0,0 +1,54 @@ +. + */ + +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 ")" + * + * @since 2.6 + * @author Mathew Davies + */ +final class MaxFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + private $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker): string + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + 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 new file mode 100644 index 000000000..e1c086913 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/MinFunction.php @@ -0,0 +1,54 @@ +. + */ + +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 ")" + * + * @since 2.6 + * @author Mathew Davies + */ +final class MinFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + private $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker): string + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser): void + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} 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/SumFunction.php b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php new file mode 100644 index 000000000..c9fcf7b04 --- /dev/null +++ b/lib/Doctrine/ORM/Query/AST/Functions/SumFunction.php @@ -0,0 +1,54 @@ +. + */ + +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 ")" + * + * @since 2.6 + * @author Mathew Davies + */ +final class SumFunction extends FunctionNode +{ + /** + * @var AggregateExpression + */ + private $aggregateExpression; + + /** + * @inheritDoc + */ + public function getSql(SqlWalker $sqlWalker): string + { + return $this->aggregateExpression->dispatch($sqlWalker); + } + + /** + * @inheritDoc + */ + public function parse(Parser $parser): void + { + $this->aggregateExpression = $parser->AggregateExpression(); + } +} 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/Expr/OrderBy.php b/lib/Doctrine/ORM/Query/Expr/OrderBy.php index b9da73b98..a5f8ef957 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; } diff --git a/lib/Doctrine/ORM/Query/Parser.php b/lib/Doctrine/ORM/Query/Parser.php index 54d84f3e6..c21b2de96 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. * @@ -197,7 +187,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 +267,7 @@ class Parser } if ($this->deferredPathExpressions) { - $this->processDeferredPathExpressions($AST); + $this->processDeferredPathExpressions(); } if ($this->deferredResultVariables) { @@ -482,7 +472,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 +739,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 +1492,7 @@ class Parser $glimpse = $this->lexer->glimpse(); switch (true) { - case ($this->isFunction($peek)): + case ($this->isFunction()): $expr = $this->FunctionDeclaration(); break; @@ -1724,9 +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); @@ -1795,7 +1789,7 @@ class Parser * PartialObjectExpression ::= "PARTIAL" IdentificationVariable "." PartialFieldSet * PartialFieldSet ::= "{" SimpleStateField {"," SimpleStateField}* "}" * - * @return array + * @return \Doctrine\ORM\Query\AST\PartialObjectExpression */ public function PartialObjectExpression() { @@ -1980,9 +1974,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(); @@ -2211,11 +2202,6 @@ class Parser $expression = $this->ScalarExpression(); break; - case ($this->isAggregateFunction($lookaheadType)): - // COUNT(u.id) - $expression = $this->AggregateExpression(); - break; - default: // IDENTITY(u) $expression = $this->FunctionDeclaration(); @@ -2860,10 +2846,6 @@ class Parser $peek = $this->lexer->glimpse(); if ($peek['value'] == '(') { - if ($this->isAggregateFunction($this->lexer->lookahead['type'])) { - return $this->AggregateExpression(); - } - return $this->FunctionDeclaration(); } @@ -2934,11 +2916,6 @@ class Parser case Lexer::T_COALESCE: case Lexer::T_NULLIF: return $this->CaseExpression(); - - default: - if ($this->isAggregateFunction($lookaheadType)) { - return $this->AggregateExpression(); - } } $this->syntaxError( @@ -3238,10 +3215,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; @@ -3378,8 +3351,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(); @@ -3390,7 +3368,7 @@ class Parser return $this->FunctionsReturningDatetime(); default: - return $this->CustomFunctionDeclaration(); + $this->syntaxError('known function', $token); } } @@ -3418,7 +3396,7 @@ class Parser return $this->CustomFunctionsReturningDatetime(); default: - $this->syntaxError('known function', $token); + return null; } } diff --git a/lib/Doctrine/ORM/Query/QueryException.php b/lib/Doctrine/ORM/Query/QueryException.php index 8245722a9..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,13 +206,15 @@ class QueryException extends \Doctrine\ORM\ORMException } /** + * @param PathExpression $pathExpr + * * @return QueryException */ - public static function associationPathInverseSideNotSupported() + 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. 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/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/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 0bf999ed5..3407b0a8b 100644 --- a/lib/Doctrine/ORM/Query/SqlWalker.php +++ b/lib/Doctrine/ORM/Query/SqlWalker.php @@ -643,6 +643,7 @@ class SqlWalker implements TreeWalker { $sql = ''; + /* @var $pathExpr Query\AST\PathExpression */ switch ($pathExpr->type) { case AST\PathExpression::TYPE_STATE_FIELD: $fieldName = $pathExpr->field; @@ -670,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 @@ -763,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); } @@ -791,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); } @@ -1499,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) @@ -1576,12 +1579,6 @@ class SqlWalker implements TreeWalker $sql .= $this->walkPathExpression($expr); break; - case ($expr instanceof AST\AggregateExpression): - $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; - - $sql .= $this->walkAggregateExpression($expr) . ' AS dctrn__' . $alias; - break; - case ($expr instanceof AST\Subselect): $alias = $simpleSelectExpression->fieldIdentificationVariable ?: $this->scalarResultCounter++; @@ -1758,7 +1755,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 = []; @@ -2273,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) { @@ -2317,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/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 */ 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/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; } 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/EntityGenerator.php b/lib/Doctrine/ORM/Tools/EntityGenerator.php index 8d1f05ac1..fafa51f3d 100644 --- a/lib/Doctrine/ORM/Tools/EntityGenerator.php +++ b/lib/Doctrine/ORM/Tools/EntityGenerator.php @@ -1731,8 +1731,12 @@ public function __construct() $embedded = ['class="' . $embeddedClass['class'] . '"']; - if (isset($fieldMapping['columnPrefix'])) { - $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); + if (isset($embeddedClass['columnPrefix'])) { + if (is_string($embeddedClass['columnPrefix'])) { + $embedded[] = 'columnPrefix="' . $embeddedClass['columnPrefix'] . '"'; + } else { + $embedded[] = 'columnPrefix=' . var_export($embeddedClass['columnPrefix'], true); + } } $lines[] = $this->spaces . ' * @' . 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/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 627f7b573..007ac85a8 100644 --- a/lib/Doctrine/ORM/Tools/SchemaTool.php +++ b/lib/Doctrine/ORM/Tools/SchemaTool.php @@ -351,15 +351,14 @@ 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) { $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; @@ -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) { @@ -401,12 +400,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); - } } /** @@ -416,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'] . "'."; } } 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/Mocks/ConnectionMock.php b/tests/Doctrine/Tests/Mocks/ConnectionMock.php index 5a28ffa5a..af8fc252e 100644 --- a/tests/Doctrine/Tests/Mocks/ConnectionMock.php +++ b/tests/Doctrine/Tests/Mocks/ConnectionMock.php @@ -1,7 +1,9 @@ _fetchOneException) { + throw $this->_fetchOneException; + } + return $this->_fetchOneResult; } + /** + * {@inheritdoc} + */ + public function query() : Statement + { + return $this->_queryResult; + } + /** * {@inheritdoc} */ @@ -112,6 +136,16 @@ class ConnectionMock extends Connection $this->_fetchOneResult = $fetchOneResult; } + /** + * @param \Exception|null $exception + * + * @return void + */ + public function setFetchOneException(\Exception $exception = null) + { + $this->_fetchOneException = $exception; + } + /** * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform * @@ -132,6 +166,14 @@ class ConnectionMock extends Connection $this->_lastInsertId = $id; } + /** + * @param Statement $result + */ + public function setQueryResult(Statement $result) + { + $this->_queryResult = $result; + } + /** * @return array */ diff --git a/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php b/tests/Doctrine/Tests/Mocks/HydratorMockStatement.php index ca0df22fe..4f6df40e5 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 int|null $fetchMode + * @param int|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,7 +107,7 @@ class HydratorMockStatement implements \IteratorAggregate, Statement /** * {@inheritdoc} */ - public function execute($params = []) + public function execute($params = null) { } 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); 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) { } 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/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 @@ +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 @@ +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]] ] ); 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(); + } + }; + } +} diff --git a/tests/Doctrine/Tests/ORM/ConfigurationTest.php b/tests/Doctrine/Tests/ORM/ConfigurationTest.php index df74c6df2..92a2eeaea 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() @@ -263,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() @@ -274,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() @@ -285,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/BasicFunctionalTest.php b/tests/Doctrine/Tests/ORM/Functional/BasicFunctionalTest.php index eec4844d1..7bdb84653 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."; @@ -741,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(); } /** @@ -775,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(); } /** @@ -798,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() @@ -934,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/CascadeRemoveOrderTest.php b/tests/Doctrine/Tests/ORM/Functional/CascadeRemoveOrderTest.php index cb19c2bcf..8908e51e0 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), ] ); } @@ -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/ClassTableInheritanceTest.php b/tests/Doctrine/Tests/ORM/Functional/ClassTableInheritanceTest.php index 2698c3252..4ece24fa7 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,11 +47,11 @@ 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(); - $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())); @@ -62,11 +62,11 @@ 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(); - $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()); @@ -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,19 +158,13 @@ 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)); + $this->assertCount(1, $result); $this->assertInstanceOf(CompanyPerson::class, $result[0]); $this->assertEquals('Mary Smith', $result[0]->getName()); $this->assertInstanceOf(CompanyEmployee::class, $result[0]->getSpouse()); @@ -185,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); @@ -196,12 +193,12 @@ 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(); - $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(); @@ -229,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()); @@ -238,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 { @@ -247,7 +244,6 @@ class ClassTableInheritanceTest extends OrmFunctionalTestCase } } - public function testLazyLoading2() { $org = new CompanyOrganization; @@ -259,21 +255,21 @@ 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->assertCount(1, $result); + $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(); - $this->assertEquals(1, count($result)); + $this->assertCount(1, $result); $this->assertInstanceOf(CompanyOrganization::class, $result[0]); $mainEvent = $result[0]->getMainEvent(); @@ -287,12 +283,13 @@ 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') - ->getResult()) > 0); + $result = $this->_em->createQuery('SELECT count(p.id) FROM ' . CompanyEmployee::class . ' p WHERE p.salary = 1') + ->getResult(); + + $this->assertGreaterThan(0, count($result)); } /** @@ -300,13 +297,12 @@ 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(); + $this->addToAssertionCount(1); } /** @@ -314,8 +310,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 +355,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()); @@ -447,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()); } /** @@ -487,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/CustomFunctionsTest.php b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php index 63c3e4ee9..79668b8f2 100644 --- a/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/CustomFunctionsTest.php @@ -47,6 +47,23 @@ 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(DISTINCT u.id) FROM Doctrine\Tests\Models\CMS\CmsUser u'); + + $usersCount = $query->getSingleScalarResult(); + + $this->assertEquals(1, $usersCount); + } } class NoOp extends FunctionNode @@ -70,3 +87,20 @@ class NoOp extends FunctionNode } } +class CustomCount extends FunctionNode +{ + /** + * @var Query\AST\AggregateExpression + */ + private $aggregateExpression; + + public function parse(Parser $parser): void + { + $this->aggregateExpression = $parser->AggregateExpression(); + } + + public function getSql(SqlWalker $sqlWalker): string + { + return $this->aggregateExpression->dispatch($sqlWalker); + } +} diff --git a/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php b/tests/Doctrine/Tests/ORM/Functional/DetachedEntityTest.php index b0326e542..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; @@ -23,7 +24,8 @@ class DetachedEntityTest extends OrmFunctionalTestCase parent::setUp(); } - public function testSimpleDetachMerge() { + public function testSimpleDetachMerge() + { $user = new CmsUser; $user->name = 'Roman'; $user->username = 'romanb'; @@ -33,13 +35,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 +48,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'; @@ -116,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() @@ -173,7 +173,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 +216,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/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/Functional/Locking/LockTest.php b/tests/Doctrine/Tests/ORM/Functional/Locking/LockTest.php index e92b9476b..d515e95bf 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"; @@ -35,13 +37,16 @@ class LockTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->lock($article, LockMode::OPTIMISTIC, $article->version); + + $this->addToAssertionCount(1); } /** * @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 +63,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 +82,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 +96,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 +114,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 +180,7 @@ class LockTest extends OrmFunctionalTestCase $this->_em->flush(); $this->_em->beginTransaction(); + try { $this->_em->lock($article, LockMode::PESSIMISTIC_READ); $this->_em->commit(); @@ -179,8 +189,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 +200,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..8b8113b6a 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); @@ -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/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 */ diff --git a/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php b/tests/Doctrine/Tests/ORM/Functional/NativeQueryTest.php index 93eab2667..31c19a1cd 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(); } @@ -324,6 +325,8 @@ class NativeQueryTest extends OrmFunctionalTestCase { $rsm = new ResultSetMappingBuilder($this->_em); $rsm->addRootEntityFromClassMetadata(CompanyFixContract::class, 'c'); + + self::assertSame(CompanyFixContract::class, $rsm->getClassName('c')); } /** @@ -426,9 +429,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 +442,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 +471,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..0fd2b4745 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); } @@ -35,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/QueryTest.php b/tests/Doctrine/Tests/ORM/Functional/QueryTest.php index 805478bdf..f25cd33fa 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,51 @@ 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(); + + $extractValue = function (Parameter $parameter) { + return $parameter->getValue(); + }; + + self::assertSame( + $parameters->map($extractValue)->toArray(), + $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params'] + ); } 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']); + $parameters = [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($parameters) + ->getResult(); + + self::assertSame( + array_values($parameters), + $this->_sqlLoggerStack->queries[$this->_sqlLoggerStack->currentQuery]['params'] + ); } /** @@ -200,18 +214,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( + $this->assertSame( [ - [['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 +255,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; @@ -246,8 +272,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(); @@ -283,8 +309,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(); } @@ -294,7 +320,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 +386,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 +395,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 +404,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 +498,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/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/ORM/Functional/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php index 13091c5e5..290984f35 100644 --- a/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/SequenceGeneratorTest.php @@ -14,28 +14,29 @@ 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) { - } } 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()); } } @@ -48,7 +49,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..324e84812 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) { - } } @@ -43,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 9c6740c33..8478a5f66 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,16 +266,17 @@ 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); $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 d72a960f7..564e046e7 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), ] ); } @@ -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 77cde3262..6c54da296 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) { @@ -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 4818c82ad..03c761a95 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!"; @@ -46,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 4ac78d9b7..1248fe841 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,17 +48,20 @@ 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(); + + $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 f85df4a7e..3866c588d 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,13 +23,14 @@ class DDC144Test extends OrmFunctionalTestCase */ public function testIssue() { - $operand = new DDC144Operand; $operand->property = 'flowValue'; $operand->operandProperty = 'operandValue'; + $this->_em->persist($operand); $this->_em->flush(); + self::assertSame($operand, $this->_em->find(DDC144Operand::class, $operand->id)); } } @@ -41,23 +41,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..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 */ @@ -14,21 +16,20 @@ 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) { - } } public function testFailingCase() { $pic = new DDC1454Picture(); - $this->_em->getUnitOfWork()->getEntityState($pic); - } + self::assertSame(UnitOfWork::STATE_NEW, $this->_em->getUnitOfWork()->getEntityState($pic)); + } } /** @@ -36,7 +37,6 @@ class DDC1454Test extends \Doctrine\Tests\OrmFunctionalTestCase */ class DDC1454Picture extends DDC1454File { - } /** @@ -53,14 +53,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..ef7d6014b 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1925Test.php @@ -14,26 +14,34 @@ 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(); + $this->_em->clear(); + + /** @var DDC1925Product $persistedProduct */ + $persistedProduct = $this->_em->find(DDC1925Product::class, $product->getId()); + + self::assertEquals($user, $persistedProduct->getBuyers()->first()); } } @@ -104,15 +112,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..532e0edfe 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC192Test.php @@ -2,29 +2,43 @@ namespace Doctrine\Tests\ORM\Functional\Ticket; +use Doctrine\ORM\Mapping\ClassMetadata; use Doctrine\Tests\OrmFunctionalTestCase; +/** + * @group DDC-192 + */ class DDC192Test extends OrmFunctionalTestCase { public function testSchemaCreation() { - $this->_schemaTool->createSchema( - [ + $classes = [ $this->_em->getClassMetadata(DDC192User::class), - $this->_em->getClassMetadata(DDC192Phonenumber::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); + } } } - /** - * @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 +51,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 +70,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/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); } } diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2106Test.php index 0fdc7f84d..4856852ec 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), ] ); } @@ -33,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 681210159..02281a5e3 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) ] ); } @@ -50,15 +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'] - ); + $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 025ee7633..b84024f04 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(); @@ -50,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 ac3f10be6..45a49b7a6 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC3170Test.php @@ -38,36 +38,31 @@ 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(); $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'); - } + $result = $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'); - } + 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/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..984cda551 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,18 +31,26 @@ 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); + + $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)); } } @@ -68,12 +76,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 +91,7 @@ class DDC3785_Asset public function getAttributes() { - return $this->attributes; + return $this->attributes; } } @@ -93,23 +101,23 @@ class DDC3785_Asset */ class DDC3785_Attribute { - /** + /** * @Id @Column(type="integer") * @GeneratedValue */ - private $id; + public $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 +128,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..dc6fa2081 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,33 +71,43 @@ 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); $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)); } } /** @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 +116,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..7361bc4f4 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), ] ); } @@ -22,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/DDC6460Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php new file mode 100644 index 000000000..9868c7d1c --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC6460Test.php @@ -0,0 +1,111 @@ +setUpEntitySchema( + [ + DDC6460Entity::class, + DDC6460ParentEntity::class, + ] + ); + } catch (SchemaException $e) { + } + } + + /** + * @group DDC-6460 + */ + public function testInlineEmbeddable() + { + $isFieldMapped = $this->_em + ->getClassMetadata(DDC6460Entity::class) + ->hasField('embedded'); + + $this->assertTrue($isFieldMapped); + } + + /** + * @group DDC-6460 + */ + public function testInlineEmbeddableProxyInitialization() + { + $entity = new DDC6460Entity(); + $entity->id = 1; + $entity->embedded = new DDC6460Embeddable(); + $entity->embedded->field = 'test'; + $this->_em->persist($entity); + + $second = new DDC6460ParentEntity(); + $second->id = 1; + $second->lazyLoaded = $entity; + $this->_em->persist($second); + $this->_em->flush(); + + $this->_em->clear(); + + $secondEntityWithLazyParameter = $this->_em->getRepository(DDC6460ParentEntity::class)->findOneById(1); + + $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()); + } +} + +/** + * @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", cascade={"persist"}) */ + public $lazyLoaded; +} diff --git a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC742Test.php index 4d03bca2a..8adcb0879 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,10 +64,11 @@ 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(); + $this->addToAssertionCount(1); } } @@ -86,11 +87,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 +102,7 @@ class DDC742User * inverseJoinColumns={@JoinColumn(name="comment_id", referencedColumnName="id")} * ) * - * @var Doctrine\ORM\PersistentCollection + * @var \Doctrine\ORM\PersistentCollection */ public $favoriteComments; } @@ -119,6 +122,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..fdae13585 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,12 +44,15 @@ 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(); + $this->_em->clear(); + + self::assertEquals($like, $this->_em->find(DDC832Like::class, $like->id)); } /** @@ -54,12 +60,17 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableBasicRemove() { - $like = new DDC832Like("test"); + $like = new DDC832Like('test'); $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)); } /** @@ -67,12 +78,15 @@ 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(); + $this->_em->clear(); + + self::assertEquals($index, $this->_em->find(DDC832JoinedIndex::class, $index->id)); } /** @@ -80,12 +94,17 @@ class DDC832Test extends \Doctrine\Tests\OrmFunctionalTestCase */ public function testQuotedTableJoinedRemove() { - $index = new DDC832JoinedIndex("test"); + $index = new DDC832JoinedIndex('test'); $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)); } /** @@ -93,12 +112,15 @@ 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(); + $this->_em->clear(); + + self::assertEquals($index, $this->_em->find(DDC832JoinedTreeIndex::class, $index->id)); } /** @@ -106,12 +128,17 @@ 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(); + $idToBeRemoved = $index->id; + $this->_em->remove($index); $this->_em->flush(); + $this->_em->clear(); + + self::assertNull($this->_em->find(DDC832JoinedTreeIndex::class, $idToBeRemoved)); } } @@ -178,6 +205,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..f6216a162 100644 --- a/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC933Test.php @@ -2,13 +2,17 @@ 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 { public function setUp() { $this->useModelSet('company'); + parent::setUp(); } @@ -17,9 +21,11 @@ class DDC933Test extends OrmFunctionalTestCase */ public function testLockCTIClass() { - //$this->_em->getConnection()->getConfiguration()->setSQLLogger(new \Doctrine\DBAL\Logging\EchoSQLLogger()); + if ($this->_em->getConnection()->getDatabasePlatform()->getName() === 'sqlite') { + self::markTestSkipped('It should not run on in-memory databases'); + } - $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 +35,35 @@ 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(); + + // 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()); } } 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/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; + } +} 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; +} 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..85bf43ea0 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Functional/Ticket/GH6402Test.php @@ -0,0 +1,96 @@ +useModelSet('quote'); + + parent::setUp(); + } + + 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); + } + + 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); + self::assertNotNull($addresses[0]->user); + } + + 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"; + $user->setAddress($address); + + $this->_em->persist($user); + $this->_em->flush(); + $this->_em->clear(); + } +} diff --git a/tests/Doctrine/Tests/ORM/Functional/TypeTest.php b/tests/Doctrine/Tests/ORM/Functional/TypeTest.php index 052002014..9dd99777a 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,11 +29,11 @@ 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); - $this->assertEquals(0.1515, $decimal->highScale); + $this->assertSame('0.15', $decimal->decimal); + $this->assertSame('0.1515', $decimal->highScale); } /** @@ -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,10 +75,10 @@ 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); + $this->assertSame(["foo" => "bar", "bar" => "baz"], $serialize->array); } public function testObject() @@ -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,8 +107,8 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); - $this->assertInstanceOf('DateTime', $dateTimeDb->date); - $this->assertEquals('2009-10-01', $dateTimeDb->date->format('Y-m-d')); + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->date); + $this->assertSame('2009-10-01', $dateTimeDb->date->format('Y-m-d')); } public function testDateTime() @@ -121,12 +122,13 @@ class TypeTest extends OrmFunctionalTestCase $dateTimeDb = $this->_em->find(DateTimeModel::class, $dateTime->id); - $this->assertInstanceOf('DateTime', $dateTimeDb->datetime); - $this->assertEquals('2009-10-02 20:10:52', $dateTimeDb->datetime->format('Y-m-d H:i:s')); + $this->assertInstanceOf(\DateTime::class, $dateTimeDb->datetime); + $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( "now" )] - ); - $this->assertEquals( 0, count( $articles ) ); + $articles = $this->_em->getRepository(DateTimeModel::class) + ->findBy(['datetime' => new \DateTime()]); + + $this->assertEmpty($articles); } public function testDqlQueryBindDateTimeInstance() @@ -143,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() @@ -162,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() @@ -175,7 +183,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->assertSame('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/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)); + } +} diff --git a/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/ScalarHydratorTest.php index 2ad9461ff..919486cc8 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,12 +33,12 @@ 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); - $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']); @@ -63,9 +64,9 @@ 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); + self::assertCount(1, $hydrator->hydrateAll($stmt, $rsm)); } /** @@ -93,8 +94,8 @@ 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); + self::assertCount(1, $hydrator->hydrateAll($stmt, $rsm)); } } diff --git a/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php b/tests/Doctrine/Tests/ORM/Hydration/SingleScalarHydratorTest.php index d0cebbc49..f9d91be63 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,19 +70,24 @@ 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') { + 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() diff --git a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php index 5d7f7a59b..5e4247715 100644 --- a/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php +++ b/tests/Doctrine/Tests/ORM/Id/SequenceGeneratorTest.php @@ -2,38 +2,58 @@ 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 { - for ($i=0; $i < 42; ++$i) { + $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) { if ($i % 10 == 0) { - $this->_em->getConnection()->setFetchOneResult((int)($i / 10) * 10); + $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()); } - - } } 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], diff --git a/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php b/tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php index 4e19c987c..e13d7aa7e 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; @@ -67,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); @@ -273,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']); @@ -816,6 +808,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/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/ClassMetadataTest.php b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php index 3e9148b4d..24d9559f7 100644 --- a/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php +++ b/tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php @@ -14,6 +14,7 @@ use Doctrine\Tests\Models\Company\CompanyContract; use Doctrine\Tests\Models\CustomType\CustomTypeParent; use Doctrine\Tests\Models\DDC117\DDC117Article; use Doctrine\Tests\Models\DDC117\DDC117ArticleDetails; +use Doctrine\Tests\Models\DDC6412\DDC6412File; use Doctrine\Tests\Models\DDC964\DDC964Admin; use Doctrine\Tests\Models\DDC964\DDC964Guest; use Doctrine\Tests\Models\Routing\RoutingLeg; @@ -209,6 +210,15 @@ class ClassMetadataTest extends OrmTestCase $cm->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); @@ -1259,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')); + } } /** 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 e374e135e..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 @@ -12,7 +13,6 @@ class StaticPHPMappingDriverTest extends AbstractMappingDriverTest return new StaticPHPDriver(__DIR__ . DIRECTORY_SEPARATOR . 'php'); } - /** * All class with static::loadMetadata are entities for php driver * @@ -20,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/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.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] 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 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')], diff --git a/tests/Doctrine/Tests/ORM/Query/QueryTest.php b/tests/Doctrine/Tests/ORM/Query/QueryTest.php index 9b8f24d40..5a2a295fe 100644 --- a/tests/Doctrine/Tests/ORM/Query/QueryTest.php +++ b/tests/Doctrine/Tests/ORM/Query/QueryTest.php @@ -6,7 +6,9 @@ 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\ORM\Query\QueryException; use Doctrine\Tests\Mocks\DriverConnectionMock; use Doctrine\Tests\Mocks\StatementArrayMock; use Doctrine\Tests\Models\CMS\CmsAddress; @@ -147,7 +149,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()); } /** @@ -243,4 +246,61 @@ 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()); + } + + /** + * @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->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->getSQL(); + } } diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index f9fb0b820..82facdb49 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() { @@ -1033,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'" ); } @@ -1200,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_" ); } @@ -1752,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 )', @@ -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/ORM/Tools/Console/MetadataFilterTest.php b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php new file mode 100644 index 000000000..24f3b54a3 --- /dev/null +++ b/tests/Doctrine/Tests/ORM/Tools/Console/MetadataFilterTest.php @@ -0,0 +1,184 @@ +createAnnotationDriver(); + $em = $this->_getTestEntityManager(); + + $em->getConfiguration()->setMetadataDriverImpl($driver); + + $this->cmf = new DisconnectedClassMetadataFactory(); + $this->cmf->setEntityManager($em); + } + + public function testFilterWithEmptyArray() : void + { + $originalMetadatas = [ + $metadataAaa = $this->cmf->getMetadataFor(MetadataFilterTestEntityAaa::class), + $metadataBbb = $this->cmf->getMetadataFor(MetadataFilterTestEntityBbb::class), + ]; + + $metadatas = $originalMetadatas; + $metadatas = MetadataFilter::filter($metadatas, []); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertContains($metadataBbb, $metadatas); + $this->assertCount(count($originalMetadatas), $metadatas); + } + + public function testFilterWithString() : void + { + $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'); + + $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 testFilterWithString2() : void + { + $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'); + + $this->assertContains($metadataFoo, $metadatas); + $this->assertContains($metadataFooBar, $metadatas); + $this->assertNotContains($metadataBar, $metadatas); + $this->assertCount(2, $metadatas); + } + + public function testFilterWithArray() : void + { + $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', + 'MetadataFilterTestEntityCcc', + ]); + + $this->assertContains($metadataAaa, $metadatas); + $this->assertNotContains($metadataBbb, $metadatas); + $this->assertContains($metadataCcc, $metadatas); + $this->assertCount(2, $metadatas); + } + + public function testFilterWithRegex() : void + { + $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$'); + + $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 */ +class MetadataFilterTestEntityAaa +{ + /** @Id @Column */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityBbb +{ + /** @Id @Column */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityCcc +{ + /** @Id @Column */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityFoo +{ + /** @Id @Column */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityBar +{ + /** @Id @Column */ + protected $id; +} + +/** @Entity */ +class MetadataFilterTestEntityFooBar +{ + /** @Id @Column */ + protected $id; +} diff --git a/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php b/tests/Doctrine/Tests/ORM/Tools/EntityGeneratorTest.php index 5a9f451fe..f2d74d043 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,39 @@ class EntityGeneratorTest extends OrmTestCase return new $metadata->name; } + /** + * @group GH-6314 + */ + public function testEmbeddedEntityWithNamedColumnPrefix() + { + $columnPrefix = 'GH6314Prefix_'; + $testMetadata = $this->generateTestEmbeddableFixture(); + $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=false)', $testMetadata->name); + self::assertContains($needle, $docComment); + } + public function testGeneratedEntityClass() { $testMetadata = $this->generateTestEmbeddableFixture(); 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() ); } 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() ); } diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaToolTest.php index 7bae933a6..1164ae219 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() : void + { + $em = $this->_getTestEntityManager(); + $schemaTool = new SchemaTool($em); + $metadata = $em->getClassMetadata(FirstEntity::class); + + $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()); + } } /** diff --git a/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php b/tests/Doctrine/Tests/ORM/Tools/SchemaValidatorTest.php index ea2826309..682ee896d 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->validator->validateMapping(); + $this->em->getConfiguration() + ->getMetadataDriverImpl() + ->addPaths([$path]); + + self::assertEmpty($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'], + ]; } /** 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]); } 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()); } /** diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php index 88fbc43ca..e9299b1c6 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; @@ -68,6 +69,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. * @@ -98,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, @@ -225,6 +232,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 +489,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'])) { @@ -616,14 +635,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 +655,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); } @@ -661,12 +674,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). @@ -693,6 +705,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) { @@ -715,13 +731,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 diff --git a/tests/README.markdown b/tests/README.markdown index c1027aced..dfba6fa21 100644 --- a/tests/README.markdown +++ b/tests/README.markdown @@ -1,8 +1,25 @@ # 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: + + 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 Debian, or a Debian-derivate Linux distribution (like Ubuntu), you can install SQLite with: + + sudo apt-get install sqlite ## Testing Lock-Support @@ -14,7 +31,7 @@ Install Gearman with PHP as follows: 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: +You can then go into `tests/` and start up two workers: php Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php @@ -22,4 +39,4 @@ 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 +This can run considerable time, because it is using sleep() to test for the timing ranges of locks.