SherifElfadaly / Laravel-Api-Skeleton

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)
 	{

Braces +7 added lines, -14 removed lines

@@ -102,20 +102,16 @@ 
 		if ( ! $user = $this->first(['email' => $credentials['email']])) 
 		{
 			\ErrorHandler::loginFailed();
-		}
-		else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
+		} else if ($adminLogin && ! $user->groups->whereIn('name', ['Admin'])->count()) 
 		{
 			\ErrorHandler::loginFailed();
-		}
-		else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
+		} else if ( ! $adminLogin && $user->groups->whereIn('name', ['Admin'])->count()) 
 		{
 			\ErrorHandler::loginFailed();
-		}
-		else if ($user->blocked)
+		} else if ($user->blocked)
 		{
 			\ErrorHandler::userIsBlocked();
-		}
-		else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
+		} else if ( ! config('skeleton.disable_confirm_email') && ! $user->confirmed)
 		{
 			\ErrorHandler::emailNotConfirmed();
 		}
@@ -165,8 +161,7 @@ 
 		{
 			$user->confirmed = 1;
 			$user->save();
-		}
-		else if ( ! config('skeleton.disable_confirm_email'))  
+		} else if ( ! config('skeleton.disable_confirm_email'))  
 		{
 			$this->sendConfirmationEmail($user->email);
 		}
@@ -189,12 +184,10 @@ 
 		if ( ! $this->hasGroup(['Admin']))
 		{
 			\ErrorHandler::noPermissions();
-		}
-		else if (\Auth::id() == $userId)
+		} else if (\Auth::id() == $userId)
 		{
 			\ErrorHandler::noPermissions();
-		}
-		else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
+		} else if ($user->groups->pluck('name')->search('Admin', true) !== false) 
 		{
 			\ErrorHandler::noPermissions();
 		}

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
 	 */

Braces +11 added lines, -22 removed lines

@@ -471,8 +471,7 @@ 
 		{
 			$model = $this->model->lockForUpdate()->find($value);
 			$model ? $model->update($data) : 0;
-		}
-		else
+		} else
 		{
 			call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data){
 				$model->update($data);
@@ -501,8 +500,7 @@ 
                 
 				$model->delete();
 			});
-		}
-		else
+		} else
 		{
 			\DB::transaction(function () use ($value, $attribute, &$result) {
 				call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
@@ -623,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)) 
 				{
@@ -639,13 +635,11 @@ 
 					{
 						$value1 = $value['val1'];
 						$value2 = $value['val2'];
-					}
-					else
+					} else
 					{
 						$value = array_key_exists('val', $value) ? $value['val'] : '';
 					}
-				}
-				else
+				} else
 				{
 					$operator = '=';
 				}
@@ -657,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 +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
 	 */

Braces +3 added lines, -6 removed lines

@@ -164,8 +164,7 @@ 
 				if ($match[1] == '$this->validationRules')
 				{
 					$route['body'] = $validationRules;
-				}
-				else
+				} else
 				{
 					$route['body'] = eval('return ' . str_replace(',\'.$request->get(\'id\')', ',{id}\'', $match[1]) . ';');
 				}
@@ -175,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/Notifications/Notifications/ConfirmEmail.php

Doc Comments +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	 * Get the notification's delivery channels.
 	 *
 	 * @param  mixed  $notifiable
-	 * @return array
+	 * @return string[]
 	 */
 	public function via($notifiable)
 	{

files/Handler.php

Braces +6 added lines, -12 removed lines

@@ -57,29 +57,23 @@
 			if ($exception instanceof \Illuminate\Database\QueryException) 
 			{
 				\ErrorHandler::dbQueryError();
-			}
-			else if ($exception instanceof \predis\connection\connectionexception) 
+			} else if ($exception instanceof \predis\connection\connectionexception) 
 			{
 				\ErrorHandler::redisNotRunning();
-			}
-			else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
+			} else if ($exception instanceof \GuzzleHttp\Exception\ClientException) 
 			{
 				\ErrorHandler::connectionError();
-			}
-			else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
+			} else if ($exception instanceof \Symfony\Component\HttpKernel\Exception\HttpException) 
 			{
 				return \Response::json($exception->getMessage(), $exception->getStatusCode());   
-			}
-			else if ($exception instanceof \Illuminate\Validation\ValidationException) 
+			} else if ($exception instanceof \Illuminate\Validation\ValidationException) 
 			{
 				return \Response::json($exception->errors(), 422);   
-			}
-			else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
+			} else if ( ! $exception instanceof \Symfony\Component\Debug\Exception\FatalErrorException)
 			{
 				return parent::render($request, $exception);
 			}
-		}
-		else
+		} else
 		{
 			return parent::render($request, $exception);
 		}

src/Modules/Reporting/Repositories/ReportRepository.php

Braces +2 added lines, -4 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();
 		}
@@ -61,8 +60,7 @@ 
 		if ($perPage) 
 		{
 			return $report->paginate($perPage);
-		}
-		else
+		} else
 		{
 			return $report->get();  
 		}

src/Modules/Core/Decorators/CachingDecorator.php

Braces +2 added lines, -4 removed lines

@@ -84,8 +84,7 @@ 
 			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
 				return call_user_func_array([$this->repo, $name], $arguments);
 			});
-		}
-		else if ($this->cacheConfig)
+		} else if ($this->cacheConfig)
 		{
 			$this->cache->tags($this->cacheConfig)->flush();
 			return call_user_func_array([$this->repo, $name], $arguments);
@@ -109,8 +108,7 @@ 
 		if ($cacheConfig && in_array($name, $cacheConfig['cache']))
 		{
 			$this->cacheConfig = 'cache';
-		}
-		else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
+		} else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
 		{
 			$this->cacheConfig = $cacheConfig['clear'][$name];
 		}

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

Braces +3 added lines, -6 removed lines

@@ -157,8 +157,7 @@ 
 			if ($request->has('id')) 
 			{
 				$rule = str_replace('{id}', $request->get('id'), $rule);
-			}
-			else
+			} else
 			{
 				$rule = str_replace(',{id}', '', $rule);
 			}
@@ -228,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();

src/Modules/Acl/AclUser.php

Braces +1 added lines, -2 removed lines

@@ -97,8 +97,7 @@
 				}
 
 				$tokens[] = $device->device_token;
-			} 
-			catch (\Exception $e) 
+			} catch (\Exception $e) 
 			{
 				$device->forceDelete();
 			}