Pleets / dronephp

src/Error/ErrorTrait.php

Braces +17 added lines, -13 removed lines

@@ -92,29 +92,32 @@ 
      */
     protected function _error($code, $message = null)
     {
-        if (!is_null($code) && !is_integer($code) && !is_string($code))
-            throw new \InvalidArgumentException("Invalid type given. Integer or string expected");
+        if (!is_null($code) && !is_integer($code) && !is_string($code)) {
+                    throw new \InvalidArgumentException("Invalid type given. Integer or string expected");
+        }
 
-        if (is_null($code))
-            $code = preg_replace('/=|\/|\+/', "", base64_encode($message));
-        else
+        if (is_null($code)) {
+                    $code = preg_replace('/=|\/|\+/', "", base64_encode($message));
+        } else
         {
-            if (!array_key_exists($code, $this->standardErrors) && empty($message))
-                /*
+            if (!array_key_exists($code, $this->standardErrors) && empty($message)) {
+                            /*
                  * Non-standard errors must have a message to describe the error, make sure
                  * you execute the error() method with a message as the second parameter.
                  */
                 throw new \LogicException('The message does not be empty in non-standard errors!');
+            }
         }
 
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$code] = (array_key_exists($code, $this->standardErrors))
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$code] = (array_key_exists($code, $this->standardErrors))
                 ?
                     is_null($message)
                         ? preg_replace('/\s\'%[a-zA-Z]*%\'/', $message, $this->standardErrors[$code])
                         # if $message is not null it will replace the %file% wildcard
                         : preg_replace('/%[a-zA-Z]*%/', $message, $this->standardErrors[$code])
                 : $message;
+        }
     }
 
     function __call($method, $arguments)
@@ -124,10 +127,11 @@ 
             switch (count($arguments))
             {
                 case 1:
-                    if (is_integer($arguments[0]))
-                        return call_user_func([$this, '_error'], array_shift($arguments));
-                    else
-                        return call_user_func([$this, '_error'], null, array_shift($arguments));
+                    if (is_integer($arguments[0])) {
+                                            return call_user_func([$this, '_error'], array_shift($arguments));
+                    } else {
+                                            return call_user_func([$this, '_error'], null, array_shift($arguments));
+                    }
                     break;
                 case 2:
                     return call_user_func([$this, '_error'], $arguments[0], $arguments[1]);

src/Validator/FormValidator.php

Spacing +1 added lines, -1 removed lines

@@ -304,7 +304,7 @@
             {
                 foreach ($validator->getMessages() as $message)
                 {
-                    $this->error($label ."-~-". (count($this->getErrors()) + 1), $message);
+                    $this->error($label . "-~-" . (count($this->getErrors()) + 1), $message);
                 }
             }
         }

Braces +34 added lines, -26 removed lines

@@ -69,9 +69,10 @@ 
      */
     public function isValid()
     {
-        if (is_null($this->valid))
-            # This error is thrown because of 'setValid' method has not been executed.
+        if (is_null($this->valid)) {
+                    # This error is thrown because of 'setValid' method has not been executed.
             throw new \LogicException('No validation has been executed!');
+        }
 
         return $this->valid;
     }
@@ -136,8 +137,9 @@ 
 
         foreach ($elements as $label => $element)
         {
-            if (!$element->isFormControl())
-                continue;
+            if (!$element->isFormControl()) {
+                            continue;
+            }
 
             $attribs = $element->getAttributes();
 
@@ -206,19 +208,21 @@ 
 
                     case 'min':
 
-                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range']))
-                            $validator = new GreaterThan(['min' => $value, 'inclusive' => true]);
-                        else
-                            throw new \LogicException("The input type must be 'range' or 'number'");
+                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) {
+                                                    $validator = new GreaterThan(['min' => $value, 'inclusive' => true]);
+                        } else {
+                                                    throw new \LogicException("The input type must be 'range' or 'number'");
+                        }
 
                         break;
 
                     case 'max':
 
-                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range']))
-                            $validator = new LessThan(['max' => $value, 'inclusive' => true]);
-                        else
-                            throw new \LogicException("The input type must be 'range' or 'number'");
+                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['number', 'range'])) {
+                                                    $validator = new LessThan(['max' => $value, 'inclusive' => true]);
+                        } else {
+                                                    throw new \LogicException("The input type must be 'range' or 'number'");
+                        }
 
                         break;
 
@@ -226,17 +230,19 @@ 
 
                         $baseValue = (array_key_exists('min', $all_attribs)) ? $all_attribs['min'] : 0;
 
-                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['range']))
-                            $validator = new Step(['baseValue' => $baseValue, 'step' => $value]);
-                        else
-                            throw new \LogicException("The input type must be 'range'");
+                        if (array_key_exists('type', $all_attribs) && in_array($all_attribs['type'], ['range'])) {
+                                                    $validator = new Step(['baseValue' => $baseValue, 'step' => $value]);
+                        } else {
+                                                    throw new \LogicException("The input type must be 'range'");
+                        }
 
                         break;
 
                     case 'data-validators':
 
-                        if (!is_array($value))
-                            throw new \InvalidArgumentException("Invalid type given. Array expected in 'data-validators' attribute.");
+                        if (!is_array($value)) {
+                                                    throw new \InvalidArgumentException("Invalid type given. Array expected in 'data-validators' attribute.");
+                        }
 
                         foreach ($value as $class => $params)
                         {
@@ -246,8 +252,9 @@ 
                             {
                                 $className = "\Zend\I18n\Validator\\" . $class;
 
-                                if (!class_exists($className))
-                                    throw new \RuntimeException("The class '$userInputClass' or '$className' does not exists");
+                                if (!class_exists($className)) {
+                                                                    throw new \RuntimeException("The class '$userInputClass' or '$className' does not exists");
+                                }
                             }
 
                             $validator = new $className($params);
@@ -294,8 +301,9 @@ 
             $v->setTranslator($this->translator);
             $notEmpty = $v->isValid($val);
 
-            if (!$required && !$notEmpty)
-                return null;
+            if (!$required && !$notEmpty) {
+                            return null;
+            }
 
             $valid = $validator->isValid($val);
             $this->setValid($valid);
@@ -307,8 +315,7 @@ 
                     $this->error($label ."-~-". (count($this->getErrors()) + 1), $message);
                 }
             }
-        }
-        else
+        } else
         {
             foreach ($form_value as $val)
             {
@@ -333,8 +340,9 @@ 
                 $errorLbl = explode("-~-", $key);
                 $label = array_shift($errorLbl);
 
-                if (!array_key_exists($label, $errors))
-                    $errors[$label] = [];
+                if (!array_key_exists($label, $errors)) {
+                                    $errors[$label] = [];
+                }
 
                 $errors[$label][] = $value;
             }