phpstan fixes

Author: thomasvargiu

src/AbstractFactory/ReflectionBasedAbstractFactory.php

@@ -110,7 +110,9 @@ public function __invoke(ContainerInterface $container, $requestedName, array $o
     {
         $reflectionClass = new ReflectionClass($requestedName);
 
-        if (null === ($constructor = $reflectionClass->getConstructor())) {
+        $constructor = $reflectionClass->getConstructor();
+
+        if (null === $constructor) {
             return new $requestedName();
         }
 
@@ -202,7 +204,9 @@ private function resolveParameter(ReflectionParameter $parameter, ContainerInter
             return [];
         }
 
-        if (! $parameter->getClass()) {
+        $parameterClass = $parameter->getClass();
+
+        if (! $parameterClass) {
             if (! $parameter->isDefaultValueAvailable()) {
                 throw new ServiceNotFoundException(sprintf(
                     'Unable to create service "%s"; unable to resolve parameter "%s" '
@@ -215,7 +219,7 @@ private function resolveParameter(ReflectionParameter $parameter, ContainerInter
             return $parameter->getDefaultValue();
         }
 
-        $type = $parameter->getClass()->getName();
+        $type = $parameterClass->getName();
         $type = isset($this->aliases[$type]) ? $this->aliases[$type] : $type;
 
         if ($container->has($type)) {

src/AbstractFactoryInterface.php

@@ -40,8 +40,8 @@ interface AbstractFactoryInterface extends Factory\AbstractFactoryInterface
      * Determine if we can create a service with name
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @param $name
-     * @param $requestedName
+     * @param string $name
+     * @param string $requestedName
      * @return bool
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName);
@@ -50,8 +50,8 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      * Create service with name
      *
      * @param ServiceLocatorInterface $serviceLocator
-     * @param $name
-     * @param $requestedName
+     * @param string $name
+     * @param string $requestedName
      * @return mixed
      */
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName);

src/InitializerInterface.php

@@ -32,7 +32,7 @@ interface InitializerInterface extends Initializer\InitializerInterface
     /**
      * Initialize
      *
-     * @param $instance
+     * @param mixed $instance
      * @param ServiceLocatorInterface $serviceLocator
      * @return mixed
      */

src/ServiceManager.php

@@ -55,7 +55,7 @@ class ServiceManager implements ServiceLocatorInterface
     /**
      * Whether or not changes may be made to this instance.
      *
-     * @param bool
+     * @var bool
      */
     protected $allowOverride = false;
 
@@ -672,6 +672,7 @@ private function getFactory($name)
             if (PHP_MAJOR_VERSION < 7
                 && is_string($factory) && strpos($factory, '::') !== false
             ) {
+                /** @var callable $factory */
                 $factory = explode('::', $factory);
             }
             return $factory;
@@ -739,7 +740,7 @@ private function createDelegatorFromName($name, array $options = null)
             };
         }
 
-        return $creationCallback($this->creationContext, $name, $creationCallback, $options);
+        return $creationCallback();
     }
 
     /**
@@ -933,7 +934,7 @@ private function validateOverrides(array $config)
      * service instances; if not, it returns, but otherwise, it raises an
      * exception indicating modification is not allowed.
      *
-     * @param string[] $services
+     * @param array $services
      * @param string $type Type of service being checked.
      * @throws ContainerModificationsNotAllowedException if any services
      *     provided already have instances available.

src/Tool/ConfigDumper.php

@@ -27,7 +27,7 @@ class ConfigDumper
 EOC;
 
     /**
-     * @var ContainerInterface
+     * @var ContainerInterface|null
      */
     private $container;
 
@@ -58,11 +58,12 @@ public function createDependencyConfig(array $config, $className, $ignoreUnresol
         }
 
         // class has no constructor, treat it as an invokable
-        if (! $reflectionClass->getConstructor()) {
+        $constructor = $reflectionClass->getConstructor();
+        if (! $constructor) {
             return $this->createInvokable($config, $className);
         }
 
-        $constructorArguments = $reflectionClass->getConstructor()->getParameters();
+        $constructorArguments = $constructor->getParameters();
         $constructorArguments = array_filter(
             $constructorArguments,
             function (ReflectionParameter $argument) {
@@ -105,7 +106,7 @@ function (ReflectionParameter $argument) {
     }
 
     /**
-     * @param $className
+     * @param string $className
      * @throws InvalidArgumentException if class name is not a string or does
      *     not exist.
      */

src/Tool/FactoryCreator.php

@@ -58,7 +58,7 @@ public function createFactory($className)
     }
 
     /**
-     * @param $className
+     * @param string $className
      * @return string
      */
     private function getClassName($className)
@@ -75,11 +75,12 @@ private function getConstructorParameters($className)
     {
         $reflectionClass = new ReflectionClass($className);
 
-        if (! $reflectionClass || ! $reflectionClass->getConstructor()) {
+        $reflectionConstructor = $reflectionClass->getConstructor();
+        if (! $reflectionConstructor) {
             return [];
         }
 
-        $constructorParameters = $reflectionClass->getConstructor()->getParameters();
+        $constructorParameters = $reflectionConstructor->getParameters();
 
         if (empty($constructorParameters)) {
             return [];
@@ -109,7 +110,9 @@ function (ReflectionParameter $argument) {
         }
 
         return array_map(function (ReflectionParameter $parameter) {
-            return $parameter->getClass()->getName();
+            /** @var ReflectionClass $class */
+            $class = $parameter->getClass();
+            return $class->getName();
         }, $constructorParameters);
     }