code coverage fixes

PetrenkoAnton · Feb 8, 2024 · 72cb232 · 72cb232
1 parent 5dc6a87
commit 72cb232
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 43 deletions.
diff --git a/app/Core/Validators/PNValidator.php b/app/Core/Validators/PNValidator.php
@@ -5,7 +5,7 @@
 namespace App\Core\Validators;
 
 use App\Exceptions\AppException\PNException\InvalidPNFormatException;
-use App\Exceptions\AppException\PNException\NumericPNException;
+use App\Exceptions\AppException\PNException\NotNumericPNException;
 use App\Exceptions\AppException\PNException\UnsupportedCodePNException;
 
 use function config;
@@ -17,7 +17,7 @@
 class PNValidator
 {
     /**
-     * @throws NumericPNException
+     * @throws NotNumericPNException
      * @throws InvalidPNFormatException
      * @throws UnsupportedCodePNException
      */
@@ -31,12 +31,12 @@ public function validate(string $pn): void
     }
 
     /**
-     * @throws NumericPNException
+     * @throws NotNumericPNException
      */
     private function validateNumeric(string $pn): void
     {
         if (!is_numeric($pn)) {
-            throw new NumericPNException();
+            throw new NotNumericPNException();
         }
     }
 

diff --git a/app/Exceptions/AppException.php b/app/Exceptions/AppException.php
@@ -8,4 +8,17 @@
 
 class AppException extends Exception
 {
+    protected const INVALID_FORMAT_PN = 100;
+    protected const NOT_NUMERIC_PN = 101;
+    protected const UNSUPPORTED_CODE_PN = 102;
+
+    protected const INTERNAL_ERROR = 500;
+
+    protected function __construct(string $message, int $code)
+    {
+        parent::__construct(
+            message: $message,
+            code: $code,
+        );
+    }
 }
diff --git a/app/Exceptions/AppException/PNException.php b/app/Exceptions/AppException/PNException.php
@@ -8,4 +8,11 @@
 
 class PNException extends AppException
 {
+    protected function __construct(string $message, int $code)
+    {
+        parent::__construct(
+            message: $message,
+            code: $code,
+        );
+    }
 }
diff --git a/app/Exceptions/AppException/PNException/InvalidPNFormatException.php b/app/Exceptions/AppException/PNException/InvalidPNFormatException.php
@@ -5,12 +5,14 @@
 namespace App\Exceptions\AppException\PNException;
 
 use App\Exceptions\AppException\PNException;
-use Throwable;
 
-class InvalidPNFormatException extends PNException
+final class InvalidPNFormatException extends PNException
 {
-    public function __construct(int $code = 0, ?Throwable $previous = null)
+    public function __construct()
     {
-        parent::__construct('Invalid phone number format', $code, $previous);
+        parent::__construct(
+            message: 'Invalid phone number format',
+            code: self::INVALID_FORMAT_PN,
+        );
     }
 }
diff --git a/app/Exceptions/AppException/PNException/NotNumericPNException.php b/app/Exceptions/AppException/PNException/NotNumericPNException.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Exceptions\AppException\PNException;
+
+use App\Exceptions\AppException\PNException;
+
+final class NotNumericPNException extends PNException
+{
+    public function __construct()
+    {
+        parent::__construct(
+            message: 'Not numeric phone number',
+            code: self::NOT_NUMERIC_PN,
+        );
+    }
+}
diff --git a/app/Exceptions/AppException/PNException/NumericPNException.php b/app/Exceptions/AppException/PNException/NumericPNException.php
diff --git a/app/Exceptions/AppException/PNException/UnsupportedCodePNException.php b/app/Exceptions/AppException/PNException/UnsupportedCodePNException.php
@@ -5,12 +5,14 @@
 namespace App\Exceptions\AppException\PNException;
 
 use App\Exceptions\AppException\PNException;
-use Throwable;
 
-class UnsupportedCodePNException extends PNException
+final class UnsupportedCodePNException extends PNException
 {
-    public function __construct(int $code = 0, ?Throwable $previous = null)
+    public function __construct()
     {
-        parent::__construct('Unsupported operator code', $code, $previous);
+        parent::__construct(
+            message: 'Unsupported operator code',
+            code: self::UNSUPPORTED_CODE_PN,
+        );
     }
 }
diff --git a/app/Exceptions/AppException/UrlFormatterException.php b/app/Exceptions/AppException/UrlFormatterException.php
diff --git a/app/Exceptions/Internal/InternalException.php b/app/Exceptions/Internal/InternalException.php
@@ -8,4 +8,11 @@
 
 class InternalException extends AppException
 {
+    public function __construct(string $message, int $code = self::INTERNAL_ERROR)
+    {
+        parent::__construct(
+            message: $message,
+            code: $code,
+        );
+    }
 }
diff --git a/tests/Feature/PNValidatorTest.php b/tests/Feature/PNValidatorTest.php
@@ -7,7 +7,7 @@
 use App\Core\Validators\PNValidator;
 use App\Exceptions\AppException;
 use App\Exceptions\AppException\PNException\InvalidPNFormatException;
-use App\Exceptions\AppException\PNException\NumericPNException;
+use App\Exceptions\AppException\PNException\NotNumericPNException;
 use App\Exceptions\AppException\PNException\UnsupportedCodePNException;
 use Tests\TestCase;
 
@@ -57,9 +57,9 @@ public function testValidateThrowsException(string $pn, AppException $e): void
     public static function dpInvalid(): array
     {
         return [
-            ['qwerty', new NumericPNException()],
-            ['q', new NumericPNException()],
-            ['q71234567', new NumericPNException()],
+            ['qwerty', new NotNumericPNException()],
+            ['q', new NotNumericPNException()],
+            ['q71234567', new NotNumericPNException()],
 
             ['0', new InvalidPNFormatException()],
             ['000', new InvalidPNFormatException()],