Tweaks as requested by webimpress.

Author: fhein

src/Exception/CyclicAliasException.php

@@ -20,7 +20,7 @@
 class CyclicAliasException extends InvalidArgumentException
 {
     /**
-     * @param string   conflicting alias key
+     * @param string   $alias conflicting alias key
      * @param string[] $aliases map of referenced services, indexed by alias name (string)
      *
      * @return self

src/Exception/InvalidArgumentException.php

@@ -23,7 +23,7 @@ public static function fromInvalidInitializer($initializer)
             . '(or valid class name or function name resolving to) "%s", '
             . 'but "%s" was received',
             InitializerInterface::class,
-            (is_object($initializer) ? get_class($initializer) : gettype($initializer))
+            is_object($initializer) ? get_class($initializer) : gettype($initializer)
         ));
     }
 
@@ -33,7 +33,7 @@ public static function fromInvalidAbstractFactory($abstractFactory)
             '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))
+            is_object($abstractFactory) ? get_class($abstractFactory) : gettype($abstractFactory)
         ));
     }
 }

src/ServiceManager.php

@@ -21,18 +21,18 @@
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
 
-use function \array_merge_recursive;
-use function \class_exists;
-use function \get_class;
-use function \gettype;
-use function \is_callable;
-use function \is_object;
-use function \is_string;
-use function \spl_autoload_register;
-use function \spl_object_hash;
-use function \sprintf;
-use function \trigger_error;
-use function \in_array;
+use function array_merge_recursive;
+use function class_exists;
+use function get_class;
+use function gettype;
+use function is_callable;
+use function is_object;
+use function is_string;
+use function spl_autoload_register;
+use function spl_object_hash;
+use function sprintf;
+use function trigger_error;
+use function in_array;
 
 /**
  * Service Manager.
@@ -526,8 +526,6 @@ public function setShared($name, $flag)
      * Instantiate initializers for to avoid checks during service construction.
      *
      * @param string[]|Initializer\InitializerInterface[]|callable[] $initializers
-     *
-     * @return void
      */
     private function resolveInitializers(array $initializers)
     {

test/Exception/CyclicAliasExceptionTest.php

@@ -19,11 +19,9 @@ class CyclicAliasExceptionTest extends TestCase
     /**
      * @dataProvider cyclicAliasProvider
      *
-     * @param string   conflicting alias key
+     * @param string   $alias, conflicting alias key
      * @param string[] $aliases
      * @param string   $expectedMessage
-     *
-     * @return void
      */
     public function testFromCyclicAlias($alias, array $aliases, $expectedMessage)
     {
@@ -40,8 +38,7 @@ public function testFromCyclicAlias($alias, array $aliases, $expectedMessage)
      */
     public function cyclicAliasProvider()
     {
-        return
-        [
+        return [
             [
                 'a',
                 [
@@ -115,8 +112,6 @@ public function cyclicAliasProvider()
      *
      * @param string[] $aliases
      * @param string   $expectedMessage
-     *
-     * @return void
      */
     public function testFromAliasesMap(array $aliases, $expectedMessage)
     {