SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Acl/AclGroup.php

Indentation +37 added lines, -37 removed lines

@@ -5,41 +5,41 @@
 
 class AclGroup extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'groups';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name'];
-
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
-
-    public function getUpdatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
-
-    public function getDeletedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
-
-    public function users()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
-
-    public function permissions()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclGroupObserver'));
-    }
+	use SoftDeletes;
+	protected $table    = 'groups';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name'];
+
+	public function getCreatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
+
+	public function getUpdatedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
+
+	public function getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
+
+	public function users()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
+
+	public function permissions()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclGroupObserver'));
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -3,7 +3,7 @@ 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class AclGroup extends Model{
+class AclGroup extends Model {
 
     use SoftDeletes;
     protected $table    = 'groups';
@@ -29,12 +29,12 @@ 
 
     public function users()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     public function permissions()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
     }
 
     public static function boot()

src/Modules/V1/Acl/Database/Migrations/2015_12_22_145819_groups.php

Indentation +12 added lines, -12 removed lines

@@ -13,19 +13,19 @@
 	public function up()
 	{
 		Schema::create('groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100)->unique();
-            $table->softDeletes();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100)->unique();
+			$table->softDeletes();
+			$table->timestamps();
+		});
         
-        Schema::create('users_groups', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('user_id');
-            $table->integer('group_id');
-            $table->softDeletes();
-            $table->timestamps();
-        });
+		Schema::create('users_groups', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('user_id');
+			$table->integer('group_id');
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +3 added lines, -3 removed lines

@@ -12,14 +12,14 @@
 	 */
 	public function up()
 	{
-		Schema::create('groups', function (Blueprint $table) {
+		Schema::create('groups', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100)->unique();
+            $table->string('name', 100)->unique();
             $table->softDeletes();
             $table->timestamps();
         });
         
-        Schema::create('users_groups', function (Blueprint $table) {
+        Schema::create('users_groups', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('user_id');
             $table->integer('group_id');

src/Modules/V1/Acl/Database/Migrations/2016_01_05_130507_initialize_acl.php

Indentation +188 added lines, -188 removed lines

@@ -12,191 +12,191 @@ 
 	 */
 	public function up()
 	{
-        /**
-         * Delete previous permissions.
-         */
+		/**
+		 * Delete previous permissions.
+		 */
 		DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->delete();
 
 		/**
-         * Insert the permissions related to this module.
-         */
-        DB::table('permissions')->insert(
-        	[
-        		/**
-        		 * Users model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'delete',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'assigngroups',
-	        	'model'      => 'users',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
+		 * Insert the permissions related to this module.
+		 */
+		DB::table('permissions')->insert(
+			[
+				/**
+				 * Users model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assigngroups',
+				'model'      => 'users',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
 
-	        	/**
-        		 * Permissions model permissions.
-        		 */
-        		[
-	        	'name'       => 'find',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'permissions',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
+				/**
+				 * Permissions model permissions.
+				 */
+				[
+				'name'       => 'find',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'permissions',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
 
-	        	/**
-        		 * Groups model permissions.
-        		 */
-	        	[
-	        	'name'       => 'save',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'delete',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'find',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'search',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'list',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'findby',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'first',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginate',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'paginateby',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-	        	[
-	        	'name'       => 'assignpermissions',
-	        	'model'      => 'groups',
-	        	'created_at' => \DB::raw('NOW()'),
-	        	'updated_at' => \DB::raw('NOW()')
-	        	],
-        	]
-        );
+				/**
+				 * Groups model permissions.
+				 */
+				[
+				'name'       => 'save',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'delete',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'find',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'search',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'list',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'findby',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'first',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginate',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'paginateby',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+				[
+				'name'       => 'assignpermissions',
+				'model'      => 'groups',
+				'created_at' => \DB::raw('NOW()'),
+				'updated_at' => \DB::raw('NOW()')
+				],
+			]
+		);
 
 		/**
 		 * Delete previous data.
@@ -224,29 +224,29 @@ 
 		 * Create Default users.
 		 */
 		$adminUserId = DB::table('users')->insertGetId(
-            [
+			[
 			'email'      => 'admin@user.com',
 			'password'   => bcrypt('123456'),
 			'created_at' => \DB::raw('NOW()'),
 			'updated_at' => \DB::raw('NOW()')
 			]
-        );
+		);
 
 		/**
 		 * Assign users to groups.
 		 */
 		DB::table('users_groups')->insert(
-        	[
-	            [
+			[
+				[
 				'user_id'    => $adminUserId,
 				'group_id'   => $adminGroupId,
 				'created_at' => \DB::raw('NOW()'),
 				'updated_at' => \DB::raw('NOW()')
-	            ]
-        	]
-        );
+				]
+			]
+		);
 
-        /**
+		/**
 		 * Assign the permissions to the admin group.
 		 */
 		$permissionIds = DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->select('id')->lists('id');

src/Modules/V1/Acl/Database/Migrations/2016_01_05_130506_permissions.php

Indentation +15 added lines, -15 removed lines

@@ -12,21 +12,21 @@
 	 */
 	public function up()
 	{
-        Schema::create('permissions', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100);
-            $table->string('model',100);
-            $table->softDeletes();
-            $table->timestamps();
-            $table->unique(array('name', 'model'));
-        });
-        Schema::create('groups_permissions', function (Blueprint $table) {
-            $table->increments('id');
-            $table->integer('group_id');
-            $table->integer('permission_id');
-            $table->softDeletes();
-            $table->timestamps();
-        });
+		Schema::create('permissions', function (Blueprint $table) {
+			$table->increments('id');
+			$table->string('name',100);
+			$table->string('model',100);
+			$table->softDeletes();
+			$table->timestamps();
+			$table->unique(array('name', 'model'));
+		});
+		Schema::create('groups_permissions', function (Blueprint $table) {
+			$table->increments('id');
+			$table->integer('group_id');
+			$table->integer('permission_id');
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -12,15 +12,15 @@
 	 */
 	public function up()
 	{
-        Schema::create('permissions', function (Blueprint $table) {
+        Schema::create('permissions', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100);
-            $table->string('model',100);
+            $table->string('name', 100);
+            $table->string('model', 100);
             $table->softDeletes();
             $table->timestamps();
             $table->unique(array('name', 'model'));
         });
-        Schema::create('groups_permissions', function (Blueprint $table) {
+        Schema::create('groups_permissions', function(Blueprint $table) {
             $table->increments('id');
             $table->integer('group_id');
             $table->integer('permission_id');

src/Modules/V1/Acl/ModelObservers/AclUserObserver.php

Indentation +46 added lines, -46 removed lines

@@ -5,51 +5,51 @@
  */
 class AclUserObserver {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    /**
-     * Soft delete the associated groups and logs to the deleted user.
-     * 
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        \DB::table('users_groups')->where('user_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
-        $model->logs()->delete();
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	/**
+	 * Soft delete the associated groups and logs to the deleted user.
+	 * 
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		\DB::table('users_groups')->where('user_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
+		$model->logs()->delete();
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
 
 }
\ No newline at end of file

src/Modules/V1/Acl/ModelObservers/AclGroupObserver.php

Indentation +45 added lines, -45 removed lines

@@ -5,50 +5,50 @@
  */
 class AclGroupObserver {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    /**
-     * Soft delete the associated permissions to the deleted group.
-     * 
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        \DB::table('groups_permissions')->where('group_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	/**
+	 * Soft delete the associated permissions to the deleted group.
+	 * 
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		\DB::table('groups_permissions')->where('group_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
 
 }
\ No newline at end of file

src/Modules/V1/Acl/ModelObservers/AclPermissionObserver.php

Indentation +45 added lines, -45 removed lines

@@ -5,50 +5,50 @@
  */
 class AclPermissionObserver {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    /**
-     * Soft delete the associated groups to the deleted permission.
-     * 
-     * @param  object $model the delted model.
-     * @return void
-     */
-    public function deleting($model)
-    {
-        \DB::table('groups_permissions')->where('permission_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
+
+	public function saved($model)
+	{
+		//
+	}
+
+	public function creating($model)
+	{
+		//
+	}
+
+	public function created($model)
+	{
+		//
+	}
+
+	public function updating($model)
+	{
+		//
+	}
+
+	public function updated($model)
+	{
+		//
+	}
+
+	/**
+	 * Soft delete the associated groups to the deleted permission.
+	 * 
+	 * @param  object $model the delted model.
+	 * @return void
+	 */
+	public function deleting($model)
+	{
+		\DB::table('groups_permissions')->where('permission_id', $model->id)->update(array('deleted_at' => \DB::raw('NOW()')));
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
 
 }
\ No newline at end of file

src/Modules/V1/Acl/Repositories/GroupRepository.php

Indentation +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 			$group->permissions()->attach($permission_ids);
 		});
 
-        return \Core::groups()->find($group_id);
+		return \Core::groups()->find($group_id);
 	}
 }

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 */
 	public function assignPermissions($group_id, $permission_ids)
 	{
-		\DB::transaction(function () use ($group_id, $permission_ids) {
+		\DB::transaction(function() use ($group_id, $permission_ids) {
 			$group = \Core::groups()->find($group_id);
 			$group->permissions()->detach();
 			$group->permissions()->attach($permission_ids);

src/Modules/V1/Acl/Repositories/UserRepository.php

Braces +2 added lines, -4 removed lines

@@ -75,12 +75,10 @@
         if ($this->isBlocked($credentials['email'])) 
         {
             \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
+        } else if ($token = \JWTAuth::attempt($credentials))
         {
             return $token;
-        }
-        else
+        } else
         {
             \ErrorHandler::loginFailed();
         }

Doc Comments +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
      * Reset the given user's password.
      *
      * @param  array  $credentials
-     * @return integer
+     * @return false|null
      */
     public function resetPassword($credentials)
     {

Indentation +221 added lines, -221 removed lines

@@ -4,232 +4,232 @@
 
 class UserRepository extends AbstractRepository
 {
-    /**
-     * Return the model full namespace.
-     * 
-     * @return string
-     */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Acl\AclUser';
-    }
-
-    /**
-     * Check if the logged in user or the given user 
-     * has the given permissions on the given model.
-     * 
-     * @param  string  $nameOfPermission
-     * @param  string  $model            
-     * @param  boolean $user
-     * @return boolean
-     */
-    public function can($nameOfPermission, $model, $user = false )
-    {       
-        $user        = $user ?: \JWTAuth::parseToken()->authenticate();
-        $permissions = [];
-        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
-            $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
-        });
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Acl\AclUser';
+	}
+
+	/**
+	 * Check if the logged in user or the given user 
+	 * has the given permissions on the given model.
+	 * 
+	 * @param  string  $nameOfPermission
+	 * @param  string  $model            
+	 * @param  boolean $user
+	 * @return boolean
+	 */
+	public function can($nameOfPermission, $model, $user = false )
+	{       
+		$user        = $user ?: \JWTAuth::parseToken()->authenticate();
+		$permissions = [];
+		\Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
+			$permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
+		});
         
-        return in_array($nameOfPermission, $permissions);
-    }
-
-    /**
-     * Check if the logged in user has the given group.
-     * 
-     * @param  string  $groupName
-     * @return boolean
-     */
-    public function hasGroup($groupName)
-    {
-        $groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
-        return $groups->lists('name')->search($groupName, true) === false ? false : true;
-    }
-
-    /**
-     * Assign the given group ids to the given user.
-     * 
-     * @param  integer $user_id    
-     * @param  array   $group_ids
-     * @return object
-     */
-    public function assignGroups($user_id, $group_ids)
-    {
-        \DB::transaction(function () use ($user_id, $group_ids) {
-            $user = \Core::users()->find($user_id);
-            $user->groups()->detach();
-            $user->groups()->attach($group_ids);
-        });
-
-        return \Core::users()->find($user_id);
-    }
-
-    /**
-     * Handle a login request to the application.
-     * 
-     * @param  array $credentials    
-     * @return string
-     */
-    public function login($credentials)
-    {
-        if ($this->isBlocked($credentials['email'])) 
-        {
-            \ErrorHandler::userIsBlocked();
-        }
-        else if ($token = \JWTAuth::attempt($credentials))
-        {
-            return $token;
-        }
-        else
-        {
-            \ErrorHandler::loginFailed();
-        }
-    }
-
-    /**
-     * Handle a registration request.
-     * 
-     * @param  array $credentials
-     * @return string
-     */
-    public function register($credentials)
-    {
-        return \JWTAuth::fromUser(\Core::users()->model->create($credentials));
-    }
-
-    /**
-     * Logout the user.
-     * 
-     * @return boolean
-     */
-    public function logout()
-    {
-        return \JWTAuth::invalidate(\JWTAuth::getToken());
-    }
-
-    /**
-     * Block the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function block($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = \Core::users()->find($user_id);
-        $user->blocked = 1;
-        $user->save();
+		return in_array($nameOfPermission, $permissions);
+	}
+
+	/**
+	 * Check if the logged in user has the given group.
+	 * 
+	 * @param  string  $groupName
+	 * @return boolean
+	 */
+	public function hasGroup($groupName)
+	{
+		$groups = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id)->groups;
+		return $groups->lists('name')->search($groupName, true) === false ? false : true;
+	}
+
+	/**
+	 * Assign the given group ids to the given user.
+	 * 
+	 * @param  integer $user_id    
+	 * @param  array   $group_ids
+	 * @return object
+	 */
+	public function assignGroups($user_id, $group_ids)
+	{
+		\DB::transaction(function () use ($user_id, $group_ids) {
+			$user = \Core::users()->find($user_id);
+			$user->groups()->detach();
+			$user->groups()->attach($group_ids);
+		});
+
+		return \Core::users()->find($user_id);
+	}
+
+	/**
+	 * Handle a login request to the application.
+	 * 
+	 * @param  array $credentials    
+	 * @return string
+	 */
+	public function login($credentials)
+	{
+		if ($this->isBlocked($credentials['email'])) 
+		{
+			\ErrorHandler::userIsBlocked();
+		}
+		else if ($token = \JWTAuth::attempt($credentials))
+		{
+			return $token;
+		}
+		else
+		{
+			\ErrorHandler::loginFailed();
+		}
+	}
+
+	/**
+	 * Handle a registration request.
+	 * 
+	 * @param  array $credentials
+	 * @return string
+	 */
+	public function register($credentials)
+	{
+		return \JWTAuth::fromUser(\Core::users()->model->create($credentials));
+	}
+
+	/**
+	 * Logout the user.
+	 * 
+	 * @return boolean
+	 */
+	public function logout()
+	{
+		return \JWTAuth::invalidate(\JWTAuth::getToken());
+	}
+
+	/**
+	 * Block the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function block($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = \Core::users()->find($user_id);
+		$user->blocked = 1;
+		$user->save();
         
-        return $user;
-    }
-
-    /**
-     * Unblock the user.
-     *
-     * @param  integer $user_id
-     * @return object
-     */
-    public function unblock($user_id)
-    {
-        if ( ! $this->hasGroup('Admin'))
-        {
-            \ErrorHandler::noPermissions();
-        }
-
-        $user          = \Core::users()->find($user_id);
-        $user->blocked = 0;
-        $user->save();
-
-        return $user;
-    }
-
-    /**
-     * Check if the user blocked or not.
-     *
-     * @param  string $email
-     * @return boolean
-     */
-    public function isBlocked($email)
-    {
-        $user = \Core::users()->first(['email' => $email]);
-        if ( ! $user) 
-        {
-            \ErrorHandler::notFound('email or password');
-        }
-
-        return $user->blocked;
-    }
-
-    /**
-     * Handle the editing of the user profile.
-     * 
-     * @param  array $profile
-     * @return object
-     */
-    public function editProfile($profile)
-    {
-        unset($profile['email']);
-        unset($profile['password']);
-        $profile['id'] = \JWTAuth::parseToken()->authenticate()->id;
+		return $user;
+	}
+
+	/**
+	 * Unblock the user.
+	 *
+	 * @param  integer $user_id
+	 * @return object
+	 */
+	public function unblock($user_id)
+	{
+		if ( ! $this->hasGroup('Admin'))
+		{
+			\ErrorHandler::noPermissions();
+		}
+
+		$user          = \Core::users()->find($user_id);
+		$user->blocked = 0;
+		$user->save();
+
+		return $user;
+	}
+
+	/**
+	 * Check if the user blocked or not.
+	 *
+	 * @param  string $email
+	 * @return boolean
+	 */
+	public function isBlocked($email)
+	{
+		$user = \Core::users()->first(['email' => $email]);
+		if ( ! $user) 
+		{
+			\ErrorHandler::notFound('email or password');
+		}
+
+		return $user->blocked;
+	}
+
+	/**
+	 * Handle the editing of the user profile.
+	 * 
+	 * @param  array $profile
+	 * @return object
+	 */
+	public function editProfile($profile)
+	{
+		unset($profile['email']);
+		unset($profile['password']);
+		$profile['id'] = \JWTAuth::parseToken()->authenticate()->id;
         
-        return $this->save($profile);
-    }
-
-    /**
-     * Send a reset link to the given user.
-     *
-     * @param  string  $email
-     * @return void
-     */
-    public function sendReset($email)
-    {
-        $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
-            $message->subject('Your Password Reset Link');
-        });
-
-        switch ($response) 
-        {
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('email');
-        }
-    }
-
-    /**
-     * Reset the given user's password.
-     *
-     * @param  array  $credentials
-     * @return integer
-     */
-    public function resetPassword($credentials)
-    {
-        $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
-            $user->password = $password;
-            $user->save();
-
-            $token = \JWTAuth::fromUser($user);
-        });
-
-
-        switch ($response) {
-            case \Password::PASSWORD_RESET:
-                return $token;
+		return $this->save($profile);
+	}
+
+	/**
+	 * Send a reset link to the given user.
+	 *
+	 * @param  string  $email
+	 * @return void
+	 */
+	public function sendReset($email)
+	{
+		$response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
+			$message->subject('Your Password Reset Link');
+		});
+
+		switch ($response) 
+		{
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('email');
+		}
+	}
+
+	/**
+	 * Reset the given user's password.
+	 *
+	 * @param  array  $credentials
+	 * @return integer
+	 */
+	public function resetPassword($credentials)
+	{
+		$token    = false;
+		$response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+			$user->password = $password;
+			$user->save();
+
+			$token = \JWTAuth::fromUser($user);
+		});
+
+
+		switch ($response) {
+			case \Password::PASSWORD_RESET:
+				return $token;
                 
-            case \Password::INVALID_TOKEN:
-                \ErrorHandler::invalidResetToken('token');
+			case \Password::INVALID_TOKEN:
+				\ErrorHandler::invalidResetToken('token');
 
-            case \Password::INVALID_PASSWORD:
-                \ErrorHandler::invalidResetPassword('email');
+			case \Password::INVALID_PASSWORD:
+				\ErrorHandler::invalidResetPassword('email');
 
-            case \Password::INVALID_USER:
-                \ErrorHandler::notFound('user');
+			case \Password::INVALID_USER:
+				\ErrorHandler::notFound('user');
 
-            default:
-                \ErrorHandler::generalError();
-        }
-    }
+			default:
+				\ErrorHandler::generalError();
+		}
+	}
 }

Spacing +5 added lines, -5 removed lines

@@ -23,11 +23,11 @@ 
      * @param  boolean $user
      * @return boolean
      */
-    public function can($nameOfPermission, $model, $user = false )
+    public function can($nameOfPermission, $model, $user = false)
     {       
         $user        = $user ?: \JWTAuth::parseToken()->authenticate();
         $permissions = [];
-        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function ($permission) use (&$permissions, $model){
+        \Core::users()->find($user->id, ['groups.permissions'])->groups->lists('permissions')->each(function($permission) use (&$permissions, $model){
             $permissions = array_merge($permissions, $permission->where('model', $model)->lists('name')->toArray()); 
         });
         
@@ -55,7 +55,7 @@ 
      */
     public function assignGroups($user_id, $group_ids)
     {
-        \DB::transaction(function () use ($user_id, $group_ids) {
+        \DB::transaction(function() use ($user_id, $group_ids) {
             $user = \Core::users()->find($user_id);
             $user->groups()->detach();
             $user->groups()->attach($group_ids);
@@ -187,7 +187,7 @@ 
      */
     public function sendReset($email)
     {
-        $response = \Password::sendResetLink($email, function (\Illuminate\Mail\Message $message) {
+        $response = \Password::sendResetLink($email, function(\Illuminate\Mail\Message $message) {
             $message->subject('Your Password Reset Link');
         });
 
@@ -207,7 +207,7 @@ 
     public function resetPassword($credentials)
     {
         $token    = false;
-        $response = \Password::reset($credentials, function ($user, $password) use (&$token) {
+        $response = \Password::reset($credentials, function($user, $password) use (&$token) {
             $user->password = $password;
             $user->save();