Improve "NonPublicConstructorException" + More tests (#60)

yiisoft · Oct 26, 2023 · e101145 · e101145
1 parent 40ee56e
commit e101145
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 6 deletions.
diff --git a/src/Exception/NonPublicConstructorException.php b/src/Exception/NonPublicConstructorException.php
@@ -4,23 +4,23 @@
 
 namespace Yiisoft\Hydrator\Exception;
 
+use LogicException;
 use ReflectionMethod;
 
 final class NonPublicConstructorException extends NonInstantiableException
 {
     public function __construct(ReflectionMethod $constructor)
     {
-        $type = $this->getConstructorType($constructor);
         parent::__construct(
             sprintf(
-                '%s is not instantiable because contain non-public%s constructor.',
+                '%s is not instantiable because contain non-public (%s) constructor.',
                 $constructor->getDeclaringClass()->getName(),
-                $type !== null ? ' (' . $type . ')' : '',
+                $this->getConstructorType($constructor),
             ),
         );
     }
 
-    private function getConstructorType(ReflectionMethod $constructor): ?string
+    private function getConstructorType(ReflectionMethod $constructor): string
     {
         if ($constructor->isPrivate()) {
             return 'private';
@@ -30,6 +30,8 @@ private function getConstructorType(ReflectionMethod $constructor): ?string
             return 'protected';
         }
 
-        return null;
+        throw new LogicException(
+            'Exception "NonPublicConstructorException" can be used only for non-public constructors.'
+        );
     }
 }
diff --git a/src/Exception/WrongConstructorArgumentsCountException.php b/src/Exception/WrongConstructorArgumentsCountException.php
@@ -4,9 +4,11 @@
 
 namespace Yiisoft\Hydrator\Exception;
 
+use ReflectionMethod;
+
 final class WrongConstructorArgumentsCountException extends NonInstantiableException
 {
-    public function __construct(\ReflectionMethod $constructor, int $countArguments)
+    public function __construct(ReflectionMethod $constructor, int $countArguments)
     {
         parent::__construct(
             sprintf(

diff --git a/src/Temp/RouteArgument.php b/src/Temp/RouteArgument.php
@@ -7,6 +7,9 @@
 use Attribute;
 use Yiisoft\Hydrator\Attribute\Parameter\ParameterAttributeInterface;
 
+/**
+ * @codeCoverageIgnore
+ */
 #[Attribute(Attribute::TARGET_PROPERTY | Attribute::TARGET_PARAMETER | Attribute::IS_REPEATABLE)]
 final class RouteArgument implements ParameterAttributeInterface
 {

diff --git a/src/Temp/RouteArgumentResolver.php b/src/Temp/RouteArgumentResolver.php
@@ -13,6 +13,9 @@
 
 use function array_key_exists;
 
+/**
+ * @codeCoverageIgnore
+ */
 final class RouteArgumentResolver implements ParameterAttributeResolverInterface
 {
     public function __construct(

diff --git a/tests/Exception/NonPublicConstructorExceptionTest.php b/tests/Exception/NonPublicConstructorExceptionTest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Exception;
+
+use LogicException;
+use PHPUnit\Framework\TestCase;
+use ReflectionObject;
+use Yiisoft\Hydrator\Exception\NonPublicConstructorException;
+
+final class NonPublicConstructorExceptionTest extends TestCase
+{
+    public function testWithPublicConstructor(): void
+    {
+        $reflection = (new ReflectionObject(
+            new class () {
+                public function __construct()
+                {
+                }
+            }
+        ))->getConstructor();
+
+        $this->expectException(LogicException::class);
+        $this->expectExceptionMessage(
+            'Exception "NonPublicConstructorException" can be used only for non-public constructors.'
+        );
+        new NonPublicConstructorException($reflection);
+    }
+}
diff --git a/tests/TypeCaster/TypeCastContextTest.php b/tests/TypeCaster/TypeCastContextTest.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace TypeCaster;
+
+use PHPUnit\Framework\TestCase;
+use ReflectionFunction;
+use ReflectionNamedType;
+use Yiisoft\Hydrator\Hydrator;
+use Yiisoft\Hydrator\TypeCaster\TypeCastContext;
+
+final class TypeCastContextTest extends TestCase
+{
+    public function testGetters(): void
+    {
+        $hydrator = new Hydrator();
+        $reflection = (new ReflectionFunction(static fn(int $a) => null))->getParameters()[0];
+
+        $context = new TypeCastContext($hydrator, $reflection);
+
+        $this->assertSame($reflection, $context->getReflection());
+        $this->assertInstanceOf(ReflectionNamedType::class, $context->getReflectionType());
+        $this->assertSame($hydrator, $context->getHydrator());
+    }
+}