Pleets / dronephp

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/FileSystem/Shell.php

Spacing +15 added lines, -15 removed lines

@@ -93,24 +93,24 @@ 
             {
                 foreach ($contents as $i)
                 {
-                    if (is_file($handler.'/'.$i))
+                    if (is_file($handler . '/' . $i))
                     {
-                        $allContents[] = $handler.'/'.$i;
+                        $allContents[] = $handler . '/' . $i;
 
-                        $this->buffer = $handler.'/'.$i;
+                        $this->buffer = $handler . '/' . $i;
                         call_user_func($fileCallback, $this);
                     }
-                    elseif (is_dir($handler.'/'.$i))
+                    elseif (is_dir($handler . '/' . $i))
                     {
-                        $allContents[] = $handler.'/'.$i;
+                        $allContents[] = $handler . '/' . $i;
 
-                        $this->buffer = $handler.'/'.$i;
-                        $this->getContents($handler.'/'.$i, $fileCallback, $dirCallback);
+                        $this->buffer = $handler . '/' . $i;
+                        $this->getContents($handler . '/' . $i, $fileCallback, $dirCallback);
 
                         $directory = scandir($handler);
 
                         if (!count($directory) < 3)
-                            $this->buffer = $handler.'/'.$i;
+                            $this->buffer = $handler . '/' . $i;
 
                         call_user_func($dirCallback, $this);
                     }
@@ -196,7 +196,7 @@ 
                 if (!empty($path))
                     if (!strlen(stristr($item, $path)) > 0)
                         continue;
-                if (strstr($item,'~') === false && $item != '.' && $item != '..')
+                if (strstr($item, '~') === false && $item != '.' && $item != '..')
                     $filesToReturn[] = $item;
             }
         }
@@ -299,7 +299,7 @@ 
         if (is_dir($dest))
         {
             if (!$recursive)
-                copy($file, $dest.'/'.$file);
+                copy($file, $dest . '/' . $file);
             else {
 
                 $files = array();
@@ -318,14 +318,14 @@ 
 
                     foreach ($files[1] as $item)
                     {
-                        if (!file_exists($dest.'/'.$item))
+                        if (!file_exists($dest . '/' . $item))
                             mkdir("$dest/$item", 0777, true);
                     }
 
                     foreach ($files[0] as $item)
                     {
                         if (!file_exists("$dest/$files"))
-                            copy($item, $dest.'/'.$item);
+                            copy($item, $dest . '/' . $item);
                     }
                 });
             }
@@ -350,12 +350,12 @@ 
             throw new Exception("Missing parameter for mv!");
 
         if (is_dir($newfile))
-                $newfile .= '/'.basename($oldfile);
+                $newfile .= '/' . basename($oldfile);
 
         if ($oldfile == $newfile)
             throw new Exception("'$oldfile' and '$newfile' are the same file");
 
-        if(!rename($oldfile, $newfile))
+        if (!rename($oldfile, $newfile))
             return false;
 
         return true;
@@ -385,7 +385,7 @@ 
         else {
             if (!is_dir($dir))
             {
-                if(!mkdir("$dir", 0777))
+                if (!mkdir("$dir", 0777))
                     return false;
             }
         }

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/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