SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/BaseClasses/BaseApiController.php

Doc Comments +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
      * Init new object.
      *
      * @param   mixed      $repo
-     * @param   CoreConfig $config
+     * @param   \App\Modules\Core\Utl\CoreConfig $config
      * @param   string     $modelResource
      * @return  void
      */

Indentation +200 added lines, -200 removed lines

@@ -9,205 +9,205 @@
 
 class BaseApiController extends Controller
 {
-    /**
-     * The config implementation.
-     *
-     * @var array
-     */
-    protected $config;
-
-    /**
-     * The relations implementation.
-     *
-     * @var array
-     */
-    protected $relations;
-
-    /**
-     * The repo implementation.
-     *
-     * @var object
-     */
-    protected $repo;
-
-    /**
-     * Init new object.
-     *
-     * @param   mixed      $repo
-     * @param   CoreConfig $config
-     * @param   string     $modelResource
-     * @return  void
-     */
-    public function __construct($repo, $config, $modelResource)
-    {
-        $this->repo = $repo;
-        $this->modelResource = $modelResource;
-        $this->config = $config->getConfig();
-        $this->modelName = explode('\\', get_called_class());
-        $this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
-        $this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
-        $this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-        $route = explode('@', \Route::currentRouteAction())[1];
-
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
-    }
-
-    /**
-     * Fetch all records with relations from storage.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->list($this->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
-
-    /**
-     * Fetch the single object with relations from storage.
-     *
-     * @param  integer $id Id of the requested model.
-     * @return \Illuminate\Http\Response
-     */
-    public function find($id)
-    {
-        return new $this->modelResource($this->repo->find($id, $this->relations));
-    }
-
-    /**
-     * Delete by the given id from storage.
-     *
-     * @param  integer $id Id of the deleted model.
-     * @return \Illuminate\Http\Response
-     */
-    public function delete($id)
-    {
-        return new GeneralResource($this->repo->delete($id));
-    }
-
-    /**
-     * Return the deleted models in pages based on the given conditions.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function deleted(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->deleted($request->all(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
-    }
-
-    /**
-     * Restore the deleted model.
-     *
-     * @param  integer $id Id of the restored model.
-     * @return \Illuminate\Http\Response
-     */
-    public function restore($id)
-    {
-        return new GeneralResource($this->repo->restore($id));
-    }
-
-    /**
-     * Check if the logged in user can do the given permission.
-     *
-     * @param  string $permission
-     * @return void
-     */
-    private function checkPermission($permission)
-    {
-        \Auth::shouldUse('api');
-        $this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
+	/**
+	 * The config implementation.
+	 *
+	 * @var array
+	 */
+	protected $config;
+
+	/**
+	 * The relations implementation.
+	 *
+	 * @var array
+	 */
+	protected $relations;
+
+	/**
+	 * The repo implementation.
+	 *
+	 * @var object
+	 */
+	protected $repo;
+
+	/**
+	 * Init new object.
+	 *
+	 * @param   mixed      $repo
+	 * @param   CoreConfig $config
+	 * @param   string     $modelResource
+	 * @return  void
+	 */
+	public function __construct($repo, $config, $modelResource)
+	{
+		$this->repo = $repo;
+		$this->modelResource = $modelResource;
+		$this->config = $config->getConfig();
+		$this->modelName = explode('\\', get_called_class());
+		$this->modelName = lcfirst(str_replace('Controller', '', end($this->modelName)));
+		$this->validationRules = property_exists($this, 'validationRules') ? $this->validationRules : false;
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
+		$this->skipLoginCheck = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
+		$route = explode('@', \Route::currentRouteAction())[1];
+
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
+	}
+
+	/**
+	 * Fetch all records with relations from storage.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->list($this->relations, $request->query(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
+
+	/**
+	 * Fetch the single object with relations from storage.
+	 *
+	 * @param  integer $id Id of the requested model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function find($id)
+	{
+		return new $this->modelResource($this->repo->find($id, $this->relations));
+	}
+
+	/**
+	 * Delete by the given id from storage.
+	 *
+	 * @param  integer $id Id of the deleted model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function delete($id)
+	{
+		return new GeneralResource($this->repo->delete($id));
+	}
+
+	/**
+	 * Return the deleted models in pages based on the given conditions.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function deleted(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->deleted($request->all(), $request->query('perPage'), $request->query('sortBy'), $request->query('desc')));
+	}
+
+	/**
+	 * Restore the deleted model.
+	 *
+	 * @param  integer $id Id of the restored model.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function restore($id)
+	{
+		return new GeneralResource($this->repo->restore($id));
+	}
+
+	/**
+	 * Check if the logged in user can do the given permission.
+	 *
+	 * @param  string $permission
+	 * @return void
+	 */
+	private function checkPermission($permission)
+	{
+		\Auth::shouldUse('api');
+		$this->middleware('auth:api', ['except' => $this->skipLoginCheck]);
         
-        if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
-            $user             = \Auth::user();
-            $permission       = $permission !== 'index' ? $permission : 'list';
-            $isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
-
-            if ($user->blocked) {
-                \ErrorHandler::userIsBlocked();
-            }
-
-            if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
-            } elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
-            } else {
-                \ErrorHandler::noPermissions();
-            }
-        }
-    }
-
-    /**
-     * Set sessions based on the given headers in the request.
-     *
-     * @return void
-     */
-    private function setSessions()
-    {
-        \Session::put('time-zone', \Request::header('time-zone') ?: 0);
-
-        $locale = \Request::header('locale');
-        switch ($locale) {
-            case 'en':
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-
-            case 'ar':
-                \App::setLocale('ar');
-                \Session::put('locale', 'ar');
-                break;
-
-            case 'all':
-                \App::setLocale('en');
-                \Session::put('locale', 'all');
-                break;
-
-            default:
-                \App::setLocale('en');
-                \Session::put('locale', 'en');
-                break;
-        }
-    }
-
-    /**
-     * Set relation based on the called api.
-     *
-     * @param  string $route
-     * @return void
-     */
-    private function setRelations($route)
-    {
-        $route           = $route !== 'index' ? $route : 'list';
-        $relations       = Arr::get($this->config['relations'], $this->modelName, false);
-        $this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
-    }
-
-    /**
-     * Update the logged in user locale and time zone.
-     *
-     * @param  object $user
-     * @return void
-     */
-    private function updateLocaleAndTimezone($user)
-    {
-        $update   = false;
-        $locale   = \Session::get('locale');
-        $timezone = \Session::get('time-zone');
-        if ($locale && $locale !== 'all' && $locale !== $user->locale) {
-            $user->locale = $locale;
-            $update       = true;
-        }
-
-        if ($timezone && $timezone !== $user->timezone) {
-            $user->timezone = $timezone;
-            $update       = true;
-        }
-
-        if ($update) {
-            $user->save();
-        }
-    }
+		if (! in_array($permission, $this->skipLoginCheck) && $user = \Auth::user()) {
+			$user             = \Auth::user();
+			$permission       = $permission !== 'index' ? $permission : 'list';
+			$isPasswordClient = $user->token()->client->password_client;
+			$this->updateLocaleAndTimezone($user);
+
+			if ($user->blocked) {
+				\ErrorHandler::userIsBlocked();
+			}
+
+			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->modelName))) {
+			} elseif (! $isPasswordClient && $user->tokenCan($this->modelName.'-'.$permission)) {
+			} else {
+				\ErrorHandler::noPermissions();
+			}
+		}
+	}
+
+	/**
+	 * Set sessions based on the given headers in the request.
+	 *
+	 * @return void
+	 */
+	private function setSessions()
+	{
+		\Session::put('time-zone', \Request::header('time-zone') ?: 0);
+
+		$locale = \Request::header('locale');
+		switch ($locale) {
+			case 'en':
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+
+			case 'ar':
+				\App::setLocale('ar');
+				\Session::put('locale', 'ar');
+				break;
+
+			case 'all':
+				\App::setLocale('en');
+				\Session::put('locale', 'all');
+				break;
+
+			default:
+				\App::setLocale('en');
+				\Session::put('locale', 'en');
+				break;
+		}
+	}
+
+	/**
+	 * Set relation based on the called api.
+	 *
+	 * @param  string $route
+	 * @return void
+	 */
+	private function setRelations($route)
+	{
+		$route           = $route !== 'index' ? $route : 'list';
+		$relations       = Arr::get($this->config['relations'], $this->modelName, false);
+		$this->relations = $relations && isset($relations[$route]) ? $relations[$route] : [];
+	}
+
+	/**
+	 * Update the logged in user locale and time zone.
+	 *
+	 * @param  object $user
+	 * @return void
+	 */
+	private function updateLocaleAndTimezone($user)
+	{
+		$update   = false;
+		$locale   = \Session::get('locale');
+		$timezone = \Session::get('time-zone');
+		if ($locale && $locale !== 'all' && $locale !== $user->locale) {
+			$user->locale = $locale;
+			$update       = true;
+		}
+
+		if ($timezone && $timezone !== $user->timezone) {
+			$user->timezone = $timezone;
+			$update       = true;
+		}
+
+		if ($update) {
+			$user->save();
+		}
+	}
 }

