introduce PHPStan (retry)

.gitattributes

@@ -10,3 +10,4 @@
 /phpcs.xml export-ignore
 /phpunit.xml.dist export-ignore
 /test/ export-ignore
+/phpstan.neon.dist export-ignore

.gitignore

@@ -6,3 +6,4 @@
 /laminas-mkdoc-theme/
 /phpunit.xml
 /vendor/
+/phpstan.neon

.travis.yml

@@ -8,6 +8,7 @@ env:
   global:
     - COMPOSER_ARGS="--no-interaction"
     - COVERAGE_DEPS="php-coveralls/php-coveralls"
+    - STATIC_ANALYSIS_DEPS="phpstan/phpstan"
 
 matrix:
   fast_finish: true
@@ -21,6 +22,7 @@ matrix:
         - CS_CHECK=true
         - BENCHMARKS=true
         - TEST_COVERAGE=true
+        - STATIC_ANALYSIS=true
     - php: 7.4
       env:
         - DEPS=lowest
@@ -36,12 +38,14 @@ install:
   - if [[ $DEPS == 'latest' ]]; then travis_retry composer update $COMPOSER_ARGS ; fi
   - if [[ $DEPS == 'lowest' ]]; then travis_retry composer update --prefer-lowest --prefer-stable $COMPOSER_ARGS ; fi
   - if [[ $TEST_COVERAGE == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $COVERAGE_DEPS ; fi
+  - if [[ $STATIC_ANALYSIS == 'true' ]]; then travis_retry composer require --dev $COMPOSER_ARGS $STATIC_ANALYSIS_DEPS ; fi
   - stty cols 120 && composer show
 
 script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then composer test-coverage ; else composer test ; fi
   - if [[ $BENCHMARKS == 'true' ]]; then vendor/bin/phpbench run --revs=2 --iterations=2 --report=aggregate ; fi
   - if [[ $CS_CHECK == 'true' ]]; then composer cs-check ; fi
+  - if [[ $STATIC_ANALYSIS == 'true' ]]; then ./vendor/bin/phpstan analyse --no-progress ; fi
 
 after_script:
   - if [[ $TEST_COVERAGE == 'true' ]]; then vendor/bin/php-coveralls -v ; fi

composer.json

@@ -41,6 +41,7 @@
         "mikey179/vfsstream": "^1.6.8",
         "ocramius/proxy-manager": "^2.1.1",
         "phpbench/phpbench": "^0.13.0",
+        "phpstan/phpstan": "^0.12.28",
         "phpunit/phpunit": "^7.5.20"
     },
     "provide": {

phpstan-baseline.neon

@@ -0,0 +1,42 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: src/AbstractPluginManager.php
+
+		-
+			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
+			count: 2
+			path: src/AbstractPluginManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$detectedCycles of static method Laminas\\\\ServiceManager\\\\Exception\\\\CyclicAliasException\\:\\:printCycles\\(\\) expects array\\<array\\<string\\>\\>, array\\<array\\<bool\\>\\> given\\.$#"
+			count: 1
+			path: src/Exception/CyclicAliasException.php
+
+		-
+			message: "#^If condition is always false\\.$#"
+			count: 1
+			path: src/ServiceManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$autoload_function of function spl_autoload_register expects callable\\(string\\)\\: void, ProxyManager\\\\Autoloader\\\\AutoloaderInterface given\\.$#"
+			count: 1
+			path: src/ServiceManager.php
+
+		-
+			message: "#^Negated boolean expression is always true\\.$#"
+			count: 7
+			path: src/ServiceManager.php
+
+		-
+			message: "#^Left side of && is always true\\.$#"
+			count: 1
+			path: src/Tool/ConfigDumper.php
+
+		-
+			message: "#^Negated boolean expression is always false\\.$#"
+			count: 1
+			path: src/Tool/FactoryCreator.php
+

phpstan.neon.dist

@@ -0,0 +1,7 @@
+includes:
+    - phpstan-baseline.neon
+
+parameters:
+    level: 5
+    paths:
+        - src

src/AbstractFactory/ReflectionBasedAbstractFactory.php

@@ -10,6 +10,7 @@
 
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Laminas\ServiceManager\Factory\AbstractFactoryInterface;
+use Laminas\Stdlib\DispatchableInterface;
 use Psr\Container\ContainerInterface;
 use ReflectionClass;
 use ReflectionParameter;

src/AbstractFactoryInterface.php

@@ -41,8 +41,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);
@@ -51,8 +51,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/Exception/ExceptionInterface.php

@@ -13,6 +13,6 @@
 /**
  * Base exception for all Laminas\ServiceManager exceptions.
  */
-interface ExceptionInterface extends ContainerExceptionInterface
+interface ExceptionInterface extends ContainerExceptionInterface, \Throwable
 {
 }

src/Factory/DelegatorFactoryInterface.php

@@ -11,6 +11,7 @@
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
 use Psr\Container\ContainerInterface;
+use Psr\Container\ContainerExceptionInterface;
 
 /**
  * Delegator factory interface.
@@ -33,7 +34,7 @@ interface DelegatorFactoryInterface
      * @throws ServiceNotFoundException if unable to resolve the service.
      * @throws ServiceNotCreatedException if an exception is raised when
      *     creating a service.
-     * @throws ContainerException if any other error occurs
+     * @throws ContainerExceptionInterface&\Throwable if any other error occurs
      */
     public function __invoke(ContainerInterface $container, $name, callable $callback, array $options = null);
 }

