Pleets / dronephp

src/Db/Driver/MySQL.php

Spacing +2 added lines, -2 removed lines

@@ -118,7 +118,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
@@ -174,7 +174,7 @@ 
             $this->rowsAffected = $this->dbconn->affected_rows;
 
         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 +45 added lines, -35 removed lines

@@ -31,15 +31,17 @@ 
      */
     public function __construct($options)
     {
-        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();
+        }
     }
 
     /**
@@ -52,13 +54,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)
         {
@@ -68,8 +72,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);
@@ -116,13 +119,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 . ']';
             }
@@ -143,12 +148,12 @@ 
                      * 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;
+                    }
                 }
             }
-        }
-        else
+        } else
         {
             $prev_error_handler = set_error_handler(['\Drone\Error\ErrorHandler', 'errorControlOperator'], E_ALL);
 
@@ -164,17 +169,21 @@ 
             throw new Exception\InvalidQueryException($this->dbconn->error, $this->dbconn->errno);
         }
 
-        if (property_exists($this->dbconn, 'num_rows'))
-            $this->numRows = $this->dbconn->num_rows;
+        if (property_exists($this->dbconn, 'num_rows')) {
+                    $this->numRows = $this->dbconn->num_rows;
+        }
 
-        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 (property_exists($this->dbconn, 'affected_rows'))
-            $this->rowsAffected = $this->dbconn->affected_rows;
+        if (property_exists($this->dbconn, 'affected_rows')) {
+                    $this->rowsAffected = $this->dbconn->affected_rows;
+        }
 
-        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.
@@ -251,9 +260,8 @@ 
             {
                 $data[] = $row;
             }
-        }
-        else
-            /*
+        } else {
+                    /*
              * "This kind of exception should lead directly to a fix in your code"
              * So much production tests tell us this error is throwed because developers
              * execute toArray() before execute().
@@ -261,6 +269,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -275,7 +284,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/Db/Driver/AbstractDriver.php

Braces +32 added lines, -22 removed lines

@@ -216,8 +216,9 @@ 
      */
     public function getArrayResult()
     {
-        if (!empty($this->arrayResult))
-            return $this->arrayResult;
+        if (!empty($this->arrayResult)) {
+                    return $this->arrayResult;
+        }
 
         return $this->toArray();
     }
@@ -313,8 +314,9 @@ 
      */
     public function autocommit($value)
     {
-        if ($this->transac_mode)
-            throw new \LogicException("You cannot change autocommit behavior during a transaction");
+        if ($this->transac_mode) {
+                    throw new \LogicException("You cannot change autocommit behavior during a transaction");
+        }
 
         $this->autocommit = $value;
     }
@@ -330,8 +332,9 @@ 
     {
         foreach ($options as $option => $value)
         {
-            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option))
-                $this->{'set'.$option}($value);
+            if (property_exists(__CLASS__, strtolower($option)) && method_exists($this, 'set'.$option)) {
+                            $this->{'set'.$option}($value);
+            }
         }
     }
 
@@ -375,8 +378,9 @@ 
      */
     public function reconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
 
         $this->disconnect();
         return $this->connect();
@@ -405,8 +409,9 @@ 
      */
     public function disconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
     }
 
     /**
@@ -418,11 +423,13 @@ 
      */
     public function beginTransaction()
     {
-        if (!$this->isConnected())
-            $this->connect();
+        if (!$this->isConnected()) {
+                    $this->connect();
+        }
 
-        if ($this->transac_mode)
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_STARTED]);
+        if ($this->transac_mode) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_STARTED]);
+        }
 
         $this->transac_mode = true;
     }
@@ -436,16 +443,19 @@ 
      */
     public function endTransaction()
     {
-        if (!$this->transac_mode)
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_NOT_STARTED]);
+        if (!$this->transac_mode) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_NOT_STARTED]);
+        }
 
-        if (is_null($this->transac_result))
-            throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_EMPTY]);
+        if (is_null($this->transac_result)) {
+                    throw new \LogicException($this->standardErrors[Errno::DB_TRANSACTION_EMPTY]);
+        }
 
-        if ($this->transac_result)
-            $this->commit();
-        else
-            $this->rollback();
+        if ($this->transac_result) {
+                    $this->commit();
+        } else {
+                    $this->rollback();
+        }
 
         $this->result = $this->transac_result;
 

test/Db/Driver/MySQLTest.php

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
     public function testCannotStablishConnection()
     {
         $options = $this->options;
-        $options["dbhost"] = 'myserver';   // this server does not exists
+        $options["dbhost"] = 'myserver'; // this server does not exists
 
         $conn = new MySQL($options);
 
@@ -240,7 +240,7 @@ 
         $this->assertEquals(2, $conn->getNumFields());
         $this->assertEquals(0, $conn->getRowsAffected());
 
-        $rowset = $conn->getArrayResult();    # array with results
+        $rowset = $conn->getArrayResult(); # array with results
         $row = array_shift($rowset);
 
         $this->assertArrayHasKey("ID", $row);

Braces +6 added lines, -12 removed lines

@@ -83,12 +83,10 @@ 
 
         try {
             $conn->disconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertNotTrue($conn->isConnected());
             $this->assertTrue($errorObject, $e->getMessage());
@@ -124,12 +122,10 @@ 
 
         try {
             $conn->reconnect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof \LogicException);
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $e->getMessage());
             $this->assertNotTrue($conn->isConnected());
@@ -154,13 +150,11 @@ 
 
         try {
             $mysqliObject = $conn->connect();
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof ConnectionException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
             $this->assertNotTrue($conn->isConnected());