Pleets / dronephp

test/Util/DateTimeTest.php

Braces +2 added lines, -4 removed lines

@@ -39,13 +39,11 @@
         try
         {
             $this->assertEquals('June', Dt::getMonth(13));
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof MonthOutOfRange);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }

test/Db/TableGateway/TableGatewayTest.php

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

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

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