2DSharp / Phypes

src/Rule/Aggregate/ForAll.php

Braces +6 added lines, -5 removed lines

@@ -33,8 +33,9 @@ 
      */
     public function __construct(Rule... $rules)
     {
-        if (empty($rules))
-            throw new InvalidAggregateRule("No rules specified for aggregate rule", ForAll::class);
+        if (empty($rules)) {
+                    throw new InvalidAggregateRule("No rules specified for aggregate rule", ForAll::class);
+        }
         $this->rules = $rules;
     }
 
@@ -65,9 +66,9 @@ 
 
         }
 
-        if (!($errors))
-            return new Success();
-        else {
+        if (!($errors)) {
+                    return new Success();
+        } else {
             return new Failure(...$errors); // Use the splat operator
 
         }

src/Rule/Aggregate/ForAtLeast.php

Braces +10 added lines, -8 removed lines

@@ -44,12 +44,14 @@ 
      */
     public function __construct(int $numOfRules, Rule... $rules)
     {
-        if (empty($rules))
-            throw new InvalidAggregateRule("No rules specified for aggregate rule", ForAtLeast::class);
+        if (empty($rules)) {
+                    throw new InvalidAggregateRule("No rules specified for aggregate rule", ForAtLeast::class);
+        }
 
-        if (count($rules) < $numOfRules)
-            throw new InvalidAggregateRule('Minimum passing rule number is greater than supplied rules',
+        if (count($rules) < $numOfRules) {
+                    throw new InvalidAggregateRule('Minimum passing rule number is greater than supplied rules',
                 ForAtLeast::class);
+        }
 
         $this->rules = $rules;
         $this->minimum = $numOfRules;
@@ -74,13 +76,13 @@ 
                 foreach ($result->getErrors() as $error) {
                     $errors[] = $error;
                 }
-            }
-            else {
+            } else {
                 $passed++;
             }
 
-            if ($passed >= $this->minimum)
-                return new Success();
+            if ($passed >= $this->minimum) {
+                            return new Success();
+            }
         }
         return new Failure(...$errors);
     }

src/Validator/PasswordValidator.php

Braces +3 added lines, -2 removed lines

@@ -39,8 +39,9 @@
 
         $result = $rule->validate($password);
 
-        if ($result->isValid())
-            return new Success();
+        if ($result->isValid()) {
+                    return new Success();
+        }
         /**
          * @var Failure $result
          */

src/Rule/Pattern/ContainsPattern.php

Braces +8 added lines, -6 removed lines

@@ -38,8 +38,9 @@ 
      */
     public function __construct(int $patternType)
     {
-        if ($patternType < 0 || $patternType > 3)
-            throw new InvalidRuleOption($patternType);
+        if ($patternType < 0 || $patternType > 3) {
+                    throw new InvalidRuleOption($patternType);
+        }
 
         $this->pattern = $patternType;
     }
@@ -63,10 +64,11 @@ 
                 break;
         }
 
-        if ($isValid)
-            return new Success();
-        else
-            return new Failure(new RuleError(RuleErrorCode::PATTERN_MISMATCH,
+        if ($isValid) {
+                    return new Success();
+        } else {
+                    return new Failure(new RuleError(RuleErrorCode::PATTERN_MISMATCH,
                 "The string doesn't contain the required pattern"));
+        }
     }
 }
\ No newline at end of file

src/Rule/Pattern/ContainsKeyword.php

Braces +5 added lines, -4 removed lines

@@ -33,9 +33,10 @@
 
     public function validate($data): Result
     {
-        if (strpos($data, $this->keyword) !== false)
-            return new Success();
-        else
-            return new Failure(new RuleError(RuleErrorCode::PATTERN_MISMATCH, "String does not contain keyword"));
+        if (strpos($data, $this->keyword) !== false) {
+                    return new Success();
+        } else {
+                    return new Failure(new RuleError(RuleErrorCode::PATTERN_MISMATCH, "String does not contain keyword"));
+        }
     }
 }
\ No newline at end of file

src/Rule/String/TextCase.php

Braces +33 added lines, -26 removed lines

