SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/Decorators/CachingDecorator.php

Spacing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		if ($this->cacheConfig && $this->cacheConfig == 'cache') 
 		{
 			$page     = \Request::get('page') !== null ? \Request::get('page') : '1';
-			$cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
+			$cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
 			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
 				return call_user_func_array([$this->repo, $name], $arguments);
 			});

src/Modules/Core/Settings.php

Spacing +2 added lines, -2 removed lines

@@ -3,14 +3,14 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Settings extends Model{
+class Settings extends Model {
 
 	use SoftDeletes;
 	protected $table    = 'settings';
 	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
 	protected $hidden   = ['deleted_at'];
 	protected $guarded  = ['id', 'key'];
-	protected $fillable = ['name','value'];
+	protected $fillable = ['name', 'value'];
 	public $searchable  = ['name', 'value', 'key'];
     
 	public function getCreatedAtAttribute($value)

src/Modules/Core/Providers/RouteServiceProvider.php

Spacing +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 		Route::group([
 			'middleware' => 'web',
 			'namespace'  => $this->namespace,
-		], function ($router) {
+		], function($router) {
 			require module_path('core', 'Routes/web.php');
 		});
 	}
@@ -72,7 +72,7 @@ 
 			'middleware' => 'api',
 			'namespace'  => $this->namespace,
 			'prefix'     => 'api',
-		], function ($router) {
+		], function($router) {
 			require module_path('core', 'Routes/api.php');
 		});
 	}

src/Modules/Core/AbstractRepositories/AbstractRepository.php

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/AbstractRepositories/AbstractRepositoryContainer.php

Spacing +2 added lines, -2 removed lines

@@ -18,10 +18,10 @@
 	{
 		foreach ($this->getRepoNameSpace() as $repoNameSpace) 
 		{
-			$class = rtrim($repoNameSpace, '\\') . '\\' . ucfirst(str_singular($name)) . 'Repository';
+			$class = rtrim($repoNameSpace, '\\').'\\'.ucfirst(str_singular($name)).'Repository';
 			if (class_exists($class)) 
 			{
-				\App::singleton($class, function ($app) use ($class) {
+				\App::singleton($class, function($app) use ($class) {
 
 					return new \App\Modules\Core\Decorators\CachingDecorator(new $class, $app['cache.store']);
 				});

src/Modules/Core/Repositories/SettingRepository.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 	 */
 	public function saveMany(array $data)
 	{
-		\DB::transaction(function () use ($data) {
+		\DB::transaction(function() use ($data) {
 			foreach ($data as $key => $value) 
 			{
 				$this->save($value);

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

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@ 
 		$this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
 		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
 		$this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
-		$route                     = explode('@',\Route::currentRouteAction())[1];
+		$route                     = explode('@', \Route::currentRouteAction())[1];
 
-		$this->middleware(function ($request, $next) {
+		$this->middleware(function($request, $next) {
             
 			$this->repo = call_user_func_array("\Core::{$this->model}", []);            
 			return $next($request);
@@ -229,7 +229,7 @@ 
 
 			if ($isPasswordClient && (in_array($permission, $this->skipPermissionCheck) || \Core::users()->can($permission, $this->model)))
 			{}
-			elseif ( ! $isPasswordClient && $user->tokenCan($this->model . '-' . $permission)) 
+			elseif ( ! $isPasswordClient && $user->tokenCan($this->model.'-'.$permission)) 
 			{}
 			else
 			{

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

Spacing +2 added lines, -2 removed lines

@@ -13,14 +13,14 @@
 	 * to preform actions like (add, edit ... etc).
 	 * @var string
 	 */
-	protected $model               = 'settings';
+	protected $model = 'settings';
 
 	/**
 	 * The validations rules used by the base api controller
 	 * to check before add.
 	 * @var array
 	 */
-	protected $validationRules  = [
+	protected $validationRules = [
 		'id'    => 'required|exists:settings,id',
 		'value' => 'required|string'
 	];

src/Modules/Core/Utl/Media.php

Spacing +10 added lines, -10 removed lines

@@ -11,13 +11,13 @@ 
 	 */
 	public function uploadImage($image, $dir) 
 	{
-	   $imageName       =  str_slug('image' . uniqid() . time() . '_' . $image->getClientOriginalName());
-	   $destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+	   $imageName       = str_slug('image'.uniqid().time().'_'.$image->getClientOriginalName());
+	   $destinationPath = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
 
 	   ! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 	   $image->move($destinationPath, $imageName);
 
-	   return url($destinationPath . $imageName);
+	   return url($destinationPath.$imageName);
 	}
 
 	/**
@@ -29,20 +29,20 @@ 
 	 */
 	public function uploadImageBas64($image, $dir) 
 	{
-		if (! strlen($image)) 
+		if ( ! strlen($image)) 
 		{
 			return null;
 		}
         
-		$imageName       = 'image' . uniqid() . time() . '.jpg';
-		$destinationPath = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR;
+		$imageName       = 'image'.uniqid().time().'.jpg';
+		$destinationPath = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR;
 
 		! file_exists($destinationPath) ? \File::makeDirectory($destinationPath) : false;
 
-		$base  = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
-		\Image::make($base)->save($destinationPath . $imageName);
+		$base = base64_decode(preg_replace('#^data:image/\w+;base64,#i', '', $image));
+		\Image::make($base)->save($destinationPath.$imageName);
 
-		return url($destinationPath . $imageName);
+		return url($destinationPath.$imageName);
 	}
 
 	/**
@@ -55,7 +55,7 @@ 
 	public function deleteImage($path, $dir) 
 	{   
 		$arr      = explode('/', $path);
-		$path     = 'media' . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . end($arr);
+		$path     = 'media'.DIRECTORY_SEPARATOR.$dir.DIRECTORY_SEPARATOR.end($arr);
 		if (\File::exists($path)) 
 		{
 			\File::delete($path);