SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Users/Proxy/LoginProxy.php

Spacing +1 added lines, -1 removed lines

@@ -49,7 +49,7 @@
 
         $response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
+        if ( ! $response->isSuccessful()) {
             if ($grantType == 'refresh_token') {
                 \Errors::invalidRefreshToken();
             }

Indentation +53 added lines, -53 removed lines

@@ -7,64 +7,64 @@
 
 class LoginProxy
 {
-    /**
-     * Attempt to create an access token using user credentials.
-     *
-     * @param  string  $email
-     * @param  string  $password
-     * @return array
-     */
-    public function login($email, $password)
-    {
-        return $this->proxy('password', [
-            'username' => $email,
-            'password' => $password
-        ]);
-    }
+	/**
+	 * Attempt to create an access token using user credentials.
+	 *
+	 * @param  string  $email
+	 * @param  string  $password
+	 * @return array
+	 */
+	public function login($email, $password)
+	{
+		return $this->proxy('password', [
+			'username' => $email,
+			'password' => $password
+		]);
+	}
 
-    /**
-     * Attempt to refresh the access token using the given refresh token.
-     *
-     * @param  string $refreshToken
-     * @return array
-     */
-    public function refreshToken($refreshToken)
-    {
-        return $this->proxy('refresh_token', [
-            'refresh_token' => $refreshToken
-        ]);
-    }
+	/**
+	 * Attempt to refresh the access token using the given refresh token.
+	 *
+	 * @param  string $refreshToken
+	 * @return array
+	 */
+	public function refreshToken($refreshToken)
+	{
+		return $this->proxy('refresh_token', [
+			'refresh_token' => $refreshToken
+		]);
+	}
 
-    /**
-     * Proxy a request to the OAuth server.
-     *
-     * @param string $grantType what type of grant type should be proxied
-     * @param array
-     */
-    public function proxy($grantType, array $data = [])
-    {
-        $data = array_merge($data, [
-            'client_id'     => config('user.passport_client_id'),
-            'client_secret' => config('user.passport_client_secret'),
-            'grant_type'    => $grantType
-        ]);
+	/**
+	 * Proxy a request to the OAuth server.
+	 *
+	 * @param string $grantType what type of grant type should be proxied
+	 * @param array
+	 */
+	public function proxy($grantType, array $data = [])
+	{
+		$data = array_merge($data, [
+			'client_id'     => config('user.passport_client_id'),
+			'client_secret' => config('user.passport_client_secret'),
+			'grant_type'    => $grantType
+		]);
 
-        $response = \ApiConsumer::post('/oauth/token', $data);
+		$response = \ApiConsumer::post('/oauth/token', $data);
 
-        if (! $response->isSuccessful()) {
-            if ($grantType == 'refresh_token') {
-                \Errors::invalidRefreshToken();
-            }
+		if (! $response->isSuccessful()) {
+			if ($grantType == 'refresh_token') {
+				\Errors::invalidRefreshToken();
+			}
 
-            \Errors::loginFailed();
-        }
+			\Errors::loginFailed();
+		}
 
-        $data = json_decode($response->getContent());
+		$data = json_decode($response->getContent());
 
-        return [
-            'access_token'  => $data->access_token,
-            'refresh_token' => $data->refresh_token,
-            'expires_in'    => $data->expires_in
-        ];
-    }
+		return [
+			'access_token'  => $data->access_token,
+			'refresh_token' => $data->refresh_token,
+			'expires_in'    => $data->expires_in
+		];
+	}
 }

src/Modules/Users/ModelObservers/AclUserObserver.php

Indentation +48 added lines, -48 removed lines

@@ -6,61 +6,61 @@
 class AclUserObserver
 {
 
-    public function saving($model)
-    {
-        if ($model->isDirty('profile_picture')) {
-            \Media::deleteImage($model->getOriginal('profile_picture'));
-        }
-    }
+	public function saving($model)
+	{
+		if ($model->isDirty('profile_picture')) {
+			\Media::deleteImage($model->getOriginal('profile_picture'));
+		}
+	}
 
-    public function saved($model)
-    {
-        //
-    }
+	public function saved($model)
+	{
+		//
+	}
 
-    public function creating($model)
-    {
-        //
-    }
+	public function creating($model)
+	{
+		//
+	}
 
-    public function created($model)
-    {
-        //
-    }
+	public function created($model)
+	{
+		//
+	}
 
-    public function updating($model)
-    {
-        //
-    }
+	public function updating($model)
+	{
+		//
+	}
 
-    public function updated($model)
-    {
-        if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
-                \Core::oauthClients()->revokeAccessToken($token);
-            });
-        }
-    }
+	public function updated($model)
+	{
+		if ($model->isDirty('blocked') && $model->blocked) {
+			$model->tokens()->each(function ($token) {
+				\Core::oauthClients()->revokeAccessToken($token);
+			});
+		}
+	}
 
