Pleets / dronephp

src/Db/TableGateway/AbstractTableGateway.php

Braces +3 added lines, -2 removed lines

@@ -73,7 +73,8 @@
     {
         $this->currentDriverIdentifier = $connection_identifier;
 
-        if (!isset(self::$drivers[$connection_identifier]))
-            self::$drivers[$connection_identifier] = new DriverAdapter($connection_identifier, $auto_connect);
+        if (!isset(self::$drivers[$connection_identifier])) {
+                    self::$drivers[$connection_identifier] = new DriverAdapter($connection_identifier, $auto_connect);
+        }
     }
 }
\ No newline at end of file

src/Db/TableGateway/TableGateway.php

Braces +45 added lines, -45 removed lines

@@ -73,11 +73,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 = [];
 
@@ -100,8 +100,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -119,9 +118,9 @@ 
             }
 
             $where = "WHERE \r\n\t" . implode(" AND\r\n\t", $parsed_where);
+        } else {
+                    $where = "";
         }
-        else
-            $where = "";
 
         $table = $this->entity->getTableName();
 
@@ -144,8 +143,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 = [];
 
@@ -168,11 +168,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)
                 {
@@ -222,11 +222,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 = [];
 
@@ -238,11 +240,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 = [];
 
@@ -253,8 +255,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;
@@ -269,8 +272,7 @@ 
                 }
 
                 $parsed_set[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -296,11 +298,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 = [];
 
@@ -323,8 +325,7 @@ 
                 }
 
                 $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-            }
