CS/consistency fixes for InvalidArgumentException

- Adds parameter and return value annotations
- Make line lengths similar
- Use verbiage consistent with other exceptions
- Fixes test exception expectation messages to match

Author: weierophinney

src/Exception/InvalidArgumentException.php

@@ -8,30 +8,37 @@
 namespace Zend\ServiceManager\Exception;
 
 use InvalidArgumentException as SplInvalidArgumentException;
-use Zend\ServiceManager\Initializer\InitializerInterface;
 use Zend\ServiceManager\AbstractFactoryInterface;
+use Zend\ServiceManager\Initializer\InitializerInterface;
 
 /**
  * @inheritDoc
  */
 class InvalidArgumentException extends SplInvalidArgumentException implements ExceptionInterface
 {
+    /**
+     * @param mixed $initializer
+     * @return self
+     */
     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',
+            'An invalid initializer was registered. Expected a callable or an'
+            . ' instance of "%s"; received "%s"',
             InitializerInterface::class,
             is_object($initializer) ? get_class($initializer) : gettype($initializer)
         ));
     }
 
+    /**
+     * @param mixed $abstractFactory
+     * @return self
+     */
     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.',
+            '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)
         ));

test/CommonServiceLocatorBehaviorsTrait.php

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