From 0cfc82ddae1ea8de077bd5873a89fdc04a5c63a0 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 --- .github/ISSUE_TEMPLATE/BC_Break.md | 2 +- CONTRIBUTING.md | 10 +++--- README.md | 34 +++++++++---------- SECURITY.md | 2 +- UPGRADE.md | 6 ++-- composer.json | 6 ++-- docs/en/changelog/migration_2_5.rst | 20 +++++------ docs/en/index.rst | 2 +- .../limitations-and-known-issues.rst | 10 +++--- .../working-with-indexed-associations.rst | 2 +- .../ORM/Functional/LifecycleCallbackTest.php | 2 +- .../ORM/Query/SelectSqlGenerationTest.php | 2 +- tests/README.markdown | 10 +++--- 13 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/BC_Break.md b/.github/ISSUE_TEMPLATE/BC_Break.md index 21ee116042..90064ef51a 100644 --- a/.github/ISSUE_TEMPLATE/BC_Break.md +++ b/.github/ISSUE_TEMPLATE/BC_Break.md @@ -4,7 +4,7 @@ about: Have you encountered an issue during upgrade? 💣 --- ### BC Break Report diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8305f83b42..21713e2f82 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -11,7 +11,7 @@ unified and future proof. In order to submit a pull request, you will need to [fork the project][Fork] and obtain a fresh copy of the source code: ```sh -git clone git@github.com:/doctrine2.git orm +git clone git@github.com:/orm.git cd orm ``` @@ -81,10 +81,10 @@ everything as fast as possible, but cannot always live up to our own expectation Thank you very much again for your contribution! - [Master]: https://github.com/doctrine/doctrine2/tree/master - [2.7]: https://github.com/doctrine/doctrine2/tree/2.7 - [2.6]: https://github.com/doctrine/doctrine2/tree/2.6 + [Master]: https://github.com/doctrine/orm/tree/master + [2.7]: https://github.com/doctrine/orm/tree/2.7 + [2.6]: https://github.com/doctrine/orm/tree/2.6 [CS]: https://github.com/doctrine/coding-standard [Fork]: https://guides.github.com/activities/forking/ [Travis]: https://www.travis-ci.org - [Test Example]: https://github.com/doctrine/doctrine2/tree/master/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php + [Test Example]: https://github.com/doctrine/orm/tree/master/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php diff --git a/README.md b/README.md index 2dc2062d8e..4cdf1d1814 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -[![Tidelift](https://tidelift.com/badges/github/doctrine/doctrine2)](https://tidelift.com/subscription/pkg/packagist-doctrine-orm?utm_source=packagist-doctrine-orm&utm_medium=referral&utm_campaign=readme) +[![Tidelift](https://tidelift.com/badges/github/doctrine/orm)](https://tidelift.com/subscription/pkg/packagist-doctrine-orm?utm_source=packagist-doctrine-orm&utm_medium=referral&utm_campaign=readme) [Professionally supported Doctrine is now available](https://tidelift.com/subscription/pkg/packagist-doctrine-orm?utm_source=packagist-doctrine-orm&utm_medium=referral&utm_campaign=readme) @@ -37,19 +37,19 @@ 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.7 image]: https://img.shields.io/travis/doctrine/doctrine2/2.7.svg?style=flat-square - [2.7]: https://github.com/doctrine/doctrine2/tree/2.7 - [2.7 coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/doctrine2/2.7.svg?style=flat-square - [2.7 coverage]: https://scrutinizer-ci.com/g/doctrine/doctrine2/?branch=2.7 - [2.6 image]: https://img.shields.io/travis/doctrine/doctrine2/2.6.svg?style=flat-square - [2.6]: https://github.com/doctrine/doctrine2/tree/2.6 - [2.6 coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/doctrine2/2.6.svg?style=flat-square - [2.6 coverage]: https://scrutinizer-ci.com/g/doctrine/doctrine2/?branch=2.6 - [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.7 image]: https://img.shields.io/travis/doctrine/orm/2.7.svg?style=flat-square + [2.7]: https://github.com/doctrine/orm/tree/2.7 + [2.7 coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/orm/2.7.svg?style=flat-square + [2.7 coverage]: https://scrutinizer-ci.com/g/doctrine/orm/?branch=2.7 + [2.6 image]: https://img.shields.io/travis/doctrine/orm/2.6.svg?style=flat-square + [2.6]: https://github.com/doctrine/orm/tree/2.6 + [2.6 coverage image]: https://img.shields.io/scrutinizer/coverage/g/doctrine/orm/2.6.svg?style=flat-square + [2.6 coverage]: https://scrutinizer-ci.com/g/doctrine/orm/?branch=2.6 + [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 313900211e..0789963bf7 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 905e5baa3b..a3338a727b 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -339,13 +339,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) ## Minor BC BREAK: removed $className parameter on `AbstractEntityInheritancePersister#getSelectJoinColumnSQL()` @@ -365,7 +365,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: query cache key time is now a float diff --git a/composer.json b/composer.json index cabd5a179e..cbde86186c 100644 --- a/composer.json +++ b/composer.json @@ -26,9 +26,9 @@ "chat": "https://www.doctrine-project.org/slack", "docs": "https://www.doctrine-project.org/projects/orm.html", "email": "doctrine-user@googlegroups.com", - "issues": "https://github.com/doctrine/doctrine2/issues", - "rss": "https://github.com/doctrine/doctrine2/releases.atom", - "source": "https://github.com/doctrine/doctrine2" + "issues": "https://github.com/doctrine/orm/issues", + "rss": "https://github.com/doctrine/orm/releases.atom", + "source": "https://github.com/doctrine/orm" }, "config": { "sort-packages": true diff --git a/docs/en/changelog/migration_2_5.rst b/docs/en/changelog/migration_2_5.rst index f3da1480c9..4e3ed525ab 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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -104,7 +104,7 @@ This feature was developed by external contributor `Johannes Schmitt `_ - `DDC-93 `_ -- `Pull Request #835 `_ +- `Pull Request #835 `_ Second-Level-Cache ~~~~~~~~~~~~~~~~~~ @@ -165,7 +165,7 @@ instead of the database. - `Documentation `_ -- `Pull Request #808 `_ +- `Pull Request #808 `_ Criteria API: Support for ManyToMany assocations ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -227,8 +227,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -254,7 +254,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -285,7 +285,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 ~~~~~~~~~~~~~~~~~~~~~~~ @@ -318,7 +318,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 @@ -432,7 +432,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 @@ -456,7 +456,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 6f8255eaa9..7763a0644f 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -13,7 +13,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 3c4262e4e1..4dcc600b9c 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 `_. Custom Persisters ~~~~~~~~~~~~~~~~~ @@ -74,8 +74,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -85,7 +85,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 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -135,7 +135,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/docs/en/tutorials/working-with-indexed-associations.rst b/docs/en/tutorials/working-with-indexed-associations.rst index 1c0292cb36..4ddb022922 100644 --- a/docs/en/tutorials/working-with-indexed-associations.rst +++ b/docs/en/tutorials/working-with-indexed-associations.rst @@ -260,6 +260,6 @@ Outlook into the Future ~~~~~~~~~~~~~~~~~~~~~~~ For the inverse side of a many-to-many associations there will be a way to persist the keys and the order -as a third and fourth parameter into the join table. This feature is discussed in `DDC-213 `_ +as a third and fourth parameter into the join table. This feature is discussed in `DDC-213 `_ This feature cannot be implemented for one-to-many associations, because they are never the owning side. diff --git a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php index 0f0750aa43..a7f3d890cb 100644 --- a/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php +++ b/tests/Doctrine/Tests/ORM/Functional/LifecycleCallbackTest.php @@ -278,7 +278,7 @@ public function testCascadedEntitiesNotLoadedInPostLoadDuringIterationWithSimple } /** - * https://github.com/doctrine/doctrine2/issues/6568 + * https://github.com/doctrine/orm/issues/6568 */ public function testPostLoadIsInvokedOnFetchJoinedEntities() : void { diff --git a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php index 293808dc93..93b121e1c0 100644 --- a/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php +++ b/tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php @@ -2332,7 +2332,7 @@ public function testHavingSupportResultVariableInAggregateFunction() : void } /** - * 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 dfba6fa217..5b8fb05b65 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