Pleets / dronephp

src/Dom/Element/ElementFactory.php

Braces +3 added lines, -2 removed lines

@@ -38,8 +38,9 @@
         {
             foreach ($attributes as $name => $value)
             {
-                if (!is_string($name))
-                    throw new \InvalidArgumentException("Attribute only accepts strings as names");
+                if (!is_string($name)) {
+                                    throw new \InvalidArgumentException("Attribute only accepts strings as names");
+                }
 
                 $instance->setAttribute(new Attribute($name, $value));
             }

src/Dom/Element/AbstractElement.php

Spacing +3 added lines, -3 removed lines

@@ -258,12 +258,12 @@
     {
         if (static::HAS_END_TAG)
         {
-            $this->startTag = "<" .strtolower(static::NODE_NAME). ">";
-            $this->endTag   = "</" .strtolower(static::NODE_NAME). ">";
+            $this->startTag = "<" . strtolower(static::NODE_NAME) . ">";
+            $this->endTag   = "</" . strtolower(static::NODE_NAME) . ">";
         }
         else
         {
-            $this->startTag = "<" .strtolower(static::NODE_NAME);
+            $this->startTag = "<" . strtolower(static::NODE_NAME);
             $this->endTag   = "/>";
         }
     }

Braces +29 added lines, -22 removed lines

@@ -110,8 +110,9 @@ 
      */
     public function hasChild($label)
     {
-        if (array_key_exists($label, $this->children))
-            return true;
+        if (array_key_exists($label, $this->children)) {
+                    return true;
+        }
 
         return false;
     }
@@ -125,8 +126,9 @@ 
      */
     public function getChild($label)
     {
-        if (array_key_exists($label, $this->children))
-            return $this->children[$label];
+        if (array_key_exists($label, $this->children)) {
+                    return $this->children[$label];
+        }
 
         return null;
     }
@@ -155,10 +157,11 @@ 
      */
     public function removeChild($label)
     {
-        if (array_key_exists($label, $this->children))
-            unset($this->children[$label]);
-        else
-            throw new Exception\ChildNotFoundException("The child to remove does not exists");
+        if (array_key_exists($label, $this->children)) {
+                    unset($this->children[$label]);
+        } else {
+                    throw new Exception\ChildNotFoundException("The child to remove does not exists");
+        }
     }
 
     /**
@@ -174,8 +177,9 @@ 
         {
             foreach ($this->attributes as $attrib)
             {
-                if ($attrib->getName() == $name)
-                    return true;
+                if ($attrib->getName() == $name) {
+                                    return true;
+                }
             }
         }
 
@@ -195,8 +199,9 @@ 
         {
             foreach ($this->attributes as $attrib)
             {
-                if ($attrib->getName() == $name)
-                    return $attrib;
+                if ($attrib->getName() == $name) {
+                                    return $attrib;
+                }
             }
         }
 
@@ -218,12 +223,13 @@ 
         {
             foreach ($this->attributes as $key => $_attrib)
             {
-                if ($_attrib->getName() == $attrib->getName())
-                    $this->attributes[$key] = $attribute;
+                if ($_attrib->getName() == $attrib->getName()) {
+                                    $this->attributes[$key] = $attribute;
+                }
             }
+        } else {
+                    $this->attributes[] = $attribute;
         }
-        else
-            $this->attributes[] = $attribute;
     }
 
     /**
@@ -241,8 +247,9 @@ 
         {
             foreach ($this->attributes as $key => $attrib)
             {
-                if ($attrib->getName() == $name)
-                    unset($this->attributes[$key]);
+                if ($attrib->getName() == $name) {
+                                    unset($this->attributes[$key]);
+                }
             }
         }
 
@@ -260,8 +267,7 @@ 
         {
             $this->startTag = "<" .strtolower(static::NODE_NAME). ">";
             $this->endTag   = "</" .strtolower(static::NODE_NAME). ">";
-        }
-        else
+        } else
         {
             $this->startTag = "<" .strtolower(static::NODE_NAME);
             $this->endTag   = "/>";
@@ -275,8 +281,9 @@ 
      */
     public function isFormControl()
     {
-        if (in_array(static::NODE_NAME, ['INPUT']))
-            return true;
+        if (in_array(static::NODE_NAME, ['INPUT'])) {
+                    return true;
+        }
 
         return false;
     }

test/Validator/FormValidatorTest.php

Spacing +5 added lines, -5 removed lines

@@ -47,7 +47,7 @@ 
         ]);
 
         $form->fill([
-            "username" => 'jobs',       # wrong because of minlength attr
+            "username" => 'jobs', # wrong because of minlength attr
             "password" => 'jVi7Qp4X',
             "email"    => 'j@'          # wrong because of type and minlength attr
         ]);
@@ -198,7 +198,7 @@ 
         ]);
 
         $form->fill([
-            "username" => 'jobs',       # wrong because of minlength attr
+            "username" => 'jobs', # wrong because of minlength attr
         ]);
 
         $validator = new FormValidator($form, 'en');
@@ -243,12 +243,12 @@ 
         $form->fill([
             "product" => [
                 "optical mouse",
-                "-",                # wrong name
+                "-", # wrong name
                 "78"                # another wrong name
             ],
             "price" => [
                 10,
-                0,   # wrong price
+                0, # wrong price
                 0    # another wrong price
             ]
         ]);
