SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Reporting/Database/Migrations/2016_01_19_112603_sampel_report.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 	 */
 	public function up()
 	{
-		DB::statement( "CREATE VIEW admin_count AS  
+		DB::statement("CREATE VIEW admin_count AS  
 			select count(u.id)
 			from users u, groups g ,users_groups ug
 			where
@@ -39,6 +39,6 @@ 
 	 */
 	public function down()
 	{
-		DB::statement( "DROP VIEW IF EXISTS admin_count");
+		DB::statement("DROP VIEW IF EXISTS admin_count");
 	}
 }
\ No newline at end of file

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

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/Acl/Database/Migrations/2015_12_20_124153_users.php

Spacing +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
 	 */
 	public function up()
 	{
-		Schema::create('users', function (Blueprint $table) {
+		Schema::create('users', function(Blueprint $table) {
             $table->increments('id');
             $table->string('profile_picture', 150)->nullable();
             $table->string('name', 100)->nullable();

src/Modules/Acl/Repositories/GroupRepository.php

Spacing +1 added lines, -1 removed lines

@@ -23,7 +23,7 @@
 	 */
 	public function assignPermissions($groupId, $permissionIds)
 	{
-		\DB::transaction(function () use ($groupId, $permissionIds) {
+		\DB::transaction(function() use ($groupId, $permissionIds) {
 			$group = $this->find($groupId);
 			$group->permissions()->detach();
 			$group->permissions()->attach($permissionIds);

src/Modules/Core/Core.php

Spacing +1 added lines, -1 removed lines

@@ -2,7 +2,7 @@
 
 use App\Modules\Core\AbstractRepositories\AbstractRepositoryContainer;
 
-class Core extends AbstractRepositoryContainer{
+class Core extends AbstractRepositoryContainer {
 	/**
 	 * Specify module repositories name space.
 	 * 

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

Spacing +7 added lines, -7 removed lines

@@ -20,27 +20,27 @@ 
 			],
 			[
 				'title'   => 'email equal John@Doe.com and user is blocked:',
-				'content' => ['and' => ['email' => 'John@Doe.com','blocked' => 1]]
+				'content' => ['and' => ['email' => 'John@Doe.com', 'blocked' => 1]]
 			],
 			[
 				'title'   => 'email equal John@Doe.com or user is blocked:',
-				'content' => ['or' => ['email' => 'John@Doe.com','blocked' => 1]]
+				'content' => ['or' => ['email' => 'John@Doe.com', 'blocked' => 1]]
 			],
 			[
 				'title'   => 'email contain John:',
-				'content' => ['email' => ['op' => 'like','val' => '%John%']]
+				'content' => ['email' => ['op' => 'like', 'val' => '%John%']]
 			],
 			[
 				'title'   => 'user created after 2016-10-25:',
-				'content' => ['created_at' => ['op' => '>','val' => '2016-10-25']]
+				'content' => ['created_at' => ['op' => '>', 'val' => '2016-10-25']]
 			],
 			[
 				'title'   => 'user created between 2016-10-20 and 2016-10-25:',
-				'content' => ['created_at' => ['op' => 'between','val1' => '2016-10-20','val2' => '2016-10-25']]
+				'content' => ['created_at' => ['op' => 'between', 'val1' => '2016-10-20', 'val2' => '2016-10-25']]
 			],
 			[
 				'title'   => 'user id in 1,2,3:',
-				'content' => ['id' => ['op' => 'in','val' => [1, 2, 3]]]
+				'content' => ['id' => ['op' => 'in', 'val' => [1, 2, 3]]]
 			],
 			[
 				'title'   => 'user name is null:',
@@ -52,7 +52,7 @@ 
 			],
 			[
 				'title'   => 'user has group admin:',
-				'content' => ['groups' => ['op' => 'has','val' => ['name' => 'Admin']]]
+				'content' => ['groups' => ['op' => 'has', 'val' => ['name' => 'Admin']]]
 			]
 		];
 

src/Modules/Acl/Repositories/UserRepository.php

Doc Comments +3 added lines, -3 removed lines

@@ -61,7 +61,7 @@ 
 	/**
 	 * Check if the logged in user has the given group.
 	 * 
-	 * @param  array $groups
+	 * @param  string[] $groups
 	 * @param  mixed $user
 	 * @return boolean
 	 */
@@ -155,7 +155,7 @@ 
 	 * 
 	 * @param  array   $credentials
 	 * @param  boolean $skipConfirmEmail
-	 * @return array
+	 * @return boolean
 	 */
 	public function register($credentials, $skipConfirmEmail = false)
 	{
@@ -246,7 +246,7 @@ 
 	 * Reset the given user's password.
 	 *
 	 * @param  array  $credentials
-	 * @return array
+	 * @return string|null
 	 */
 	public function resetPassword($credentials)
 	{

Spacing +4 added lines, -4 removed lines

@@ -28,7 +28,7 @@ 
 		$user        = \Core::users()->find(\Auth::id(), $relations);
 		foreach ($user->groups()->get() as $group)
 		{
-			$group->permissions->each(function ($permission) use (&$permissions){
+			$group->permissions->each(function($permission) use (&$permissions){
 				$permissions[$permission->model][$permission->id] = $permission->name;
 			});
 		}
@@ -51,7 +51,7 @@ 
 		$user        = $user ?: $this->find(\Auth::id(), ['groups.permissions']);
 		$permissions = [];
 
-		$user->groups->pluck('permissions')->each(function ($permission) use (&$permissions, $model){
+		$user->groups->pluck('permissions')->each(function($permission) use (&$permissions, $model){
 			$permissions = array_merge($permissions, $permission->where('model', $model)->pluck('name')->toArray()); 
 		});
         
@@ -80,7 +80,7 @@ 
 	 */
 	public function assignGroups($userId, $groupIds)
 	{
-		\DB::transaction(function () use ($userId, $groupIds) {
+		\DB::transaction(function() use ($userId, $groupIds) {
 			$user = $this->find($userId);
 			$user->groups()->detach();
 			$user->groups()->attach($groupIds);
@@ -250,7 +250,7 @@ 
 	 */
 	public function resetPassword($credentials)
 	{
-		$response = \Password::reset($credentials, function ($user, $password) {
+		$response = \Password::reset($credentials, function($user, $password) {
 			$user->password = $password;
 			$user->save();
 		});

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Doc Comments +8 added lines, -8 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)
 	{
@@ -517,7 +517,7 @@ 
 	 * id.
 	 * 
 	 * @param  integer $id
-	 * @param  array   $relations
+	 * @param  string[]   $relations
 	 * @param  array   $columns
 	 * @return object
 	 */
@@ -533,7 +533,7 @@ 
 	 * @param  array   $conditions array of conditions
 	 * @param  array   $relations
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */
@@ -565,7 +565,7 @@ 
 	 * @param  array   $conditions array of conditions
 	 * @param  integer $perPage
 	 * @param  string  $sortBy
-	 * @param  boolean $desc
+	 * @param  integer $desc
 	 * @param  array   $columns
 	 * @return collection
 	 */

Spacing +36 added lines, -36 removed lines

@@ -63,11 +63,11 @@ 
 		/**
 		 * Construct the select conditions for the model.
 		 */
-		$model->where(function ($q) use ($query, $conditionColumns, $relations){
+		$model->where(function($q) use ($query, $conditionColumns, $relations){
 
 			if (count($conditionColumns)) 
 			{
-				$column = 'LOWER(' . array_shift($conditionColumns) . ')';
+				$column = 'LOWER('.array_shift($conditionColumns).')';
 				if (str_contains($column, '->')) 
 				{
 					$column = $this->wrapJsonSelector($column);
@@ -76,7 +76,7 @@ 
 				/**
 				 * Use the first element in the model columns to construct the first condition.
 				 */
-				$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+				$q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
 			}
 
 			/**
@@ -84,13 +84,13 @@ 
 			 */
 			foreach ($conditionColumns as $column) 
 			{
-				$column = 'LOWER(' . $column . ')';
+				$column = 'LOWER('.$column.')';
 				if (str_contains($column, '->')) 
 				{
 					$column = $this->wrapJsonSelector($column);
 				}
 
-				$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+				$q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
 			}
 
 			/**
@@ -111,9 +111,9 @@ 
 					/**
 					 * Construct the relation condition.
 					 */
-					$q->orWhereHas($relation, function ($subModel) use ($query, $relation){
+					$q->orWhereHas($relation, function($subModel) use ($query, $relation){
 
-						$subModel->where(function ($q) use ($query, $relation){
+						$subModel->where(function($q) use ($query, $relation){
 
 							/**
 							 * Get columns of the relation.
@@ -123,7 +123,7 @@ 
 							if (count($subConditionColumns)) 
 							{
 
-								$column = 'LOWER(' . array_shift($subConditionColumns) . ')';
+								$column = 'LOWER('.array_shift($subConditionColumns).')';
 								if (str_contains($column, '->')) 
 								{
 									$column = $this->wrapJsonSelector($column);
@@ -132,7 +132,7 @@ 
 								/**
 								 * Use the first element in the relation model columns to construct the first condition.
 								 */
-								$q->where(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+								$q->where(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
 							}
 
 							/**
@@ -140,13 +140,13 @@ 
 							 */
 							foreach ($subConditionColumns as $subConditionColumn)
 							{
-								$column = 'LOWER(' . $subConditionColumn . ')';
+								$column = 'LOWER('.$subConditionColumn.')';
 								if (str_contains($column, '->')) 
 								{
 									$column = $this->wrapJsonSelector($column);
 								}
                                 
-								$q->orWhere(\DB::raw($column), 'LIKE', '%' . strtolower($query) . '%');
+								$q->orWhere(\DB::raw($column), 'LIKE', '%'.strtolower($query).'%');
 							} 
 						});
 
@@ -207,7 +207,7 @@ 
 		$modelClass = $this->model;
 		$relations  = [];
 
-		\DB::transaction(function () use (&$model, &$relations, $data, $modelClass) {
+		\DB::transaction(function() use (&$model, &$relations, $data, $modelClass) {
 			/**
 			 * If the id is present in the data then select the model for updating,
 			 * else create new model.
@@ -216,7 +216,7 @@ 
 			$model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
 			if ( ! $model) 
 			{
-				\ErrorHandler::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+				\ErrorHandler::notFound(class_basename($modelClass).' with id : '.$data['id']);
 			}
 
 			/**
@@ -274,7 +274,7 @@ 
 								 */
 								if ( ! $relationModel) 
 								{
-									\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+									\ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
 								}
 
 								/**
@@ -285,7 +285,7 @@ 
 									/**
 									 * Prevent the sub relations or attributes not in the fillable.
 									 */
-									if (gettype($val) !== 'object' && gettype($val) !== 'array' &&  array_search($attr, $relationModel->getFillable(), true) !== false)
+									if (gettype($val) !== 'object' && gettype($val) !== 'array' && array_search($attr, $relationModel->getFillable(), true) !== false)
 									{
 										$relationModel->$attr = $val;
 									}
@@ -315,7 +315,7 @@ 
 									 */
 									if ( ! $relationModel) 
 									{
-										\ErrorHandler::notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+										\ErrorHandler::notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
 									}
 
 									foreach ($value as $relationAttribute => $relationValue) 
@@ -474,7 +474,7 @@ 
 		}
 		else
 		{
-			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
+			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data){
 				$model->update($data);
 			});
 		}
@@ -492,11 +492,11 @@ 
 	{
 		if ($attribute == 'id') 
 		{
-			\DB::transaction(function () use ($value, $attribute, &$result) {
+			\DB::transaction(function() use ($value, $attribute, &$result) {
 				$model = $this->model->lockForUpdate()->find($value);
 				if ( ! $model) 
 				{
-					\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $value);
+					\ErrorHandler::notFound(class_basename($this->model).' with id : '.$value);
 				}
                 
 				$model->delete();
@@ -504,8 +504,8 @@ 
 		}
 		else
 		{
-			\DB::transaction(function () use ($value, $attribute, &$result) {
-				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+			\DB::transaction(function() use ($value, $attribute, &$result) {
+				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
 					$model->delete();
 				});
 			});   
@@ -541,7 +541,7 @@ 
 	{
 		$conditions = $this->constructConditions($conditions, $this->model);
 		$sort       = $desc ? 'desc' : 'asc';
-		return call_user_func_array("{$this->getModel()}::with",  array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
+		return call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->orderBy($sortBy, $sort)->get($columns);
 	}
 
 	/**
@@ -581,7 +581,7 @@ 
 			$model->whereRaw($conditions['conditionString'], $conditions['conditionValues']);
 		}
 
-		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns);;
+		return $model->orderBy($sortBy, $sort)->paginate($perPage, $columns); ;
 	}
 
 	/**
@@ -596,7 +596,7 @@ 
 
 		if ( ! $model) 
 		{
-			\ErrorHandler::notFound(class_basename($this->model) . ' with id : ' . $id);
+			\ErrorHandler::notFound(class_basename($this->model).' with id : '.$id);
 		}
 
 		$model->restore();
@@ -621,13 +621,13 @@ 
 			if ($key == 'and') 
 			{
 				$conditions       = $this->constructConditions($value, $model);
-				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']) . ' {op} ';
+				$conditionString .= str_replace('{op}', 'and', $conditions['conditionString']).' {op} ';
 				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
 			}
 			else if ($key == 'or')
 			{
 				$conditions       = $this->constructConditions($value, $model);
-				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']) . ' {op} ';
+				$conditionString .= str_replace('{op}', 'or', $conditions['conditionString']).' {op} ';
 				$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
 			}
 			else
@@ -652,41 +652,41 @@ 
                 
 				if (strtolower($operator) == 'between') 
 				{
-					$conditionString  .= $key . ' >= ? and ';
+					$conditionString  .= $key.' >= ? and ';
 					$conditionValues[] = $value1;
 
-					$conditionString  .= $key . ' <= ? {op} ';
+					$conditionString  .= $key.' <= ? {op} ';
 					$conditionValues[] = $value2;
 				}
 				elseif (strtolower($operator) == 'in') 
 				{
 					$conditionValues  = array_merge($conditionValues, $value);
 					$inBindingsString = rtrim(str_repeat('?,', count($value)), ',');
-					$conditionString .= $key . ' in (' . rtrim($inBindingsString, ',') . ') {op} ';
+					$conditionString .= $key.' in ('.rtrim($inBindingsString, ',').') {op} ';
 				}
 				elseif (strtolower($operator) == 'null') 
 				{
-					$conditionString .= $key . ' is null {op} ';
+					$conditionString .= $key.' is null {op} ';
 				}
 				elseif (strtolower($operator) == 'not null') 
 				{
-					$conditionString .= $key . ' is not null {op} ';
+					$conditionString .= $key.' is not null {op} ';
 				}
 				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} ';
+					$conditionString .= rtrim(substr($sql, strpos($sql, 'exists')), ')').' and '.$conditions['conditionString'].') {op} ';
 					$conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
 				}
 				else
 				{
-					$conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+					$conditionString  .= $key.' '.$operator.' ? {op} ';
 					$conditionValues[] = $value;
 				}
 			}
 		}
-		$conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+		$conditionString = '('.rtrim($conditionString, '{op} ').')';
 		return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
 	}
 
@@ -702,11 +702,11 @@ 
 		$value      = $removeLast === false ? $value : substr($value, 0, $removeLast);
 		$path       = explode('->', $value);
 		$field      = array_shift($path);
-		$result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
+		$result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function($part) {
 			return '"'.$part.'"';
 		})->implode('.'));
         
-		return $removeLast === false ? $result : $result . ')';
+		return $removeLast === false ? $result : $result.')';
 	}
 
 	/**

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

Doc Comments +2 added lines, -2 removed lines

@@ -124,7 +124,7 @@ 
 	 * based on the docblock.
 	 * 
 	 * @param  array  &$route
-	 * @param  object $reflectionMethod
+	 * @param  \ReflectionMethod $reflectionMethod
 	 * @return void
 	 */
 	protected function processDocBlock(&$route, $reflectionMethod)
@@ -148,7 +148,7 @@ 
 	 * Generate post body for the given route.
 	 * 
 	 * @param  array  &$route
-	 * @param  object $reflectionMethod
+	 * @param  \ReflectionMethod $reflectionMethod
 	 * @param  array  $validationRules
 	 * @return void
 	 */

Spacing +9 added lines, -9 removed lines

@@ -43,7 +43,7 @@ 
 			if ($route) 
 			{
 				$actoinArray = explode('@', $route['action']);
-				if(array_get($actoinArray, 1, false))
+				if (array_get($actoinArray, 1, false))
 				{
 					$controller       = $actoinArray[0];
 					$method           = $actoinArray[1];
@@ -62,7 +62,7 @@ 
 					$route['response'] = $this->getResponseObject($classProperties['model'], $route['name'], $route['returnDocBlock']);
 
 					preg_match('/api\/([^#]+)\//iU', $route['uri'], $module);
-					$docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/' . $module[1] . '/') - 1)][] = $route;
+					$docData['modules'][$module[1]][substr($route['prefix'], strlen('/api/'.$module[1].'/') - 1)][] = $route;
 
 					$this->getModels($classProperties['model'], $docData);   
 				}
@@ -81,7 +81,7 @@ 
 	 */
 	protected function getRoutes()
 	{
-		return collect(\Route::getRoutes())->map(function ($route) {
+		return collect(\Route::getRoutes())->map(function($route) {
 			if (strpos($route->uri(), 'api') !== false) 
 			{
 				return [
@@ -113,7 +113,7 @@ 
 		];
 
 
-		if (! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
+		if ( ! $skipLoginCheck || ! in_array($method, $skipLoginCheck)) 
 		{
 			$route['headers']['Authorization'] = 'Bearer {token}';
 		}
@@ -167,16 +167,16 @@ 
 				}
 				else
 				{
-					$route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
+					$route['body'] = eval('return '.str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]).';');
 				}
 
 				foreach ($route['body'] as &$rule) 
 				{
-					if(strpos($rule, 'unique'))
+					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);
 					}
@@ -249,10 +249,10 @@ 
 			$model      = factory($modelClass)->make();
 			$modelArr   = $model->toArray();
 
-			if ( $model->trans && ! $model->trans->count()) 
+			if ($model->trans && ! $model->trans->count()) 
 			{
 				$modelArr['trans'] = [
-					'en' => factory($modelClass . 'Translation')->make()->toArray()
+					'en' => factory($modelClass.'Translation')->make()->toArray()
 				];
 			}