Fix code to PSR-12

otusteamedu · Apr 8, 2024 · c92dc57 · c92dc57
1 parent 1c8cd42
commit c92dc57
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/code/public/index.php b/code/public/index.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 use Dmatrenin\Hw6\App;

diff --git a/code/src/App.php b/code/src/App.php
@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Dmatrenin\Hw6;
@@ -8,7 +9,7 @@
 
 class App
 {
-    public function run()
+    public function run(): void
     {
         try {
             http_response_code(200);
@@ -18,12 +19,11 @@ public function run()
                 '[email protected]',
                 '[email protected]', //Валидный E-mail. Домен не существует
             ]);
-            echo 'Ok';
-        }
-        catch (Exception $exception) {
+
+            echo 'All emails are valid';
+        } catch (Exception $exception) {
             http_response_code($exception->getCode());
             echo $exception->getMessage();
         }
-
     }
 }
diff --git a/code/src/Validator.php b/code/src/Validator.php
@@ -1,15 +1,15 @@
 <?php
+
 declare(strict_types=1);
 
 namespace Dmatrenin\Hw6;
 
-
 class Validator
 {
     /**
      * @throws \Exception
      */
-    public static function validateEmails($emails = []) : void
+    public static function validateEmails($emails = []): void
     {
         if (empty($emails)) {
             throw new \Exception('Emails is empty', 400);
@@ -24,6 +24,7 @@ public static function validateEmails($emails = []) : void
                 throw new \Exception($email . ' is not valid E-mail' . PHP_EOL);
             }
 
+            /** @var TYPE_NAME $email_regex */
             $email_regex = '/^(?!(?:(?:\x22?\x5C[\x00-\x7E]\x22?)|(?:\x22?[^\x5C\x22]\x22?)){255,})(?!(?:(?:\x22?\x5C[\x00-\x7E]\x22?)|(?:\x22?[^\x5C\x22]\x22?)){65,}@)(?:(?:[\x21\x23-\x27\x2A\x2B\x2D\x2F-\x39\x3D\x3F\x5E-\x7E]+)|(?:\x22(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|(?:\x5C[\x00-\x7F]))*\x22))(?:\.(?:(?:[\x21\x23-\x27\x2A\x2B\x2D\x2F-\x39\x3D\x3F\x5E-\x7E]+)|(?:\x22(?:[\x01-\x08\x0B\x0C\x0E-\x1F\x21\x23-\x5B\x5D-\x7F]|(?:\x5C[\x00-\x7F]))*\x22)))*@(?:(?:(?!.*[^.]{64,})(?:(?:(?:xn--)?[a-z0-9]+(?:-[a-z0-9]+)*\.){1,126}){1,}(?:(?:[a-z][a-z0-9]*)|(?:(?:xn--)[a-z0-9]+))(?:-[a-z0-9]+)*)|(?:\[(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){7})|(?:(?!(?:.*[a-f0-9][:\]]){7,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,5})?)))|(?:(?:IPv6:(?:(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){5}:)|(?:(?!(?:.*[a-f0-9]:){5,})(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3})?::(?:[a-f0-9]{1,4}(?::[a-f0-9]{1,4}){0,3}:)?)))?(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))(?:\.(?:(?:25[0-5])|(?:2[0-4][0-9])|(?:1[0-9]{2})|(?:[1-9]?[0-9]))){3}))\]))$/iD';
 
             if (!preg_match($email_regex, $email)) {
@@ -39,4 +40,4 @@ public static function validateEmails($emails = []) : void
             }
         }
     }
-}
+}