src/Modules/Reporting/Http/Controllers/ReportController.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
      *
      * @param Request $request
      * @param  string $reportName Name of the requested report
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
     public function getReport(Request $request, $reportName)
     {

Indentation +28 added lines, -28 removed lines

@@ -9,34 +9,34 @@
 
 class ReportController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['getReport'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['getReport'];
 
-    /**
-     * Init new object.
-     *
-     * @param   ReportRepository $repo
-     * @param   CoreConfig       $config
-     * @return  void
-     */
-    public function __construct(ReportRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   ReportRepository $repo
+	 * @param   CoreConfig       $config
+	 * @return  void
+	 */
+	public function __construct(ReportRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Reporting\Http\Resources\Report');
+	}
 
-    /**
-     * Render the given report name with the given conditions.
-     *
-     * @param Request $request
-     * @param  string $reportName Name of the requested report
-     * @return \Illuminate\Http\Response
-     */
-    public function getReport(Request $request, $reportName)
-    {
-        return \Response::json($this->repo->getReport($reportName, $request->all(), $request->query('perPage')), 200);
-    }
+	/**
+	 * Render the given report name with the given conditions.
+	 *
+	 * @param Request $request
+	 * @param  string $reportName Name of the requested report
+	 * @return \Illuminate\Http\Response
+	 */
+	public function getReport(Request $request, $reportName)
+	{
+		return \Response::json($this->repo->getReport($reportName, $request->all(), $request->query('perPage')), 200);
+	}
 }

src/Modules/Notifications/Repositories/NotificationRepository.php

Indentation +64 added lines, -64 removed lines

@@ -5,73 +5,73 @@
 
 class NotificationRepository extends BaseRepository
 {
-    /**
-     * Init new object.
-     *
-     * @param   Notification $model
-     * @return  void
-     */
-    public function __construct(Notification $model)
-    {
-        parent::__construct($model);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   Notification $model
+	 * @return  void
+	 */
+	public function __construct(Notification $model)
+	{
+		parent::__construct($model);
+	}
 
-    /**
-     * Retrieve all notifications of the logged in user.
-     *
-     * @param  integer $perPage
-     * @return Collection
-     */
-    public function all($perPage)
-    {
-        return \Auth::user()->notifications()->paginate($perPage);
-    }
+	/**
+	 * Retrieve all notifications of the logged in user.
+	 *
+	 * @param  integer $perPage
+	 * @return Collection
+	 */
+	public function all($perPage)
+	{
+		return \Auth::user()->notifications()->paginate($perPage);
+	}
 
-    /**
-     * Retrieve unread notifications of the logged in user.
-     *
-     * @param  integer $perPage
-     * @return Collection
-     */
-    public function unread($perPage)
-    {
-        return \Auth::user()->unreadNotifications()->paginate($perPage);
-    }
+	/**
+	 * Retrieve unread notifications of the logged in user.
+	 *
+	 * @param  integer $perPage
+	 * @return Collection
+	 */
+	public function unread($perPage)
+	{
+		return \Auth::user()->unreadNotifications()->paginate($perPage);
+	}
 
-    /**
-     * Mark the notification as read.
-     *
-     * @param  integer  $id
-     * @return object
-     */
-    public function markAsRead($id)
-    {
-        if ($notification = \Auth::user()->unreadNotifications()->where('id', $id)->first()) {
-            $notification->markAsRead();
-        }
-    }
+	/**
+	 * Mark the notification as read.
+	 *
+	 * @param  integer  $id
+	 * @return object
+	 */
+	public function markAsRead($id)
+	{
+		if ($notification = \Auth::user()->unreadNotifications()->where('id', $id)->first()) {
+			$notification->markAsRead();
+		}
+	}
 
-    /**
-     * Mark all notifications as read.
-     *
-     * @return void
-     */
-    public function markAllAsRead()
-    {
-        \Auth::user()->unreadNotifications()->update(['read_at' => now()]);
-    }
+	/**
+	 * Mark all notifications as read.
+	 *
+	 * @return void
+	 */
+	public function markAllAsRead()
+	{
+		\Auth::user()->unreadNotifications()->update(['read_at' => now()]);
+	}
 
-    /**
-     * Notify th given user with the given notification.
-     *
-     * @param  collection $users
-     * @param  string     $notification
-     * @param  object     $notificationData
-     * @return void
-     */
-    public function notify($users, $notification, $notificationData = false)
-    {
-        $notification = 'App\Modules\Notifications\Notifications\\'.$notification;
-        \Notification::send($users, new $notification($notificationData));
-    }
+	/**
+	 * Notify th given user with the given notification.
+	 *
+	 * @param  collection $users
+	 * @param  string     $notification
+	 * @param  object     $notificationData
+	 * @return void
+	 */
+	public function notify($users, $notification, $notificationData = false)
+	{
+		$notification = 'App\Modules\Notifications\Notifications\\'.$notification;
+		\Notification::send($users, new $notification($notificationData));
+	}
 }

src/Modules/Notifications/Http/Resources/Notification.php

Indentation +17 added lines, -17 removed lines

@@ -6,21 +6,21 @@
 
 class Notification extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'type' => $this->type,
-            'data' => $this->data,
-            'read_at' => $this->read_at,
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'type' => $this->type,
+			'data' => $this->data,
+			'read_at' => $this->read_at,
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

src/Modules/Notifications/Http/Resources/PushNotificationDevice.php

Indentation +17 added lines, -17 removed lines

@@ -7,21 +7,21 @@
 
 class PushNotificationDevice extends JsonResource
 {
-    /**
-     * Transform the resource into an array.
-     *
-     * @param Request $request
-     * @return array
-     */
-    public function toArray($request)
-    {
-        return [
-            'id' => $this->id,
-            'device_token' => $this->device_token,
-            'access_token' => $this->access_token,
-            'user' => new UserResource($this->whenLoaded('user')),
-            'created_at' => $this->created_at,
-            'updated_at' => $this->updated_at,
-        ];
-    }
+	/**
+	 * Transform the resource into an array.
+	 *
+	 * @param Request $request
+	 * @return array
+	 */
+	public function toArray($request)
+	{
+		return [
+			'id' => $this->id,
+			'device_token' => $this->device_token,
+			'access_token' => $this->access_token,
+			'user' => new UserResource($this->whenLoaded('user')),
+			'created_at' => $this->created_at,
+			'updated_at' => $this->updated_at,
+		];
+	}
 }

src/Modules/Notifications/Http/Controllers/PushNotificationDeviceController.php

Indentation +47 added lines, -47 removed lines

@@ -11,55 +11,55 @@
 
 class PushNotificationDeviceController extends BaseApiController
 {
-    /**
-     * 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'];
 
-    /**
-     * Init new object.
-     *
-     * @param   PushNotificationDeviceRepository $repo
-     * @param   CoreConfig                       $config
-     * @return  void
-     */
-    public function __construct(PushNotificationDeviceRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Notifications\Http\Resources\PushNotificationDevice');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   PushNotificationDeviceRepository $repo
+	 * @param   CoreConfig                       $config
+	 * @return  void
+	 */
+	public function __construct(PushNotificationDeviceRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Notifications\Http\Resources\PushNotificationDevice');
+	}
 
-    /**
-     * Insert the given model to storage.
-     *
-     * @param InsertPushNotificationDevice $request
-     * @return \Illuminate\Http\Response
-     */
-    public function insert(InsertPushNotificationDevice $request)
-    {
-        return new $this->modelResource($this->repo->save($request->all()));
-    }
+	/**
+	 * Insert the given model to storage.
+	 *
+	 * @param InsertPushNotificationDevice $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function insert(InsertPushNotificationDevice $request)
+	{
+		return new $this->modelResource($this->repo->save($request->all()));
+	}
 
-    /**
-     * Update the given model to storage.
-     *
-     * @param UpdatePushNotificationDevice $request
-     * @return \Illuminate\Http\Response
-     */
-    public function update(UpdatePushNotificationDevice $request)
-    {
-        return new $this->modelResource($this->repo->save($request->all()));
-    }
+	/**
+	 * Update the given model to storage.
+	 *
+	 * @param UpdatePushNotificationDevice $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function update(UpdatePushNotificationDevice $request)
+	{
+		return new $this->modelResource($this->repo->save($request->all()));
+	}
 
-    /**
-     * Register the given device to the logged in user.
-     *
-     * @param RegisterDevice $request
-     * @return \Illuminate\Http\Response
-     */
-    public function registerDevice(RegisterDevice $request)
-    {
-        return new $this->modelResource($this->repo->registerDevice($request->all()));
-    }
+	/**
+	 * Register the given device to the logged in user.
+	 *
+	 * @param RegisterDevice $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function registerDevice(RegisterDevice $request)
+	{
+		return new $this->modelResource($this->repo->registerDevice($request->all()));
+	}
 }

src/Modules/Notifications/Http/Controllers/NotificationController.php

Indentation +56 added lines, -56 removed lines

@@ -10,65 +10,65 @@
 
 class NotificationController extends BaseApiController
 {
-    /**
-     * List of all route actions that the base api controller
-     * will skip permissions check for them.
-     * @var array
-     */
-    protected $skipPermissionCheck = ['markAsRead', 'markAllAsRead', 'index', 'unread'];
+	/**
+	 * List of all route actions that the base api controller
+	 * will skip permissions check for them.
+	 * @var array
+	 */
+	protected $skipPermissionCheck = ['markAsRead', 'markAllAsRead', 'index', 'unread'];
 
-    /**
-     * Init new object.
-     *
-     * @param   NotificationRepository $repo
-     * @param   CoreConfig             $config
-     * @return  void
-     */
-    public function __construct(NotificationRepository $repo, CoreConfig $config)
-    {
-        parent::__construct($repo, $config, 'App\Modules\Notifications\Http\Resources\Notification');
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   NotificationRepository $repo
+	 * @param   CoreConfig             $config
+	 * @return  void
+	 */
+	public function __construct(NotificationRepository $repo, CoreConfig $config)
+	{
+		parent::__construct($repo, $config, 'App\Modules\Notifications\Http\Resources\Notification');
+	}
 
-    /**
-     * Retrieve all notifications of the logged in user.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function index(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->all($request->query('perPage')));
-    }
+	/**
+	 * Retrieve all notifications of the logged in user.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function index(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->all($request->query('perPage')));
+	}
 
-    /**
-     * Retrieve unread notifications of the logged in user.
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response
-     */
-    public function unread(Request $request)
-    {
-        return $this->modelResource::collection($this->repo->unread($request->query('perPage')));
-    }
+	/**
+	 * Retrieve unread notifications of the logged in user.
+	 *
+	 * @param Request $request
+	 * @return \Illuminate\Http\Response
+	 */
+	public function unread(Request $request)
+	{
+		return $this->modelResource::collection($this->repo->unread($request->query('perPage')));
+	}
 
-    /**
-     * Mark the notification as read.
-     *
-     * @param  integer  $id Id of the notification.
-     * @return \Illuminate\Http\Response
-     */
-    public function markAsRead($id)
-    {
-        return new GeneralResource($this->repo->markAsRead($id));
-    }
+	/**
+	 * Mark the notification as read.
+	 *
+	 * @param  integer  $id Id of the notification.
+	 * @return \Illuminate\Http\Response
+	 */
+	public function markAsRead($id)
+	{
+		return new GeneralResource($this->repo->markAsRead($id));
+	}
 
-    /**
-     * Mark all notifications as read.
-     *
-     * @return \Illuminate\Http\Response
-     */
-    public function markAllAsRead()
-    {
-        return new GeneralResource($this->repo->markAllAsRead());
-    }
+	/**
+	 * Mark all notifications as read.
+	 *
+	 * @return \Illuminate\Http\Response
+	 */
+	public function markAllAsRead()
+	{
+		return new GeneralResource($this->repo->markAllAsRead());
+	}
 }

src/Modules/Notifications/Http/Requests/InsertPushNotificationDevice copy.php

Indentation +21 added lines, -21 removed lines

@@ -6,26 +6,26 @@
 
 class InsertPushNotificationDevice extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'device_token' => 'required|string|max:255',
-            'user_id'      => 'required|exists:users,id'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'device_token' => 'required|string|max:255',
+			'user_id'      => 'required|exists:users,id'
+		];
+	}
 }

src/Modules/Notifications/Http/Requests/UpdatePushNotificationDevice.php

Indentation +22 added lines, -22 removed lines

@@ -6,27 +6,27 @@
 
 class UpdatePushNotificationDevice extends FormRequest
 {
-    /**
-     * Determine if the user is authorized to make this request.
-     *
-     * @return bool
-     */
-    public function authorize()
-    {
-        return true;
-    }
+	/**
+	 * Determine if the user is authorized to make this request.
+	 *
+	 * @return bool
+	 */
+	public function authorize()
+	{
+		return true;
+	}
 
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array
-     */
-    public function rules()
-    {
-        return [
-            'id'           => 'required|exists:push_notification_devices,id',
-            'device_token' => 'required|string|max:255',
-            'user_id'      => 'required|exists:users,id'
-        ];
-    }
+	/**
+	 * Get the validation rules that apply to the request.
+	 *
+	 * @return array
+	 */
+	public function rules()
+	{
+		return [
+			'id'           => 'required|exists:push_notification_devices,id',
+			'device_token' => 'required|string|max:255',
+			'user_id'      => 'required|exists:users,id'
+		];
+	}
 }