Pleets / dronephp

test/Db/Driver/MySQLTest.php

Indentation +5 added lines, -5 removed lines

@@ -240,7 +240,7 @@ 
         try
         {
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')";
-	        $result = $conn->execute($sql);
+            $result = $conn->execute($sql);
         }
         catch (\Exception $e)
         {
@@ -511,11 +511,11 @@ 
 
         try
         {
-	        $sql = "INSERT INTO MYTABLE (DESCRIPTION) VALUES ('TRANS_SHORTCUT_1')";
-	        $result = $conn->execute($sql);
+            $sql = "INSERT INTO MYTABLE (DESCRIPTION) VALUES ('TRANS_SHORTCUT_1')";
+            $result = $conn->execute($sql);
 
-	        $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
-	        $result = $conn->execute($sql);
+            $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
+            $result = $conn->execute($sql);
         }
         catch (InvalidQueryException $e)
         {

Spacing +18 added lines, -18 removed lines

@@ -145,7 +145,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);
 
@@ -272,7 +272,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);
@@ -299,12 +299,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -313,7 +313,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available
+        $this->assertTrue(($rowcount === 1)); # the row is available
     }
 
     /**
@@ -336,12 +336,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 1));    # the row is available for now
+        $this->assertTrue(($rowcount === 1)); # the row is available for now
 
         # properties modified by execute() method
         $this->assertEquals(1, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -350,7 +350,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 1));    # the row is not available
+        $this->assertNotTrue(($rowcount === 1)); # the row is not available
     }
 
     /**
@@ -382,12 +382,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->commit());
 
@@ -396,7 +396,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the row is available
+        $this->assertTrue(($rowcount === 4)); # the row is available
     }
 
     /**
@@ -428,12 +428,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 4));    # the rows are available for now
+        $this->assertTrue(($rowcount === 4)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(4, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         $this->assertTrue($conn->rollback());
 
@@ -442,7 +442,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 4));    # the row is available
+        $this->assertNotTrue(($rowcount === 4)); # the row is available
     }
 
     /**
@@ -473,12 +473,12 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the rows are available for now
+        $this->assertTrue(($rowcount === 2)); # the rows are available for now
 
         # properties modified by execute() method
         $this->assertEquals(2, $conn->getNumRows());
         $this->assertEquals(2, $conn->getNumFields());
-        $this->assertEquals(0, $conn->getRowsAffected());    # nothing affected (autocommit = false)
+        $this->assertEquals(0, $conn->getRowsAffected()); # nothing affected (autocommit = false)
 
         # ends the transaction
         $conn->endTransaction();
@@ -488,7 +488,7 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertTrue(($rowcount === 2));    # the row is available
+        $this->assertTrue(($rowcount === 2)); # the row is available
     }
 
     /**
@@ -532,6 +532,6 @@ 
         $result = $conn->execute($sql);
         $rowcount = count($conn->getArrayResult());
 
-        $this->assertNotTrue(($rowcount === 0));    # the rows are not available
+        $this->assertNotTrue(($rowcount === 0)); # the rows are not available
     }
 }
\ No newline at end of file

Braces +9 added lines, -18 removed lines

@@ -84,12 +84,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());
@@ -125,12 +123,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());
@@ -155,13 +151,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());
@@ -241,13 +235,11 @@ 
         {
             $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('Hello world!')";
 	        $result = $conn->execute($sql);
-        }
-        catch (\Exception $e)
+        } catch (\Exception $e)
         {
             $errorObject = ($e instanceof InvalidQueryException);
             $message = $e->getMessage();
-        }
-        finally
+        } finally
         {
             $this->assertTrue($errorObject, $message);
         }
@@ -516,8 +508,7 @@ 
 
 	        $sql = "INSERT INTO MYTABLE (DESCRIPTION, WRONG) VALUES ('TRANS_SHORTCUT_2')";
 	        $result = $conn->execute($sql);
-        }
-        catch (InvalidQueryException $e)
+        } catch (InvalidQueryException $e)
         {
             $message = $e->getMessage();
             #·not necessary!

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
@@ -178,7 +178,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,

Braces +45 added lines, -36 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);
 
@@ -165,20 +170,23 @@ 
         }
 
         # 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
         {
             # affected_rows return the same of num_rows on select statements!
-            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 (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,
@@ -247,9 +255,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().
@@ -257,6 +264,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -271,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