Pleets / dronephp

src/Db/Driver/SQLServer.php

Braces +23 added lines, -17 removed lines

@@ -31,15 +31,17 @@ 
      */
     public function __construct($options)
     {
-        if (!array_key_exists("dbchar", $options))
-            $options["dbchar"] = "UTF-8";
+        if (!array_key_exists("dbchar", $options)) {
+                    $options["dbchar"] = "UTF-8";
+        }
 
         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,11 +54,13 @@ 
      */
     public function connect()
     {
-        if (!extension_loaded('sqlsrv'))
-            throw new \RuntimeException("The Sqlsrv extension is not loaded");
+        if (!extension_loaded('sqlsrv')) {
+                    throw new \RuntimeException("The Sqlsrv extension is not loaded");
+        }
 
-        if (!is_null($this->dbport) && !empty($this->dbport))
-            $this->dbhost .= ', ' . $this->dbport;
+        if (!is_null($this->dbport) && !empty($this->dbport)) {
+                    $this->dbhost .= ', ' . $this->dbport;
+        }
 
         $db_info = array("Database" => $this->dbname, "UID" => $this->dbuser, "PWD" => $this->dbpass, "CharacterSet" => $this->dbchar);
         $conn = sqlsrv_connect($this->dbhost, $db_info);
@@ -116,9 +120,9 @@ 
             }
 
             $exec = sqlsrv_execute($stmt);
+        } else {
+                    $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
         }
-        else
-            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
 
         if ($exec === false)
         {
@@ -138,8 +142,9 @@ 
         $this->numFields = sqlsrv_num_fields($this->result);
         $this->rowsAffected = sqlsrv_rows_affected($this->result);
 
-        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;
+        }
 
         return $this->result;
     }
@@ -206,9 +211,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().
@@ -216,6 +220,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -229,7 +234,8 @@ 
      */
     public function __destruct()
     {
-        if ($this->dbconn)
-            sqlsrv_close($this->dbconn);
+        if ($this->dbconn) {
+                    sqlsrv_close($this->dbconn);
+        }
     }
 }
\ No newline at end of file

src/Db/Driver/AbstractDriver.php

Braces +29 added lines, -20 removed lines

@@ -209,8 +209,9 @@ 
      */
     public function getArrayResult()
     {
-        if (count($this->arrayResult))
-            return $this->arrayResult;
+        if (count($this->arrayResult)) {
+                    return $this->arrayResult;
+        }
 
         return $this->toArray();
     }
@@ -298,8 +299,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);
+            }
         }
     }
 
@@ -343,8 +345,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();
@@ -373,8 +376,9 @@ 
      */
     public function disconnect()
     {
-        if (!$this->isConnected())
-            throw new \LogicException("Connection was not established");
+        if (!$this->isConnected()) {
+                    throw new \LogicException("Connection was not established");
+        }
     }
 
     /**
@@ -386,11 +390,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;
     }
@@ -404,16 +410,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;
 

src/Network/Socket/AbstractSocket.php

Indentation +4 added lines, -4 removed lines

@@ -121,7 +121,7 @@ 
         }
 
         $this->socket = $socket;
-	}
+    }
 
     /**
      * Binds the socket
@@ -145,8 +145,8 @@ 
      *
      * @return null
      */
-	public function close()
-	{
+    public function close()
+    {
         return socket_close($this->socket);
-	}
+    }
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -108,8 +108,8 @@
     {
         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);
         }
 
         if (!($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)))

Braces +3 added lines, -2 removed lines

@@ -108,8 +108,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);
+            }
         }
 
         if (!($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP)))