From 09a2648f7e07ad3ff92e532bc6af1ec6ecdb45ad Mon Sep 17 00:00:00 2001 From: "Alexander M. Turek" Date: Wed, 12 Jan 2022 12:10:23 +0100 Subject: [PATCH] Fix doc blocks on ID generators (#9368) --- lib/Doctrine/ORM/Id/AbstractIdGenerator.php | 2 +- lib/Doctrine/ORM/Id/BigIntegerIdentityGenerator.php | 2 +- psalm-baseline.xml | 5 ----- 3 files changed, 2 insertions(+), 7 deletions(-) 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 38f15718f88..3cc10fe3f93 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -508,11 +508,6 @@ $entity - - - $sequenceName - - $currentLevel