-    public function deleting($model)
-    {
-        if ($model->getOriginal('id') == \Auth::id()) {
-            \Errors::noPermissions();
-        }
-    }
+	public function deleting($model)
+	{
+		if ($model->getOriginal('id') == \Auth::id()) {
+			\Errors::noPermissions();
+		}
+	}
 
-    public function deleted($model)
-    {
-        //
-    }
+	public function deleted($model)
+	{
+		//
+	}
 
-    public function restoring($model)
-    {
-        //
-    }
+	public function restoring($model)
+	{
+		//
+	}
 
-    public function restored($model)
-    {
-        //
-    }
+	public function restored($model)
+	{
+		//
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
     public function updated($model)
     {
         if ($model->isDirty('blocked') && $model->blocked) {
-            $model->tokens()->each(function ($token) {
+            $model->tokens()->each(function($token) {
                 \Core::oauthClients()->revokeAccessToken($token);
             });
         }

src/Modules/Reporting/ModelObservers/ReportObserver.php

Indentation +49 added lines, -49 removed lines

@@ -6,53 +6,53 @@
 class ReportObserver
 {
 
-    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)
+	{
+		//
+	}
 }

src/Modules/Reporting/Services/ReportService.php

Spacing +2 added lines, -2 removed lines

@@ -43,9 +43,9 @@
         /**
          * Check report existance and permission.
          */
-        if (! $report) {
+        if ( ! $report) {
             \Errors::notFound('report');
-        } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
+        } elseif ( ! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
             \Errors::noPermissions();
         }
 

Indentation +41 added lines, -41 removed lines

@@ -8,49 +8,49 @@
 
 class ReportService extends BaseService
 {
-    /**
-     * @var UserService
-     */
-    protected $userService;
+	/**
+	 * @var UserService
+	 */
+	protected $userService;
 
-    /**
-     * Init new object.
-     *
-     * @param   ReportRepository $repo
-     * @return  void
-     */
-    public function __construct(ReportRepository $repo, UserService $userService)
-    {
-        $this->userService = $userService;
-        parent::__construct($repo);
-    }
+	/**
+	 * Init new object.
+	 *
+	 * @param   ReportRepository $repo
+	 * @return  void
+	 */
+	public function __construct(ReportRepository $repo, UserService $userService)
+	{
+		$this->userService = $userService;
+		parent::__construct($repo);
+	}
 
-    /**
-     * Render the given report db view based on the given
-     * condition.
-     *
-     * @param  string  $reportName
-     * @param  array   $conditions
-     * @param  integer $perPage
-     * @param  boolean $skipPermission
-     * @return object
-     */
-    public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false)
-    {
-        /**
-         * Fetch the report from db.
-         */
-        $report = $this->repo->first(['report_name' => $reportName]);
+	/**
+	 * Render the given report db view based on the given
+	 * condition.
+	 *
+	 * @param  string  $reportName
+	 * @param  array   $conditions
+	 * @param  integer $perPage
+	 * @param  boolean $skipPermission
+	 * @return object
+	 */
+	public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false)
+	{
+		/**
+		 * Fetch the report from db.
+		 */
+		$report = $this->repo->first(['report_name' => $reportName]);
 
-        /**
-         * Check report existance and permission.
-         */
-        if (! $report) {
-            \Errors::notFound('report');
-        } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
-            \Errors::noPermissions();
-        }
+		/**
+		 * Check report existance and permission.
+		 */
+		if (! $report) {
+			\Errors::notFound('report');
+		} elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) {
+			\Errors::noPermissions();
+		}
 
-        return $this->repo->renderReport($report, $conditions, $perPage);
-    }
+		return $this->repo->renderReport($report, $conditions, $perPage);
+	}
 }

lang/en/passwords.php

Indentation +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Password Reset Language Lines

     |--------------------------------------------------------------------------

@@ -13,10 +13,10 @@ 
     |

     */

 

-    'password' => 'Passwords must be at least six characters and match the confirmation.',

-    'reset' => 'Your password has been reset!',

-    'sent' => 'We have e-mailed your password reset link!',

-    'token' => 'This password reset token is invalid.',

-    'user' => "We can't find a user with that e-mail address.",

+	'password' => 'Passwords must be at least six characters and match the confirmation.',

+	'reset' => 'Your password has been reset!',

+	'sent' => 'We have e-mailed your password reset link!',

+	'token' => 'This password reset token is invalid.',

+	'user' => "We can't find a user with that e-mail address.",

 

 ];

lang/en/pagination.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Pagination Language Lines

     |--------------------------------------------------------------------------