@@ -305,7 +305,7 @@ 
         ]);
 
         $form->fill([
-            "username" => 'steave jobs',       # wrong because of minlength attr
+            "username" => 'steave jobs', # wrong because of minlength attr
             "password" => 'jVi7Qp4X',
             "type"     => 'moderator'          # wrong because moderator is not a valid needle
         ]);

src/Dom/Element/Form.php

Braces +6 added lines, -4 removed lines

@@ -48,11 +48,13 @@
         {
             $child = $this->getChild($label);
 
-            if (is_null($child))
-                throw new Exception\ChildNotFoundException("The child '$label' does not exists inside the form element");
+            if (is_null($child)) {
+                            throw new Exception\ChildNotFoundException("The child '$label' does not exists inside the form element");
+            }
 
-            if (!$child->isFormControl())
-                throw new Exception\NotFormControlException("The child '$label' is not a form control");
+            if (!$child->isFormControl()) {
+                            throw new Exception\NotFormControlException("The child '$label' is not a form control");
+            }
 
             $child->setAttribute(new Attribute("value", $value));
         }

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 +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;
     }

test/Exception/ExceptionTest.php

Braces +4 added lines, -8 removed lines

@@ -25,8 +25,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             mkdir('exceptions');
 
@@ -64,8 +63,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception too");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             $date = date('dmY');
             $file = 'nofolder/exception-' . $date . '.json';
@@ -95,8 +93,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             $file = 'exceptions/exception-' . $date . '.json';
             $storage = new \Drone\Exception\Storage($file);
@@ -106,8 +103,7 @@ 
         try
         {
             throw new ExceptionException("This is an storable exception too");
-        }
-        catch (ExceptionException $e)
+        } catch (ExceptionException $e)
         {
             $file = 'exceptions/exception-' . $date . '.json';
             $storage = new \Drone\Exception\Storage($file);

src/Mvc/AbstractController.php

Spacing +1 added lines, -1 removed lines

@@ -313,7 +313,7 @@
         if ($_SERVER['REQUEST_METHOD'] != 'JSON')
             throw new \LogicException("Request method is not JSON");
 
-        $input =  file_get_contents('php://input');
+        $input = file_get_contents('php://input');
         $array = explode("&", $input);
 
         $result = [];

Braces +25 added lines, -19 removed lines

@@ -86,13 +86,14 @@ 
     {
         $method = $this->method;
 
-        if (is_null($method))
-            # This error is thrown because of 'setMethod' method has not been executed
+        if (is_null($method)) {
+                    # This error is thrown because of 'setMethod' method has not been executed
             throw new \LogicException("No method has been setted to execute!");
+        }
 
-        if (!is_null($this->module) && !$this->module->executionIsAllowed())
-            throw new Exception\MethodExecutionNotAllowedException("Method execution is not allowed");
-        else
+        if (!is_null($this->module) && !$this->module->executionIsAllowed()) {
+                    throw new Exception\MethodExecutionNotAllowedException("Method execution is not allowed");
+        } else
         {
             if (method_exists($this, $method))
             {
@@ -100,12 +101,12 @@ 
 
                 $reflection = new \ReflectionMethod($this, $method);
 
-                if (!$reflection->isPublic())
-                    throw new Exception\PrivateMethodExecutionException("The method '$method' is not public in the control class '$class'");
+                if (!$reflection->isPublic()) {
+                                    throw new Exception\PrivateMethodExecutionException("The method '$method' is not public in the control class '$class'");
+                }
 
                 return $this->$method();
-            }
-            else
+            } else
             {
                 $class = __CLASS__;
                 throw new Exception\MethodNotFoundException("The method '$method' doesn't exists in the control class '$class'");
@@ -130,8 +131,9 @@ 
      */
     public function getPost()
     {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST))
-            $_POST = json_decode(file_get_contents('php://input'), true);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST)) {
+                    $_POST = json_decode(file_get_contents('php://input'), true);
+        }
 
         return (array) $_POST;
     }
@@ -145,8 +147,9 @@ 
      */
     public function getJson()
     {
-        if ($_SERVER['REQUEST_METHOD'] != 'JSON')
-            throw new \LogicException("Request method is not JSON");
+        if ($_SERVER['REQUEST_METHOD'] != 'JSON') {
+                    throw new \LogicException("Request method is not JSON");
+        }
 
         $input =  file_get_contents('php://input');
         $array = explode("&", $input);
@@ -170,8 +173,9 @@ 
     public function isXmlHttpRequest()
     {
         # non standard (HTTP_X_REQUESTED_WITH is not a part of PHP)
-        if (isset($_SERVER['HTTP_X_REQUESTED_WITH']))
-            return true;
+        if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
+                    return true;
+        }
         return false;
     }
 
@@ -182,8 +186,9 @@ 
      */
     public function isPost()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "POST")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                    return true;
+        }
         return false;
     }
 
@@ -194,8 +199,9 @@ 
      */
     public function isGet()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "GET")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "GET") {
+                    return true;
+        }
         return false;
     }
 }
\ No newline at end of file