joaogl / base

src/baseServiceProvider.php

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
     {
         // Publish our routes
         // if (!$this->app->routesAreCached())
-		require __DIR__ . '/routes.php';
+        require __DIR__ . '/routes.php';
 
         // Publish our views
         $this->loadViewsFrom(base_path("resources/views"), 'base');

Spacing +3 added lines, -3 removed lines

@@ -19,12 +19,12 @@ 
         // Publish our views
         $this->loadViewsFrom(base_path("resources/views"), 'base');
         $this->publishes([
-            __DIR__ .  '/views' => base_path("resources/views")
+            __DIR__ . '/views' => base_path("resources/views")
         ]);
 
         // Publish our migrations
         $this->publishes([
-            __DIR__ .  '/migrations' => base_path("database/migrations")
+            __DIR__ . '/migrations' => base_path("database/migrations")
         ], 'migrations');
 
         // Publish a config file
@@ -41,7 +41,7 @@ 
     public function register()
     {
         // Bind the
-        $this->app->bind('base', function($app){
+        $this->app->bind('base', function($app) {
             return new base;
         });
     }

src/Models/BaseUser.php

Braces +3 added lines, -2 removed lines

@@ -240,8 +240,9 @@
     {
         $results = $this->belongsToMany('App\Menu', 'Menu_User', 'user', 'menu')->withTimestamps()->where('pos', $pos)->get();
 
-        foreach ($this->groups as $group)
-            $results->merge($group->menus->where('pos', $pos));
+        foreach ($this->groups as $group) {
+                    $results->merge($group->menus->where('pos', $pos));
+        }
 
         return $results;
     }

src/Helpers/ColorHelper.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,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
@@ -20,7 +20,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/Migrations/2016_01_14_235300_create_base_tables.php

Spacing +7 added lines, -7 removed lines

@@ -14,7 +14,7 @@ 
     public function up()
     {
 
-        Schema::create('User', function (Blueprint $table) {
+        Schema::create('User', function(Blueprint $table) {
             $table->increments('id');
             $table->string('username', 25)->nullable()->unique();
             $table->string('password', 60)->nullable();
@@ -34,14 +34,14 @@ 
             $table->creation();
         });
 
-        Schema::create('Logs', function (Blueprint $table) {
+        Schema::create('Logs', function(Blueprint $table) {
             $table->increments('id');
             $table->text('log');
             $table->timestamps();
             $table->creation();
         });
 
-        Schema::create('Settings', function (Blueprint $table) {
+        Schema::create('Settings', function(Blueprint $table) {
             $table->increments('id');
             $table->string('friendy_name', 25);
             $table->string('name', 25);
@@ -50,7 +50,7 @@ 
             $table->creation();
         });
 
-        Schema::create('Group', function (Blueprint $table) {
+        Schema::create('Group', function(Blueprint $table) {
             $table->increments('id');
             $table->string('name', 25);
             $table->string('description', 250)->nullable();
@@ -63,7 +63,7 @@ 
             $table->unique('slug');
         });
 
-        Schema::create('Group_User', function (Blueprint $table) {
+        Schema::create('Group_User', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('user')->unsigned();
             $table->integer('group')->unsigned();
@@ -75,7 +75,7 @@ 
             $table->foreign('group')->references('id')->on('Group');
         });
 
-        Schema::create('ActivityFeed', function (Blueprint $table) {
+        Schema::create('ActivityFeed', function(Blueprint $table) {
             $table->increments('id');
             $table->string('added_by', 150);
             $table->text('activity');
@@ -86,7 +86,7 @@ 
             $table->timestamps();
         });
 
-        Schema::create('Permission', function (Blueprint $table) {
+        Schema::create('Permission', function(Blueprint $table) {
             $table->increments('id');
             $table->string('key', 100);
             $table->string('description', 250);

src/Database/Blueprint.php

Braces +3 added lines, -2 removed lines

@@ -103,8 +103,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'));
     }
 

src/Database/MySqlGrammar.php

Spacing +10 added lines, -10 removed lines

@@ -17,12 +17,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');
         }
@@ -37,7 +37,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}";
@@ -53,7 +53,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'";
@@ -72,7 +72,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'";
@@ -113,21 +113,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)';
                 }

Braces +1 added lines, -2 removed lines

@@ -126,8 +126,7 @@
                 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/Creation.php

Spacing +3 added lines, -3 removed lines

@@ -11,17 +11,17 @@
     {
 
         // create a event to happen on updating
-        static::updating(function($table)  {
+        static::updating(function($table) {
             $table->updated_by = Sentinel::getUser()->id;
         });
 
         // create a event to happen on deleting
-        static::deleting(function($table)  {
+        static::deleting(function($table) {
             $table->deleted_by = Sentinel::getUser()->id;
         });
 
         // create a event to happen on saving
-        static::saving(function($table)  {
+        static::saving(function($table) {
             $table->created_by = Sentinel::getUser()->id;
         });