-            else
+            } else
             {
                 switch ($driver)
                 {
@@ -376,11 +377,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 = [];
 
@@ -403,8 +404,7 @@ 
                     }
 
                     $parsed_where[] = "$key IN (" . implode(", ", $parsed_in) . ")";
-                }
-                else
+                } else
                 {
                     switch ($driver)
                     {
@@ -422,9 +422,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/TableGateway/EntityAdapter.php

Braces +21 added lines, -16 removed lines

@@ -58,8 +58,9 @@ 
     {
         $result = $this->tableGateway->select($where);
 
-        if (!count($result))
-            return $result;
+        if (!count($result)) {
+                    return $result;
+        }
 
         $array_result = [];
 
@@ -69,8 +70,9 @@ 
 
             foreach ($row as $key => $value)
             {
-                if (is_string($key))
-                    $filtered_array[$key] = $value;
+                if (is_string($key)) {
+                                    $filtered_array[$key] = $value;
+                }
             }
 
             $user_entity = get_class($this->tableGateway->getEntity());
@@ -94,10 +96,11 @@ 
      */
     public function insert($entity)
     {
-        if ($entity instanceof Entity)
-            $entity = get_object_vars($entity);
-        else if (!is_array($entity))
-            throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        if ($entity instanceof Entity) {
+                    $entity = get_object_vars($entity);
+        } else if (!is_array($entity)) {
+                    throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        }
 
         $this->parseEntity($entity);
 
@@ -126,14 +129,15 @@ 
 
             foreach ($entity as $key => $value)
             {
-                if (in_array($key, $changedFields))
-                    $fieldsToModify[$key] = $value;
+                if (in_array($key, $changedFields)) {
+                                    $fieldsToModify[$key] = $value;
+                }
             }
 
             $entity = $fieldsToModify;
+        } else if (!is_array($entity)) {
+                    throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
         }
-        else if (!is_array($entity))
-            throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
 
         $this->parseEntity($entity);
 
@@ -152,10 +156,11 @@ 
      */
     public function delete($entity)
     {
-        if ($entity instanceof Entity)
-            $entity = get_object_vars($entity);
-        else if (!is_array($entity))
-            throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        if ($entity instanceof Entity) {
+                    $entity = get_object_vars($entity);
+        } else if (!is_array($entity)) {
+                    throw new \InvalidArgumentException("Invalid type given. Drone\Db\Entity or Array expected");
+        }
 
         return $this->tableGateway->delete($entity);
     }

src/Mvc/Layout.php

Braces +22 added lines, -16 removed lines

@@ -133,8 +133,9 @@ 
     {
         $config = $module->getConfig();
 
-        if (!array_key_exists($view, $config["view_manager"]["view_map"]) || !file_exists($config["view_manager"]["view_map"][$view]))
-            throw new Exception\ViewNotFoundException("The 'view' template " . $view . " does not exists");
+        if (!array_key_exists($view, $config["view_manager"]["view_map"]) || !file_exists($config["view_manager"]["view_map"][$view])) {
+                    throw new Exception\ViewNotFoundException("The 'view' template " . $view . " does not exists");
+        }
 
         $this->view = $config["view_manager"]["view_map"][$view];
     }
@@ -164,8 +165,9 @@ 
     {
         foreach ($params as $param => $value)
         {
-            if (property_exists(__CLASS__, strtolower($param)) && method_exists($this, 'set'.$param))
-                $this->{'set'.$param}($value);
+            if (property_exists(__CLASS__, strtolower($param)) && method_exists($this, 'set'.$param)) {
+                            $this->{'set'.$param}($value);
+            }
         }
     }
 
@@ -194,23 +196,26 @@ 
 
         if ($controller->getTerminal())
         {
-            if (file_exists($view))
-                include $view;
-        }
-        else
+            if (file_exists($view)) {
+                            include $view;
+            }
+        } else
         {
-            if (!is_null($this->view) && !file_exists($this->view))
-                throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+            if (!is_null($this->view) && !file_exists($this->view)) {
+                            throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+            }
 
             $config = $controller->getModule()->getConfig();
 
-            if (!array_key_exists($controller->getLayout(), $config["view_manager"]["template_map"]))
-                throw new Exception\PageNotFoundException("The 'template' " . $template . " was not defined in module.config.php");
+            if (!array_key_exists($controller->getLayout(), $config["view_manager"]["template_map"])) {
+                            throw new Exception\PageNotFoundException("The 'template' " . $template . " was not defined in module.config.php");
+            }
 
             $template = $config["view_manager"]["template_map"][$controller->getLayout()];
 
-            if (!file_exists($template))
-                throw new Exception\PageNotFoundException("The 'template' " . $template . " does not exists");
+            if (!file_exists($template)) {
+                            throw new Exception\PageNotFoundException("The 'template' " . $template . " does not exists");
+            }
 
             include $template;
         }
@@ -237,8 +242,9 @@ 
      */
     public function content()
     {
-        if (!file_exists($this->view))
-            throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+        if (!file_exists($this->view)) {
+                    throw new Exception\ViewNotFoundException("The 'view' template " . $this->view . " does not exists");
+        }
 
         include $this->view;
     }

src/Mvc/AbstractionController.php

Braces +32 added lines, -24 removed lines

@@ -150,8 +150,9 @@ 
      */
     public function getPost()
     {
-        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST))
-            $_POST = json_decode(file_get_contents('php://input'), true);
+        if ($_SERVER['REQUEST_METHOD'] == 'POST' && empty($_POST)) {
+                    $_POST = json_decode(file_get_contents('php://input'), true);
+        }
 
         return (array) $_POST;
     }