@@ -46,8 +46,9 @@ 
      */
     public function __construct(int $caseType, bool $allowSpecialChars = true)
     {
-        if ($caseType > 4 || $caseType < 0)
-            throw new InvalidRuleOption($caseType);
+        if ($caseType > 4 || $caseType < 0) {
+                    throw new InvalidRuleOption($caseType);
+        }
 
         $this->caseType = $caseType;
         $this->strictCheck = !$allowSpecialChars;
@@ -60,10 +61,11 @@ 
     private function isMixed(string $text) : bool
     {
         if ($this->strictCheck) {
-            if (preg_match("/^[a-zA-Z]+$/", $text))
-                return preg_match('/[a-z]/', $text) && preg_match('/[A-Z]/', $text);
-            else
-                return false;
+            if (preg_match("/^[a-zA-Z]+$/", $text)) {
+                            return preg_match('/[a-z]/', $text) && preg_match('/[A-Z]/', $text);
+            } else {
+                            return false;
+            }
         }
 
         return preg_match('/[a-z]/', $text) && preg_match('/[A-Z]/', $text);
@@ -71,39 +73,43 @@ 
 
     private function isAllUpper(string $text) : bool
     {
-        if ($this->strictCheck)
-            return ctype_upper($text);
-        else
-            return !preg_match('/[a-z]/', $text) && preg_match('/[A-Z]/', $text);
+        if ($this->strictCheck) {
+                    return ctype_upper($text);
+        } else {
+                    return !preg_match('/[a-z]/', $text) && preg_match('/[A-Z]/', $text);
+        }
             
     }
 
     private function isAllLower(string $text) : bool
     {
-        if ($this->strictCheck)
-            return ctype_lower($text);
-        else
-            return preg_match('/[a-z]/', $text) && !preg_match('/[A-Z]/', $text);
+        if ($this->strictCheck) {
+                    return ctype_lower($text);
+        } else {
+                    return preg_match('/[a-z]/', $text) && !preg_match('/[A-Z]/', $text);
+        }
     }
 
     private function isSomeLower(string $text) : bool
     {
         $containsLower = (bool) preg_match('/[a-z]/', $text);
 
-        if ($this->strictCheck)
-           return !preg_match('/[\W]/', $text) && $containsLower;
-        else
-            return $containsLower;
+        if ($this->strictCheck) {
+                   return !preg_match('/[\W]/', $text) && $containsLower;
+        } else {
+                    return $containsLower;
+        }
     }
 
     private function isSomeUpper(string $text) : bool
     {
         $containsUpper = (bool) preg_match('/[A-Z]/', $text);
 
-        if ($this->strictCheck)
-            return !preg_match('/[\W]/', $text) && $containsUpper;
-        else
-            return $containsUpper;
+        if ($this->strictCheck) {
+                    return !preg_match('/[\W]/', $text) && $containsUpper;
+        } else {
+                    return $containsUpper;
+        }
     }
 
     public function validate($data): Result
@@ -128,10 +134,11 @@ 
                 break;
         }
 
-        if ($isValid)
-            return new Success();
-        else
-            return new Failure(new RuleError(RuleErrorCode::CASING_MISMATCH,
+        if ($isValid) {
+                    return new Success();
+        } else {
+                    return new Failure(new RuleError(RuleErrorCode::CASING_MISMATCH,
                 "The given string doesn't match the required case"));
+        }
     }
 }
\ No newline at end of file

src/Rule/String/MaximumLength.php

Braces +3 added lines, -2 removed lines

@@ -21,9 +21,10 @@
     {
         if (mb_strlen($data, 'UTF-8') <= $this->maxLength) {
             return new Success();
-        }
-        else return new Failure(
+        } else {
+            return new Failure(
             new RuleError(RuleErrorCode::LENGTH_ERROR,
                 'The supplied string is too long'));
+        }
     }
 }
\ No newline at end of file

src/Rule/String/MinimumLength.php

Braces +3 added lines, -2 removed lines

@@ -20,9 +20,10 @@
     {
         if (mb_strlen($data, 'UTF-8') >= $this->minLength) {
             return new Result\Success();
-        }
-        else return new Result\Failure(
+        } else {
+            return new Result\Failure(
             new RuleError(RuleErrorCode::LENGTH_ERROR,
             'The supplied string is too short'));
+        }
     }
 }
\ No newline at end of file

src/Validator/NameValidator.php

Braces +3 added lines, -2 removed lines

@@ -66,8 +66,9 @@
 
         $result = $rule->validate($name);
 
-        if ($result->isValid())
-            return new Success();
+        if ($result->isValid()) {
+                    return new Success();
+        }
         /**
          * @var Failure $result
          */