@@ -13,7 +13,7 @@ 
     |

     */

 

-    'previous' => '« Previous',

-    'next'     => 'Next »',

+	'previous' => '« Previous',

+	'next'     => 'Next »',

 

 ];

lang/en/auth.php

Indentation +3 added lines, -3 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Authentication Language Lines

     |--------------------------------------------------------------------------

@@ -13,7 +13,7 @@ 
     |

     */

 

-    'failed' => 'These credentials do not match our records.',

-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',

+	'failed' => 'These credentials do not match our records.',

+	'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',

 

 ];

lang/en/validation.php

Indentation +75 added lines, -75 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Validation Language Lines

     |--------------------------------------------------------------------------

@@ -13,74 +13,74 @@ 
     |

     */

 

-    'accepted'             => 'The :attribute must be accepted.',

-    'active_url'           => 'The :attribute is not a valid URL.',

-    'after'                => 'The :attribute must be a date after :date.',

-    'alpha'                => 'The :attribute may only contain letters.',

-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',

-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',

-    'array'                => 'The :attribute must be an array.',

-    'before'               => 'The :attribute must be a date before :date.',

-    'between'              => [

-        'numeric' => 'The :attribute must be between :min and :max.',

-        'file'    => 'The :attribute must be between :min and :max kilobytes.',

-        'string'  => 'The :attribute must be between :min and :max characters.',

-        'array'   => 'The :attribute must have between :min and :max items.',

-    ],

-    'boolean'              => 'The :attribute field must be true or false.',

-    'confirmed'            => 'The :attribute confirmation does not match.',

-    'date'                 => 'The :attribute is not a valid date.',

-    'date_format'          => 'The :attribute does not match the format :format.',

-    'different'            => 'The :attribute and :other must be different.',

-    'digits'               => 'The :attribute must be :digits digits.',

-    'digits_between'       => 'The :attribute must be between :min and :max digits.',

-    'distinct'             => 'The :attribute field has a duplicate value.',

-    'email'                => 'The :attribute must be a valid email address.',

-    'exists'               => 'The selected :attribute is invalid.',

-    'filled'               => 'The :attribute field is required.',

-    'image'                => 'The :attribute must be an image.',

-    'in'                   => 'The selected :attribute is invalid.',

-    'in_array'             => 'The :attribute field does not exist in :other.',

-    'integer'              => 'The :attribute must be an integer.',

-    'ip'                   => 'The :attribute must be a valid IP address.',

-    'json'                 => 'The :attribute must be a valid JSON string.',

-    'max'                  => [

-        'numeric' => 'The :attribute may not be greater than :max.',

-        'file'    => 'The :attribute may not be greater than :max kilobytes.',

-        'string'  => 'The :attribute may not be greater than :max characters.',

-        'array'   => 'The :attribute may not have more than :max items.',

-    ],

-    'mimes'                => 'The :attribute must be a file of type: :values.',

-    'min'                  => [

-        'numeric' => 'The :attribute must be at least :min.',

-        'file'    => 'The :attribute must be at least :min kilobytes.',

-        'string'  => 'The :attribute must be at least :min characters.',

-        'array'   => 'The :attribute must have at least :min items.',

-    ],

-    'not_in'               => 'The selected :attribute is invalid.',

-    'numeric'              => 'The :attribute must be a number.',

-    'present'              => 'The :attribute field must be present.',

-    'regex'                => 'The :attribute format is invalid.',

-    'required'             => 'The :attribute field is required.',

-    'required_if'          => 'The :attribute field is required when :other is :value.',

-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',

-    'required_with'        => 'The :attribute field is required when :values is present.',

-    'required_with_all'    => 'The :attribute field is required when :values is present.',

-    'required_without'     => 'The :attribute field is required when :values is not present.',

-    'required_without_all' => 'The :attribute field is required when none of :values are present.',

-    'same'                 => 'The :attribute and :other must match.',

-    'size'                 => [

-        'numeric' => 'The :attribute must be :size.',

-        'file'    => 'The :attribute must be :size kilobytes.',

-        'string'  => 'The :attribute must be :size characters.',

-        'array'   => 'The :attribute must contain :size items.',

-    ],

-    'string'               => 'The :attribute must be a string.',

-    'timezone'             => 'The :attribute must be a valid zone.',

-    'unique'               => 'The :attribute has already been taken.',

-    'url'                  => 'The :attribute format is invalid.',

+	'accepted'             => 'The :attribute must be accepted.',

+	'active_url'           => 'The :attribute is not a valid URL.',

+	'after'                => 'The :attribute must be a date after :date.',

+	'alpha'                => 'The :attribute may only contain letters.',

+	'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',

+	'alpha_num'            => 'The :attribute may only contain letters and numbers.',

