DI Container - throw unprefixed exception

Author: ondrejmirtes

build/phpstan.neon

@@ -58,6 +58,7 @@ parameters:
 			- 'PHPStan\Broker\ClassNotFoundException'
 			- 'PHPStan\Broker\FunctionNotFoundException'
 			- 'PHPStan\Broker\ConstantNotFoundException'
+			- 'PHPStan\DependencyInjection\MissingServiceException'
 			- 'PHPStan\Reflection\MissingMethodFromReflectionException'
 			- 'PHPStan\Reflection\MissingPropertyFromReflectionException'
 			- 'PHPStan\Reflection\MissingConstantFromReflectionException'

src/DependencyInjection/Container.php

@@ -10,13 +10,15 @@ public function hasService(string $serviceName): bool;
 
 	/**
 	 * @return mixed
+	 * @throws MissingServiceException
 	 */
 	public function getService(string $serviceName);
 
 	/**
 	 * @template T of object
 	 * @param class-string<T> $className
 	 * @return T
+	 * @throws MissingServiceException
 	 */
 	public function getByType(string $className);
 

src/DependencyInjection/MissingServiceException.php

@@ -0,0 +1,10 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection;
+
+use Exception;
+
+final class MissingServiceException extends Exception
+{
+
+}

src/DependencyInjection/Nette/NetteContainer.php

@@ -3,6 +3,7 @@
 namespace PHPStan\DependencyInjection\Nette;
 
 use PHPStan\DependencyInjection\Container;
+use PHPStan\DependencyInjection\MissingServiceException;
 use PHPStan\DependencyInjection\ParameterNotFoundException;
 use function array_key_exists;
 use function array_keys;
@@ -28,7 +29,11 @@ public function hasService(string $serviceName): bool
 	 */
 	public function getService(string $serviceName)
 	{
-		return $this->container->getService($serviceName);
+		try {
+			return $this->container->getService($serviceName);
+		} catch (\Nette\DI\MissingServiceException $e) {
+			throw new MissingServiceException($e->getMessage(), previous: $e);
+		}
 	}
 
 	/**
@@ -38,7 +43,11 @@ public function getService(string $serviceName)
 	 */
 	public function getByType(string $className)
 	{
-		return $this->container->getByType($className);
+		try {
+			return $this->container->getByType($className);
+		} catch (\Nette\DI\MissingServiceException $e) {
+			throw new MissingServiceException($e->getMessage(), previous: $e);
+		}
 	}
 
 	/**

tests/PHPStan/DependencyInjection/Nette/NetteContainerTest.php

@@ -0,0 +1,37 @@
+<?php declare(strict_types = 1);
+
+namespace PHPStan\DependencyInjection\Nette;
+
+use PHPStan\DependencyInjection\MissingServiceException;
+use PHPStan\Testing\PHPStanTestCase;
+use PHPStan\TrinaryLogic;
+use PHPStan\Type\Php\ReflectionGetAttributesMethodReturnTypeExtension;
+
+class NetteContainerTest extends PHPStanTestCase
+{
+
+	public function testGetServiceThrows(): void
+	{
+		$container = self::getContainer();
+
+		$this->expectException(MissingServiceException::class);
+		$container->getService('nonexistent');
+	}
+
+	public function testGetByTypeNotFoundThrows(): void
+	{
+		$container = self::getContainer();
+
+		$this->expectException(MissingServiceException::class);
+		$container->getByType(TrinaryLogic::class);
+	}
+
+	public function testGetByTypeNotUniqueThrows(): void
+	{
+		$container = self::getContainer();
+
+		$this->expectException(MissingServiceException::class);
+		$container->getByType(ReflectionGetAttributesMethodReturnTypeExtension::class);
+	}
+
+}