Fix #5: Adjust exception type (#21)

yiisoft · Nov 18, 2021 · afe907f · afe907f
1 parent 2284a40
commit afe907f
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 90 deletions.
diff --git a/src/Contract/DefinitionInterface.php b/src/Contract/DefinitionInterface.php
@@ -5,9 +5,9 @@
 namespace Yiisoft\Definitions\Contract;
 
 use Psr\Container\ContainerInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Yiisoft\Definitions\Exception\CircularReferenceException;
 use Yiisoft\Definitions\Exception\InvalidConfigException;
-use Yiisoft\Definitions\Exception\NotFoundException;
 use Yiisoft\Definitions\Exception\NotInstantiableException;
 
 /**
@@ -21,7 +21,7 @@ interface DefinitionInterface
      * @throws InvalidConfigException If an object of incorrect type was created.
      * @throws CircularReferenceException If there is a circular reference detected
      * when resolving the definition.
-     * @throws NotFoundException If container does not know how to resolve
+     * @throws NotFoundExceptionInterface If container does not know how to resolve
      * the definition.
      * @throws NotInstantiableException If an object can not be instantiated.
      *

diff --git a/src/Exception/NotFoundException.php b/src/Exception/NotFoundException.php
diff --git a/src/Infrastructure/DefinitionExtractor.php b/src/Infrastructure/DefinitionExtractor.php
@@ -8,7 +8,6 @@
 use ReflectionException;
 use ReflectionFunctionAbstract;
 use ReflectionParameter;
-use Yiisoft\Definitions\Exception\NotFoundException;
 use Yiisoft\Definitions\Exception\NotInstantiableClassException;
 use Yiisoft\Definitions\Exception\NotInstantiableException;
 use Yiisoft\Definitions\ParameterDefinition;
@@ -51,7 +50,6 @@ public static function getInstance(): self
      *
      * @psalm-param class-string $class
      *
-     * @throws NotFoundException
      * @throws NotInstantiableException
      *
      * @return ParameterDefinition[]
@@ -66,7 +64,7 @@ public function fromClassName(string $class): array
         try {
             $reflectionClass = new ReflectionClass($class);
         } catch (ReflectionException $e) {
-            throw new NotFoundException($class);
+            throw new NotInstantiableClassException($class);
         }
 
         if (!$reflectionClass->isInstantiable()) {

diff --git a/tests/Php8/ParameterDefinitionTest.php b/tests/Php8/ParameterDefinitionTest.php
@@ -6,6 +6,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Closure;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionClass;
 use ReflectionFunction;
 use ReflectionParameter;
@@ -14,7 +15,6 @@
 use Yiisoft\Definitions\ParameterDefinition;
 use Yiisoft\Definitions\Tests\Objects\GearBox;
 use Yiisoft\Definitions\Tests\Objects\UnionCar;
-use Yiisoft\Test\Support\Container\Exception\NotFoundException;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class ParameterDefinitionTest extends TestCase
@@ -26,7 +26,7 @@ public function testNotInstantiable(): void
         );
         $container = new SimpleContainer();
 
-        $this->expectException(NotFoundException::class);
+        $this->expectException(NotFoundExceptionInterface::class);
         $definition->resolve($container);
     }
 

diff --git a/tests/Unit/Exception/NotFoundExceptionTest.php b/tests/Unit/Exception/NotFoundExceptionTest.php
diff --git a/tests/Unit/Infrastructure/DefinitionExtractorTest.php b/tests/Unit/Infrastructure/DefinitionExtractorTest.php
@@ -6,8 +6,8 @@
 
 use DateTime;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\NotFoundExceptionInterface;
 use Yiisoft\Definitions\Contract\DefinitionInterface;
-use Yiisoft\Definitions\Exception\NotFoundException;
 use Yiisoft\Definitions\Exception\NotInstantiableClassException;
 use Yiisoft\Definitions\Exception\NotInstantiableException;
 use Yiisoft\Definitions\Infrastructure\DefinitionExtractor;
@@ -58,7 +58,7 @@ public function testResolveCarConstructor(): void
         $this->assertInstanceOf(ParameterDefinition::class, $dependencies['engine']);
         $this->assertInstanceOf(ParameterDefinition::class, $dependencies['moreEngines']);
 
-        $this->expectException(\Yiisoft\Test\Support\Container\Exception\NotFoundException::class);
+        $this->expectException(NotFoundExceptionInterface::class);
         $dependencies['engine']->resolve($container);
     }
 
@@ -89,7 +89,7 @@ public function testNullableInterfaceDependency(): void
         /** @var DefinitionInterface[] $dependencies */
         $dependencies = $resolver->fromClassName(NullableInterfaceDependency::class);
         $this->assertCount(1, $dependencies);
-        $this->expectException(\Yiisoft\Test\Support\Container\Exception\NotFoundException::class);
+        $this->expectException(NotFoundExceptionInterface::class);
         $dependencies['engine']->resolve($container);
     }
 
@@ -110,7 +110,7 @@ public function testNullableConcreteDependency(): void
         /** @var DefinitionInterface[] $dependencies */
         $dependencies = $resolver->fromClassName(NullableConcreteDependency::class);
         $this->assertCount(1, $dependencies);
-        $this->expectException(\Yiisoft\Test\Support\Container\Exception\NotFoundException::class);
+        $this->expectException(NotFoundExceptionInterface::class);
         $dependencies['car']->resolve($container);
     }
 
@@ -138,8 +138,8 @@ public function testFromNonExistingClass(): void
     {
         $extractor = DefinitionExtractor::getInstance();
 
-        $this->expectException(NotFoundException::class);
-        $this->expectExceptionMessage('No definition or class found or resolvable for NonExistingClass.');
+        $this->expectException(NotInstantiableClassException::class);
+        $this->expectExceptionMessage('Can not instantiate NonExistingClass.');
         $extractor->fromClassName('NonExistingClass');
     }
 

diff --git a/tests/Unit/ParameterDefinitionTest.php b/tests/Unit/ParameterDefinitionTest.php
@@ -6,6 +6,7 @@
 
 use Closure;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\NotFoundExceptionInterface;
 use ReflectionClass;
 use ReflectionFunction;
 use ReflectionParameter;
@@ -15,7 +16,6 @@
 use Yiisoft\Definitions\ParameterDefinition;
 use Yiisoft\Definitions\Tests\Objects\Car;
 use Yiisoft\Definitions\Tests\Objects\NullableConcreteDependency;
-use Yiisoft\Test\Support\Container\Exception\NotFoundException;
 use Yiisoft\Test\Support\Container\SimpleContainer;
 
 final class ParameterDefinitionTest extends TestCase
@@ -119,7 +119,7 @@ public function testNullableParameterNotInstantiable(): void
         );
         $container = new SimpleContainer();
 
-        $this->expectException(NotFoundException::class);
+        $this->expectException(NotFoundExceptionInterface::class);
         $definition->resolve($container);
     }
 
@@ -159,7 +159,7 @@ public function testNotInstantiable(): void
         );
         $container = new SimpleContainer();
 
-        $this->expectException(NotFoundException::class);
+        $this->expectException(NotFoundExceptionInterface::class);
         $definition->resolve($container);
     }