+	'array'                => 'The :attribute must be an array.',

+	'before'               => 'The :attribute must be a date before :date.',

+	'between'              => [

+		'numeric' => 'The :attribute must be between :min and :max.',

+		'file'    => 'The :attribute must be between :min and :max kilobytes.',

+		'string'  => 'The :attribute must be between :min and :max characters.',

+		'array'   => 'The :attribute must have between :min and :max items.',

+	],

+	'boolean'              => 'The :attribute field must be true or false.',

+	'confirmed'            => 'The :attribute confirmation does not match.',

+	'date'                 => 'The :attribute is not a valid date.',

+	'date_format'          => 'The :attribute does not match the format :format.',

+	'different'            => 'The :attribute and :other must be different.',

+	'digits'               => 'The :attribute must be :digits digits.',

+	'digits_between'       => 'The :attribute must be between :min and :max digits.',

+	'distinct'             => 'The :attribute field has a duplicate value.',

+	'email'                => 'The :attribute must be a valid email address.',

+	'exists'               => 'The selected :attribute is invalid.',

+	'filled'               => 'The :attribute field is required.',

+	'image'                => 'The :attribute must be an image.',

+	'in'                   => 'The selected :attribute is invalid.',

+	'in_array'             => 'The :attribute field does not exist in :other.',

+	'integer'              => 'The :attribute must be an integer.',

+	'ip'                   => 'The :attribute must be a valid IP address.',

+	'json'                 => 'The :attribute must be a valid JSON string.',

+	'max'                  => [

+		'numeric' => 'The :attribute may not be greater than :max.',

+		'file'    => 'The :attribute may not be greater than :max kilobytes.',

+		'string'  => 'The :attribute may not be greater than :max characters.',

+		'array'   => 'The :attribute may not have more than :max items.',

+	],

+	'mimes'                => 'The :attribute must be a file of type: :values.',

+	'min'                  => [

+		'numeric' => 'The :attribute must be at least :min.',

+		'file'    => 'The :attribute must be at least :min kilobytes.',

+		'string'  => 'The :attribute must be at least :min characters.',

+		'array'   => 'The :attribute must have at least :min items.',

+	],

+	'not_in'               => 'The selected :attribute is invalid.',

+	'numeric'              => 'The :attribute must be a number.',

+	'present'              => 'The :attribute field must be present.',

+	'regex'                => 'The :attribute format is invalid.',

+	'required'             => 'The :attribute field is required.',

+	'required_if'          => 'The :attribute field is required when :other is :value.',

+	'required_unless'      => 'The :attribute field is required unless :other is in :values.',

+	'required_with'        => 'The :attribute field is required when :values is present.',

+	'required_with_all'    => 'The :attribute field is required when :values is present.',

+	'required_without'     => 'The :attribute field is required when :values is not present.',

+	'required_without_all' => 'The :attribute field is required when none of :values are present.',

+	'same'                 => 'The :attribute and :other must match.',

+	'size'                 => [

+		'numeric' => 'The :attribute must be :size.',

+		'file'    => 'The :attribute must be :size kilobytes.',

+		'string'  => 'The :attribute must be :size characters.',

+		'array'   => 'The :attribute must contain :size items.',

+	],

+	'string'               => 'The :attribute must be a string.',

+	'timezone'             => 'The :attribute must be a valid zone.',

+	'unique'               => 'The :attribute has already been taken.',

+	'url'                  => 'The :attribute format is invalid.',

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Custom Validation Language Lines

     |--------------------------------------------------------------------------

@@ -91,13 +91,13 @@ 
     |

     */

 

-    'custom' => [

-        'attribute-name' => [

-            'rule-name' => 'custom-message',

-        ],

-    ],

+	'custom' => [

+		'attribute-name' => [

+			'rule-name' => 'custom-message',

+		],

+	],

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Custom Validation Attributes

     |--------------------------------------------------------------------------

@@ -108,6 +108,6 @@ 
     |

     */

 

-    'attributes' => [],

+	'attributes' => [],

 

 ];

lang/ar/passwords.php

Indentation +6 added lines, -6 removed lines

@@ -2,7 +2,7 @@ 
 

 return [

 

-    /*

+	/*

     |--------------------------------------------------------------------------

     | Password Reminder Language Lines

     |--------------------------------------------------------------------------

@@ -13,10 +13,10 @@ 
     |

     */

 

-    'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد',

-    'reset'    => 'تمت إعادة تعيين كلمة السر',

-    'sent'     => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني',

-    'token'    => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح',

-    'user'     => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني',

+	'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد',

+	'reset'    => 'تمت إعادة تعيين كلمة السر',

+	'sent'     => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني',

+	'token'    => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح',

+	'user'     => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني',

 

 ];