From 9048bb47b6ea64f6e639b5209b9532ee33eed062 Mon Sep 17 00:00:00 2001
From: George Steel <george@net-glue.co.uk>
Date: Sun, 26 Jan 2025 22:17:58 +0000
Subject: [PATCH] Callable intersections in `class-string` don't work in Psalm
 v5 or v6

Signed-off-by: George Steel <george@net-glue.co.uk>
---
 src/AbstractPluginManager.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/AbstractPluginManager.php b/src/AbstractPluginManager.php
index 3f099abd..dde8edb1 100644
--- a/src/AbstractPluginManager.php
+++ b/src/AbstractPluginManager.php
@@ -255,9 +255,7 @@ public function setInvokableClass(string $name, string|null $class = null): void
      *
      * @deprecated Please use {@see AbstractPluginManager::configure()} instead.
      *
-     * @phpcs:disable Generic.Files.LineLength.TooLong
-     * @param class-string<FactoryInterface>|class-string<object&FactoryCallable>|FactoryCallable|FactoryInterface $factory
-     * @phpcs:enable Generic.Files.LineLength.TooLong
+     * @param class-string<FactoryInterface>|FactoryCallable|FactoryInterface $factory
      * @throws ContainerModificationsNotAllowedException If $name already
      *     exists as a service and overrides are disallowed.
      */
@@ -301,9 +299,7 @@ public function addAbstractFactory(string|AbstractFactoryInterface $factory): vo
      *
      * @param string $name Service name
      * @param string|callable|DelegatorFactoryInterface $factory Delegator factory to assign.
-     * @phpcs:disable Generic.Files.LineLength.TooLong
-     * @psalm-param class-string<DelegatorFactoryInterface>|class-string<object&DelegatorCallable>|DelegatorCallable $factory
-     * @phpcs:enable Generic.Files.LineLength.TooLong
+     * @psalm-param class-string<DelegatorFactoryInterface>|DelegatorCallable $factory
      */
     public function addDelegator(string $name, string|callable|DelegatorFactoryInterface $factory): void
     {