SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/AbstractRepositories/AbstractRepository.php

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/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();

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

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/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();
 		}