fix: Updated tests for new exceptions with extra properties.

Signed-off-by: Johannes Tegnér <johannes@jitesoft.com>

Author: Johannestegner

src/Http/Client/HttpUnavailableForLegalReasonsException.php

@@ -16,8 +16,7 @@
  * due to legal reasons hence can't be served.
  */
 class HttpUnavailableForLegalReasonsException extends HttpException {
-
-    private ?string $reason;
+    protected ?string $reason;
 
     /**
      * Reason for unavailability.
@@ -47,4 +46,10 @@ public function __construct(
         $this->reason = $reason;
     }
 
+    public function toArray(): array {
+        $arr           = parent::toArray();
+        $arr['reason'] = $this->getReason();
+        return $arr;
+    }
+
 }

src/Http/Server/HttpServiceUnavailableException.php

@@ -33,20 +33,26 @@ public function getRetryAfter(): ?int {
      * HttpServiceUnavailableException constructor.
      *
      * @param string         $message
-     * @param int            $code
      * @param ?int           $retryAfter
+     * @param int            $code
      * @param Throwable|null $previous
      */
     public function __construct(
         string $message
             = 'Service is currently not able to handle the request.',
-        int $code = 503,
         ?int $retryAfter = null,
+        int $code = 503,
         ?Throwable $previous = null
     ) {
         parent::__construct($message, $code, $previous);
 
         $this->retryAfter = $retryAfter;
     }
 
+    public function toArray(): array {
+        $arr                = parent::toArray();
+        $arr['retry-after'] = $this->getRetryAfter();
+        return $arr;
+    }
+
 }

src/Validation/ValidationException.php

@@ -16,18 +16,38 @@
  * Mainly used as a base class for more specific validation exception types.
  */
 class ValidationException extends JitesoftException {
+    protected ?array $errors;
+
+    /**
+     * Get list of validation errors.
+     *
+     * @return array|null
+     */
+    public function getErrors(): ?array {
+        return $this->errors;
+    }
 
     /**
      * ValidationException constructor.
      *
      * @param string         $message
+     * @param null|array     $errors
      * @param integer        $code
      * @param null|Throwable $previous
      */
     public function __construct(string $message = 'Validation failed.',
+                                ?array $errors = null,
                                 int $code = 0,
                                 ?Throwable $previous = null) {
         parent::__construct($message, $code, $previous);
+
+        $this->errors = $errors;
+    }
+
+    public function toArray(): array {
+        $arr           = parent::toArray();
+        $arr['errors'] = $this->getErrors();
+        return $arr;
     }
 
 }

tests/ExceptionTestCase.php

@@ -30,9 +30,9 @@ static function(ReflectionParameter $parm) {
             );
             $message = array_values($message);
 
-            /** @var $message ReflectionParameter[] */
             self::assertNotEmpty($message);
 
+            /** @noinspection PhpUnhandledExceptionInspection */
             $message = $message[0]->getDefaultValue();
             $count   = substr_count($message, '%s');
             $args    = array_fill(0, $count, '');
@@ -78,7 +78,7 @@ final public function testHasProperties(): void {
         try {
             $this->throwDefaultException();
         } catch (JitesoftException $ex) {
-            self::assertHasProperties($ex->toArray(), static::getTestProperties());
+            $this->assertHasProperties($ex->toArray(), static::getTestProperties());
         }
     }
 

tests/Http/Client/HttpUnavailableForLegalReasonsExceptionTest.php

@@ -18,14 +18,27 @@
  */
 class HttpUnavailableForLegalReasonsExceptionTest extends HttpExceptionTest {
 
+    protected static function getTestProperties(): array {
+        return [...parent::getTestProperties(), 'reason'];
+    }
+
     protected $expectedErrorCode = 451;
 
     protected function throwDefaultException(): void {
         throw new HttpUnavailableForLegalReasonsException();
     }
 
     public function throwMessageException(string $message): void {
-        throw new HttpUnavailableForLegalReasonsException($message);
+        throw new HttpUnavailableForLegalReasonsException($message, 'test reason');
+    }
+
+    public function testGetReason(): void {
+        try {
+            $this->throwMessageException('test');
+        } catch (HttpUnavailableForLegalReasonsException $ex) {
+            self::assertEquals('test reason', $ex->getReason());
+            self::assertEquals('test reason', $ex->reason);
+        }
     }
 
 }

tests/Http/Server/HttpServiceUnavailableExceptionTest.php

@@ -11,6 +11,9 @@
  * @group HttpServerExceptions
  */
 class HttpServiceUnavailableExceptionTest extends HttpExceptionTest {
+    protected static function getTestProperties(): array {
+        return [...parent::getTestProperties(), 'retry-after'];
+    }
 
     protected $expectedErrorCode = 503;
 
@@ -19,7 +22,16 @@ protected function throwDefaultException(): void {
     }
 
     public function throwMessageException(string $message): void {
-        throw new HttpServiceUnavailableException($message);
+        throw new HttpServiceUnavailableException($message, 100);
+    }
+
+    public function testRetryAfter(): void {
+        try {
+            $this->throwMessageException('Test');
+        } catch (HttpServiceUnavailableException $ex) {
+            self::assertEquals(100, $ex->getRetryAfter());
+            self::assertEquals(100, $ex->retryAfter);
+        }
     }
 
 }

tests/IO/FileExceptionTest.php

@@ -37,5 +37,4 @@ public function testGetFileName() {
         }
     }
 
-
 }

tests/Validation/ValidationExceptionTest.php

@@ -13,13 +13,35 @@
  * @group ValidationExceptions
  */
 class ValidationExceptionTest extends ExceptionTestCase {
+    protected static function getTestProperties(): array {
+        return [...parent::getTestProperties(), 'errors'];
+    }
 
     protected function throwDefaultException(): void {
         throw new ValidationException();
     }
 
     public function throwMessageException(string $message): void {
-        throw new ValidationException($message);
+        throw new ValidationException($message, [
+            'something' => 'else',
+            'and'       => 'something'
+        ]);
+    }
+
+    public function testErrors(): void {
+        try {
+            $this->throwMessageException('test');
+        } catch (ValidationException $ex) {
+            self::assertEquals([
+                'something' => 'else',
+                'and'       => 'something'
+            ], $ex->getErrors());
+            self::assertEquals([
+                'something' => 'else',
+                'and'       => 'something'
+            ], $ex->errors);
+        }
+
     }
 
 }