Add exception code and previous exception to package exceptions (#470)

vjik · web-flow · commit 6b89cc24aed8 · 2022-12-19T09:52:01.000+03:00
diff --git a/src/Exception/InvalidCallbackReturnTypeException.php b/src/Exception/InvalidCallbackReturnTypeException.php
@@ -22,6 +22,10 @@ public function __construct(
          * @var mixed The actual wrong value returned from a callback.
          */
         mixed $returnValue,
+        /**
+         * @var int The Exception code.
+         */
+        int $code = 0,
         /**
          * @var Throwable|null The previous throwable used for the exception chaining.
          */
@@ -33,7 +37,7 @@ public function __construct(
             get_debug_type($returnValue),
         );
 
-        parent::__construct($message, 0, $previous);
+        parent::__construct($message, $code, $previous);
     }
 
     /**
diff --git a/src/Exception/RuleHandlerInterfaceNotImplementedException.php b/src/Exception/RuleHandlerInterfaceNotImplementedException.php
@@ -21,6 +21,10 @@ public function __construct(
          * @param mixed A variable retrieved from the container.
          */
         mixed $value,
+        /**
+         * @var int The Exception code.
+         */
+        int $code = 0,
         /**
          * @var Throwable|null The previous throwable used for the exception chaining.
          */
@@ -36,7 +40,7 @@ class_exists($type)
                 $type,
                 RuleHandlerInterface::class,
             ),
-            0,
+            $code,
             $previous
         );
     }
diff --git a/src/Exception/RuleHandlerNotFoundException.php b/src/Exception/RuleHandlerNotFoundException.php
@@ -18,6 +18,10 @@ public function __construct(
          * @var string A class name from failed attempt of search in the container.
          */
         string $className,
+        /**
+         * @var int The Exception code.
+         */
+        int $code = 0,
         /**
          * @var Throwable|null The previous throwable used for the exception chaining.
          */
@@ -29,7 +33,7 @@ public function __construct(
                 $className,
                 $className,
             ),
-            0,
+            $code,
             $previous,
         );
     }
diff --git a/src/Exception/UnexpectedRuleException.php b/src/Exception/UnexpectedRuleException.php
@@ -5,6 +5,7 @@
 namespace Yiisoft\Validator\Exception;
 
 use InvalidArgumentException;
+use Throwable;
 
 /**
  * An exception used by rule handlers to guarantee that passed rule have desired type. Every handler's validation code
@@ -42,14 +43,24 @@ public function __construct(
         /**
          * @var object An actual given object that's not an instance of `$expectedClassName`.
          */
-        object $actualObject
+        object $actualObject,
+        /**
+         * @var int The Exception code.
+         */
+        int $code = 0,
+        /**
+         * @var Throwable|null The previous throwable used for the exception chaining.
+         */
+        ?Throwable $previous = null,
     ) {
         parent::__construct(
             sprintf(
                 'Expected "%s", but "%s" given.',
                 $expectedClassName,
                 $actualObject::class
-            )
+            ),
+            $code,
+            $previous,
         );
     }
 }
diff --git a/src/RuleHandlerResolver/RuleHandlerContainer.php b/src/RuleHandlerResolver/RuleHandlerContainer.php
@@ -22,7 +22,7 @@ public function resolve(string $className): RuleHandlerInterface
         try {
             $ruleHandler = $this->container->get($className);
         } catch (NotFoundExceptionInterface $e) {
-            throw new RuleHandlerNotFoundException($className, $e);
+            throw new RuleHandlerNotFoundException($className, previous: $e);
         }
 
         if (!$ruleHandler instanceof RuleHandlerInterface) {
diff --git a/tests/Exception/UnexpectedRuleExceptionTest.php b/tests/Exception/UnexpectedRuleExceptionTest.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Yiisoft\Validator\Tests\Exception;
+
+use PHPUnit\Framework\TestCase;
+use stdClass;
+use Yiisoft\Validator\Exception\UnexpectedRuleException;
+use Yiisoft\Validator\Rule\Number;
+
+final class UnexpectedRuleExceptionTest extends TestCase
+{
+    public function testBase(): void
+    {
+        $exception = new UnexpectedRuleException(Number::class, new stdClass());
+
+        $this->assertSame('Expected "Yiisoft\Validator\Rule\Number", but "stdClass" given.', $exception->getMessage());
+        $this->assertSame(0, $exception->getCode());
+        $this->assertNull($exception->getPrevious());
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ public function resolve(string $className): RuleHandlerInterface`
`22`	`22`	`try {`
`23`	`23`	`$ruleHandler = $this->container->get($className);`
`24`	`24`	`} catch (NotFoundExceptionInterface $e) {`
`25`		`- throw new RuleHandlerNotFoundException($className, $e);`
	`25`	`+ throw new RuleHandlerNotFoundException($className, previous: $e);`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`if (!$ruleHandler instanceof RuleHandlerInterface) {`