Pleets / dronephp

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/Dom/Element/AbstractElement.php

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

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/Db/Driver/SQLServer.php

Braces +30 added lines, -23 removed lines

@@ -33,15 +33,17 @@ 
     {
         $this->driverName = 'Sqlsrv';
 
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "UTF-8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "UTF-8";
+        }
 
         parent::__construct($options);
 
         $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true;
 
-        if ($auto_connect)
-            $this->connect();
+        if ($auto_connect) {
+                    $this->connect();
+        }
     }
 
     /**
@@ -54,11 +56,13 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('sqlsrv'))
-            throw new \RuntimeException("The Sqlsrv extension is not loaded");
+        if (!extension_loaded('sqlsrv')) {
+                    throw new \RuntimeException("The Sqlsrv extension is not loaded");
+        }
 
-        if (!is_null($this->dbport) && !empty($this->dbport))
-            $this->dbhost .= ', ' . $this->dbport;
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $this->dbhost .= ', ' . $this->dbport;
+        }
 
         $db_info = array("Database" => $this->dbname, "UID" => $this->dbuser, "PWD" => $this->dbpass, "CharacterSet" => $this->dbchar);
         $conn = sqlsrv_connect($this->dbhost, $db_info);
@@ -139,13 +143,13 @@ 
             }
 
             $exec = sqlsrv_execute($stmt);
-        }
-        else
+        } else
         {
-            if ($isSelectStm)
-                $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
-            else
-                $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params);
+            if ($isSelectStm) {
+                            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
+            } else {
+                            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params);
+            }
         }
 
         if ($exec === false)
@@ -165,11 +169,13 @@ 
         $this->numRows = sqlsrv_has_rows($this->result) ? sqlsrv_num_rows($this->result) : $this->numRows;
         $this->numFields = sqlsrv_num_fields($this->result);
 
-        if ($isInsertStm || $isUpdateStm || $isDeleteStm)
-            $this->rowsAffected = sqlsrv_rows_affected($this->result);
+        if ($isInsertStm || $isUpdateStm || $isDeleteStm) {
+                    $this->rowsAffected = sqlsrv_rows_affected($this->result);
+        }
 
-        if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        if ($this->transac_mode) {
+                    $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        }
 
         return $this->result;
     }
@@ -236,10 +242,10 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            # This error is thrown because of 'execute' method has not been executed.
+        } else {
+                    # This error is thrown because of 'execute' method has not been executed.
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -253,7 +259,8 @@ 
      */
     public function __destruct()
     {
-        if ($this->dbconn)
-            sqlsrv_close($this->dbconn);
+        if ($this->dbconn) {
+                    sqlsrv_close($this->dbconn);
+        }
     }
 }
\ No newline at end of file

src/Db/Driver/Oracle.php

Braces +25 added lines, -19 removed lines

@@ -33,15 +33,17 @@ 
     {
         $this->driverName = 'Oci8';
 
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "AL32UTF8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "AL32UTF8";
+        }
 
         parent::__construct($options);
 
         $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true;
 
-        if ($auto_connect)
-            $this->connect();
+        if ($auto_connect) {
+                    $this->connect();
+        }
     }
 
     /**
@@ -54,8 +56,9 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('oci8'))
-            throw new \RuntimeException("The Oci8 extension is not loaded");
+        if (!extension_loaded('oci8')) {
+                    throw new \RuntimeException("The Oci8 extension is not loaded");
+        }
 
         $connection_string = (is_null($this->dbhost) || empty($this->dbhost))
             ? $this->dbname
@@ -108,14 +111,15 @@ 
                 ];
 
                 $this->error($error["message"]);
+            } else {
+                            $this->error($error["code"], $error["message"]);
             }
-            else
-                $this->error($error["code"], $error["message"]);
 
-            if (array_key_exists("code", $error))
-                throw new Exception\InvalidQueryException($error["message"], $error["code"]);
-            else
-                throw new Exception\InvalidQueryException($error["message"]);
+            if (array_key_exists("code", $error)) {
+                            throw new Exception\InvalidQueryException($error["message"], $error["code"]);
+            } else {
+                            throw new Exception\InvalidQueryException($error["message"]);
+            }
         }
 
         # Bound variables
@@ -155,8 +159,9 @@ 
         $this->numRows = count($rows);
         $this->numFields = oci_num_fields($stid);
 
-        if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
+        if ($this->transac_mode) {
+                    $this->transac_result = is_null($this->transac_result) ? $stid: $this->transac_result && $stid;
+        }
 
         $this->result = $stid;
 
@@ -205,10 +210,10 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            # This error is thrown because of 'execute' method has not been executed.
+        } else {
+                    # This error is thrown because of 'execute' method has not been executed.
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -222,7 +227,8 @@ 
      */
     public function __destruct()
     {
-        if ($this->dbconn)
-            oci_close($this->dbconn);
+        if ($this->dbconn) {
+                    oci_close($this->dbconn);
+        }
     }
 }
