SherifElfadaly / Laravel-Api-Skeleton

src/Modules/Core/BaseClasses/BaseRepository.php

Spacing +16 added lines, -16 removed lines

@@ -248,7 +248,7 @@ 
         $model = $this->model->onlyTrashed()->find($id);
 
         if (!$model) {
-            Errors::notFound(class_basename($this->model) . ' with id : ' . $id);
+            Errors::notFound(class_basename($this->model).' with id : '.$id);
         }
 
         $model->restore();
@@ -268,7 +268,7 @@ 
         $model = Arr::has($data, 'id') ? $modelClass->lockForUpdate()->find($data['id']) : new $modelClass;
 
         if (!$model) {
-            Errors::notFound(class_basename($modelClass) . ' with id : ' . $data['id']);
+            Errors::notFound(class_basename($modelClass).' with id : '.$data['id']);
         }
 
         foreach ($data as $key => $value) {
@@ -331,7 +331,7 @@ 
         }
 
         if (!$relatedModel) {
-            Errors::notFound(class_basename($relationBaseModel) . ' with id : ' . $relatedModelData['id']);
+            Errors::notFound(class_basename($relationBaseModel).' with id : '.$relatedModelData['id']);
         }
 
         if (is_array($relatedModelData)) {
@@ -401,11 +401,11 @@ 
 
             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']);
             } elseif ($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 {
                 if (is_array($value)) {
@@ -421,38 +421,38 @@ 
                 }
 
                 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()->withoutGlobalScopes()->has($key)->toSql();
                     $bindings         = $model->withTrashed()->withoutGlobalScopes()->has($key)->getBindings();
                     if ($value) {
                         $conditions       = $this->constructConditions($value, $model->$key()->getRelated());
-                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1) . ' and ' . $conditions['conditionString'] . ') {op} ';
+                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1).' and '.$conditions['conditionString'].') {op} ';
                         $conditionValues  = array_merge($conditionValues, $bindings);
                         $conditionValues  = array_merge($conditionValues, $conditions['conditionValues']);
                     } else {
-                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1) . ') {op} ';
+                        $conditionString .= substr(substr($sql, strpos($sql, 'exists')), 0, -1).') {op} ';
                         $conditionValues  = array_merge($conditionValues, $bindings);
                     }
                 } else {
-                    $conditionString  .= $key . ' ' . $operator . ' ? {op} ';
+                    $conditionString  .= $key.' '.$operator.' ? {op} ';
                     $conditionValues[] = $value;
                 }
             }
         }
-        $conditionString = '(' . rtrim($conditionString, '{op} ') . ')';
+        $conditionString = '('.rtrim($conditionString, '{op} ').')';
         return ['conditionString' => $conditionString, 'conditionValues' => $conditionValues];
     }
 
@@ -469,9 +469,9 @@ 
         $path       = explode('->', $value);
         $field      = array_shift($path);
         $result     = sprintf('%s->\'$.%s\'', $field, collect($path)->map(function ($part) {
-            return '"' . $part . '"';
+            return '"'.$part.'"';
         })->implode('.'));
 
-        return $removeLast === false ? $result : $result . ')';
+        return $removeLast === false ? $result : $result.')';
     }
 }