RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-09 00:39:25 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7551 from Majkl578/repo-rename/2.6

Browse Source 
[2.6] Migrate repository name doctrine/doctrine2 -> doctrine/orm
This commit is contained in:
Jonathan H. Wage 2019-01-03 17:18:59 -06:00 committed by GitHub
commit 98b8ced814
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CONTRIBUTING.md
View File

@ -44,12 +44,12 @@ Please try to add a test for your pull-request.
You can run the unit-tests by calling ``vendor/bin/phpunit`` from the root of the project. You can run the unit-tests by calling ``vendor/bin/phpunit`` from the root of the project.
It will run all the tests with an in memory SQLite database. It will run all the tests with an in memory SQLite database.
In order to do that, you will need a fresh copy of doctrine2, and you In order to do that, you will need a fresh copy of the ORM, and you
will have to run a composer installation in the project: will have to run a composer installation in the project:
```sh ```sh
git clone git@github.com:doctrine/doctrine2.git git clone git@github.com:doctrine/orm.git
cd doctrine2 cd orm
curl -sS https://getcomposer.org/installer | php -- curl -sS https://getcomposer.org/installer | php --
./composer.phar install ./composer.phar install
``` ```
@ -66,7 +66,7 @@ sqlite database.
Tips for creating unit tests: Tips for creating unit tests:
1. If you put a test into the `Ticket` namespace as described above, put the testcase and all entities into the same class. 1. If you put a test into the `Ticket` namespace as described above, put the testcase and all entities into the same class.
See `https://github.com/doctrine/doctrine2/tree/master/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an See `https://github.com/doctrine/orm/tree/master/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an
example. example.
## Travis ## Travis

16
README.md
View File

