Pleets / dronephp

test/Db/TableGateway/TableGatewayTest.php

Spacing +2 added lines, -2 removed lines

@@ -68,7 +68,7 @@ 
     public function testCannotStablishConnectionWhenExists()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $errorObject = null;
 
@@ -98,7 +98,7 @@ 
     public function testCannotStablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $entity = new MyEntity();
         $gateway = new TableGateway($entity, ["other" => $options]);

Braces +8 added lines, -16 removed lines

@@ -78,13 +78,11 @@ 
         {
             $entity = new MyEntity();
             $gateway = new TableGateway($entity, ["default" => $options]);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \RuntimeException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -110,13 +108,11 @@ 
         try
         {
             $gateway->getDb()->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof ConnectionException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
             $this->assertNotTrue($gateway->getDb()->isConnected());
@@ -145,13 +141,11 @@ 
         try
         {
             AbstractTableGateway::getDriver('other3');
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \RuntimeException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -250,13 +244,11 @@ 
         try
         {
             $gateway->wrongDML();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof InvalidQueryException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }

Indentation +1 added lines, -1 removed lines

@@ -440,7 +440,7 @@
     {
         parent::__construct($data);
         $this->setTableName("MYTABLE");
-   }
+    }
 }
 
 class MyEntityGateway extends TableGateway

src/Db/TableGateway/AbstractTableGateway.php

Braces +18 added lines, -15 removed lines

@@ -87,24 +87,25 @@ 
         {
             $this->currentConnection = $connection;
             $this->getDriver($connection);
-        }
-        else if (is_array($connection))
+        } else if (is_array($connection))
         {
             $identifier = key($connection);
             $connection_options = $connection[$identifier];
 
             $this->currentConnection = $identifier;
 
-            if (!array_key_exists('driver', $connection_options))
-                throw new \RuntimeException("The database driver key has not been declared");
-
-            if (!isset(self::$drivers[$identifier]))
-                self::$drivers[$identifier] = DriverFactory::create($connection_options);
-            else
-                throw new \RuntimeException("The database connection already exists");
+            if (!array_key_exists('driver', $connection_options)) {
+                            throw new \RuntimeException("The database driver key has not been declared");
+            }
+
+            if (!isset(self::$drivers[$identifier])) {
+                            self::$drivers[$identifier] = DriverFactory::create($connection_options);
+            } else {
+                            throw new \RuntimeException("The database connection already exists");
+            }
+        } else {
+                    throw new \InvalidArgumentException("Invalid type given. Array or string expected");
         }
-        else
-            throw new \InvalidArgumentException("Invalid type given. Array or string expected");
     }
 
     /**
@@ -118,8 +119,9 @@ 
      */
     public static function getDriver($identifier)
     {
-        if (!array_key_exists($identifier, self::$drivers))
-            throw new \RuntimeException("The database connection does not exists");
+        if (!array_key_exists($identifier, self::$drivers)) {
+                    throw new \RuntimeException("The database connection does not exists");
+        }
 
         return self::$drivers[$identifier];
     }
@@ -135,8 +137,9 @@ 
      */
     public static function hasDriver($identifier)
     {
-        if (!array_key_exists($identifier, self::$drivers))
-            return false;
+        if (!array_key_exists($identifier, self::$drivers)) {
+                    return false;
+        }
 
         return true;
     }

src/Db/Driver/DriverFactory.php

Braces +8 added lines, -6 removed lines

@@ -34,14 +34,16 @@
             "Sqlsrv" => "Drone\Db\Driver\SQLServer",
         ];
 
-        if (!array_key_exists('driver', $connection_options))
-            throw new \RuntimeException("The database driver key has not been declared");
+        if (!array_key_exists('driver', $connection_options)) {
+                    throw new \RuntimeException("The database driver key has not been declared");
+        }
 
         $drv = $connection_options["driver"];
 
-        if (array_key_exists($drv, $drivers))
-            return new $drivers[$drv]($connection_options);
-        else
-            throw new \RuntimeException("The database driver does not exists");
+        if (array_key_exists($drv, $drivers)) {
+                    return new $drivers[$drv]($connection_options);
+        } else {
+                    throw new \RuntimeException("The database driver does not exists");
+        }
     }
 }
\ No newline at end of file

test/Db/TableGateway/EntityAdapterTest.php

Indentation +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
     {
         parent::__construct($data);
         $this->setTableName("USER");
-   }
+    }
 }
 
 class UserGateway extends TableGateway

src/Db/TableGateway/TableGateway.php

Braces +50 added lines, -49 removed lines

@@ -78,11 +78,11 @@ 
             {
                 $k++;
 
-                if (is_null($value))
-                    $parsed_where[] = "$key IS NULL";
-                elseif ($value instanceof SQLFunction)
-                    $parsed_where[] = "$key = " . $value->getStatement();
-                elseif (is_array($value))
+                if (is_null($value)) {
+                                    $parsed_where[] = "$key IS NULL";
+                } elseif ($value instanceof SQLFunction) {
+                                    $parsed_where[] = "$key = " . $value->getStatement();
+                } elseif (is_array($value))
                 {
                     $parsed_in = [];
 
@@ -105,8 +105,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -124,9 +123,9 @@ 
             }
 
             $where = "WHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
+        } else {
+                    $where = "";
         }
