Throwable check

Author: sasezaki

phpstan-baseline.neon

@@ -25,16 +25,6 @@ parameters:
 			count: 1
 			path: src/InitializerInterface.php
 
-		-
-			message: "#^PHPDoc tag @throws with type Laminas\\\\ServiceManager\\\\ContainerException\\|Laminas\\\\ServiceManager\\\\Exception\\\\InvalidServiceException is not subtype of Throwable$#"
-			count: 1
-			path: src/PluginManagerInterface.php
-
-		-
-			message: "#^PHPDoc tag @throws with type Psr\\\\Container\\\\ContainerExceptionInterface is not subtype of Throwable$#"
-			count: 1
-			path: src/ServiceLocatorInterface.php
-
 		-
 			message: "#^PHPDoc tag @param has invalid value \\(bool\\)\\: Unexpected token \"\\\\n     \", expected variable at offset 89$#"
 			count: 1
@@ -45,11 +35,6 @@ parameters:
 			count: 1
 			path: src/ServiceManager.php
 
-		-
-			message: "#^PHPDoc tag @throws with type Laminas\\\\ServiceManager\\\\Exception\\\\ExceptionInterface is not subtype of Throwable$#"
-			count: 1
-			path: src/ServiceManager.php
-
 		-
 			message: "#^PHPDoc tag @param references unknown parameter\\: \\$abstractFactories$#"
 			count: 1

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/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);
 }