@ -16,11 +16,11 @@ without requiring unnecessary code duplication.
* [Documentation](http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/index.html) * [Documentation](http://docs.doctrine-project.org/projects/doctrine-orm/en/latest/index.html)
[Master image]: https://img.shields.io/travis/doctrine/doctrine2/master.svg?style=flat-square [Master image]: https://img.shields.io/travis/doctrine/orm/master.svg?style=flat-square
[Master]: https://travis-ci.org/doctrine/doctrine2 [Master]: https://travis-ci.org/doctrine/orm
[Master coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/doctrine2/master.svg?style=flat-square [Master coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/orm/master.svg?style=flat-square
[Master coverage]: https://scrutinizer-ci.com/g/doctrine/doctrine2/?branch=master [Master coverage]: https://scrutinizer-ci.com/g/doctrine/orm/?branch=master
[2.5 image]: https://img.shields.io/travis/doctrine/doctrine2/2.5.svg?style=flat-square [2.5 image]: https://img.shields.io/travis/doctrine/orm/2.5.svg?style=flat-square
[2.5]: https://github.com/doctrine/doctrine2/tree/2.5 [2.5]: https://github.com/doctrine/orm/tree/2.5
[2.5 coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/doctrine2/2.5.svg?style=flat-square [2.5 coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/orm/2.5.svg?style=flat-square
[2.5 coverage]: https://scrutinizer-ci.com/g/doctrine/doctrine2/?branch=2.5 [2.5 coverage]: https://scrutinizer-ci.com/g/doctrine/orm/?branch=2.5

2
SECURITY.md
View File

@ -11,7 +11,7 @@ Please read the documentation chapter on Security in Doctrine DBAL and ORM to
understand the assumptions we make. understand the assumptions we make.
- [DBAL Security Page](https://github.com/doctrine/dbal/blob/master/docs/en/reference/security.rst) - [DBAL Security Page](https://github.com/doctrine/dbal/blob/master/docs/en/reference/security.rst)
- [ORM Security Page](https://github.com/doctrine/doctrine2/blob/master/docs/en/reference/security.rst) - [ORM Security Page](https://github.com/doctrine/orm/blob/master/docs/en/reference/security.rst)
If you find a Security bug in Doctrine, please report it on Jira and change the If you find a Security bug in Doctrine, please report it on Jira and change the
Security Level to "Security Issues". It will be visible to Doctrine Core Security Level to "Security Issues". It will be visible to Doctrine Core

6
UPGRADE.md
View File

@ -20,13 +20,13 @@ now has a required parameter `$pathExpr`.
Method `Doctrine\ORM\Query\Parser#isInternalFunction()` was removed because Method `Doctrine\ORM\Query\Parser#isInternalFunction()` was removed because
the distinction between internal function and user defined DQL was removed. the distinction between internal function and user defined DQL was removed.
[#6500](https://github.com/doctrine/doctrine2/pull/6500) [#6500](https://github.com/doctrine/orm/pull/6500)
## Minor BC BREAK: removed `Doctrine\ORM\ORMException#overwriteInternalDQLFunctionNotAllowed()` ## Minor BC BREAK: removed `Doctrine\ORM\ORMException#overwriteInternalDQLFunctionNotAllowed()`
Method `Doctrine\ORM\Query\Parser#overwriteInternalDQLFunctionNotAllowed()` was Method `Doctrine\ORM\Query\Parser#overwriteInternalDQLFunctionNotAllowed()` was
removed because of the choice to allow users to overwrite internal functions, ie 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) `AVG`, `SUM`, `COUNT`, `MIN` and `MAX`. [#6500](https://github.com/doctrine/orm/pull/6500)
## PHP 7.1 is now required ## PHP 7.1 is now required
@ -42,7 +42,7 @@ As a consequence, automatic cache setup in Doctrine\ORM\Tools\Setup::create*Conf
## Minor BC BREAK: removed `Doctrine\ORM\Query\SqlWalker#walkCaseExpression()` ## Minor BC BREAK: removed `Doctrine\ORM\Query\SqlWalker#walkCaseExpression()`
Method `Doctrine\ORM\Query\SqlWalker#walkCaseExpression()` was unused and part Method `Doctrine\ORM\Query\SqlWalker#walkCaseExpression()` was unused and part
of the internal API of the ORM, so it was removed. [#5600](https://github.com/doctrine/doctrine2/pull/5600). of the internal API of the ORM, so it was removed. [#5600](https://github.com/doctrine/orm/pull/5600).
## Minor BC BREAK: removed $className parameter on `AbstractEntityInheritancePersister#getSelectJoinColumnSQL()` ## Minor BC BREAK: removed $className parameter on `AbstractEntityInheritancePersister#getSelectJoinColumnSQL()`

20
docs/en/changelog/migration_2_5.rst
View File

@ -21,7 +21,7 @@ defined then Doctrine would trigger listeners after the fields were
loaded, but before assocations are available. loaded, but before assocations are available.
- `DDC-54 <http://doctrine-project.org/jira/browse/DDC-54>`_ - `DDC-54 <http://doctrine-project.org/jira/browse/DDC-54>`_
- `Commit #a90629 <https://github.com/doctrine/doctrine2/commit/a906295c65f1516737458fbee2f6fa96254f27a5>`_ - `Commit #a90629 <https://github.com/doctrine/orm/commit/a906295c65f1516737458fbee2f6fa96254f27a5>`_
Events: Add API to programatically add event listeners to Entity Events: Add API to programatically add event listeners to Entity
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -102,7 +102,7 @@ This feature was developed by external contributor `Johannes Schmitt
<https://twitter.com/schmittjoh>`_ <https://twitter.com/schmittjoh>`_
- `DDC-93 <http://doctrine-project.org/jira/browse/DDC-93>`_ - `DDC-93 <http://doctrine-project.org/jira/browse/DDC-93>`_
- `Pull Request #835 <https://github.com/doctrine/doctrine2/pull/835>`_ - `Pull Request #835 <https://github.com/doctrine/orm/pull/835>`_
Second-Level-Cache Second-Level-Cache
~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~
@ -160,7 +160,7 @@ instead of the database.
- `Documentation - `Documentation
<http://docs.doctrine-project.org/en/latest/reference/second-level-cache.html>`_ <http://docs.doctrine-project.org/en/latest/reference/second-level-cache.html>`_
- `Pull Request #808 <https://github.com/doctrine/doctrine2/pull/808>`_ - `Pull Request #808 <https://github.com/doctrine/orm/pull/808>`_
Criteria API: Support for ManyToMany assocations Criteria API: Support for ManyToMany assocations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -217,8 +217,8 @@ trigger a full load of the collection.
This feature was contributed by `Michaël Gallego <https://github.com/bakura10>`_. This feature was contributed by `Michaël Gallego <https://github.com/bakura10>`_.
- `Pull Request #882 <https://github.com/doctrine/doctrine2/pull/882>`_ - `Pull Request #882 <https://github.com/doctrine/orm/pull/882>`_
- `Pull Request #1032 <https://github.com/doctrine/doctrine2/pull/1032>`_ - `Pull Request #1032 <https://github.com/doctrine/orm/pull/1032>`_
Mapping: Allow configuring Index flags Mapping: Allow configuring Index flags
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -241,7 +241,7 @@ only with a schema event listener before.
This feature was contributed by `Adrian Olek <https://github.com/adrianolek>`_. This feature was contributed by `Adrian Olek <https://github.com/adrianolek>`_.
- `Pull Request #973 <https://github.com/doctrine/doctrine2/pull/973>`_ - `Pull Request #973 <https://github.com/doctrine/orm/pull/973>`_
SQLFilter API: Check if a parameter is set SQLFilter API: Check if a parameter is set
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -272,7 +272,7 @@ Extending on the locale example of the documentation:
This feature was contributed by `Miroslav Demovic <https://github.com/mdemo>`_ This feature was contributed by `Miroslav Demovic <https://github.com/mdemo>`_
- `Pull Request #963 <https://github.com/doctrine/doctrine2/pull/963>`_ - `Pull Request #963 <https://github.com/doctrine/orm/pull/963>`_
EXTRA_LAZY Improvements EXTRA_LAZY Improvements
@ -301,7 +301,7 @@ EXTRA_LAZY Improvements
This feature was contributed by `Asmir Mustafic <https://github.com/goetas>`_ This feature was contributed by `Asmir Mustafic <https://github.com/goetas>`_
- `Pull Request #937 <https://github.com/doctrine/doctrine2/pull/937>`_ - `Pull Request #937 <https://github.com/doctrine/orm/pull/937>`_
2. Add EXTRA_LAZY Support for get() for owning and inverse many-to-many 2. Add EXTRA_LAZY Support for get() for owning and inverse many-to-many
@ -415,7 +415,7 @@ object:
This feature was contributed by `Michael Perrin This feature was contributed by `Michael Perrin
<https://github.com/michaelperrin>`_. <https://github.com/michaelperrin>`_.
- `Pull Request #590 <https://github.com/doctrine/doctrine2/pull/590>`_ - `Pull Request #590 <https://github.com/doctrine/orm/pull/590>`_
- `DDC-2319 <http://doctrine-project.org/jira/browse/DDC-2319>`_ - `DDC-2319 <http://doctrine-project.org/jira/browse/DDC-2319>`_
Query API: Add support for default Query Hints Query API: Add support for default Query Hints
@ -439,7 +439,7 @@ It is now possible to add query hints that are always enabled for every Query:
This feature was contributed by `Artur Eshenbrener This feature was contributed by `Artur Eshenbrener
<https://github.com/Strate>`_. <https://github.com/Strate>`_.
- `Pull Request #863 <https://github.com/doctrine/doctrine2/pull/863>`_ - `Pull Request #863 <https://github.com/doctrine/orm/pull/863>`_
ResultSetMappingBuilder: Add support for Single-Table Inheritance ResultSetMappingBuilder: Add support for Single-Table Inheritance
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
docs/en/index.rst
View File

@ -15,7 +15,7 @@ Doctrine ORM don't panic. You can get help from different sources:
- There is a :doc:`FAQ <reference/faq>` with answers to frequent questions. - There is a :doc:`FAQ <reference/faq>` with answers to frequent questions.
- The `Doctrine Mailing List <https://groups.google.com/group/doctrine-user>`_ - The `Doctrine Mailing List <https://groups.google.com/group/doctrine-user>`_
- Slack chat room `#orm <https://www.doctrine-project.org/slack>`_ - Slack chat room `#orm <https://www.doctrine-project.org/slack>`_
- Report a bug on `GitHub <https://github.com/doctrine/doctrine2/issues>`_. - Report a bug on `GitHub <https://github.com/doctrine/orm/issues>`_.
- On `Twitter <https://twitter.com/search/%23doctrine2>`_ with ``#doctrine2`` - On `Twitter <https://twitter.com/search/%23doctrine2>`_ with ``#doctrine2``
- On `StackOverflow <http://stackoverflow.com/questions/tagged/doctrine2>`_ - On `StackOverflow <http://stackoverflow.com/questions/tagged/doctrine2>`_

14
docs/en/reference/limitations-and-known-issues.rst
View File

@ -63,7 +63,7 @@ Where the ``attribute_name`` column contains the key and
``$attributes``. ``$attributes``.
The feature request for persistence of primitive value arrays The feature request for persistence of primitive value arrays
`is described in the DDC-298 ticket <https://github.com/doctrine/doctrine2/issues/3743>`_. `is described in the DDC-298 ticket <https://github.com/doctrine/orm/issues/3743>`_.
Cascade Merge with Bi-directional Associations Cascade Merge with Bi-directional Associations
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -71,8 +71,8 @@ Cascade Merge with Bi-directional Associations
There are two bugs now that concern the use of cascade merge in combination with bi-directional associations. There are two bugs now that concern the use of cascade merge in combination with bi-directional associations.
Make sure to study the behavior of cascade merge if you are using it: Make sure to study the behavior of cascade merge if you are using it:
- `DDC-875 <https://github.com/doctrine/doctrine2/issues/5398>`_ Merge can sometimes add the same entity twice into a collection - `DDC-875 <https://github.com/doctrine/orm/issues/5398>`_ Merge can sometimes add the same entity twice into a collection
- `DDC-763 <https://github.com/doctrine/doctrine2/issues/5277>`_ Cascade merge on associated entities can insert too many rows through "Persistence by Reachability" - `DDC-763 <https://github.com/doctrine/orm/issues/5277>`_ Cascade merge on associated entities can insert too many rows through "Persistence by Reachability"
Custom Persisters Custom Persisters
~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~
@ -83,8 +83,8 @@ Currently there is no way to overwrite the persister implementation
for a given entity, however there are several use-cases that can for a given entity, however there are several use-cases that can
benefit from custom persister implementations: benefit from custom persister implementations:
- `Add Upsert Support <https://github.com/doctrine/doctrine2/issues/5178>`_ - `Add Upsert Support <https://github.com/doctrine/orm/issues/5178>`_
- `Evaluate possible ways in which stored-procedures can be used <https://github.com/doctrine/doctrine2/issues/4946>`_ - `Evaluate possible ways in which stored-procedures can be used <https://github.com/doctrine/orm/issues/4946>`_
Persist Keys of Collections Persist Keys of Collections
~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -94,7 +94,7 @@ PHP Arrays are ordered hash-maps and so should be the
evaluate a feature that optionally persists and hydrates the keys evaluate a feature that optionally persists and hydrates the keys
of a Collection instance. of a Collection instance.
`Ticket DDC-213 <https://github.com/doctrine/doctrine2/issues/2817>`_ `Ticket DDC-213 <https://github.com/doctrine/orm/issues/2817>`_
Mapping many tables to one entity Mapping many tables to one entity
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@ -145,7 +145,7 @@ We don't plan to add every bug in the tracker there, just those
issues that can potentially cause nightmares or pain of any sort. issues that can potentially cause nightmares or pain of any sort.
See bugs, improvement and feature requests on `Github issues See bugs, improvement and feature requests on `Github issues
<https://github.com/doctrine/doctrine2/issues>`_. <https://github.com/doctrine/orm/issues>`_.
Identifier Quoting and Legacy Databases Identifier Quoting and Legacy Databases
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

2
tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php
View File

@ -270,7 +270,7 @@ DQL;
} }
/** /**
* https://github.com/doctrine/doctrine2/issues/6568 * https://github.com/doctrine/orm/issues/6568
*/ */
public function testPostLoadIsInvokedOnFetchJoinedEntities() public function testPostLoadIsInvokedOnFetchJoinedEntities()
{ {

2
tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
View File

@ -2302,7 +2302,7 @@ class SelectSqlGenerationTest extends OrmTestCase
} }
/** /**
* GitHub issue #4764: https://github.com/doctrine/doctrine2/issues/4764 * GitHub issue #4764: https://github.com/doctrine/orm/issues/4764
* @group DDC-3907 * @group DDC-3907
* @dataProvider mathematicOperatorsProvider * @dataProvider mathematicOperatorsProvider
*/ */

10
tests/README.markdown
View File

@ -1,16 +1,16 @@
# Running the Doctrine 2 Testsuite # Running the Doctrine ORM Testsuite
To execute the Doctrine2 testsuite, you just need to execute this simple steps: To execute the ORM testsuite, you just need to execute this simple steps:
* Clone the project from GitHub * Clone the project from GitHub
* Enter the Doctrine2 folder * Enter the ORM folder
* Install the dependencies * Install the dependencies
* Execute the tests * Execute the tests
All this is (normally) done with: All this is (normally) done with:
git clone git@github.com:doctrine/doctrine2.git git clone git@github.com:doctrine/orm.git
cd doctrine2 cd orm
composer install composer install
./vendor/bin/phpunit ./vendor/bin/phpunit