Merge pull request #170 from boesing/qa/remove-deprecated-factories

Remove deprecated factories
laminas · Feb 15, 2023 · a3f3c32 · a3f3c32
2 parents dd29f8f + 4ff1755
commit a3f3c32
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 168 deletions.
diff --git a/src/AbstractFactoryInterface.php b/src/AbstractFactoryInterface.php
diff --git a/src/DelegatorFactoryInterface.php b/src/DelegatorFactoryInterface.php
diff --git a/src/Exception/InvalidArgumentException.php b/src/Exception/InvalidArgumentException.php
@@ -5,7 +5,7 @@
 namespace Laminas\ServiceManager\Exception;
 
 use InvalidArgumentException as SplInvalidArgumentException;
-use Laminas\ServiceManager\AbstractFactoryInterface;
+use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
 use Laminas\ServiceManager\Initializer\InitializerInterface;
 
 use function gettype;

diff --git a/src/FactoryInterface.php b/src/FactoryInterface.php
diff --git a/src/InitializerInterface.php b/src/InitializerInterface.php
diff --git a/src/ServiceManager.php b/src/ServiceManager.php
@@ -976,13 +976,13 @@ private function assertCallableDelegatorFactory($delegatorFactory): void
                 . ' which does not exist; please provide a valid function name or class name resolving'
                 . ' to an implementation of %s',
                 $delegatorFactory,
-                DelegatorFactoryInterface::class
+                Factory\DelegatorFactoryInterface::class
             ));
         }
         throw new ServiceNotCreatedException(sprintf(
             'A non-callable delegator, "%s", was provided; expected a callable or instance of "%s"',
             is_object($delegatorFactory) ? $delegatorFactory::class : gettype($delegatorFactory),
-            DelegatorFactoryInterface::class
+            Factory\DelegatorFactoryInterface::class
         ));
     }
 }