SherifElfadaly / Laravel-Api-Skeleton

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;
             });
         }

src/Modules/Core/Settings.php

Indentation +40 added lines, -40 removed lines

@@ -5,45 +5,45 @@
 
 class Settings extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'settings';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at'];
-    protected $guarded  = ['id', 'key'];
-    protected $fillable = ['name','value'];
+	use SoftDeletes;
+	protected $table    = 'settings';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at'];
+	protected $guarded  = ['id', 'key'];
+	protected $fillable = ['name','value'];
     
-    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 static function boot()
-    {
-        parent::boot();
-
-        Settings::creating(function($setting)
-        {
-            $error = \ErrorHandler::cannotCreateSetting();
-            abort($error['status'], $error['message']);
-        });
-
-        Settings::updating(function($setting)
-        {
-            if ($setting->original['key'] !== $setting->key) 
-            {
-                $error = \ErrorHandler::cannotUpdateSettingKey();
-                abort($error['status'], $error['message']);
-            }
-        });
-    }
+	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 static function boot()
+	{
+		parent::boot();
+
+		Settings::creating(function($setting)
+		{
+			$error = \ErrorHandler::cannotCreateSetting();
+			abort($error['status'], $error['message']);
+		});
+
+		Settings::updating(function($setting)
+		{
+			if ($setting->original['key'] !== $setting->key) 
+			{
+				$error = \ErrorHandler::cannotUpdateSettingKey();
+				abort($error['status'], $error['message']);
+			}
+		});
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Settings extends Model{
+class Settings extends Model {
 
     use SoftDeletes;
     protected $table    = 'settings';
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
     protected $hidden   = ['deleted_at'];
     protected $guarded  = ['id', 'key'];
-    protected $fillable = ['name','value'];
+    protected $fillable = ['name', 'value'];
     
     public function getCreatedAtAttribute($value)
     {

src/Modules/Core/CoreConfig.php

Indentation +8 added lines, -8 removed lines

@@ -2,14 +2,14 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-    	$customSettings = [];
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
-    		$customSettings[$setting['key']] = $setting['value'];
-    	});
+	public function getConfig()
+	{
+		$customSettings = [];
+		Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
+			$customSettings[$setting['key']] = $setting['value'];
+		});
 
-        return array_merge($customSettings, [
+		return array_merge($customSettings, [
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -56,5 +56,5 @@ 
 				],
 			]
 		]);
-    }
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     public function getConfig()
     {
     	$customSettings = [];
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
+    	Settings::get(['key', 'value'])->each(function($setting) use (&$customSettings){
     		$customSettings[$setting['key']] = $setting['value'];
     	});
 

src/Modules/Core/Log.php

Indentation +14 added lines, -14 removed lines

@@ -2,18 +2,18 @@
 
 class Log
 {
-    public function saveLog($action, $item_name, $item_type, $item_id, $model = false)
-    {
-    	if (\Core::logs() && $item_name !== 'Log')
-    	{
-            $item_name = $item_name;
-    		\Core::logs()->save([
-	    		'action'      => $action,
-	    		'item_name'   => $item_name,
-	    		'item_type'   => $item_type,
-	    		'item_id'     => $item_id,
-	    		'user_id'     => \Auth::user()->id,
-	    		], false, false);
-    	}
-    }
+	public function saveLog($action, $item_name, $item_type, $item_id, $model = false)
+	{
+		if (\Core::logs() && $item_name !== 'Log')
+		{
+			$item_name = $item_name;
+			\Core::logs()->save([
+				'action'      => $action,
+				'item_name'   => $item_name,
+				'item_type'   => $item_type,
+				'item_id'     => $item_id,
+				'user_id'     => \Auth::user()->id,
+				], false, false);
+		}
+	}
 }
\ No newline at end of file

src/Modules/Core/Interfaces/RepositoryContainerInterface.php

Indentation +8 added lines, -8 removed lines

@@ -4,13 +4,13 @@
 {
 	/**
 	 * Construct the repository class name based on
-     * the method name called, search in the 
-     * given namespaces for the class and 
-     * return an instance.
-     * 
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
+	 * the method name called, search in the 
+	 * given namespaces for the class and 
+	 * return an instance.
+	 * 
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
 	public function __call($name, $arguments);
 }
\ No newline at end of file

src/Modules/Core/ErrorHandler.php

Indentation +24 added lines, -24 removed lines

@@ -2,33 +2,33 @@
 
 class ErrorHandler
 {
-    public function unAuthorized()
-    {
-        return ['status' => 401, 'message' => 'Please login before any action'];
-    }
+	public function unAuthorized()
+	{
+		return ['status' => 401, 'message' => 'Please login before any action'];
+	}
 
-    public function loginFailed()
-    {
-        return ['status' => 400, 'message' => 'Wrong mail or password'];
-    }
+	public function loginFailed()
+	{
+		return ['status' => 400, 'message' => 'Wrong mail or password'];
+	}
 
-    public function noPermissions()
-    {
-        return ['status' => 401, 'message' => 'No permissions'];
-    }
+	public function noPermissions()
+	{
+		return ['status' => 401, 'message' => 'No permissions'];
+	}
 
-    public function cannotCreateSetting()
-    {
-        return ['status' => 400, 'message' => 'Can\'t create setting'];
-    }
+	public function cannotCreateSetting()
+	{
+		return ['status' => 400, 'message' => 'Can\'t create setting'];
+	}
 
-    public function cannotUpdateSettingKey()
-    {
-        return ['status' => 400, 'message' => 'Can\'t update setting key'];
-    }
+	public function cannotUpdateSettingKey()
+	{
+		return ['status' => 400, 'message' => 'Can\'t update setting key'];
+	}
 
-    public function notFound($text)
-    {
-        return ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
-    }
+	public function notFound($text)
+	{
+		return ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+	}
 }
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 
     public function notFound($text)
     {
-        return ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+        return ['status' => 404, 'message' => 'The requested '.$text.' not found'];
     }
 }
\ No newline at end of file

src/Modules/Core/Database/Migrations/2016_01_24_123630_settings.php

Indentation +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@
 	public function up()
 	{
 		Schema::create('settings', function (Blueprint $table) {
-            $table->increments('id');
-            $table->string('name',100);
-            $table->string('key',100)->unique();
-            $table->string('value',100);
-            $table->softDeletes();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('name',100);
+			$table->string('key',100)->unique();
+			$table->string('value',100);
+			$table->softDeletes();
+			$table->timestamps();
+		});
 	}
 
 	/**

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 	 */
 	public function up()
 	{
-		Schema::create('settings', function (Blueprint $table) {
+		Schema::create('settings', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100);
-            $table->string('key',100)->unique();
-            $table->string('value',100);
+            $table->string('name', 100);
+            $table->string('key', 100)->unique();
+            $table->string('value', 100);
             $table->softDeletes();
             $table->timestamps();
         });

src/Modules/Logging/Log.php

Indentation +35 added lines, -35 removed lines

@@ -5,40 +5,40 @@
 
 class Log extends Model{
 
-    use SoftDeletes;
-    protected $table    = 'logs';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['deleted_at', 'item_type'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id'];
-
-    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    = 'logs';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['deleted_at', 'item_type'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id'];
+
+	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 user()
-    {
-        return $this->belongsTo('App\Modules\Acl\AclUser');
-    }
-
-    public function item()
-    {
-        return $this->morphTo();
-    }
-
-    public static function boot()
-    {
-        parent::boot();
-    }
+	public function user()
+	{
+		return $this->belongsTo('App\Modules\Acl\AclUser');
+	}
+
+	public function item()
+	{
+		return $this->morphTo();
+	}
+
+	public static function boot()
+	{
+		parent::boot();
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Log extends Model{
+class Log extends Model {
 
     use SoftDeletes;
     protected $table    = 'logs';

src/Modules/Logging/Database/Migrations/2016_01_19_084705_logs.php

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 	 */
 	public function up()
 	{
-		Schema::create('logs', function (Blueprint $table) {
+		Schema::create('logs', function(Blueprint $table) {
 			$table->increments('id');
-			$table->string('action',100);
-			$table->string('item_name',100);
-			$table->string('item_type',100);
+			$table->string('action', 100);
+			$table->string('item_name', 100);
+			$table->string('item_type', 100);
 			$table->integer('item_id');
 			$table->integer('user_id');
 			$table->softDeletes();

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
 			$table->string('view_name',100);
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**