-        else
-            $where = "";
 
         $table = $this->entity->getTableName();
 
@@ -135,10 +134,11 @@ 
         $this->lastQuery = $sql;
         $this->lastValues = $bind_values;
 
-        if (count($bind_values))
-            $this->getDb()->execute($sql, $bind_values);
-        else
-            $this->getDb()->execute($sql);
+        if (count($bind_values)) {
+                    $this->getDb()->execute($sql, $bind_values);
+        } else {
+                    $this->getDb()->execute($sql);
+        }
 
         return $this->getDb()->getArrayResult();
     }
@@ -155,8 +155,9 @@ 
      */
     public function insert(Array $data)
     {
-        if (!count($data))
-            throw new \LogicException("Missing values for INSERT statement!");
+        if (!count($data)) {
+                    throw new \LogicException("Missing values for INSERT statement!");
+        }
 
         $bind_values = [];
 
@@ -179,11 +180,11 @@ 
                 continue;
             }
 
-            if (is_null($value))
-                $value = "NULL";
-            elseif ($value instanceof SQLFunction)
-                $value = $value->getStatement();
-            else {
+            if (is_null($value)) {
+                            $value = "NULL";
+            } elseif ($value instanceof SQLFunction) {
+                            $value = $value->getStatement();
+            } else {
 
                 switch ($driver)
                 {
@@ -236,11 +237,13 @@ 
     {
         $parsed_set = [];
 
-        if (!count($set))
-            throw new \LogicException("You cannot update rows without SET clause");
+        if (!count($set)) {
+                    throw new \LogicException("You cannot update rows without SET clause");
+        }
 
-        if (!count($where))
-            throw new SecurityException("You cannot update rows without WHERE clause!");
+        if (!count($where)) {
+                    throw new SecurityException("You cannot update rows without WHERE clause!");
+        }
 
         $bind_values = [];
 
@@ -252,11 +255,11 @@ 
         {
             $k++;
 
-            if (is_null($value))
-                $parsed_set[] = "$key = NULL";
-            elseif ($value instanceof SQLFunction)
-                $parsed_set[] = "$key = " . $value->getStatement();
-            elseif (is_array($value))
+            if (is_null($value)) {
+                            $parsed_set[] = "$key = NULL";
+            } elseif ($value instanceof SQLFunction) {
+                            $parsed_set[] = "$key = " . $value->getStatement();
+            } elseif (is_array($value))
             {
                 $parsed_in = [];
 
@@ -267,8 +270,9 @@ 
                         case 'Oci8':
 
                             # [POSSIBLE BUG] - To Future revision (What about non-string values ?)
-                            if (is_string($in_value))
-                                $parsed_in[] = ":$k";
+                            if (is_string($in_value)) {
+                                                            $parsed_in[] = ":$k";
+                            }
 
                             $bind_values[":$k"] = $in_value;
                             break;
@@ -283,8 +287,7 @@ 
                 }
 
                 $parsed_set[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -309,11 +312,11 @@ 
         {
             $k++;
 
-            if (is_null($value))
-                $parsed_where[] = "$key IS NULL";
-            elseif ($value instanceof SQLFunction)
-                $parsed_where[] = "$key = " . $value->getStatement();
-            elseif (is_array($value))
+            if (is_null($value)) {
+                            $parsed_where[] = "$key IS NULL";
+            } elseif ($value instanceof SQLFunction) {
+                            $parsed_where[] = "$key = " . $value->getStatement();
+            } elseif (is_array($value))
             {
                 $parsed_in = [];
 
@@ -336,8 +339,7 @@ 
                 }
 
                 $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -392,11 +394,11 @@ 
             {
                 $k++;
 
-                if (is_null($value))
-                    $parsed_where[] = "$key IS NULL";
-                elseif ($value instanceof SQLFunction)
-                    $parsed_where[] = "$key = " . $value->getStatement();
-                elseif (is_array($value))
+                if (is_null($value)) {
+                                    $parsed_where[] = "$key IS NULL";
+                } elseif ($value instanceof SQLFunction) {
+                                    $parsed_where[] = "$key = " . $value->getStatement();
+                } elseif (is_array($value))
                 {
                     $parsed_in = [];
 
@@ -419,8 +421,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -438,9 +439,9 @@ 
             }
 
             $where = "\r\nWHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
+        } else {
+                    throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead.");
         }
-        else
-            throw new SecurityException("You cannot delete rows without WHERE clause!. Use TRUNCATE statement instead.");
 
         $table = $this->entity->getTableName();
 

src/Db/Driver/MySQL.php

Spacing +2 added lines, -2 removed lines

@@ -120,7 +120,7 @@ 
             {
                 if (is_string($param_values[$i]))
                     $bind_types .= 's';
-                else if(is_float($param_values[$i]))
+                else if (is_float($param_values[$i]))
                     $bind_types .= 'd';
                 # [POSSIBLE BUG] - To Future revision (What about non-string and non-decimal types ?)
                 else
@@ -184,7 +184,7 @@ 
             $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;
+            $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.

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/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
         ]);