\ No newline at end of file

src/Db/Driver/MySQL.php

Braces +48 added lines, -38 removed lines

@@ -33,15 +33,17 @@ 
     {
         $this->driverName = 'Mysqli';
 
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "utf8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "utf8";
+        }
 
         parent::__construct($options);
 
         $auto_connect = array_key_exists('auto_connect', $options) ? $options["auto_connect"] : true;
 
-        if ($auto_connect)
-            $this->connect();
+        if ($auto_connect) {
+                    $this->connect();
+        }
     }
 
     /**
@@ -54,13 +56,15 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('mysqli'))
-            throw new \RuntimeException("The Mysqli extension is not loaded");
+        if (!extension_loaded('mysqli')) {
+                    throw new \RuntimeException("The Mysqli extension is not loaded");
+        }
 
-        if (!is_null($this->dbport) && !empty($this->dbport))
-            $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
-        else
-            $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname, $this->dbport);
+        } else {
+                    $conn = @new \mysqli($this->dbhost, $this->dbuser, $this->dbpass, $this->dbname);
+        }
 
         if ($conn->connect_errno)
         {
@@ -70,8 +74,7 @@ 
              * the warning message "Property access is not allowed yet".
              */
             throw new Exception\ConnectionException(mysqli_connect_error(), mysqli_connect_errno());
-        }
-        else
+        } else
         {
             $this->dbconn = $conn;
             $this->dbconn->set_charset($this->dbchar);
@@ -118,13 +121,15 @@ 
 
             for ($i = 0; $i < $n_params; $i++)
             {
-                if (is_string($param_values[$i]))
-                    $bind_types .= 's';
-                else if(is_float($param_values[$i]))
-                    $bind_types .= 'd';
+                if (is_string($param_values[$i])) {
+                                    $bind_types .= 's';
+                } else if(is_float($param_values[$i])) {
+                                    $bind_types .= 'd';
+                }
                 # [POSSIBLE BUG] - To Future revision (What about non-string and non-decimal types ?)
-                else
-                    $bind_types .= 's';
+                else {
+                                    $bind_types .= 's';
+                }
 
                 $bind_values[] = '$param_values[' . $i . ']';
             }
@@ -133,8 +138,7 @@ 
             eval('$stmt->bind_param(\'' . $bind_types . '\', ' . $values . ');');
 
             $r = $stmt->execute();
-        }
-        else
+        } else
         {
             $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL);
 
@@ -163,28 +167,33 @@ 
              * It is useful to prevent rollback transactions on insert statements because
              * insert statement do not free results.
              */
-            if ($res)
-                $this->result = $res;
+            if ($res) {
+                            $this->result = $res;
+            }
         }
 
         # identify SELECT, SHOW, DESCRIBE or EXPLAIN queries
-        if (is_object($this->result) && property_exists($this->result, 'num_rows'))
-            $this->numRows = $this->result->num_rows;
-        else
+        if (is_object($this->result) && property_exists($this->result, 'num_rows')) {
+                    $this->numRows = $this->result->num_rows;
+        } else
         {
-            if (property_exists($this->dbconn, 'affected_rows') && !$is_stmt_result)
-                $this->rowsAffected = $this->dbconn->affected_rows;
+            if (property_exists($this->dbconn, 'affected_rows') && !$is_stmt_result) {
+                            $this->rowsAffected = $this->dbconn->affected_rows;
+            }
         }
 
         # affected_rows return the same of num_rows on select statements!
-        if ($this->numRows > 0)
-            $this->rowsAffected = 0;
+        if ($this->numRows > 0) {
+                    $this->rowsAffected = 0;
+        }
 
-        if (property_exists($this->dbconn, 'field_count'))
-            $this->numFields = $this->dbconn->field_count;
+        if (property_exists($this->dbconn, 'field_count')) {
+                    $this->numFields = $this->dbconn->field_count;
+        }
 
-        if ($this->transac_mode)
-            $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        if ($this->transac_mode) {
+                    $this->transac_result = is_null($this->transac_result) ? $this->result: $this->transac_result && $this->result;
+        }
         /*
          * Because mysqli_query() returns FALSE on failure, a mysqli_result object for SELECT, SHOW, DESCRIBE or EXPLAIN queries,
          * and TRUE for other successful queries, it should be handled to return only objects or resources.
@@ -252,10 +261,10 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            # This error is thrown because of 'execute' method has not been executed.
+        } else {
+                    # This error is thrown because of 'execute' method has not been executed.
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -270,7 +279,8 @@ 
     public function __destruct()
     {
         # prevent "Property access is not allowed yet" with @ on failure connections
-        if ($this->dbconn !== false && !is_null($this->dbconn))
-            @$this->dbconn->close();
+        if ($this->dbconn !== false && !is_null($this->dbconn)) {
+                    @$this->dbconn->close();
+        }
     }
 }
\ No newline at end of file

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