Merge branch 'improvement/291'

Close #291

Author: michalbundyra

src/Controller/ControllerManager.php

@@ -42,7 +42,7 @@ class ControllerManager extends AbstractPluginManager
      * Injects an initializer for injecting controllers with an
      * event manager and plugin manager.
      *
-     * @param  ConfigInterface|ContainerInterface $container
+     * @param  ConfigInterface|ContainerInterface $configOrContainerInstance
      * @param  array $config
      */
     public function __construct($configOrContainerInstance, array $config = [])

src/Controller/LazyControllerAbstractFactory.php

@@ -146,7 +146,7 @@ public function canCreate(ContainerInterface $container, $requestedName)
     private function resolveParameter(ContainerInterface $container, $requestedName)
     {
         /**
-         * @param ReflectionClass $parameter
+         * @param ReflectionParameter $parameter
          * @return mixed
          * @throws ServiceNotFoundException If type-hinted parameter cannot be
          *   resolved to a service in the container.

src/Controller/PluginManager.php

@@ -87,7 +87,8 @@ class PluginManager extends AbstractPluginManager
      * as the first controller, the reference to the controller inside the
      * plugin is lost.
      *
-     * @param  string $name
+     * @param  string     $name
+     * @param  null|array $options Options to use when creating the instance.
      * @return DispatchableInterface
      */
     public function get($name, array $options = null)

src/DispatchListener.php

@@ -83,7 +83,6 @@ public function onDispatch(MvcEvent $e)
             ? $routeMatch->getParam('controller', 'not-found')
             : 'not-found';
         $application       = $e->getApplication();
-        $events            = $application->getEventManager();
         $controllerManager = $this->controllerManager;
 
 

src/MiddlewareListener.php

@@ -11,14 +11,11 @@
 use Interop\Http\ServerMiddleware\MiddlewareInterface;
 use Psr\Http\Message\ResponseInterface as PsrResponseInterface;
 use Psr\Http\Message\ResponseInterface;
-use Psr\Http\Message\ServerRequestInterface as PsrServerRequestInterface;
 use Zend\EventManager\AbstractListenerAggregate;
 use Zend\EventManager\EventManagerInterface;
 use Zend\Mvc\Exception\InvalidMiddlewareException;
-use Zend\Mvc\Exception\ReachedFinalHandlerException;
 use Zend\Mvc\Controller\MiddlewareController;
 use Zend\Psr7Bridge\Psr7Response;
-use Zend\Router\RouteMatch;
 use Zend\Stratigility\Delegate\CallableDelegateDecorator;
 use Zend\Stratigility\MiddlewarePipe;
 
@@ -28,6 +25,7 @@ class MiddlewareListener extends AbstractListenerAggregate
      * Attach listeners to an event manager
      *
      * @param  EventManagerInterface $events
+     * @param  int                   $priority
      * @return void
      */
     public function attach(EventManagerInterface $events, $priority = 1)

src/Service/ControllerManagerFactory.php

@@ -24,7 +24,7 @@ class ControllerManagerFactory implements FactoryInterface
      * if the controller implements a setPluginManager() method.
      *
      * @param  ContainerInterface $container
-     * @param  string $Name
+     * @param  string $name
      * @param  null|array $options
      * @return ControllerManager
      */

src/Service/ServiceListenerFactory.php

@@ -14,7 +14,6 @@
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Factory\FactoryInterface;
 use Zend\ServiceManager\Factory\InvokableFactory;
-use Zend\ServiceManager\ServiceLocatorInterface;
 
 class ServiceListenerFactory implements FactoryInterface
 {
@@ -112,7 +111,9 @@ class ServiceListenerFactory implements FactoryInterface
      * - interface: the name of the interface that modules can implement as string
      * - method: the name of the method that modules have to implement as string
      *
-     * @param  ServiceLocatorInterface  $serviceLocator
+     * @param  ContainerInterface  $container
+     * @param  string              $requestedName
+     * @param  null|array          $options
      * @return ServiceListenerInterface
      * @throws ServiceNotCreatedException for invalid ServiceListener service
      * @throws ServiceNotCreatedException For invalid configurations.

src/Service/ViewHelperManagerFactory.php

@@ -31,6 +31,8 @@ class ViewHelperManagerFactory extends AbstractPluginManagerFactory
      * Create and return the view helper manager
      *
      * @param  ContainerInterface $container
+     * @param  string             $requestedName
+     * @param  null|array         $options
      * @return HelperPluginManager
      * @throws ServiceNotCreatedException
      */

src/View/Http/DefaultRenderingStrategy.php

@@ -76,7 +76,7 @@ public function getLayoutTemplate()
      *
      * @param  MvcEvent $e
      * @return Response|null
-     * @throws \Exception
+     * @throws \Exception|\Throwable
      */
     public function render(MvcEvent $e)
     {

test/Application/BadControllerTrait.php

@@ -10,7 +10,6 @@
 use ReflectionProperty;
 use Zend\Http\PhpEnvironment\Request;
 use Zend\Http\PhpEnvironment\Response;
-use Zend\Mvc\Application;
 use Zend\Mvc\Controller\ControllerManager;
 use Zend\Mvc\Service\ServiceManagerConfig;
 use Zend\Mvc\Service\ServiceListenerFactory;