@@ -165,8 +166,9 @@ 
      */
     public function getJson()
     {
-        if ($_SERVER['REQUEST_METHOD'] != 'JSON')
-            throw new \LogicException("Request method is not JSON");
+        if ($_SERVER['REQUEST_METHOD'] != 'JSON') {
+                    throw new \LogicException("Request method is not JSON");
+        }
 
         $input =  file_get_contents('php://input');
         $array = explode("&", $input);
@@ -254,8 +256,9 @@ 
         $this->module = new $fqn($module, $this);
 
         # detects method change inside Module.php
-        if (!is_null($this->getMethod()))
-            $method = $this->getMethod();
+        if (!is_null($this->getMethod())) {
+                    $method = $this->getMethod();
+        }
 
         if (!is_null($method) && $this->initExecution)
         {
@@ -265,8 +268,9 @@ 
 
                 $reflection = new \ReflectionMethod($this, $method);
 
-                if (!$reflection->isPublic())
-                    throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'");
+                if (!$reflection->isPublic()) {
+                                    throw new Exception\PageNotFoundException("The method '$method' is not public in the control class '$class'");
+                }
 
                 $this->method = $method;
 
@@ -282,8 +286,7 @@ 
                     $layoutManager = new Layout($layout_params);
                     $layoutManager->fromController($this);
                 }
-            }
-            else {
+            } else {
                 $class = __CLASS__;
                 throw new Exception\PageNotFoundException("The method '$method' doesn't exists in the control class '$class'");
             }
@@ -308,8 +311,9 @@ 
     public function isXmlHttpRequest()
     {
         # non standard (HTTP_X_REQUESTED_WITH is not a part of PHP)
-        if (isset($_SERVER['HTTP_X_REQUESTED_WITH']))
-            return true;
+        if (isset($_SERVER['HTTP_X_REQUESTED_WITH'])) {
+                    return true;
+        }
         return false;
     }
 
@@ -320,8 +324,9 @@ 
      */
     public function isPost()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "POST")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "POST") {
+                    return true;
+        }
         return false;
     }
 
@@ -332,8 +337,9 @@ 
      */
     public function isGet()
     {
-        if ($_SERVER["REQUEST_METHOD"] == "GET")
-            return true;
+        if ($_SERVER["REQUEST_METHOD"] == "GET") {
+                    return true;
+        }
         return false;
     }
 
@@ -357,10 +363,11 @@ 
             $i = 1;
             foreach ($params as $item)
             {
-                if ($i % 2 != 0)
-                    $vars[] = $item;
-                else
-                    $values[] = $item;
+                if ($i % 2 != 0) {
+                                    $vars[] = $item;
+                } else {
+                                    $values[] = $item;
+                }
                 $i++;
             }
 
@@ -368,10 +375,11 @@ 
 
             for ($i = 0; $i < $vars_count; $i++)
             {
-                if (array_key_exists($i, $values))
-                    $_GET[$vars[$i]] = $values[$i];
-                else
-                    $_GET[$vars[$i]] = '';
+                if (array_key_exists($i, $values)) {
+                                    $_GET[$vars[$i]] = $values[$i];
+                } else {
+                                    $_GET[$vars[$i]] = '';
+                }
             }
 
             unset($_GET["params"]);

src/FileSystem/Shell.php

Braces +89 added lines, -70 removed lines

@@ -83,8 +83,9 @@ 
 
             foreach ($filesForHandler as $item)
             {
-                if ($item != '.' && $item != '..')
-                    $contents[] = $item;
+                if ($item != '.' && $item != '..') {
+                                    $contents[] = $item;
+                }
             }
 
             $allContents = $contents;
@@ -99,8 +100,7 @@ 
 
                         $this->buffer = $handler.'/'.$i;
                         call_user_func($fileCallback, $this);
-                    }
-                    elseif (is_dir($handler.'/'.$i))
+                    } elseif (is_dir($handler.'/'.$i))
                     {
                         $allContents[] = $handler.'/'.$i;
 
@@ -109,19 +109,21 @@ 
 
                         $directory = scandir($handler);
 
-                        if (!count($directory) < 3)
-                            $this->buffer = $handler.'/'.$i;
+                        if (!count($directory) < 3) {
+                                                    $this->buffer = $handler.'/'.$i;
+                        }
 
                         call_user_func($dirCallback, $this);
                     }
                 }
             }
+        } else {
+                    throw new Exception("The directory '$handler' does not exists");
         }
-        else
-            throw new Exception("The directory '$handler' does not exists");
 
-        if (!is_null($callback))
-            call_user_func($callback, $this);
+        if (!is_null($callback)) {
+                    call_user_func($callback, $this);
+        }
 
         return $allContents;
     }
