diff --git a/.doctrine-project.json b/.doctrine-project.json index 69a1b4ea3d7..a79077189c3 100644 --- a/.doctrine-project.json +++ b/.doctrine-project.json @@ -12,21 +12,27 @@ "upcoming": true }, { - "name": "2.11", - "branchName": "2.11.x", - "slug": "2.11", + "name": "2.12", + "branchName": "2.12.x", + "slug": "2.12", "upcoming": true }, { - "name": "2.10", - "branchName": "2.10.x", - "slug": "2.10", + "name": "2.11", + "branchName": "2.11.x", + "slug": "2.11", "current": true, "aliases": [ "current", "stable" ] }, + { + "name": "2.10", + "branchName": "2.10.x", + "slug": "2.10", + "maintained": false + }, { "name": "2.9", "branchName": "2.9.x", diff --git a/README.md b/README.md index f323be123ed..cd167513078 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -| [3.0.x][3.0] | [2.11.x][2.11] | [2.10.x][2.10] | +| [3.0.x][3.0] | [2.12.x][2.12] | [2.11.x][2.11] | |:----------------:|:----------------:|:----------:| -| [![Build status][3.0 image]][3.0] | [![Build status][2.11 image]][2.11] | [![Build status][2.10 image]][2.10] | -| [![Coverage Status][3.0 coverage image]][3.0 coverage]| [![Coverage Status][2.11 coverage image]][2.11 coverage] | [![Coverage Status][2.10 coverage image]][2.10 coverage] | +| [![Build status][3.0 image]][3.0] | [![Build status][2.12 image]][2.12] | [![Build status][2.11 image]][2.11] | +| [![Coverage Status][3.0 coverage image]][3.0 coverage]| [![Coverage Status][2.12 coverage image]][2.12 coverage] | [![Coverage Status][2.11 coverage image]][2.11 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 @@ -20,10 +20,10 @@ without requiring unnecessary code duplication. [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.10 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.10.x - [2.10]: https://github.com/doctrine/orm/tree/2.10.x - [2.10 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.10.x/graph/badge.svg - [2.10 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.10.x + [2.12 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.12.x + [2.12]: https://github.com/doctrine/orm/tree/2.12.x + [2.12 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.12.x/graph/badge.svg + [2.12 coverage]: https://codecov.io/gh/doctrine/orm/branch/2.12.x [2.11 image]: https://github.com/doctrine/orm/actions/workflows/continuous-integration.yml/badge.svg?branch=2.11.x [2.11]: https://github.com/doctrine/orm/tree/2.11.x [2.11 coverage image]: https://codecov.io/gh/doctrine/orm/branch/2.11.x/graph/badge.svg diff --git a/lib/Doctrine/ORM/Id/AbstractIdGenerator.php b/lib/Doctrine/ORM/Id/AbstractIdGenerator.php index 5a42a3faf43..2da3766f388 100644 --- a/lib/Doctrine/ORM/Id/AbstractIdGenerator.php +++ b/lib/Doctrine/ORM/Id/AbstractIdGenerator.php @@ -78,7 +78,7 @@ public function generateId(EntityManagerInterface $em, $entity) /** * Gets whether this generator is a post-insert generator which means that - * {@link generate()} must be called after the entity has been inserted + * {@link generateId()} must be called after the entity has been inserted * into the database. * * By default, this method returns FALSE. Generators that have this requirement diff --git a/lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php b/lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php index 16f6f2b7686..4c5408ecc9c 100644 --- a/lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php +++ b/lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php @@ -16,7 +16,7 @@ class BigIntegerIdentityGenerator extends AbstractIdGenerator /** * The name of the sequence to pass to lastInsertId(), if any. * - * @var string + * @var string|null */ private $sequenceName; diff --git a/psalm-baseline.xml b/psalm-baseline.xml index bf47e80951c..e6c56469043 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -475,11 +475,6 @@ $entity - - - $sequenceName - - $vertex->state !== self::VISITED