SherifElfadaly / Laravel-Api-Skeleton

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 function getCreatedAtAttribute($value)
     {

src/Modules/Core/AbstractRepositories/AbstractRepositoryContainer.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
     {
     	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)) 
     		{
         		return \App::make($class);

src/Modules/Core/AbstractRepositories/AbstractRepository.php

Spacing +22 added lines, -22 removed lines

@@ -79,26 +79,26 @@ 
         $conditionColumns = $this->model->getFillable();
         $sort             = $desc ? 'desc' : 'asc';
 
-        $model->where(function ($q) use ($query, $conditionColumns, $relations){
-            $q->where(\DB::raw('LOWER(CAST(' . array_shift($conditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+        $model->where(function($q) use ($query, $conditionColumns, $relations){
+            $q->where(\DB::raw('LOWER(CAST('.array_shift($conditionColumns).' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
             foreach ($conditionColumns as $column) 
             {
-                $q->orWhere(\DB::raw('LOWER(CAST(' . $column . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+                $q->orWhere(\DB::raw('LOWER(CAST('.$column.' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
             }
             foreach ($relations as $relation) 
             {
                 $relation = explode('.', $relation)[0];
                 if (\Core::$relation()) 
                 {
-                    $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){
 
                             $subConditionColumns = \Core::$relation()->model->getFillable();
-                            $q->where(\DB::raw('LOWER(CAST(' . array_shift($subConditionColumns) . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+                            $q->where(\DB::raw('LOWER(CAST('.array_shift($subConditionColumns).' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
                             foreach ($subConditionColumns as $column)
                             {
-                                $q->orWhere(\DB::raw('LOWER(CAST(' . $column . ' AS TEXT))'), 'LIKE', '%' . strtolower($query) . '%');
+                                $q->orWhere(\DB::raw('LOWER(CAST('.$column.' AS TEXT))'), 'LIKE', '%'.strtolower($query).'%');
                             } 
                         });
 
@@ -160,7 +160,7 @@ 
         $relations  = [];
         $with       = [];
 
-        \DB::transaction(function () use (&$model, &$relations, &$with, $data, $saveLog, $modelClass) {
+        \DB::transaction(function() use (&$model, &$relations, &$with, $data, $saveLog, $modelClass) {
             /**
              * If the id is present in the data then select the model for updating,
              * else create new model.
@@ -169,7 +169,7 @@ 
             $model = array_key_exists('id', $data) ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
             if ( ! $model) 
             {
-                $error = $this->errorHandler->notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+                $error = $this->errorHandler->notFound(class_basename($modelClass).' with id : '.$data['id']);
                 abort($error['status'], $error['message']);
             }
 
@@ -201,13 +201,13 @@ 
                                 $relationModel = array_key_exists('id', $val) ? $relationBaseModel->lockForUpdate()->find($val['id']) : new $relationBaseModel;
                                 if ( ! $relationModel) 
                                 {
-                                    $error = $this->errorHandler->notFound(class_basename($relationBaseModel) . ' with id : ' . $val['id']);
+                                    $error = $this->errorHandler->notFound(class_basename($relationBaseModel).' with id : '.$val['id']);
                                     abort($error['status'], $error['message']);
                                 }
 
                                 foreach ($val as $attr => $val) 
                                 {
-                                    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;
                                     }
@@ -221,7 +221,7 @@ 
                                     $relationModel = array_key_exists('id', $value) ? $relationBaseModel->lockForUpdate()->find($value['id']) : new $relationBaseModel;
                                     if ( ! $relationModel) 
                                     {
-                                        $error = $this->errorHandler->notFound(class_basename($relationBaseModel) . ' with id : ' . $value['id']);
+                                        $error = $this->errorHandler->notFound(class_basename($relationBaseModel).' with id : '.$value['id']);
                                         abort($error['status'], $error['message']);
                                     }
 
@@ -309,7 +309,7 @@ 
     public function saveMany(array $data)
     {
         $result = [];
-        \DB::transaction(function () use (&$result, $data) {
+        \DB::transaction(function() use (&$result, $data) {
             foreach ($data as $key => $value) 
             {
                 $result[] = $this->save($value);
@@ -335,7 +335,7 @@ 
             $model ? $model->update($data) : 0;
             $saveLog ? $this->logs->saveLog('update', class_basename($this->model), $this->getModel(), $value, $model) : false;
         }
-    	call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model) use ($data, $saveLog){
+    	call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) use ($data, $saveLog){
             $model->update($data);
             $saveLog ? $this->logs->saveLog('update', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
         });
@@ -353,7 +353,7 @@ 
     {
     	if ($attribute == 'id') 
     	{
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
                 $model = $this->model->lockForUpdate()->find($value);
                 $model->delete();
                 $saveLog ? $this->logs->saveLog('delete', class_basename($this->model), $this->getModel(), $value, $model) : false;
@@ -361,8 +361,8 @@ 
     	}
         else
         {
-            \DB::transaction(function () use ($value, $attribute, &$result, $saveLog) {
-                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function ($model){
+            \DB::transaction(function() use ($value, $attribute, &$result, $saveLog) {
+                call_user_func_array("{$this->getModel()}::where", array($attribute, '=', $value))->lockForUpdate()->get()->each(function($model) {
                     $model->delete();
                     $saveLog ? $this->logs->saveLog('delete', class_basename($this->model), $this->getModel(), $model->id, $model) : false;
                 });
@@ -399,7 +399,7 @@ 
     {
         $conditions = $this->constructConditions($conditions);
         $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);
     }
 
     /**
@@ -430,21 +430,21 @@ 
         {
             if ($key == 'and') 
             {
-                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']) . ' {op} ';
+                $conditionString  .= str_replace('{op}', 'and', $this->constructConditions($value)['conditionString']).' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
             }
             else if ($key == 'or')
             {
-                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']) . ' {op} ';
+                $conditionString  .= str_replace('{op}', 'or', $this->constructConditions($value)['conditionString']).' {op} ';
                 $conditionValues   = array_merge($conditionValues, $this->constructConditions($value)['conditionValues']);
             }
             else
             {
-                $conditionString  .= $key . '=? {op} ';
+                $conditionString  .= $key.'=? {op} ';
                 $conditionValues[] = $value;
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }
 

src/Modules/Core/CoreConfig.php

Spacing +1 added lines, -1 removed lines

@@ -5,7 +5,7 @@
     public function getConfig()
     {
     	$customSettings = [];
-    	Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){
+    	Settings::get(['key', 'value'])->each(function($setting) use (&$customSettings){
     		$customSettings[$setting['key']] = $setting['value'];
     	});
 

src/Modules/Core/ErrorHandler.php

Spacing +1 added lines, -1 removed lines

@@ -29,6 +29,6 @@
 
     public function notFound($text)
     {
-        return ['status' => 404, 'message' => 'The requested ' . $text . ' not found'];
+        return ['status' => 404, 'message' => 'The requested '.$text.' not found'];
     }
 }
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
         $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
         
         $this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
-        $route                     = explode('@',\Route::currentRouteAction())[1];
+        $route                     = explode('@', \Route::currentRouteAction())[1];
         $this->checkPermission(explode('_', snake_case($route))[1]);
     }
 

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 = [
     'name'  => 'required|string|max:100',
     'value' => 'required|string|max:100'
     ];

src/Modules/Core/Database/Migrations/2016_01_24_123630_settings.php

Spacing +4 added lines, -4 removed lines

@@ -12,11 +12,11 @@
 	 */
 	public function up()
 	{
-		Schema::create('settings', function (Blueprint $table) {
+		Schema::create('settings', function(Blueprint $table) {
             $table->increments('id');
-            $table->string('name',100);
-            $table->string('key',100)->unique();
-            $table->string('value',100);
+            $table->string('name', 100);
+            $table->string('key', 100)->unique();
+            $table->string('value', 100);
             $table->softDeletes();
             $table->timestamps();
         });

src/Modules/Logging/Log.php

Spacing +1 added lines, -1 removed lines

@@ -3,7 +3,7 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-class Log extends Model{
+class Log extends Model {
 
     use SoftDeletes;
     protected $table    = 'logs';