joaogl / support

src/Database/MySqlGrammar.php

Unused Use Statements +3 added lines, -3 removed lines

@@ -1,8 +1,8 @@
 <?php namespace jlourenco\support\Database;

 

-use Illuminate\Database\Connection;

-use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;

-use Illuminate\Database\Schema\Grammars\MySqlGrammar as IlluminateMySqlGrammar;

+use Illuminate\Database\Connection;
+use Illuminate\Database\Schema\Blueprint as IlluminateBlueprint;
+use Illuminate\Database\Schema\Grammars\MySqlGrammar as IlluminateMySqlGrammar;
 use Illuminate\Support\Fluent;

 

 /**

Braces +1 added lines, -2 removed lines

@@ -122,8 +122,7 @@
                 if ( isset($command->length) )

                 {

                     $column .= "({$command->length})";

-                }

-                elseif ( 'string' == $blueprintColumn->type && $blueprintColumn->length > 255 )

+                } elseif ( 'string' == $blueprintColumn->type && $blueprintColumn->length > 255 )

                 {

                     $column .= '(255)';

                 }

Spacing +11 added lines, -11 removed lines

@@ -13,12 +13,12 @@ 
 

     public function __construct()

     {

-        if ( ! in_array('Collate', $this->modifiers) )

+        if (!in_array('Collate', $this->modifiers))

         {

             array_splice($this->modifiers, array_search('Unsigned', $this->modifiers) + 1, 0, 'Collate');

         }

         // new versions of Laravel already have comment modifier

-        if ( ! in_array('Comment', $this->modifiers) )

+        if (!in_array('Comment', $this->modifiers))

         {

             array_splice($this->modifiers, array_search('After', $this->modifiers) - 1, 0, 'Comment');

         }

@@ -33,7 +33,7 @@ 
      */

     protected function modifyCollate(IlluminateBlueprint $blueprint, Fluent $column)

     {

-        if ( ! is_null($column->collate) )

+        if (!is_null($column->collate))

         {

             $characterSet = strtok($column->collate, '_');

             return " character set $characterSet collate {$column->collate}";

@@ -49,7 +49,7 @@ 
      */

     protected function modifyComment(IlluminateBlueprint $blueprint, Fluent $column)

     {

-        if ( ! is_null($column->comment) )

+        if (!is_null($column->comment))

         {

             $comment = str_replace("'", "\'", $column->comment);

             return " comment '$comment'";

@@ -68,7 +68,7 @@ 
     {

         $sql = parent::compileCreate($blueprint, $command, $connection);

         // Table annotation support

-        if ( isset($blueprint->comment) )

+        if (isset($blueprint->comment))

         {

             $comment = str_replace("'", "\'", $blueprint->comment);

             $sql .= " comment = '$comment'";

@@ -95,7 +95,7 @@ 
      */

     protected function typeSet(Fluent $column)

     {

-        return "set('" . implode("', '", $column->allowed) . "')";

+        return "set('".implode("', '", $column->allowed)."')";

     }

 

     /**

@@ -109,21 +109,21 @@ 
     protected function compileKey(IlluminateBlueprint $blueprint, Fluent $command, $type)

     {

         $columns = [];

-        foreach($command->columns as $commandColumn)

+        foreach ($command->columns as $commandColumn)

         {

-            foreach($blueprint->getColumns() as $blueprintColumn)

+            foreach ($blueprint->getColumns() as $blueprintColumn)

             {

-                if ( $blueprintColumn->name != $commandColumn )

+                if ($blueprintColumn->name != $commandColumn)

                 {

                     continue;

                 }

 

                 $column = $this->wrap($commandColumn);

-                if ( isset($command->length) )

+                if (isset($command->length))

                 {

                     $column .= "({$command->length})";

                 }

-                elseif ( 'string' == $blueprintColumn->type && $blueprintColumn->length > 255 )

+                elseif ('string' == $blueprintColumn->type && $blueprintColumn->length > 255)

                 {

                     $column .= '(255)';

                 }

src/Traits/CaptchaTrait.php

Braces +5 added lines, -4 removed lines

@@ -15,10 +15,11 @@
         $recaptcha = new ReCaptcha($secret);

         $resp = $recaptcha->verify($response, $remoteip);

 

-        if ($resp->isSuccess())

-            return true;

-        else

-            return false;

+        if ($resp->isSuccess()) {
+                    return true;
+        } else {
+                    return false;
+        }
     }

 

 }
\ No newline at end of file

src/Traits/Creation.php

Spacing +2 added lines, -2 removed lines

@@ -13,7 +13,7 @@ 
     {

 

         // create a event to happen on deleting

-        static::deleting(function($table)  {

+        static::deleting(function($table) {

             if (class_exists('Cartalyst\Sentinel\Laravel\Facades\Sentinel'))

                 $table->deleted_by = Sentinel::getUser()->id;

             else

@@ -23,7 +23,7 @@ 
         });

 

         // create a event to happen on saving

-        static::saving(function($table)  {

+        static::saving(function($table) {

 

             if (class_exists('Cartalyst\Sentinel\Laravel\Facades\Sentinel'))

             {

Braces +19 added lines, -15 removed lines

@@ -14,10 +14,11 @@ 
 

         // create a event to happen on deleting

         static::deleting(function($table)  {

-            if (class_exists('Cartalyst\Sentinel\Laravel\Facades\Sentinel'))

-                $table->deleted_by = Sentinel::getUser()->id;

-            else

-                $table->deleted_by = Auth::user()->id;

+            if (class_exists('Cartalyst\Sentinel\Laravel\Facades\Sentinel')) {
+                            $table->deleted_by = Sentinel::getUser()->id;
+            } else {
+                            $table->deleted_by = Auth::user()->id;
+            }
 

             $table->update(['deleted_by' => $table->deleted_by]);

         });

@@ -27,19 +28,22 @@ 
 

             if (class_exists('Cartalyst\Sentinel\Laravel\Facades\Sentinel'))

             {

-                if (Sentinel::check())

-                    $table->modified_by = Sentinel::getUser()->id;

-

-                if (Sentinel::check() && ($table->created_by == null || !($table->created_by > 0)))

-                    $table->created_by = Sentinel::getUser()->id;

-            }

-            else

+                if (Sentinel::check()) {
+                                    $table->modified_by = Sentinel::getUser()->id;
+                }
+

+                if (Sentinel::check() && ($table->created_by == null || !($table->created_by > 0))) {
+                                    $table->created_by = Sentinel::getUser()->id;
+                }
+            } else

             {

-                if (!Auth::guest())

-                    $table->modified_by = Auth::user()->id;

+                if (!Auth::guest()) {
+                                    $table->modified_by = Auth::user()->id;
+                }
 

-                if (!Auth::guest() && ($table->created_by == null || !($table->created_by > 0)))

-                    $table->created_by = Auth::user()->id;

+                if (!Auth::guest() && ($table->created_by == null || !($table->created_by > 0))) {
+                                    $table->created_by = Auth::user()->id;
+                }
             }

 

         });

src/Database/Blueprint.php

Braces +3 added lines, -2 removed lines

@@ -109,8 +109,9 @@
         // If no name was specified for this index, we will create one using a basic

         // convention of the table name, followed by the columns, followed by an

         // index type, such as primary or index, which makes the index unique.

-        if (is_null($index))

-            $index = $this->createIndexName($type, $columns);

+        if (is_null($index)) {
+                    $index = $this->createIndexName($type, $columns);
+        }
         return $this->addCommand($type, compact('index', 'columns', 'length'));

     }

 

Spacing +1 added lines, -1 removed lines

@@ -90,7 +90,7 @@
     public function hasForeign($table, $foreign)

     {

         $sql = $this->grammar->compileHasForeign();

-        $table = $this->connection->getTablePrefix() . $table;

+        $table = $this->connection->getTablePrefix().$table;

         return count($this->connection->select($sql, [$table, $foreign])) > 0;

     }

 

src/Commands/SetupCommand.php

Braces +9 added lines, -6 removed lines

@@ -57,8 +57,9 @@ 
             return (!(stripos($var, 'jlourenco.') === false) && $var != 'jlourenco.php');

         });

 

-        if ($fileExists)

-            unlink($mainFile);

+        if ($fileExists) {
+                    unlink($mainFile);
+        }
 

         touch($mainFile);

 

@@ -71,8 +72,9 @@ 
 

             while ($line = fgets($in))

             {

-                if ((stripos($line, '<?php') === false) && (stripos($line, '];') === false) && (stripos($line, 'return [') === false))

-                    $content .= $line;

+                if ((stripos($line, '<?php') === false) && (stripos($line, '];') === false) && (stripos($line, 'return [') === false)) {
+                                    $content .= $line;
+                }
             }

 

             fclose($in);

@@ -84,8 +86,9 @@ 
 

         $bytesWritten = File::append($mainFile, $content);

 

-        if ($bytesWritten === false)

-            $this->info('Couldn\'t write to config file.');

+        if ($bytesWritten === false) {
+                    $this->info('Couldn\'t write to config file.');
+        }
 

         $this->info('Config files compiled');

     }

Spacing +4 added lines, -4 removed lines

@@ -50,10 +50,10 @@ 
     private function compileConfigFiles()

     {

         $path = base_path('/config');

-        $mainFile = $path . '/jlourenco.php';

+        $mainFile = $path.'/jlourenco.php';

         $fileExists = file_exists($mainFile);

 

-        $files = array_filter(scandir($path), function ($var) {

+        $files = array_filter(scandir($path), function($var) {

             return (!(stripos($var, 'jlourenco.') === false) && $var != 'jlourenco.php');

         });

 

@@ -67,7 +67,7 @@ 
 

         foreach ($files as $file)

         {

-            $in = fopen($path . '/' . $file, "r");

+            $in = fopen($path.'/'.$file, "r");

 

             while ($line = fgets($in))

             {

@@ -77,7 +77,7 @@ 
 

             fclose($in);

 

-            unlink($path . '/' . $file);

+            unlink($path.'/'.$file);

         }

 

         $content .= "];\n";

Unused Use Statements +3 added lines, -6 removed lines

@@ -1,11 +1,8 @@
 <?php namespace jlourenco\support\Commands;

 

-use Illuminate\Console\Command;

-use Symfony\Component\Console\Input\InputOption;

-use Symfony\Component\Console\Input\InputArgument;

-use File;

-use jlourenco\support\Helpers\FileLoader;

-use Setting;

+use Illuminate\Console\Command;
+use File;
+use Setting;
 use Schema;

 

 class SetupCommand extends Command {

src/Helpers/ColorHelper.php

Spacing +2 added lines, -2 removed lines

@@ -9,7 +9,7 @@ 
         // Normalize into a six character long hex string

         $hex = str_replace('#', '', $hex);

         if (strlen($hex) == 3) {

-            $hex = str_repeat(substr($hex,0,1), 2).str_repeat(substr($hex,1,1), 2).str_repeat(substr($hex,2,1), 2);

+            $hex = str_repeat(substr($hex, 0, 1), 2).str_repeat(substr($hex, 1, 1), 2).str_repeat(substr($hex, 2, 1), 2);

         }

 

         // Split into three parts: R, G and B

@@ -18,7 +18,7 @@ 
 

         foreach ($color_parts as $color) {

             $color   = hexdec($color); // Convert to decimal

-            $color   = max(0,min(255,$color + $steps)); // Adjust color

+            $color   = max(0, min(255, $color + $steps)); // Adjust color

             $return .= str_pad(dechex($color), 2, '0', STR_PAD_LEFT); // Make two char hex code

         }

 

src/Setting.php

Doc Comments +3 added lines, -3 removed lines

@@ -84,7 +84,7 @@ 
     /**
      * Set the path to the file to use
      * @param  string $path The path to the file
-     * @return \Philf\Setting\Setting
+     * @return Setting
      */
     public function path($path)
     {
@@ -94,7 +94,7 @@ 
     /**
      * Set the filename to use
      * @param  string $filename The filename
-     * @return \Philf\Setting\Setting
+     * @return Setting
      */
     public function filename($filename)
     {
@@ -165,7 +165,7 @@ 
      * Load the file in to $this->settings so values can be used immediately
      * @param  string $path     The path to be used
      * @param  string $filename The filename to be used
-     * @return \Philf\Setting\Setting
+     * @return Setting
      */
     public function load($path = null, $filename = null)
     {

Spacing +7 added lines, -7 removed lines

@@ -114,11 +114,11 @@ 
             return $this->settings;
         }
         $ts = microtime(true);
-        if($ts !== array_get($this->settings, $key, $ts))
+        if ($ts !== array_get($this->settings, $key, $ts))
         {
             return array_get($this->settings, $key);
         }
-        if ( ! is_null($this->fallback) and $this->fallback->fallbackHas($key))
+        if (!is_null($this->fallback) and $this->fallback->fallbackHas($key))
         {
             return $this->fallback->fallbackGet($key, $default);
         }
@@ -132,7 +132,7 @@ 
      */
     public function set($key, $value)
     {
-        array_set($this->settings,$key,$value);
+        array_set($this->settings, $key, $value);
         $this->save($this->path, $this->filename);
         $this->load($this->path, $this->filename);
     }
@@ -143,7 +143,7 @@ 
      */
     public function forget($deleteKey)
     {
-        array_forget($this->settings,$deleteKey);
+        array_forget($this->settings, $deleteKey);
         $this->save($this->path, $this->filename);
         $this->load($this->path, $this->filename);
     }
@@ -155,7 +155,7 @@ 
     public function has($searchKey)
     {
         $default = microtime(true);
-        if($default == array_get($this->settings, $searchKey, $default) and !is_null($this->fallback))
+        if ($default == array_get($this->settings, $searchKey, $default) and !is_null($this->fallback))
         {
             return $this->fallback->fallbackHas($searchKey);
         }
@@ -191,7 +191,7 @@ 
     {
         $this->path     = isset($path) ? $path : $this->path;
         $this->filename = isset($filename) ? $filename : $this->filename;
-        if ( ! file_exists($this->path))
+        if (!file_exists($this->path))
         {
             mkdir($this->path, 0755, true);
         }
@@ -216,7 +216,7 @@ 
     {
         foreach ($data as $key => $value)
         {
-            array_set($this->settings,$key,$value);
+            array_set($this->settings, $key, $value);
         }
         $this->save($this->path, $this->filename);
         $this->load($this->path, $this->filename);

Braces +1 added lines, -2 removed lines

@@ -174,8 +174,7 @@
         if (is_file($this->path.'/'.$this->filename))
         {
             $this->settings = json_decode(file_get_contents($this->path.'/'.$this->filename), true);
-        }
-        else
+        } else
         {
             $this->settings = array();
         }

src/supportServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -49,7 +49,7 @@ 
     {
         // Publish a config file
         $this->publishes([
-            __DIR__ . '/config' => base_path('/config')
+            __DIR__.'/config' => base_path('/config')
         ], 'config');
     }
 
@@ -107,7 +107,7 @@ 
      */
     protected function registerSetting()
     {
-        $this->app->singleton('setting', function ($app) {
+        $this->app->singleton('setting', function($app) {
             $config = $app['config']->get('jlourenco.support');
 
             $path = array_get($config, 'Setting.path');

Braces +3 added lines, -2 removed lines

@@ -121,8 +121,9 @@
 
         $config = $this->app['config']->get('jlourenco.support');
 
-        if (array_get($config, 'Setting.autoAlias'))
-            $this->app->alias('setting', 'jlourenco\support\Setting');
+        if (array_get($config, 'Setting.autoAlias')) {
+                    $this->app->alias('setting', 'jlourenco\support\Setting');
+        }
     }
 
     /**

src/Helpers/FileLoader.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 
         $file = (!$environment || ($environment == 'production')) ? "{$path}/{$group}.php" : "{$path}/{$environment}/{$group}.php";
 
-        $this->files->put($file, '<?php return ' . var_export($items, true) . ';');
+        $this->files->put($file, '<?php return '.var_export($items, true).';');
     }
 
 }
\ No newline at end of file

Braces +3 added lines, -2 removed lines

@@ -7,8 +7,9 @@
     {
         $path = $this->getPath($namespace);
 
-        if (is_null($path))
-            return;
+        if (is_null($path)) {
+                    return;
+        }
 
         $file = (!$environment || ($environment == 'production')) ? "{$path}/{$group}.php" : "{$path}/{$environment}/{$group}.php";