From b71328ea113517e7ae68b35b9010a3be0f394dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sat, 30 Jan 2021 12:06:25 +0100 Subject: [PATCH 1/2] Relax contract of EntityListenerResolver so it doesn't require class name There is actually no technical reason why interface should require FQCN --- lib/Doctrine/ORM/Mapping/EntityListenerResolver.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php b/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php index d3a41af994f..9f259e7c65e 100644 --- a/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php +++ b/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php @@ -29,24 +29,20 @@ interface EntityListenerResolver { /** - * Clear all instances from the set, or a specific class when given. + * Clear all instances from the set, or a specific instance when given its identifier. * - * @param string $className The fully-qualified class name + * @param string $className May be arbitrary string. Name kept for BC only. * * @return void - * - * @psalm-param class-string $className */ function clear($className = null); /** - * Returns a entity listener instance for the given class name. + * Returns a entity listener instance for the given identifier. * - * @param string $className The fully-qualified class name + * @param string $className May be arbitrary string. Name kept for BC only. * * @return object An entity listener - * - * @psalm-param class-string $className */ function resolve($className); From 29d867dbfdbe2575e04a1ae9789d32e93ceeab08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gabriel=20Ostroluck=C3=BD?= Date: Sat, 30 Jan 2021 12:47:25 +0100 Subject: [PATCH 2/2] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Grégoire Paris --- lib/Doctrine/ORM/Mapping/EntityListenerResolver.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php b/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php index 9f259e7c65e..a58631caefb 100644 --- a/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php +++ b/lib/Doctrine/ORM/Mapping/EntityListenerResolver.php @@ -31,7 +31,7 @@ interface EntityListenerResolver /** * Clear all instances from the set, or a specific instance when given its identifier. * - * @param string $className May be arbitrary string. Name kept for BC only. + * @param string $className May be any arbitrary string. Name kept for BC only. * * @return void */ @@ -40,7 +40,7 @@ function clear($className = null); /** * Returns a entity listener instance for the given identifier. * - * @param string $className May be arbitrary string. Name kept for BC only. + * @param string $className May be any arbitrary string. Name kept for BC only. * * @return object An entity listener */