Pleets / dronephp

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 +37 added lines, -28 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;
     }
@@ -98,8 +99,9 @@ 
     {
         $this->form = $form;
 
-        if (is_null($locale))
-            $locale = 'en';
+        if (is_null($locale)) {
+                    $locale = 'en';
+        }
 
         $i18nTranslator = \Zend\I18n\Translator\Translator::factory(
             [
@@ -133,8 +135,9 @@ 
 
         foreach ($elements as $label => $element)
         {
-            if (!$element->isFormControl())
-                continue;
+            if (!$element->isFormControl()) {
+                            continue;
+            }
 
             $attribs = $element->getAttributes();
 
@@ -203,19 +206,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;
 
@@ -223,17 +228,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)
                         {
@@ -243,8 +250,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);
@@ -291,8 +299,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);
@@ -304,8 +313,7 @@ 
                     $this->error($label ."-~-". (count($this->getErrors()) + 1), $message);
                 }
             }
-        }
-        else
+        } else
         {
             foreach ($form_value as $val)
             {
@@ -330,8 +338,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;
             }

src/Util/ArrayDimension.php

Spacing +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
         {
             $new = array();
 
-            foreach($obj as $key => $val)
+            foreach ($obj as $key => $val)
             {
                 $new[$key] = self::objectToArray($val);
             }

Braces +15 added lines, -12 removed lines

@@ -39,9 +39,9 @@ 
                     $again = true;
                     $new_config[$param . $glue . $key] = $value;
                 }
+            } else {
+                            $new_config[$param] = $configure;
             }
-            else
-                $new_config[$param] = $configure;
         }
 
         return (!$again) ? $new_config : self::toUnidimensional($new_config, $glue);
@@ -64,15 +64,17 @@ 
 
         do
         {
-            if (array_key_exists($key, $haystack))
-                $haystack = $haystack[$key];
-            else
-                return $value;
+            if (array_key_exists($key, $haystack)) {
+                            $haystack = $haystack[$key];
+            } else {
+                            return $value;
+            }
 
             $key = count($needle) ? array_shift($needle) : NULL;
 
-            if (is_null($key))
-                return $haystack;
+            if (is_null($key)) {
+                            return $haystack;
+            }
 
         } while (!is_null($key));
     }
@@ -86,8 +88,9 @@ 
      */
     public static function objectToArray($obj)
     {
-        if (is_object($obj))
-            $obj = (array) $obj;
+        if (is_object($obj)) {
+                    $obj = (array) $obj;
+        }
 
         if (is_array($obj))
         {
@@ -97,9 +100,9 @@ 
             {
                 $new[$key] = self::objectToArray($val);
             }
+        } else {
+                    $new = $obj;
         }
-        else
-            $new = $obj;
 
         return $new;
     }