SherifElfadaly / Laravel-Api-Skeleton

src/Modules/V1/Notifications/ModelObservers/PushNotificationDeviceObserver.php

Indentation +49 added lines, -49 removed lines

@@ -5,53 +5,53 @@
  */
 class PushNotificationDeviceObserver {
 
-    public function saving($model)
-    {
-        //
-    }
-
-    public function saved($model)
-    {
-        //
-    }
-
-    public function creating($model)
-    {
-        //
-    }
-
-    public function created($model)
-    {
-        //
-    }
-
-    public function updating($model)
-    {
-        //
-    }
-
-    public function updated($model)
-    {
-        //
-    }
-
-    public function deleting($model)
-    {
-        //
-    }
-
-    public function deleted($model)
-    {
-        //
-    }
-
-    public function restoring($model)
-    {
-        //
-    }
-
-    public function restored($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)
+	{
+		//
+	}
+
+	public function deleting($model)
+	{
+		//
+	}
+
+	public function deleted($model)
+	{
+		//
+	}
+
+	public function restoring($model)
+	{
+		//
+	}
+
+	public function restored($model)
+	{
+		//
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Decorators/CachingDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -64,7 +64,7 @@
         if ($this->cacheConfig && $this->cacheConfig == 'cache') 
         {
             $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-            $cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
+            $cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->repo, $name], $arguments);
             });

Braces +2 added lines, -4 removed lines

@@ -68,8 +68,7 @@ 
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
                 return call_user_func_array([$this->repo, $name], $arguments);
             });
-        }
-        else if ($this->cacheConfig)
+        } else if ($this->cacheConfig)
         {
             $this->cache->tags($this->cacheConfig)->flush();
             return call_user_func_array([$this->repo, $name], $arguments);
@@ -93,8 +92,7 @@ 
         if ($cacheConfig && in_array($name, $cacheConfig['cache']))
         {
             $this->cacheConfig = 'cache';
-        }
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
+        } else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
         {
             $this->cacheConfig = $cacheConfig['clear'][$name];
         }

Indentation +101 added lines, -101 removed lines

@@ -2,117 +2,117 @@
 
 class CachingDecorator
 {
-    /**
-     * The repo implementation.
-     * 
-     * @var string
-     */
-    public $repo;
+	/**
+	 * The repo implementation.
+	 * 
+	 * @var string
+	 */
+	public $repo;
 
-    /**
-     * The cache implementation.
-     * 
-     * @var object
-     */
-    protected $cache;
+	/**
+	 * The cache implementation.
+	 * 
+	 * @var object
+	 */
+	protected $cache;
 
-    /**
-     * The modelKey implementation.
-     * 
-     * @var string
-     */
-    public $modelKey;
+	/**
+	 * The modelKey implementation.
+	 * 
+	 * @var string
+	 */
+	public $modelKey;
 
-    /**
-     * The model implementation.
-     * 
-     * @var string
-     */
-    public $model;
+	/**
+	 * The model implementation.
+	 * 
+	 * @var string
+	 */
+	public $model;
 
-    /**
-     * The modelClass implementation.
-     * 
-     * @var string
-     */
-    public $modelClass;
+	/**
+	 * The modelClass implementation.
+	 * 
+	 * @var string
+	 */
+	public $modelClass;
 
-    /**
-     * The cacheConfig implementation.
-     * 
-     * @var array
-     */
-    public $cacheConfig;
+	/**
+	 * The cacheConfig implementation.
+	 * 
+	 * @var array
+	 */
+	public $cacheConfig;
 
-    /**
-     * The cacheTag implementation.
-     * 
-     * @var string
-     */
-    public $cacheTag;
+	/**
+	 * The cacheTag implementation.
+	 * 
+	 * @var string
+	 */
+	public $cacheTag;
     
-    /**
-     * Create new CachingDecorator instance.
-     */
-    public function __construct($repo, $cache)
-    {   
-        $this->repo       = $repo;
-        $this->cache      = $cache;
-        $this->model      = $this->repo->model;
-        $this->modelClass = get_class($this->model);
-        $repoClass        = explode('\\', get_class($this->repo));
-        $repoName         = end($repoClass);
-        $this->cacheTag   = str_plural(lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))));
-    }
+	/**
+	 * Create new CachingDecorator instance.
+	 */
+	public function __construct($repo, $cache)
+	{   
+		$this->repo       = $repo;
+		$this->cache      = $cache;
+		$this->model      = $this->repo->model;
+		$this->modelClass = get_class($this->model);
+		$repoClass        = explode('\\', get_class($this->repo));
+		$repoName         = end($repoClass);
+		$this->cacheTag   = str_plural(lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))));
+	}
 
