From 6ce91dd37b2b3c3fbe9749d8463fa54365f5c7bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9goire=20Paris?= Date: Tue, 23 Feb 2021 09:24:40 +0100 Subject: [PATCH] Address move away from master --- .doctrine-project.json | 2 +- CONTRIBUTING.md | 2 +- README.md | 14 +++++++------- SECURITY.md | 4 ++-- composer.json | 5 ----- docs/en/reference/caching.rst | 2 +- 6 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.doctrine-project.json b/.doctrine-project.json index 473580aff2d..951ccb0b6e4 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -7,7 +7,7 @@ "versions": [ { "name": "3.0", - "branchName": "master", + "branchName": "3.0.x", "slug": "latest", "upcoming": true }, diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 482fb631b7c..4fe845115a8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -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/orm/tree/master/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an + See `https://github.com/doctrine/orm/tree/2.8.x/tests/Doctrine/Tests/ORM/Functional/Ticket/DDC2306Test.php` for an example. ## Travis diff --git a/README.md b/README.md index 5336536be87..001c3a39ff3 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -| [Master][Master] | [2.8.x][2.8] | +| [3.0.x][3.0] | [2.8.x][2.8] | |:----------------:|:----------:| -| [![Build status][Master image]][Master] | [![Build status][2.8 image]][2.8] | -| [![Coverage Status][Master coverage image]][Master coverage] | [![Coverage Status][2.8 coverage image]][2.8 coverage] | +| [![Build status][3.0 image]][3.0] | [![Build status][2.8 image]][2.8] | +| [![Coverage Status][3.0 coverage image]][3.0 coverage] | [![Coverage Status][2.8 coverage image]][2.8 coverage] | Doctrine 2 is an object-relational mapper (ORM) for PHP 7.1+ that provides transparent persistence for PHP objects. It sits on top of a powerful database abstraction layer (DBAL). One of its key features @@ -16,10 +16,10 @@ without requiring unnecessary code duplication. * [Documentation](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/index.html) - [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://codecov.io/gh/doctrine/orm/branch/master/graph/badge.svg - [Master coverage]: https://codecov.io/gh/doctrine/orm/branch/master + [3.0 image]: https://codecov.io/gh/doctrine/orm/branch/3.0/graph/badge.svg + [3.0]: https://github.com/doctrine/orm/tree/3.0.x + [3.0 coverage image]: https://codecov.io/gh/doctrine/orm/branch/3.0.x/graph/badge.svg + [3.0 coverage]: https://codecov.io/gh/doctrine/orm/branch/3.0.x [2.8 image]: https://img.shields.io/travis/doctrine/orm/2.8.svg?style=flat-square [2.8]: https://github.com/doctrine/orm/tree/2.8 [2.8 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.8/graph/badge.svg diff --git a/SECURITY.md b/SECURITY.md index 0789963bf70..9deac9ed312 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -10,8 +10,8 @@ we cannot protect you from SQL injection. 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/orm/blob/master/docs/en/reference/security.rst) +- [DBAL Security Page](https://www.doctrine-project.org/projects/doctrine-dbal/en/latest/reference/security.html) +- [ORM Security Page](https://www.doctrine-project.org/projects/doctrine-orm/en/latest/reference/security.html) 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/composer.json b/composer.json index bd40c081a9f..29a90b80772 100644 --- a/composer.json +++ b/composer.json @@ -51,11 +51,6 @@ } }, "bin": ["bin/doctrine"], - "extra": { - "branch-alias": { - "dev-master": "2.7.x-dev" - } - }, "archive": { "exclude": ["!vendor", "tests", "*phpunit.xml", ".travis.yml", "build.xml", "build.properties", "composer.phar", "vendor/satooshi", "lib/vendor", "*.swp"] } diff --git a/docs/en/reference/caching.rst b/docs/en/reference/caching.rst index a541604da43..32c1313ed16 100644 --- a/docs/en/reference/caching.rst +++ b/docs/en/reference/caching.rst @@ -43,7 +43,7 @@ these methods. This documentation does not cover every single cache driver included with Doctrine. For an up-to-date-list, see the -`cache directory on GitHub `_. +`cache directory on GitHub `_. PhpFileCache ~~~~~~~~~~~~