Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migrate repository name from doctrine/doctrine2 to doctrine/orm #7552

Merged
merged 1 commit into from
Jan 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/BC_Break.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ about: Have you encountered an issue during upgrade? 💣
---

<!--
Before reporting a BC break, please consult the upgrading document to make sure it's not an expected change: https://github.com/doctrine/doctrine2/blob/master/UPGRADE.md
Before reporting a BC break, please consult the upgrading document to make sure it's not an expected change: https://github.com/doctrine/orm/blob/master/UPGRADE.md
-->

### BC Break Report
Expand Down
10 changes: 5 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 [email protected]:<your-github-name>/doctrine2.git orm
git clone [email protected]:<your-github-name>/orm.git
cd orm
```

Expand Down Expand Up @@ -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
34 changes: 17 additions & 17 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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()`

Expand All @@ -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

Expand Down
6 changes: 3 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
"chat": "https://www.doctrine-project.org/slack",
"docs": "https://www.doctrine-project.org/projects/orm.html",
"email": "[email protected]",
"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
Expand Down
20 changes: 10 additions & 10 deletions docs/en/changelog/migration_2_5.rst
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ defined then Doctrine would trigger listeners after the fields were
loaded, but before assocations are available.

- `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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -104,7 +104,7 @@ This feature was developed by external contributor `Johannes Schmitt
<https://twitter.com/schmittjoh>`_

- `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
~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -165,7 +165,7 @@ instead of the database.

- `Documentation
<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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -227,8 +227,8 @@ trigger a full load of the collection.

This feature was contributed by `Michaël Gallego <https://github.com/bakura10>`_.

- `Pull Request #882 <https://github.com/doctrine/doctrine2/pull/882>`_
- `Pull Request #1032 <https://github.com/doctrine/doctrine2/pull/1032>`_
- `Pull Request #882 <https://github.com/doctrine/orm/pull/882>`_
- `Pull Request #1032 <https://github.com/doctrine/orm/pull/1032>`_

Mapping: Allow configuring Index flags
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -254,7 +254,7 @@ only with a schema event listener before.

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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -285,7 +285,7 @@ Extending on the locale example of the documentation:

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
~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -318,7 +318,7 @@ EXTRA_LAZY Improvements

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

Expand Down Expand Up @@ -432,7 +432,7 @@ object:
This feature was contributed by `Michael Perrin
<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>`_

Query API: Add support for default Query Hints
Expand All @@ -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
<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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion docs/en/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,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.
- The `Doctrine Mailing List <https://groups.google.com/group/doctrine-user>`_
- 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 `StackOverflow <https://stackoverflow.com/questions/tagged/doctrine2>`_

Expand Down
10 changes: 5 additions & 5 deletions docs/en/reference/limitations-and-known-issues.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/doctrine/doctrine2/issues/3743>`_.
`is described in the DDC-298 ticket <https://github.com/doctrine/orm/issues/3743>`_.

Custom Persisters
~~~~~~~~~~~~~~~~~
Expand All @@ -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 <https://github.com/doctrine/doctrine2/issues/5178>`_
- `Evaluate possible ways in which stored-procedures can be used <https://github.com/doctrine/doctrine2/issues/4946>`_
- `Add Upsert Support <https://github.com/doctrine/orm/issues/5178>`_
- `Evaluate possible ways in which stored-procedures can be used <https://github.com/doctrine/orm/issues/4946>`_

Persist Keys of Collections
~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand All @@ -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 <https://github.com/doctrine/doctrine2/issues/2817>`_
`Ticket DDC-213 <https://github.com/doctrine/orm/issues/2817>`_

Mapping many tables to one entity
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down Expand Up @@ -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
<https://github.com/doctrine/doctrine2/issues>`_.
<https://github.com/doctrine/orm/issues>`_.

Identifier Quoting and Legacy Databases
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
2 changes: 1 addition & 1 deletion docs/en/tutorials/working-with-indexed-associations.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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 <https://github.com/doctrine/doctrine2/issues/2817>`_
as a third and fourth parameter into the join table. This feature is discussed in `DDC-213 <https://github.com/doctrine/orm/issues/2817>`_
This feature cannot be implemented for one-to-many associations, because they are never the owning side.

Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion tests/Doctrine/Tests/ORM/Query/SelectSqlGenerationTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 5 additions & 5 deletions tests/README.markdown
Original file line number Diff line number Diff line change
@@ -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 [email protected]:doctrine/doctrine2.git
cd doctrine2
git clone [email protected]:doctrine/orm.git
cd orm
composer install
./vendor/bin/phpunit

Expand Down