-    /**
-     * Handle the cache mechanism for the called method
-     * based the configurations.
-     * 
-     * @param  string $name the called method name
-     * @param  array  $arguments the method arguments
-     * @return object
-     */
-    public function __call($name, $arguments)
-    {
-        $this->setCacheConfig($name);
+	/**
+	 * Handle the cache mechanism for the called method
+	 * based the configurations.
+	 * 
+	 * @param  string $name the called method name
+	 * @param  array  $arguments the method arguments
+	 * @return object
+	 */
+	public function __call($name, $arguments)
+	{
+		$this->setCacheConfig($name);
 
-        if ($this->cacheConfig && $this->cacheConfig == 'cache') 
-        {
-            $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-            $cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
-            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
-                return call_user_func_array([$this->repo, $name], $arguments);
-            });
-        }
-        else if ($this->cacheConfig)
-        {
-            $this->cache->tags($this->cacheConfig)->flush();
-            return call_user_func_array([$this->repo, $name], $arguments);
-        }
+		if ($this->cacheConfig && $this->cacheConfig == 'cache') 
+		{
+			$page     = \Request::get('page') !== null ? \Request::get('page') : '1';
+			$cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
+			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
+				return call_user_func_array([$this->repo, $name], $arguments);
+			});
+		}
+		else if ($this->cacheConfig)
+		{
+			$this->cache->tags($this->cacheConfig)->flush();
+			return call_user_func_array([$this->repo, $name], $arguments);
+		}
 
-        return call_user_func_array([$this->repo, $name], $arguments);
-    }
+		return call_user_func_array([$this->repo, $name], $arguments);
+	}
 