@@ -133,10 +135,11 @@ 
      */
     public function pwd()
     {
-        if (getcwd())
-            $this->buffer = getcwd();
-        else
-            return false;
+        if (getcwd()) {
+                    $this->buffer = getcwd();
+        } else {
+                    return false;
+        }
 
         return $this->buffer;
     }
@@ -155,9 +158,9 @@ 
 
         $path = (is_null($path) || empty($path)) ? '.' : $path;
 
-        if (is_file($path))
-            $filesToReturn = array($path);
-        elseif (is_dir($path))
+        if (is_file($path)) {
+                    $filesToReturn = array($path);
+        } elseif (is_dir($path))
         {
             $pathIns = dir($path);
 
@@ -179,25 +182,25 @@ 
                 foreach ($files as $item) {
                     $filesToReturn[] = $item;
                 }
-            }
-            else {
+            } else {
                 while (false !== ($item = $pathIns->read())) {
                     $filesToReturn[] = $item;
                 }
                 $pathIns->close();
             }
-        }
-        else {
+        } else {
 
             $contents = $this->ls();
 
             foreach ($contents as $item)
             {
-                if (!empty($path))
-                    if (!strlen(stristr($item, $path)) > 0)
+                if (!empty($path)) {
+                                    if (!strlen(stristr($item, $path)) > 0)
                         continue;
-                if (strstr($item,'~') === false && $item != '.' && $item != '..')
-                    $filesToReturn[] = $item;
+                }
+                if (strstr($item,'~') === false && $item != '.' && $item != '..') {
+                                    $filesToReturn[] = $item;
+                }
             }
         }
 
@@ -217,8 +220,9 @@ 
 
         if (is_dir($path))
         {
-            if (chdir($moveTo))
-                return true;
+            if (chdir($moveTo)) {
+                            return true;
+            }
         }
 
         return false;
