PHPDoc fixes after rebase

phpstan.neon.dist

@@ -13,7 +13,6 @@ parameters:
 
     ignoreErrors:
         - "#Casting to [a-z]+ something that's already [a-z]+#"
-        - '#PHPDoc tag @throws with type Interop\\Container\\Exception\\ContainerException is not subtype of Throwable#'
-        - '#PHPDoc tag @throws with type ([\w\\\|]+\|)?Psr\\Container\\ContainerExceptionInterface(\|[\w\\\|]+)? is not subtype of Throwable#'
+        - '#PHPDoc tag @throws with type Psr\\Container\\ContainerExceptionInterface is not subtype of Throwable#'
 # AbstractPluginManager::__construct() accepts more types:
         - '#Result of && is always false#'

src/Factory/DelegatorFactoryInterface.php

@@ -7,6 +7,7 @@
 
 namespace Zend\ServiceManager\Factory;
 
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
@@ -32,7 +33,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 if any other error occurs
      */
     public function __invoke(ContainerInterface $container, $name, callable $callback, array $options = null);
 }

src/Factory/FactoryInterface.php

@@ -7,6 +7,7 @@
 
 namespace Zend\ServiceManager\Factory;
 
+use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Zend\ServiceManager\Exception\ServiceNotCreatedException;
 use Zend\ServiceManager\Exception\ServiceNotFoundException;
@@ -31,7 +32,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 if any other error occurs
      */
     public function __invoke(ContainerInterface $container, $requestedName, array $options = null);
 }

src/PluginManagerInterface.php

@@ -23,7 +23,6 @@ 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
      */
     public function validate($instance);
 }

src/ServiceManager.php

@@ -926,7 +926,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)