SherifElfadaly / Laravel-Api-Skeleton

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/Database/Factories/LogFactory.php

Indentation +2 added lines, -2 removed lines

@@ -1,12 +1,12 @@
 <?php
 
 $factory->define(App\Modules\V1\Core\Log::class, function (Faker\Generator $faker) {
-    return [
+	return [
 		'action'     => $faker->randomElement(['create', 'delete', 'update']),
 		'item_name ' => $faker->randomElement(['User', 'Settings', 'Group']),
 		'item_id'    => $faker->randomDigitNotNull(),
 		'user_id'    => $faker->randomDigitNotNull(),
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
 		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
-    ];
+	];
 });
\ No newline at end of file

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 
-$factory->define(App\Modules\V1\Core\Log::class, function (Faker\Generator $faker) {
+$factory->define(App\Modules\V1\Core\Log::class, function(Faker\Generator $faker) {
     return [
 		'action'     => $faker->randomElement(['create', 'delete', 'update']),
 		'item_name ' => $faker->randomElement(['User', 'Settings', 'Group']),

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

Indentation +49 added lines, -49 removed lines

@@ -5,53 +5,53 @@
  */
 class LogObserver {
 
-    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/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/Acl/AclUser.php

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php namespace App\Modules\V1\Acl;
 
 use App\User;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Tymon\JWTAuth\Contracts\JWTSubject as AuthenticatableUserContract;
 

Indentation +54 added lines, -54 removed lines

@@ -7,68 +7,68 @@
 
 class AclUser extends User implements AuthenticatableUserContract {
 
-    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 = ['name', 'email', 'password'];
-    public $searchable  = ['name', 'email'];
+	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 = ['name', 'email', 'password'];
+	public $searchable  = ['name', 'email'];
 
-    public function getJWTIdentifier()
-    {
-        return $this->getKey();
-    }
+	public function getJWTIdentifier()
+	{
+		return $this->getKey();
+	}
 
-    public function getJWTCustomClaims()
-    {
-        return [];
-    }
+	public function getJWTCustomClaims()
+	{
+		return [];
+	}
     
-    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\V1\Core\Log', 'user_id');
-    }
+	public function logs()
+	{
+		return $this->hasMany('App\Modules\V1\Core\Log', 'user_id');
+	}
 
-    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();
+	}
 
-    public function employee()
-    {
-        return $this->hasOne('App\Modules\V1\Tobacco\Employee', 'user_id');
-    }
+	public function employee()
+	{
+		return $this->hasOne('App\Modules\V1\Tobacco\Employee', 'user_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 +2 added lines, -2 removed lines

@@ -10,7 +10,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 = ['name', 'email', 'password'];
     public $searchable  = ['name', 'email'];
@@ -58,7 +58,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();
     }
 
     public function employee()

src/Modules/V1/Notifications/Jobs/PushNotifications.php

Doc Comments +3 added lines

@@ -20,6 +20,9 @@
     /**
      * Create a new job instance.
      *
+     * @param \LaravelFCM\Message\Options $option
+     * @param \LaravelFCM\Message\PayloadNotification $notification
+     * @param \LaravelFCM\Message\PayloadData $data
      * @return void
      */
     public function __construct($option, $notification, $data, $tokens)

Indentation +47 added lines, -47 removed lines

@@ -10,58 +10,58 @@
 
 class PushNotifications implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-    protected $option;
-    protected $notification;
-    protected $data;
-    protected $tokens;
+	protected $option;
+	protected $notification;
+	protected $data;
+	protected $tokens;
 
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct($option, $notification, $data, $tokens)
-    {
-        $this->option       = $option;
-        $this->notification = $notification; 
-        $this->data         = $data; 
-        $this->tokens       = $tokens;
-    }
+	/**
+	 * Create a new job instance.
+	 *
+	 * @return void
+	 */
+	public function __construct($option, $notification, $data, $tokens)
+	{
+		$this->option       = $option;
+		$this->notification = $notification; 
+		$this->data         = $data; 
+		$this->tokens       = $tokens;
+	}
 
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle()
-    {
-        $this->push($this->tokens);
-    }
+	/**
+	 * Execute the job.
+	 *
+	 * @return void
+	 */
+	public function handle()
+	{
+		$this->push($this->tokens);
+	}
 
-    private function push($tokens)
-    {
-        $downstreamResponse = \FCM::sendTo($tokens, $this->option, $this->notification, $this->data);
+	private function push($tokens)
+	{
+		$downstreamResponse = \FCM::sendTo($tokens, $this->option, $this->notification, $this->data);
 
-        \Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensToDelete())->forceDelete();
-        \Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensWithError())->forceDelete();
+		\Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensToDelete())->forceDelete();
+		\Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensWithError())->forceDelete();
 
-        foreach ($downstreamResponse->tokensToModify() as $old => $new) 
-        {
-            if ($oldDevice = \Core::pushNotificationDevices()->model->where('device_token', $old)->first()) 
-            {
-                \Core::pushNotificationDevices()->save([
-                    'id'           => $oldDevice->id,
-                    'device_token' => $new
-                ]);
-            }
-        } 
+		foreach ($downstreamResponse->tokensToModify() as $old => $new) 
+		{
+			if ($oldDevice = \Core::pushNotificationDevices()->model->where('device_token', $old)->first()) 
+			{
+				\Core::pushNotificationDevices()->save([
+					'id'           => $oldDevice->id,
+					'device_token' => $new
+				]);
+			}
+		} 
 
-        $retry = $downstreamResponse->tokensToRetry();
-        if (count($retry)) 
-        {
-            $this->push($retry);
-        }
-    }
+		$retry = $downstreamResponse->tokensToRetry();
+		if (count($retry)) 
+		{
+			$this->push($retry);
+		}
+	}
 }

src/Modules/V1/Notifications/Repositories/PushNotificationDeviceRepository.php

Doc Comments -3 removed lines

@@ -21,9 +21,6 @@
     /**
      * Set the notification notified to all.
      *
-     * @param  array  $users_ids
-     * @param  string $title
-     * @param  string $message
      * @param  string $data
      * @return void
      */

Indentation +56 added lines, -56 removed lines

@@ -8,66 +8,66 @@
 
 class PushNotificationDeviceRepository extends AbstractRepository
 {
-    /**
-    * Return the model full namespace.
-    * 
-    * @return string
-    */
-    protected function getModel()
-    {
-        return 'App\Modules\V1\Notifications\PushNotificationDevice';
-    }
+	/**
+	 * Return the model full namespace.
+	 * 
+	 * @return string
+	 */
+	protected function getModel()
+	{
+		return 'App\Modules\V1\Notifications\PushNotificationDevice';
+	}
 
-    /**
-     * Set the notification notified to all.
-     *
-     * @param  array  $users_ids
-     * @param  string $title
-     * @param  string $message
-     * @param  string $data
-     * @return void
-     */
-    public function registerDevice($data)
-    {
-        $data['user_id'] = \JWTAuth::parseToken()->authenticate()->id;
-        if ($device = $this->model->where('device_token', $data['device_token'])->where('user_id', $data['user_id'])->first()) 
-        {
-            $data['id'] = $device->id;
-        }
+	/**
+	 * Set the notification notified to all.
+	 *
+	 * @param  array  $users_ids
+	 * @param  string $title
+	 * @param  string $message
+	 * @param  string $data
+	 * @return void
+	 */
+	public function registerDevice($data)
+	{
+		$data['user_id'] = \JWTAuth::parseToken()->authenticate()->id;
+		if ($device = $this->model->where('device_token', $data['device_token'])->where('user_id', $data['user_id'])->first()) 
+		{
+			$data['id'] = $device->id;
+		}
 
-        return $this->save($data);
-    }
+		return $this->save($data);
+	}
 
-    /**
-     * Set the notification notified to all.
-     *
-     * @param  array  $userIds
-     * @param  string $title
-     * @param  string $message
-     * @param  string $data
-     * @return void
-     */
-    public function push($userIds, $title, $message, $data = [])
-    {
-        if (count($userIds)) 
-        {
-            $optionBuilder       = new OptionsBuilder();
-            $notificationBuilder = new PayloadNotificationBuilder($title);
-            $dataBuilder         = new PayloadDataBuilder();
+	/**
+	 * Set the notification notified to all.
+	 *
+	 * @param  array  $userIds
+	 * @param  string $title
+	 * @param  string $message
+	 * @param  string $data
+	 * @return void
+	 */
+	public function push($userIds, $title, $message, $data = [])
+	{
+		if (count($userIds)) 
+		{
+			$optionBuilder       = new OptionsBuilder();
+			$notificationBuilder = new PayloadNotificationBuilder($title);
+			$dataBuilder         = new PayloadDataBuilder();
 
-            $optionBuilder->setTimeToLive(60*20);
-            $notificationBuilder->setBody($message);
-            $dataBuilder->addData($data);
+			$optionBuilder->setTimeToLive(60*20);
+			$notificationBuilder->setBody($message);
+			$dataBuilder->addData($data);
 
-            $option              = $optionBuilder->build();
-            $notification        = $notificationBuilder->build();
-            $data                = $dataBuilder->build();
-            $tokens              = $this->model->whereIn('user_id', $userIds)->pluck('device_token')->toArray();
+			$option              = $optionBuilder->build();
+			$notification        = $notificationBuilder->build();
+			$data                = $dataBuilder->build();
+			$tokens              = $this->model->whereIn('user_id', $userIds)->pluck('device_token')->toArray();
 
-            if (count($tokens)) 
-            {
-                dispatch(new PushNotifications($option, $notification, $data, $tokens));
-            }
-        }
-    }
+			if (count($tokens)) 
+			{
+				dispatch(new PushNotifications($option, $notification, $data, $tokens));
+			}
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
             $notificationBuilder = new PayloadNotificationBuilder($title);
             $dataBuilder         = new PayloadDataBuilder();
 
-            $optionBuilder->setTimeToLive(60*20);
+            $optionBuilder->setTimeToLive(60 * 20);
             $notificationBuilder->setBody($message);
             $dataBuilder->addData($data);
 

src/Modules/V1/Notifications/Http/Controllers/PushNotificationsDevicesController.php

Indentation +35 added lines, -35 removed lines

@@ -7,43 +7,43 @@
 
 class PushNotificationsDevicesController 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            = 'pushNotificationDevices';
+	/**
+	 * The name of the model that is used by the base api controller 
+	 * to preform actions like (add, edit ... etc).
+	 * @var string
+	 */
+	protected $model            = 'pushNotificationDevices';
 
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['registerDevice'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['registerDevice'];
 
-    /**
-     * The validations rules used by the base api controller
-     * to check before add.
-     * @var array
-     */
-    protected $validationRules  = [
-    'device_token' => 'required|string|max:255',
-    'user_id'      => 'required|exists:users,id',
-    'active'       => 'boolean'
-    ];
+	/**
+	 * The validations rules used by the base api controller
+	 * to check before add.
+	 * @var array
+	 */
+	protected $validationRules  = [
+	'device_token' => 'required|string|max:255',
+	'user_id'      => 'required|exists:users,id',
+	'active'       => 'boolean'
+	];
 
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param  \Illuminate\Http\Request  $request
-     * @return \Illuminate\Http\Response
-     */
-    public function registerDevice(Request $request)
-    {
-        $this->validate($request, [
-            'device_token' => 'required|string|max:255'
-            ]);
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param  \Illuminate\Http\Request  $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function registerDevice(Request $request)
+	{
+		$this->validate($request, [
+			'device_token' => 'required|string|max:255'
+			]);
 
-        return \Response::json(\Core::pushNotificationDevices()->registerDevice($request->all()), 200);
-    }
+		return \Response::json(\Core::pushNotificationDevices()->registerDevice($request->all()), 200);
+	}
 }

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
      * to preform actions like (add, edit ... etc).
      * @var string
      */
-    protected $model            = 'pushNotificationDevices';
+    protected $model = 'pushNotificationDevices';
 
     /**
      * List of all route actions that the base api controller
@@ -26,7 +26,7 @@ 
      * to check before add.
      * @var array
      */
-    protected $validationRules  = [
+    protected $validationRules = [
     'device_token' => 'required|string|max:255',
     'user_id'      => 'required|exists:users,id',
     'active'       => 'boolean'