@@ -235,11 +239,13 @@ 
     {
         if (file_exists($file))
         {
-            if (!$openFile = fopen($file, 'w+'))
-                return false;
+            if (!$openFile = fopen($file, 'w+')) {
+                            return false;
+            }
 
-            if (fwrite($openFile, ""))
-                return true;
+            if (fwrite($openFile, "")) {
+                            return true;
+            }
 
             fclose($openFile);
         }
@@ -259,12 +265,13 @@ 
     {
         $recursive = is_null($recursive) ? false : $recursive;
 
-        if (is_null($file))
-            throw new Exception("Missing parameter for rm!");
+        if (is_null($file)) {
+                    throw new Exception("Missing parameter for rm!");
+        }
 
-        if (file_exists($file) && !$recursive)
-            unlink($file);
-        elseif (is_dir($file) && $recursive)
+        if (file_exists($file) && !$recursive) {
+                    unlink($file);
+        } elseif (is_dir($file) && $recursive)
         {
             $that = $this;
 
@@ -293,14 +300,15 @@ 
     {
         $recursive = (is_null($recursive)) ? false : $recursive;
 
-        if (empty($file) || empty($dest))
-            throw new Exception("Missing parameters!");
+        if (empty($file) || empty($dest)) {
+                    throw new Exception("Missing parameters!");
+        }
 
         if (is_dir($dest))
         {
-            if (!$recursive)
-                copy($file, $dest.'/'.$file);
-            else {
+            if (!$recursive) {
+                            copy($file, $dest.'/'.$file);
+            } else {
 
                 $files = array();
                 $files[0] = array();
@@ -318,20 +326,22 @@ 
 
                     foreach ($files[1] as $item)
                     {
-                        if (!file_exists($dest.'/'.$item))
-                            mkdir("$dest/$item", 0777, true);
+                        if (!file_exists($dest.'/'.$item)) {
+                                                    mkdir("$dest/$item", 0777, true);
+                        }
                     }
 
                     foreach ($files[0] as $item)
                     {
-                        if (!file_exists("$dest/$files"))
-                            copy($item, $dest.'/'.$item);
+                        if (!file_exists("$dest/$files")) {
+                                                    copy($item, $dest.'/'.$item);
+                        }
                     }
                 });
             }
+        } else {
+                    copy($file, $dest);
         }
-        else
-            copy($file, $dest);
 
         return true;
     }
@@ -346,17 +356,21 @@ 
      */
     public function mv($oldfile, $newfile)
     {
-        if (empty($oldfile))
-            throw new Exception("Missing parameter for mv!");
+        if (empty($oldfile)) {
+                    throw new Exception("Missing parameter for mv!");
+        }
 
-        if (is_dir($newfile))
-                $newfile .= '/'.basename($oldfile);
+        if (is_dir($newfile)) {
+                        $newfile .= '/'.basename($oldfile);
+        }
 
-        if ($oldfile == $newfile)
-            throw new Exception("'$oldfile' and '$newfile' are the same file");
+        if ($oldfile == $newfile) {
+                    throw new Exception("'$oldfile' and '$newfile' are the same file");
+        }
 
-        if(!rename($oldfile, $newfile))
-            return false;
+        if(!rename($oldfile, $newfile)) {
+                    return false;
+        }
 
         return true;
     }
@@ -372,21 +386,24 @@ 
      */
     public function mkdir($dir, $dest = null, $recursive = null)
     {
-        if (empty($dir))
-            throw new Exception("Missing parameter for mkdir!");
+        if (empty($dir)) {
+                    throw new Exception("Missing parameter for mkdir!");
+        }
 
-        if (empty($dest))
-            $dest = '.';
+        if (empty($dest)) {
+                    $dest = '.';
+        }
 
         $recursive = (is_null($recursive)) ? false : $recursive;
 
-        if ($recursive)
-            mkdir("$dest/$dir", 0777, true);
-        else {
+        if ($recursive) {
+                    mkdir("$dest/$dir", 0777, true);
+        } else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
-                    return false;
+                if(!mkdir("$dir", 0777)) {
+                                    return false;
+                }
             }
         }
         return true;
@@ -401,12 +418,14 @@ 
      */
     public function rmdir($dir)
     {
-        if (is_null($dir) || empty($dir))
-            throw new Exception("Missing parameter for rmdir!");
+        if (is_null($dir) || empty($dir)) {
+                    throw new Exception("Missing parameter for rmdir!");
+        }
 
-        if (rmdir($dir))
-            return true;
-        else
-            return false;
+        if (rmdir($dir)) {
+                    return true;
+        } else {
+                    return false;
+        }
     }
 }
\ No newline at end of file

src/Pear/Mail.php

Braces +12 added lines, -8 removed lines

@@ -74,18 +74,21 @@ 
     {
         @include_once 'System.php';
 
-        if (!class_exists('System', false))
-            throw new \RuntimeException("PEAR is not installed in your system!");
+        if (!class_exists('System', false)) {
+                    throw new \RuntimeException("PEAR is not installed in your system!");
+        }
 
         include_once 'Net/SMTP.php';
 
-        if (!class_exists('\Net_SMTP', false))
-            throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        if (!class_exists('\Net_SMTP', false)) {
+                    throw new \RuntimeException("PEAR::Net_SMTP is not installed!");
+        }
 
         @include_once 'Mail.php';
 
-        if (!class_exists('\Mail', false))
-            throw new \RuntimeException("PEAR::Mail is not installed!");
+        if (!class_exists('\Mail', false)) {
+                    throw new \RuntimeException("PEAR::Mail is not installed!");
+        }
     }
 
     /**
@@ -98,8 +101,9 @@ 
      */
     protected function error($code, $message = null)
     {
-        if (!array_key_exists($code, $this->errors))
-            $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        if (!array_key_exists($code, $this->errors)) {
+                    $this->errors[$message] = (is_null($message) && array_key_exists($code, $this->errors)) ? $this->errors[$code] : $message;
+        }
     }
 
     /**

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