Unified redundant exception messages for invalid initializers and

invalid abstract factories. Moved them to Named Constructors of
InvalidArgumentException. Adjusted test which checks the wording of the
exception messages to reflect the change.

Author: fhein

src/Exception/InvalidArgumentException.php

@@ -8,10 +8,32 @@
 namespace Zend\ServiceManager\Exception;
 
 use InvalidArgumentException as SplInvalidArgumentException;
+use Zend\ServiceManager\Initializer\InitializerInterface;
+use Zend\ServiceManager\AbstractFactoryInterface;
 
 /**
  * @inheritDoc
  */
 class InvalidArgumentException extends SplInvalidArgumentException implements ExceptionInterface
 {
+    public static function fromInvalidInitializer($initializer)
+    {
+        return new self(sprintf(
+            'An invalid initializer was registered. Expected a callable, or an instance of '
+            . '(or valid class name or function name resolving to) "%s", '
+            . 'but "%s" was received',
+            InitializerInterface::class,
+            (is_object($initializer) ? get_class($initializer) : gettype($initializer))
+        ));
+    }
+
+    public static function fromInvalidAbstractFactory($abstractFactory)
+    {
+        return new self(sprintf(
+            'An invalid abstract factory was registered. Expected an instance of or a '
+            . 'valid class name resolving to an implementation of "%s", but "%s" was received.',
+            AbstractFactoryInterface::class,
+            (is_object($abstractFactory) ? get_class($abstractFactory) : gettype($abstractFactory))
+        ));
+    }
 }

src/ServiceManager.php

@@ -522,46 +522,6 @@ public function setShared($name, $flag)
         throw ContainerModificationsNotAllowedException::fromExistingService($name);
     }
 
-    /**
-     * Instantiate initializers for to avoid checks during service construction.
-     *
-     * @param string[]|Initializer\InitializerInterface[]|callable[] $initializers
-     *
-     * @return void
-     */
-    private function resolveInitializer($initializer)
-    {
-        if (is_string($initializer) && class_exists($initializer)) {
-            $initializer = new $initializer();
-        }
-
-        if (is_callable($initializer)) {
-            $this->initializers[] = $initializer;
-            return;
-        }
-
-        // Error condition; let's find out why.
-
-        if (is_string($initializer)) {
-            throw new InvalidArgumentException(sprintf(
-                'An invalid initializer was registered; resolved to class or function "%s" '
-                . 'which does not exist; please provide a valid function name or class '
-                . 'name resolving to an implementation of %s',
-                $initializer,
-                Initializer\InitializerInterface::class
-            ));
-        }
-
-        // Otherwise, we have an invalid type.
-        throw new InvalidArgumentException(sprintf(
-            'An invalid initializer was registered. Expected a callable, or an instance of '
-            . '(or string class name resolving to) "%s", '
-            . 'but "%s" was received',
-            Initializer\InitializerInterface::class,
-            (is_object($initializer) ? get_class($initializer) : gettype($initializer))
-        ));
-    }
-
     /**
      * Instantiate initializers for to avoid checks during service construction.
      *
@@ -572,7 +532,16 @@ private function resolveInitializer($initializer)
     private function resolveInitializers(array $initializers)
     {
         foreach ($initializers as $initializer) {
-            $this->resolveInitializer($initializer);
+            if (is_string($initializer) && class_exists($initializer)) {
+                $initializer = new $initializer();
+            }
+
+            if (is_callable($initializer)) {
+                $this->initializers[] = $initializer;
+                return;
+            }
+
+            throw InvalidArgumentException::fromInvalidInitializer($initializer);
         }
     }
 
@@ -947,25 +916,6 @@ private function resolveAbstractFactoryInstance($abstractFactory)
             return;
         }
 
-        // Error condition; let's find out why.
-
-        // If we still have a string, we have a class name that does not resolve
-        if (is_string($abstractFactory)) {
-            throw new InvalidArgumentException(sprintf(
-                'An invalid abstract factory was registered; resolved to class "%s" '
-                . 'which does not exist; please provide a valid class name resolving '
-                . 'to an implementation of %s',
-                $abstractFactory,
-                AbstractFactoryInterface::class
-            ));
-        }
-
-        // Otherwise, we have an invalid type.
-        throw new InvalidArgumentException(sprintf(
-            'An invalid abstract factory was registered. Expected an instance of "%s", '
-            . 'but "%s" was received',
-            AbstractFactoryInterface::class,
-            (is_object($abstractFactory) ? get_class($abstractFactory) : gettype($abstractFactory))
-        ));
+        throw InvalidArgumentException::fromInvalidAbstractFactory($abstractFactory);
     }
 }

test/CommonServiceLocatorBehaviorsTrait.php

@@ -545,7 +545,7 @@ public function testCanSpecifyInitializerUsingStringViaConfiguration()
     public function invalidInitializers()
     {
         $factories = $this->invalidFactories();
-        $factories['non-class-string'] = ['non-callable-string', 'valid function name or class name'];
+        $factories['non-class-string'] = ['non-callable-string', 'valid class name or function name'];
         return $factories;
     }