Pleets / dronephp

src/Db/Driver/SQLServer.php

Spacing +2 added lines, -2 removed lines

@@ -116,7 +116,7 @@ 
             $exec = sqlsrv_execute($stmt);
         }
         else
-            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array( "Scrollable" => SQLSRV_CURSOR_KEYSET ));
+            $exec = $this->result = sqlsrv_query($this->dbconn, $sql, $params, array("Scrollable" => SQLSRV_CURSOR_KEYSET));
 
         if ($exec === false)
         {
@@ -137,7 +137,7 @@ 
         $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;
+            $this->transac_result = is_null($this->transac_result) ? $this->result : $this->transac_result && $this->result;
 
         return $this->result;
     }

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);
         $this->dbconn = sqlsrv_connect($this->dbhost, $db_info);
@@ -114,9 +118,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)
         {
@@ -136,8 +140,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;
     }
@@ -204,9 +209,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().
@@ -214,6 +218,7 @@ 
              * Ref: http://php.net/manual/en/class.logicexception.php
              */
             throw new \LogicException('There are not data in the buffer!');
+        }
 
         $this->arrayResult = $data;
 
@@ -227,7 +232,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/Network/Socket/Server.php

Indentation +56 added lines, -56 removed lines

@@ -26,18 +26,18 @@ 
      *
      * @return string
      */
-	public function read($socket)
-	{
-		if (($message = @socket_read($socket, 1024)) === false)
-		{
-			$errno = socket_last_error();
-			$this->error($errno, socket_strerror($errno));
+    public function read($socket)
+    {
+        if (($message = @socket_read($socket, 1024)) === false)
+        {
+            $errno = socket_last_error();
+            $this->error($errno, socket_strerror($errno));
 
-			throw new \RuntimeException("Could not read message from client socket");
-		}
+            throw new \RuntimeException("Could not read message from client socket");
+        }
 
-		return $message;
-	}
+        return $message;
+    }
 
     /**
      * Sends a message to client socket
@@ -49,18 +49,18 @@ 
      *
      * @return integer
      */
-	public function send($socket, $message)
-	{
-		if (($bytes = @socket_write($socket, $message, strlen($message))) === false)
-		{
-			$errno = socket_last_error();
-			$this->error($errno, socket_strerror($errno));
+    public function send($socket, $message)
+    {
+        if (($bytes = @socket_write($socket, $message, strlen($message))) === false)
+        {
+            $errno = socket_last_error();
+            $this->error($errno, socket_strerror($errno));
 
-			throw new \RuntimeException("Could not send message to the client socket");
-		}
+            throw new \RuntimeException("Could not send message to the client socket");
+        }
 
-		return $bytes;
-	}
+        return $bytes;
+    }
 
     /**
      * Sets socket to listening
@@ -71,54 +71,54 @@ 
      *
      * @return boolean
      */
-	public function listen(Array $eventHandlers = array())
-	{
-		$event = $eventHandlers;
-		$clousure = function(){};
+    public function listen(Array $eventHandlers = array())
+    {
+        $event = $eventHandlers;
+        $clousure = function(){};
 
-		if (!array_key_exists('success', $event))
-			$event["success"] = $clousure;
+        if (!array_key_exists('success', $event))
+            $event["success"] = $clousure;
 
-		if (!array_key_exists('error', $event))
-			$event["error"] = $clousure;
+        if (!array_key_exists('error', $event))
+            $event["error"] = $clousure;
 
-		$listener = false;
+        $listener = false;
 
-		if (!($listener = @socket_listen($this->socket, 30)))
-		{
-			$errno = socket_last_error();
-			$this->error($errno, socket_strerror($errno));
+        if (!($listener = @socket_listen($this->socket, 30)))
+        {
+            $errno = socket_last_error();
+            $this->error($errno, socket_strerror($errno));
 
-			throw new \RuntimeException("Could not set socket to listen");
-		}
-		else {
+            throw new \RuntimeException("Could not set socket to listen");
+        }
+        else {
 
-			echo "\n";
-			echo "Server Started : " . date('Y-m-d H:i:s') . "\n";
-			echo "Master socket  : " . $this->socket . "\n";
-			echo "Listening on   : " . $this->host . " port " . $this->port . "\n\n";
+            echo "\n";
+            echo "Server Started : " . date('Y-m-d H:i:s') . "\n";
+            echo "Master socket  : " . $this->socket . "\n";
+            echo "Listening on   : " . $this->host . " port " . $this->port . "\n\n";
 
-			$socket = $this->socket;
+            $socket = $this->socket;
 
-			if (!($spawn = @socket_accept($this->socket)))
-			{
-				$errno = socket_last_error();
-				$this->error($errno, socket_strerror($errno));
+            if (!($spawn = @socket_accept($this->socket)))
+            {
+                $errno = socket_last_error();
+                $this->error($errno, socket_strerror($errno));
 
-				throw new \RuntimeException("Could not accept incoming connection");
-			}
+                throw new \RuntimeException("Could not accept incoming connection");
+            }
 
-			$input = $this->read($spawn);
+            $input = $this->read($spawn);
 
-			$input = trim($input);
-			call_user_func($event["success"], $input, $this, $spawn);
+            $input = trim($input);
+            call_user_func($event["success"], $input, $this, $spawn);
 
-			socket_close($spawn);
-		}
+            socket_close($spawn);
+        }
 
-		if (!$listener)
-			call_user_func($event["error"], $this->getLastError());
+        if (!$listener)
+            call_user_func($event["error"], $this->getLastError());
 
-		return $listener;
-	}
+        return $listener;
+    }
 }
\ No newline at end of file

src/Network/Socket/AbstractSocket.php

Indentation +4 added lines, -4 removed lines

@@ -119,7 +119,7 @@ 
 
             throw new \RuntimeException("Could not create the socket");
         }
-	}
+    }
 
     /**
      * Binds the socket
@@ -143,8 +143,8 @@ 
      *
      * @return null
      */
-	public function close()
-	{
+    public function close()
+    {
         return socket_close($this->socket);
-	}
+    }
 }
\ No newline at end of file