SherifElfadaly / Laravel-Api-Skeleton

src/Modules/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 {

Indentation +22 added lines, -22 removed lines

@@ -30,10 +30,10 @@ 
 		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
 	}
 
-    /**
-     * Get the profile picture url.
-     * @return string
-     */
+	/**
+	 * Get the profile picture url.
+	 * @return string
+	 */
 	public function getProfilePictureAttribute($value)
 	{
 		return url(\Storage::url($value));
@@ -89,24 +89,24 @@ 
 	 * 
 	 * @return array
 	 */
-    public function routeNotificationForFCM()
-    {
-        $devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
-        $tokens  = [];
-
-        foreach ($devices as $device) 
-        {
-            if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) 
-            {
-                $device->forceDelete();
-                continue;
-            }
-
-            $tokens[] = $device->device_token;
-        }
-
-        return $tokens;
-    }
+	public function routeNotificationForFCM()
+	{
+		$devices = \Core::pushNotificationDevices()->findBy(['user_id' => $this->id]);
+		$tokens  = [];
+
+		foreach ($devices as $device) 
+		{
+			if (\Core::users()->accessTokenExpiredOrRevoked($device->access_token)) 
+			{
+				$device->forceDelete();
+				continue;
+			}
+
+			$tokens[] = $device->device_token;
+		}
+
+		return $tokens;
+	}
 
 	/**
 	 * The channels the user receives notification broadcasts on.

src/Modules/Acl/Repositories/UserRepository.php

Doc Comments +1 added lines, -1 removed lines

@@ -151,7 +151,7 @@
 	 * 
 	 * @param  array   $credentials
 	 * @param  boolean $skipConfirmEmail
-	 * @return array
+	 * @return boolean
 	 */
 	public function register($credentials, $skipConfirmEmail = false)
 	{

Unused Use Statements -1 removed lines

@@ -1,7 +1,6 @@
 <?php namespace App\Modules\Acl\Repositories;
 
 use App\Modules\Core\AbstractRepositories\AbstractRepository;
-use Lcobucci\JWT\ValidationData;
 use Illuminate\Support\Arr;
 
 class UserRepository extends AbstractRepository

Indentation +26 added lines, -26 removed lines

@@ -293,14 +293,14 @@ 
 	 */
 	public function confirmEmail($confirmationCode)
 	{
-        if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) 
-        {
-            \ErrorHandler::invalidConfirmationCode();
-        }
-
-        $user->confirmed         = 1;
-        $user->confirmation_code = null;
-        $user->save();
+		if ( ! $user = $this->first(['confirmation_code' => $confirmationCode])) 
+		{
+			\ErrorHandler::invalidConfirmationCode();
+		}
+
+		$user->confirmed         = 1;
+		$user->confirmation_code = null;
+		$user->save();
 	}
 
 	/**
@@ -375,26 +375,26 @@ 
 		$this->save($data);
 	}
 
-    /**
-     * Ensure access token hasn't expired or revoked.
-     * 
-     * @param  string $accessToken
-     * @return boolean
-     */
-    public function accessTokenExpiredOrRevoked($accessToken)
-    {
-        $accessTokenId = json_decode($accessToken, true)['id'];
-        $accessToken   = \DB::table('oauth_access_tokens')
-                ->where('id', $accessTokenId)
-                ->first();
+	/**
+	 * Ensure access token hasn't expired or revoked.
+	 * 
+	 * @param  string $accessToken
+	 * @return boolean
+	 */
+	public function accessTokenExpiredOrRevoked($accessToken)
+	{
+		$accessTokenId = json_decode($accessToken, true)['id'];
+		$accessToken   = \DB::table('oauth_access_tokens')
+				->where('id', $accessTokenId)
+				->first();
         
-        if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) 
-        {
-            return true;
-        }
+		if (\Carbon\Carbon::parse($accessToken->expires_at)->isPast() || $accessToken->revoked) 
+		{
+			return true;
+		}
 
-        return false;
-    }
+		return false;
+	}
 
 	/**
 	 * Revoke the given access token and all 

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Doc Comments +7 added lines, -7 removed lines

@@ -32,7 +32,7 @@ 
 	 *
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -50,7 +50,7 @@ 
 	 * @param  integer $perPage
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -164,7 +164,7 @@ 
 	 * @param  integer $perPage
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -182,7 +182,7 @@ 
 	 * @param  integer $perPage
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -198,7 +198,7 @@ 
 	 * Save the given model to the storage.
 	 * 
 	 * @param  array $data
-	 * @return mixed
+	 * @return boolean
 	 */
 	public function save(array $data)
 	{
@@ -531,7 +531,7 @@ 
 	 * @param  array   $conditions array of conditions
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -563,7 +563,7 @@ 
 	 * @param  array   $conditions array of conditions
 	 * @param  integer $perPage
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */

Braces +7 added lines, -14 removed lines

@@ -621,14 +621,12 @@ 
 				$conditions       = $this->constructConditions($value, $model);
 				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
 				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-			}