-    /**
-     * Set cache config based on the called method.
-     * 
-     * @param  string $name
-     * @return void
-     */
-    private function setCacheConfig($name)
-    {   
-        $config            = \CoreConfig::getConfig();
-        $cacheConfig       = array_key_exists($this->cacheTag, $config['cacheConfig']) ? $config['cacheConfig'][$this->cacheTag] : false;
-        $this->cacheConfig = false;
+	/**
+	 * Set cache config based on the called method.
+	 * 
+	 * @param  string $name
+	 * @return void
+	 */
+	private function setCacheConfig($name)
+	{   
+		$config            = \CoreConfig::getConfig();
+		$cacheConfig       = array_key_exists($this->cacheTag, $config['cacheConfig']) ? $config['cacheConfig'][$this->cacheTag] : false;
+		$this->cacheConfig = false;
 
-        if ($cacheConfig && in_array($name, $cacheConfig['cache']))
-        {
-            $this->cacheConfig = 'cache';
-        }
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
-        {
-            $this->cacheConfig = $cacheConfig['clear'][$name];
-        }
-    }
+		if ($cacheConfig && in_array($name, $cacheConfig['cache']))
+		{
+			$this->cacheConfig = 'cache';
+		}
+		else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
+		{
+			$this->cacheConfig = $cacheConfig['clear'][$name];
+		}
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Database/Factories/SettingFactory.php

Indentation +2 added lines, -2 removed lines

@@ -1,11 +1,11 @@
 <?php
 
 $factory->define(App\Modules\V1\Core\Settings::class, function (Faker\Generator $faker) {
-    return [
+	return [
 		'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
 		'value'      => $faker->word(),
 		'key'        => $faker->word(),
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
 		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	];
 });

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Core\Settings::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Core\Settings::class, function(Faker\Generator $faker) {
     return [
 		'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
 		'value'      => $faker->word(),

src/Modules/V1/Core/ModelObservers/SettingsObserver.php

Indentation +55 added lines, -55 removed lines

@@ -5,68 +5,68 @@
  */
 class SettingsObserver {
 
-    public function saving($model)
-    {
-        //
-    }
+	public function saving($model)
+	{
+		//
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent the creating of the settings.
-     * 
-     * @param  object $model the model beign created.
-     * @return void
-     */
-    public function creating($model)
-    {
-        \ErrorHandler::cannotCreateSetting();
-    }
+	/**
+	 * Prevent the creating of the settings.
+	 * 
+	 * @param  object $model the model beign created.
+	 * @return void
+	 */
+	public function creating($model)
+	{
+		\ErrorHandler::cannotCreateSetting();
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    /**
-     * Prevent updating of the setting key.
-     * 
-     * @param  object $model the model beign updated.
-     * @return void
-     */
-    public function updating($model)
-    {
-        if ($model->getOriginal('key') !== $model->key) 
-        {
-            \ErrorHandler::cannotUpdateSettingKey();
-        }
-    }
+	/**
+	 * Prevent updating of the setting key.
+	 * 
+	 * @param  object $model the model beign updated.
+	 * @return void
+	 */
+	public function updating($model)
+	{
+		if ($model->getOriginal('key') !== $model->key) 
+		{
+			\ErrorHandler::cannotUpdateSettingKey();
+		}
+	}
 
-    public function updated($model)
-    {
-        //
-    }
+	public function updated($model)
+	{
+		//
+	}
 
-    public function deleting($model)
-    {
-        //
-    }
+	public function deleting($model)
+	{
+		//
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }
\ No newline at end of file

src/Modules/V1/Core/Utl/CoreConfig.php

Indentation +5 added lines, -5 removed lines

@@ -3,10 +3,10 @@ 
 
 class CoreConfig
 {
-    public function getConfig()
-    {
-        return [
-        	'resetLink' => '{{link_here}}',
+	public function getConfig()
+	{
+		return [
+			'resetLink' => '{{link_here}}',
 			/**
 			 * Specify what relations should be used for every model.
 			 */
@@ -180,5 +180,5 @@ 
 				]
 			]
 		];
-    }
+	}
 }
\ No newline at end of file

src/Modules/V1/Notifications/Database/Factories/PushNotificationDeviceFactory.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function(Faker\Generator $faker) {
     return [
 		'device_token' => $faker->sha1(),
 		'user_id'      => $faker->randomDigitNotNull(),

Indentation +2 added lines, -2 removed lines

@@ -1,10 +1,10 @@
 <?php
 
 $factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
-    return [
+	return [
 		'device_token' => $faker->sha1(),
 		'user_id'      => $faker->randomDigitNotNull(),
 		'created_at'   => $faker->dateTimeBetween('-1 years', 'now'),
 		'updated_at'   => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	];
 });
\ No newline at end of file

src/Modules/V1/Notifications/Database/Migrations/2016_01_24_111942_push_notifications_devices.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 			$table->unique(array('device_token', 'user_id'));
 			$table->softDeletes();
 			$table->timestamps();
-        });
+		});
 	}
 
 	/**

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('push_notifications_devices', function (Blueprint $table) {
+		Schema::create('push_notifications_devices', function(Blueprint $table) {
 			$table->increments('id');
 			$table->string('device_token');
 			$table->integer('user_id');

src/Modules/V1/Notifications/Database/Migrations/2017_10_26_154804_create_jobs_table.php

Indentation +27 added lines, -27 removed lines

@@ -6,33 +6,33 @@
 
 class CreateJobsTable extends Migration
 {
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('jobs', function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('queue');
-            $table->longText('payload');
-            $table->tinyInteger('attempts')->unsigned();
-            $table->unsignedInteger('reserved_at')->nullable();
-            $table->unsignedInteger('available_at');
-            $table->unsignedInteger('created_at');
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		Schema::create('jobs', function (Blueprint $table) {
+			$table->bigIncrements('id');
+			$table->string('queue');
+			$table->longText('payload');
+			$table->tinyInteger('attempts')->unsigned();
+			$table->unsignedInteger('reserved_at')->nullable();
+			$table->unsignedInteger('available_at');
+			$table->unsignedInteger('created_at');
 
-            $table->index(['queue', 'reserved_at']);
-        });
-    }
+			$table->index(['queue', 'reserved_at']);
+		});
+	}
 
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('jobs');
-    }
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Schema::dropIfExists('jobs');
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
      */
     public function up()
     {
-        Schema::create('jobs', function (Blueprint $table) {
+        Schema::create('jobs', function(Blueprint $table) {
             $table->bigIncrements('id');
             $table->string('queue');
             $table->longText('payload');

src/Modules/V1/Acl/AclUser.php

Unused Use Statements -1 removed lines

@@ -2,7 +2,6 @@
 
 use App\User;
 use Illuminate\Database\Eloquent\SoftDeletes;
-use Illuminate\Notifications\Notifiable;
 use Laravel\Passport\HasApiTokens;
 
 class AclUser extends User {

Braces +1 added lines, -2 removed lines

@@ -67,8 +67,7 @@
                 }
 
                 $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
+            } catch (\Exception $e) 
             {
                 $device->forceDelete();
             }

Indentation +73 added lines, -73 removed lines

@@ -7,89 +7,89 @@
 
 class AclUser extends User {
 
-    use SoftDeletes, HasApiTokens;
-    protected $table    = 'users';
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
-    protected $guarded  = ['id'];
-    protected $fillable = ['name', 'email', 'password'];
-    public $searchable  = ['name', 'email'];
+	use SoftDeletes, HasApiTokens;
+	protected $table    = 'users';
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
+	protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
+	protected $guarded  = ['id'];
+	protected $fillable = ['name', 'email', 'password'];
+	public $searchable  = ['name', 'email'];
     
-    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 groups()
-    {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
-    }
+	public function groups()
+	{
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+	}
 
-    /**
-     * Return fcm device tokens related to the user.
-     * @return array
-     */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
+	/**
+	 * Return fcm device tokens related to the user.
+	 * @return array
+	 */
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
 
-        foreach ($devices as $device) 
-        {
-            $accessToken = decrypt($device->access_token);
+		foreach ($devices as $device) 
+		{
+			$accessToken = decrypt($device->access_token);
 
-            try
-            {
-                if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
-                {
-                    continue;
-                }
+			try
+			{
+				if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
+				{
+					continue;
+				}
 
-                $tokens[] = $device->device_token;
-            } 
-            catch (\Exception $e) 
-            {
-                $device->forceDelete();
-            }
-        }
+				$tokens[] = $device->device_token;
+			} 
+			catch (\Exception $e) 
+			{
+				$device->forceDelete();
+			}
+		}
 
-        return $tokens;
-    }
+		return $tokens;
+	}
 
-    /**
-     * The channels the user receives notification broadcasts on.
-     *
-     * @return string
-     */
-    public function receivesBroadcastNotificationsOn()
-    {
-        return 'users.' . $this->id;
-    }
+	/**
+	 * The channels the user receives notification broadcasts on.
+	 *
+	 * @return string
+	 */
+	public function receivesBroadcastNotificationsOn()
+	{
+		return 'users.' . $this->id;
+	}
     
-    public static function boot()
-    {
-        parent::boot();
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
-    }
+	public static function boot()
+	{
+		parent::boot();
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
+	}
 }

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
     use SoftDeletes, HasApiTokens;
     protected $table    = 'users';
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
-    protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
+    protected $hidden   = ['password', 'remember_token', 'deleted_at', 'two_factor_code'];
     protected $guarded  = ['id'];
     protected $fillable = ['name', 'email', 'password'];
     public $searchable  = ['name', 'email'];
@@ -43,7 +43,7 @@ 
 
     public function groups()
     {
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
     }
 
     /**
@@ -84,7 +84,7 @@ 
      */
     public function receivesBroadcastNotificationsOn()
     {
-        return 'users.' . $this->id;
+        return 'users.'.$this->id;
     }
     
     public static function boot()