src/Factory/FactoryInterface.php

@@ -10,6 +10,7 @@
 
 use Laminas\ServiceManager\Exception\ServiceNotCreatedException;
 use Laminas\ServiceManager\Exception\ServiceNotFoundException;
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 
 /**
@@ -32,7 +33,7 @@ interface FactoryInterface
      * @throws ServiceNotFoundException if unable to resolve the service.
      * @throws ServiceNotCreatedException if an exception is raised when
      *     creating a service.
-     * @throws ContainerException if any other error occurs
+     * @throws ContainerExceptionInterface&\Throwable if any other error occurs
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null);
 }

src/InitializerInterface.php

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

src/PluginManagerInterface.php

@@ -9,6 +9,7 @@
 namespace Laminas\ServiceManager;
 
 use Laminas\ServiceManager\Exception\InvalidServiceException;
+use Psr\Container\ContainerExceptionInterface;
 
 /**
  * Interface for a plugin manager
@@ -24,7 +25,7 @@ interface PluginManagerInterface extends ServiceLocatorInterface
      * @return void
      * @throws InvalidServiceException If created instance does not respect the
      *     constraint on type imposed by the plugin manager
-     * @throws ContainerException if any other error occurs
+     * @throws ContainerExceptionInterface&\Throwable if any other error occurs
      */
     public function validate($instance);
 }

src/ServiceLocatorInterface.php

@@ -26,7 +26,7 @@ interface ServiceLocatorInterface extends ContainerInterface
      *     factory could be found to create the instance.
      * @throws Exception\ServiceNotCreatedException If factory/delegator fails
      *     to create the instance.
-     * @throws ContainerExceptionInterface if any other error occurs
+     * @throws ContainerExceptionInterface&\Throwable if any other error occurs
      */
     public function build($name, array $options = null);
 }

src/ServiceManager.php

@@ -70,7 +70,7 @@ class ServiceManager implements ServiceLocatorInterface
     /**
      * Whether or not changes may be made to this instance.
      *
-     * @param bool
+     * @var bool
      */
     protected $allowOverride = false;
 
@@ -646,7 +646,7 @@ private function createDelegatorFromName($name, array $options = null)
             };
         }
 
-        return $creationCallback($this->creationContext, $name, $creationCallback, $options);
+        return $creationCallback();
     }
 
     /**
@@ -953,7 +953,7 @@ private function mapAliasesToTargets()
     /**
      * Instantiate abstract factories in order to avoid checks during service construction.
      *
-     * @param string|Factory\AbstractFactoryInterface $abstractFactories
+     * @param string|Factory\AbstractFactoryInterface $abstractFactory
      * @return void
      */
     private function resolveAbstractFactoryInstance($abstractFactory)

src/Tool/ConfigDumper.php

@@ -123,7 +123,8 @@ function (ReflectionParameter $argument) {
     }
 
     /**
-     * @param $className
+     * @param string $className
+     * @psalm-param class-string $className
      * @throws InvalidArgumentException if class name is not a string or does
      *     not exist.
      */

src/Tool/FactoryCreator.php

@@ -77,7 +77,8 @@ public function createFactory($className)
     }
 
     /**
-     * @param $className
+     * @param string $className
+     * @psalm-param class-string $className
      * @return string
      */
     private function getClassName($className)