From efaee8ce85a11b9da8679d1dc0ba96c73946aa7b Mon Sep 17 00:00:00 2001 From: Michael Moravec Date: Sun, 11 Nov 2018 23:49:03 +0100 Subject: [PATCH] Migrate repository name doctrine/doctrine2 -> doctrine/orm --- CONTRIBUTING.md | 8 ++++---- README.md | 16 +++++++-------- SECURITY.md | 2 +- UPGRADE.md | 6 +++--- docs/en/changelog/migration_2_5.rst | 20 +++++++++---------- docs/en/index.rst | 2 +- .../limitations-and-known-issues.rst | 14 ++++++------- .../ORM/Functional/LifecycleCallbackTest.php | 2 +- .../ORM/Query/SelectSqlGenerationTest.php | 2 +- tests/README.markdown | 10 +++++----- 10 files changed, 41 insertions(+), 41 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 1034dbe06..482fb631b 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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. 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: ```sh -git clone git@github.com:doctrine/doctrine2.git -cd doctrine2 +git clone git@github.com:doctrine/orm.git +cd orm curl -sS https://getcomposer.org/installer | php -- ./composer.phar install ``` @@ -66,7 +66,7 @@ sqlite database. 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. - 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. ## Travis diff --git a/README.md b/README.md index 45d2b1f5f..7f935fc34 100644 --- a/README.md +++ b/README.md @@ -16,11 +16,11 @@ without requiring unnecessary code duplication. * [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]: https://travis-ci.org/doctrine/doctrine2 - [Master coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/doctrine2/master.svg?style=flat-square - [Master coverage]: https://scrutinizer-ci.com/g/doctrine/doctrine2/?branch=master - [2.5 image]: https://img.shields.io/travis/doctrine/doctrine2/2.5.svg?style=flat-square - [2.5]: https://github.com/doctrine/doctrine2/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]: https://scrutinizer-ci.com/g/doctrine/doctrine2/?branch=2.5 + [Master image]: https://img.shields.io/travis/doctrine/orm/master.svg?style=flat-square + [Master]: https://travis-ci.org/doctrine/orm + [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/orm/?branch=master + [2.5 image]: https://img.shields.io/travis/doctrine/orm/2.5.svg?style=flat-square + [2.5]: https://github.com/doctrine/orm/tree/2.5 + [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/orm/?branch=2.5 diff --git a/SECURITY.md b/SECURITY.md index 313900211..0789963bf 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -11,7 +11,7 @@ Please read the documentation chapter on Security in Doctrine DBAL and ORM to understand the assumptions we make. - [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 Security Level to "Security Issues". It will be visible to Doctrine Core diff --git a/UPGRADE.md b/UPGRADE.md index 19528d89f..3567b998d 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -20,13 +20,13 @@ now has a required parameter `$pathExpr`. 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) +[#6500](https://github.com/doctrine/orm/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) +`AVG`, `SUM`, `COUNT`, `MIN` and `MAX`. [#6500](https://github.com/doctrine/orm/pull/6500) ## 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()` 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()` diff --git a/docs/en/changelog/migration_2_5.rst b/docs/en/changelog/migration_2_5.rst index 408776d03..dca6a0c8b 100644 --- a/docs/en/changelog/migration_2_5.rst +++ b/docs/en/changelog/migration_2_5.rst @@ -21,7 +21,7 @@ defined then Doctrine would trigger listeners after the fields were loaded, but before assocations are available. - `DDC-54 `_ -- `Commit #a90629 `_ +- `Commit #a90629 `_ Events: Add API to programatically add event listeners to Entity ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -102,7 +102,7 @@ This feature was developed by external contributor `Johannes Schmitt `_ - `DDC-93 `_ -- `Pull Request #835 `_ +- `Pull Request #835 `_ Second-Level-Cache ~~~~~~~~~~~~~~~~~~ @@ -160,7 +160,7 @@ instead of the database. - `Documentation `_ -- `Pull Request #808 `_ +- `Pull Request #808 `_ 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 `_. -- `Pull Request #882 `_ -- `Pull Request #1032 `_ +- `Pull Request #882 `_ +- `Pull Request #1032 `_ Mapping: Allow configuring Index flags ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -241,7 +241,7 @@ only with a schema event listener before. This feature was contributed by `Adrian Olek `_. -- `Pull Request #973 `_ +- `Pull Request #973 `_ 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 `_ -- `Pull Request #963 `_ +- `Pull Request #963 `_ EXTRA_LAZY Improvements @@ -301,7 +301,7 @@ EXTRA_LAZY Improvements This feature was contributed by `Asmir Mustafic `_ - - `Pull Request #937 `_ + - `Pull Request #937 `_ 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 `_. -- `Pull Request #590 `_ +- `Pull Request #590 `_ - `DDC-2319 `_ 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 `_. -- `Pull Request #863 `_ +- `Pull Request #863 `_ ResultSetMappingBuilder: Add support for Single-Table Inheritance ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/en/index.rst b/docs/en/index.rst index 1863da705..290137daf 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -15,7 +15,7 @@ Doctrine ORM don't panic. You can get help from different sources: - There is a :doc:`FAQ ` with answers to frequent questions. - The `Doctrine Mailing List `_ - Slack chat room `#orm `_ -- Report a bug on `GitHub `_. +- Report a bug on `GitHub `_. - On `Twitter `_ with ``#doctrine2`` - On `StackOverflow `_ diff --git a/docs/en/reference/limitations-and-known-issues.rst b/docs/en/reference/limitations-and-known-issues.rst index 15cde689b..8fd20e819 100644 --- a/docs/en/reference/limitations-and-known-issues.rst +++ b/docs/en/reference/limitations-and-known-issues.rst @@ -63,7 +63,7 @@ Where the ``attribute_name`` column contains the key and ``$attributes``. The feature request for persistence of primitive value arrays -`is described in the DDC-298 ticket `_. +`is described in the DDC-298 ticket `_. 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. Make sure to study the behavior of cascade merge if you are using it: -- `DDC-875 `_ Merge can sometimes add the same entity twice into a collection -- `DDC-763 `_ Cascade merge on associated entities can insert too many rows through "Persistence by Reachability" +- `DDC-875 `_ Merge can sometimes add the same entity twice into a collection +- `DDC-763 `_ Cascade merge on associated entities can insert too many rows through "Persistence by Reachability" 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 benefit from custom persister implementations: -- `Add Upsert Support `_ -- `Evaluate possible ways in which stored-procedures can be used `_ +- `Add Upsert Support `_ +- `Evaluate possible ways in which stored-procedures can be used `_ 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 of a Collection instance. -`Ticket DDC-213 `_ +`Ticket DDC-213 `_ 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. See bugs, improvement and feature requests on `Github issues -`_. +`_. Identifier Quoting and Legacy Databases ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 914acbecf..e23095fe8 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -270,7 +270,7 @@ DQL; } /** - * https://github.com/doctrine/doctrine2/issues/6568 + * https://github.com/doctrine/orm/issues/6568 */ public function testPostLoadIsInvokedOnFetchJoinedEntities() { diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index b65611217..2c3435fdb 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -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 * @dataProvider mathematicOperatorsProvider */ diff --git a/tests/README.markdown b/tests/README.markdown index dfba6fa21..5b8fb05b6 100644 --- a/tests/README.markdown +++ b/tests/README.markdown @@ -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 - * Enter the Doctrine2 folder + * Enter the ORM folder * Install the dependencies * Execute the tests All this is (normally) done with: - git clone git@github.com:doctrine/doctrine2.git - cd doctrine2 + git clone git@github.com:doctrine/orm.git + cd orm composer install ./vendor/bin/phpunit