Pleets / dronephp

src/Util/DateTime.php

Spacing +2 added lines, -2 removed lines

@@ -94,7 +94,7 @@ 
                 break;
 
             case self::LAST_YEAR:
-                $year = ((int) date('Y'))- 1;
+                $year = ((int) date('Y')) - 1;
                 break;
 
             default:
@@ -142,7 +142,7 @@ 
                 $d->setDate($year, (int) $d->format('m'), (int) $d->format('d'));
             }
 
-            $d->add(new \DateInterval('P'.($day - 1).'D'));
+            $d->add(new \DateInterval('P' . ($day - 1) . 'D'));
         }
 
         return $d;

Braces +18 added lines, -14 removed lines

@@ -63,8 +63,9 @@ 
      */
     public static function getMonth($month_number)
     {
-        if (!array_key_exists($month_number, self::MONTHS))
-            throw new Exception\MonthOutOfRange("Invalid Month");
+        if (!array_key_exists($month_number, self::MONTHS)) {
+                    throw new Exception\MonthOutOfRange("Invalid Month");
+        }
 
         return self::MONTHS[$month_number];
     }
@@ -78,14 +79,17 @@ 
      */
     public static function create(array $date = [])
     {
-        if (!array_key_exists('day', $date))
-            $date["day"] = self::TODAY;
+        if (!array_key_exists('day', $date)) {
+                    $date["day"] = self::TODAY;
+        }
 
-        if (!array_key_exists('month', $date))
-            $date["month"] = self::THIS_MONTH;
+        if (!array_key_exists('month', $date)) {
+                    $date["month"] = self::THIS_MONTH;
+        }
 
-        if (!array_key_exists('year', $date))
-            $date["year"] = self::THIS_YEAR;
+        if (!array_key_exists('year', $date)) {
+                    $date["year"] = self::THIS_YEAR;
+        }
 
         switch ($date['year'])
         {
@@ -130,13 +134,13 @@ 
                 break;
         }
 
-        if (is_string($day))
-            $d = new \DateTime("$day $month $year");
-        else
+        if (is_string($day)) {
+                    $d = new \DateTime("$day $month $year");
+        } else
         {
-            if (in_array($month, self::MONTHS))
-                $d = new \DateTime("first day of $month $year");
-            else
+            if (in_array($month, self::MONTHS)) {
+                            $d = new \DateTime("first day of $month $year");
+            } else
             {
                 $d = new \DateTime("first day of $month");
                 $d->setDate($year, (int) $d->format('m'), (int) $d->format('d'));

test/Error/ErrorTraitTest.php

Spacing +1 added lines, -1 removed lines

@@ -126,7 +126,7 @@
     public function getContentsFromUrl($filename)
     {
         $headers = get_headers($url);
-        $exists = stripos($headers[0],"200 OK") ? true : false;
+        $exists = stripos($headers[0], "200 OK") ? true : false;
 
         if ($exists)
             return file_get_contents($filename);

Braces +17 added lines, -16 removed lines

@@ -90,13 +90,11 @@ 
         try
         {
             $ctrl->addNonExistingError();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -109,18 +107,20 @@ 
 
     public function getContentsFromFile($filename)
     {
-        if (file_exists($filename))
-            return file_get_contents($filename);
-        else
-            $this->error(Errno::FILE_NOT_FOUND, $filename);
+        if (file_exists($filename)) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error(Errno::FILE_NOT_FOUND, $filename);
+        }
     }
 
     public function getContentsFromFileWithoutFilenameOnError($filename)
     {
-        if (file_exists($filename))
-            return file_get_contents($filename);
-        else
-            $this->error(Errno::FILE_NOT_FOUND);
+        if (file_exists($filename)) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error(Errno::FILE_NOT_FOUND);
+        }
     }
 
     public function getContentsFromUrl($filename)
@@ -128,10 +128,11 @@ 
         $headers = get_headers($url);
         $exists = stripos($headers[0],"200 OK") ? true : false;
 
-        if ($exists)
-            return file_get_contents($filename);
-        else
-            $this->error("URL not found");
+        if ($exists) {
+                    return file_get_contents($filename);
+        } else {
+                    $this->error("URL not found");
+        }
     }
 
     public function addNonExistingError()

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

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

test/Db/TableGateway/TableGatewayTest.php

Indentation +1 added lines, -1 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -66,7 +66,7 @@ 
     public function testCannotEstablishConnectionWhenExists()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $entity = new MyEntity();
         new TableGateway($entity, ["default" => $options]);
@@ -80,7 +80,7 @@ 
     public function testCannotEstablishConnection()
     {
         $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 +1 added lines, -2 removed lines

@@ -88,8 +88,7 @@
         try
         {
             $gateway->getDb()->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $this->assertNotTrue($gateway->getDb()->isConnected());
             throw $e;

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