-			else if ($key == 'or')
+			} else if ($key == 'or')
 			{
 				$conditions       = $this->constructConditions($value, $model);
 				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
 				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-			}
-			else
+			} else
 			{
 				if (is_array($value)) 
 				{
@@ -653,29 +651,24 @@ 
 
 					$conditionString  .= $key.' <= ? {op} ';
 					$conditionValues[] = $value2;
-				}
-				elseif (strtolower($operator) == 'in') 
+				} elseif (strtolower($operator) == 'in') 
 				{
 					$conditionValues  = array_merge($conditionValues, $value);
 					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
 					$conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
-				}
-				elseif (strtolower($operator) == 'null') 
+				} elseif (strtolower($operator) == 'null') 
 				{
 					$conditionString .= $key.' is null {op} ';
-				}
-				elseif (strtolower($operator) == 'not null') 
+				} elseif (strtolower($operator) == 'not null') 
 				{
 					$conditionString .= $key.' is not null {op} ';
-				}
-				elseif (strtolower($operator) == 'has') 
+				} elseif (strtolower($operator) == 'has') 
 				{
 					$sql              = $model->withTrashed()->has($key)->toSql();
 					$conditions       = $this->constructConditions($value, $model->$key()->getRelated());
 					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
 					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
-				}
-				else
+				} else
 				{
 					$conditionString  .= $key.' '.$operator.' ? {op} ';
 					$conditionValues[] = $value;

src/Modules/Core/Console/Commands/GenerateDoc.php

Doc Comments +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
 	/**
 	 * Get the given method body code.
 	 * 
-	 * @param  object $reflectionMethod
+	 * @param  \ReflectionMethod $reflectionMethod
 	 * @return string
 	 */
 	protected function getMethodBody($reflectionMethod)

Braces +2 added lines, -4 removed lines

@@ -174,14 +174,12 @@
 					if (strpos($rule, 'unique'))
 					{
 						$rule = substr($rule, 0, strpos($rule, 'unique') + 6);
-					}
-					elseif (strpos($rule, 'exists'))
+					} elseif (strpos($rule, 'exists'))
 					{
 						$rule = substr($rule, 0, strpos($rule, 'exists') - 1);
 					}
 				}
-			}
-			else
+			} else
 			{
 				$route['body'] = 'conditions';
 			}

src/Modules/Core/Http/Controllers/BaseApiController.php

Braces +2 added lines, -4 removed lines

@@ -227,10 +227,8 @@
 			}
 
 			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
-			{}
-			elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
-			{}
-			else
+			{} elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
+			{} else
 			{
 
 				\ErrorHandler::noPermissions();

Indentation +32 added lines, -32 removed lines

@@ -43,9 +43,9 @@ 
 			return $next($request);
 		});
 
