SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Acl/AclGroup.php

Indentation +43 added lines, -43 removed lines

@@ -5,47 +5,47 @@
 
 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\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
-
-    public function permissions()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-
-        AclGroup::deleting(function($group)
-        {
-            \DB::table('groups_permissions')
-            ->where('group_id', $group->id)
-            ->update(array('deleted_at' => \DB::raw('NOW()')));
-        });
-    }
+	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\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
+
+	public function permissions()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+
+		AclGroup::deleting(function($group)
+		{
+			\DB::table('groups_permissions')
+			->where('group_id', $group->id)
+			->update(array('deleted_at' => \DB::raw('NOW()')));
+		});
+	}
 }

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\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     public function permissions()
     {
-        return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
     }
 
     public static function boot()

src/Modules/Acl/Repositories/UserRepository.php

Indentation +1 added lines, -1 removed lines

@@ -61,6 +61,6 @@
 			$user->groups()->attach($group_ids);
 		});
 
-        return \Core::users()->find($user_id);
+		return \Core::users()->find($user_id);
 	}
 }

Spacing +3 added lines, -3 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 ?: \Auth::user();
 		$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);

src/Modules/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/Acl/Http/Controllers/PermissionsController.php

Indentation +6 added lines, -6 removed lines

@@ -7,10 +7,10 @@
 
 class PermissionsController extends BaseApiController
 {
-    /**
-     * The name of the model that is used by the base api controller 
-     * to preform actions like (add, edit ... etc).
-     * @var string
-     */
-    protected $model = 'permissions';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model = 'permissions';
 }

src/Modules/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +11 added lines, -11 removed lines

@@ -13,17 +13,17 @@
 	public function up()
 	{
 		Schema::create('users', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('first_name',100)->nullable();
-            $table->string('last_name',100)->nullable();
-            $table->string('user_name',100)->nullable();
-            $table->text('address')->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60);
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('first_name',100)->nullable();
+			$table->string('last_name',100)->nullable();
+			$table->string('user_name',100)->nullable();
+			$table->text('address')->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60);
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 	 */
 	public function up()
 	{
-		Schema::create('users', function (Blueprint $table) {
+		Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('first_name',100)->nullable();
-            $table->string('last_name',100)->nullable();
-            $table->string('user_name',100)->nullable();
+            $table->string('first_name', 100)->nullable();
+            $table->string('last_name', 100)->nullable();
+            $table->string('user_name', 100)->nullable();
             $table->text('address')->nullable();
             $table->string('email')->unique();
             $table->string('password', 60);

src/Modules/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/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/Acl/AclPermission.php

Indentation +37 added lines, -37 removed lines

@@ -5,42 +5,42 @@
 
 class AclPermission extends Model {
 
-    use SoftDeletes;
-    protected $table    = 'permissions';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'model'];
-
-    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();
-    }
+	use SoftDeletes;
+	protected $table    = 'permissions';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'model'];
+
+	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 groups()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-
-        AclPermission::deleting(function($permission)
-        {
-            \DB::table('groups_permissions')
-            ->where('permission_id', $permission->id)
-            ->update(array('deleted_at' => \DB::raw('NOW()')));
-        });
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+
+		AclPermission::deleting(function($permission)
+		{
+			\DB::table('groups_permissions')
+			->where('permission_id', $permission->id)
+			->update(array('deleted_at' => \DB::raw('NOW()')));
+		});
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -29,7 +29,7 @@
     
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps();
     }
 
     public static function boot()

src/Modules/Acl/AclUser.php

Indentation +59 added lines, -59 removed lines

@@ -6,74 +6,74 @@
 
 class AclUser extends User {
 
-    use SoftDeletes;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password'];
-    protected $appends  = ['permissions'];
+	use SoftDeletes;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token','deleted_at'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password'];
+	protected $appends  = ['permissions'];
     
-    public function getCreatedAtAttribute($value)
-    {
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
-    }
+	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 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 getDeletedAtAttribute($value)
+	{
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
+	}
 
-    /**
-     * Encrypt the password attribute before
-     * saving it in the storage.
-     * 
-     * @param string $value 
-     */
-    public function setPasswordAttribute($value)
-    {
-        $this->attributes['password'] = bcrypt($value);
-    }
+	/**
+	 * Encrypt the password attribute before
+	 * saving it in the storage.
+	 * 
+	 * @param string $value 
+	 */
+	public function setPasswordAttribute($value)
+	{
+		$this->attributes['password'] = bcrypt($value);
+	}
 
-    public function logs()
-    {
-        return $this->hasMany('App\Modules\Logging\Log', 'user_id');
-    }
+	public function logs()
+	{
+		return $this->hasMany('App\Modules\Logging\Log', 'user_id');
+	}
 
-    public function groups()
-    {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
 
-    public function getPermissionsAttribute()
-    {
-        $permissions = [];
-        foreach ($this->groups as $group)
-        {
-            $group->permissions->each(function ($permission) use (&$permissions){
-                $permissions[$permission->model][$permission->id] = $permission->name;
-            });
-        }
+	public function getPermissionsAttribute()
+	{
+		$permissions = [];
+		foreach ($this->groups as $group)
+		{
+			$group->permissions->each(function ($permission) use (&$permissions){
+				$permissions[$permission->model][$permission->id] = $permission->name;
+			});
+		}
 
-        return \Illuminate\Database\Eloquent\Collection::make($permissions);
-    }
+		return \Illuminate\Database\Eloquent\Collection::make($permissions);
+	}
 
-    public static function boot()
-    {
-        parent::boot();
+	public static function boot()
+	{
+		parent::boot();
         
-        AclUser::deleting(function($user)
-        {
-            \DB::table('users_groups')
-            ->where('user_id', $user->id)
-            ->update(array('deleted_at' => \DB::raw('NOW()')));
+		AclUser::deleting(function($user)
+		{
+			\DB::table('users_groups')
+			->where('user_id', $user->id)
+			->update(array('deleted_at' => \DB::raw('NOW()')));
 
-            $user->logs()->delete();
-        });
-    }
+			$user->logs()->delete();
+		});
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
     use SoftDeletes;
     protected $table    = 'users';
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at'];
+    protected $hidden   = ['password', 'remember_token', 'deleted_at'];
     protected $guarded  = ['id'];
     protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password'];
     protected $appends  = ['permissions'];
@@ -47,7 +47,7 @@ 
 
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     public function getPermissionsAttribute()
@@ -55,7 +55,7 @@ 
         $permissions = [];
         foreach ($this->groups as $group)
         {
-            $group->permissions->each(function ($permission) use (&$permissions){
+            $group->permissions->each(function($permission) use (&$permissions){
                 $permissions[$permission->model][$permission->id] = $permission->name;
             });
         }