From fa915d9a363297b91e153e0da9c945d3fd58d461 Mon Sep 17 00:00:00 2001 From: Thomas Vargiu Date: Fri, 19 Oct 2018 15:18:52 +0200 Subject: [PATCH] PHPDoc fixes after rebase --- phpstan.neon.dist | 3 +-- src/Factory/DelegatorFactoryInterface.php | 3 ++- src/Factory/FactoryInterface.php | 3 ++- src/PluginManagerInterface.php | 1 - src/ServiceManager.php | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/phpstan.neon.dist b/phpstan.neon.dist index 5b4272a0..662f8d3f 100644 --- a/phpstan.neon.dist +++ b/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#' \ No newline at end of file diff --git a/src/Factory/DelegatorFactoryInterface.php b/src/Factory/DelegatorFactoryInterface.php index 02e69c21..473d5000 100644 --- a/src/Factory/DelegatorFactoryInterface.php +++ b/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); } diff --git a/src/Factory/FactoryInterface.php b/src/Factory/FactoryInterface.php index 33084447..4ad20f6d 100644 --- a/src/Factory/FactoryInterface.php +++ b/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); } diff --git a/src/PluginManagerInterface.php b/src/PluginManagerInterface.php index 7392195e..2cccb0ee 100644 --- a/src/PluginManagerInterface.php +++ b/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); } diff --git a/src/ServiceManager.php b/src/ServiceManager.php index fe47ff12..a507993f 100644 --- a/src/ServiceManager.php +++ b/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)