-        $this->setSessions();
-        $this->checkPermission($route);
-        $this->setRelations($route);
+		$this->setSessions();
+		$this->checkPermission($route);
+		$this->setRelations($route);
 	}
 
 	/**
@@ -221,7 +221,7 @@ 
 			$user             = \Auth::user();
 			$permission       = $permission !== 'index' ? $permission : 'list';
 			$isPasswordClient = $user->token()->client->password_client;
-            $this->updateLocaleAndTimezone($user);
+			$this->updateLocaleAndTimezone($user);
 
 			if ($user->blocked)
 			{
@@ -287,32 +287,32 @@ 
 		$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();
-        }
-    }
+	/**
+	 * 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();
+		}
+	}
 }

Spacing +1 added lines, -1 removed lines

@@ -307,7 +307,7 @@
         if ($timezone && $timezone !== $user->timezone)
         {
             $user->timezone = $timezone;
-            $update       = true;
+            $update = true;
         }
 
         if ($update) 

src/Modules/Reporting/Repositories/ReportRepository.php

Braces +1 added lines, -2 removed lines

@@ -39,8 +39,7 @@
 		if ( ! $report) 
 		{
 			\ErrorHandler::notFound('report');
-		}
-		else if ( ! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
+		} else if ( ! $skipPermission && ! \Core::users()->can($report->view_name, 'reports'))
 		{
 			\ErrorHandler::noPermissions();
 		}

src/Modules/Acl/Database/Migrations/2015_12_20_124153_users.php

Indentation +16 added lines, -16 removed lines

@@ -13,26 +13,26 @@ 
 	public function up()
 	{
 		Schema::create('users', function(Blueprint $table) {
-            $table->increments('id');
-            $table->string('profile_picture', 150)->nullable();
-            $table->string('name', 100)->nullable();
-            $table->string('email')->unique();
-            $table->string('password', 60)->nullable();
-            $table->boolean('blocked')->default(0);
-            $table->boolean('confirmed')->default(0);
-            $table->string('confirmation_code')->nullable();
-            $table->string('locale', 2)->default('en');
-            $table->string('timezone', 50)->default('Africa/Cairo');
-            $table->softDeletes();
-            $table->rememberToken();
-            $table->timestamps();
-        });
+			$table->increments('id');
+			$table->string('profile_picture', 150)->nullable();
+			$table->string('name', 100)->nullable();
+			$table->string('email')->unique();
+			$table->string('password', 60)->nullable();
+			$table->boolean('blocked')->default(0);
+			$table->boolean('confirmed')->default(0);
+			$table->string('confirmation_code')->nullable();
+			$table->string('locale', 2)->default('en');
+			$table->string('timezone', 50)->default('Africa/Cairo');
+			$table->softDeletes();
+			$table->rememberToken();
+			$table->timestamps();
+		});
 
 		/**
 		 * Create Default users.
 		 */
 		\DB::table('users')->insertGetId(
-            [
+			[
 			'name'       => 'Admin',
 			'email'      => 'admin@user.com',
 			'password'   => bcrypt('123456'),
@@ -40,7 +40,7 @@ 
 			'created_at' => \DB::raw('NOW()'),
 			'updated_at' => \DB::raw('NOW()')
 			]
-        );
+		);
 	}
 
 	/**

src/Modules/Acl/ModelObservers/AclUserObserver.php

Indentation +4 added lines, -4 removed lines

@@ -7,10 +7,10 @@
 
 	public function saving($model)
 	{
-        if ($model->isDirty('profile_picture')) 
-        {
-            \Media::deleteImage($model->getOriginal('profile_picture'));
-        }
+		if ($model->isDirty('profile_picture')) 
+		{
+			\Media::deleteImage($model->getOriginal('profile_picture'));
+		}
 	}
 
 	public function saved($model)

src/Modules/Core/Utl/Media.php

Indentation +53 added lines, -53 removed lines

@@ -2,63 +2,63 @@
 
 class Media
 {
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImage($image, $dir) 
-    {
-        $image = \Image::make($image);
-        return $this->saveImage($image, $dir);
-    }
+	/**
+	 * Upload the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImage($image, $dir) 
+	{
+		$image = \Image::make($image);
+		return $this->saveImage($image, $dir);
+	}
 
-    /**
-     * Upload the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    public function uploadImageBas64($image, $dir) 
-    {
-        if ( ! strlen($image)) 
-        {
-            return null;
-        }
+	/**
+	 * Upload the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	public function uploadImageBas64($image, $dir) 
+	{
+		if ( ! strlen($image)) 
+		{
+			return null;
+		}
 
-        $base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-        $image = \Image::make($base);
+		$base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
+		$image = \Image::make($base);
 
-        return $this->saveImage($image, $dir);
-    }
+		return $this->saveImage($image, $dir);
+	}
 
-    /**
-     * Delete the given image.
-     * 
-     * @param  object $path
-     * @return void
-     */
-    public function deleteImage($path) 
-    {   
-        \Storage::delete($path);
-    }
+	/**
+	 * Delete the given image.
+	 * 
+	 * @param  object $path
+	 * @return void
+	 */
+	public function deleteImage($path) 
+	{   
+		\Storage::delete($path);
+	}
 
-    /**
-     * Save the given image.
-     * 
-     * @param  object  $image
-     * @param  string  $dir
-     * @return string
-     */
-    protected function saveImage($image, $dir) 
-    {
-        $imageName = 'image'.uniqid().time().'.jpg';
-        $path      = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName;
-        \Storage::put($path, $image->stream());
+	/**
+	 * Save the given image.
+	 * 
+	 * @param  object  $image
+	 * @param  string  $dir
+	 * @return string
+	 */
+	protected function saveImage($image, $dir) 
+	{
+		$imageName = 'image'.uniqid().time().'.jpg';
+		$path      = 'public'.DIRECTORY_SEPARATOR.'uploads'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.$imageName;
+		\Storage::put($path, $image->stream());
 
-        return $path;
-    }
+		return $path;
+	}
 }