Clean up

Author: binaryk

src/Events/RestifyBeforeEach.php

@@ -16,7 +16,7 @@ class RestifyBeforeEach
 
     /**
      * RestifyAfterEach constructor.
-     * @param  Request  $request
+     * @param  $request
      */
     public function __construct($request)
     {

src/Events/RestifyStarting.php

@@ -16,7 +16,7 @@ class RestifyStarting
 
     /**
      * RestifyServing constructor.
-     * @param  Request  $request
+     * @param  $request
      */
     public function __construct($request)
     {

src/Repositories/Crudable.php

@@ -49,7 +49,7 @@ public function show(RestifyRequest $request)
     public function store(RestifyRequest $request)
     {
         $model = DB::transaction(function () use ($request) {
-            [$model] = self::fillWhenStore(
+            $model = self::fillWhenStore(
                 $request, self::newModel()
             );
 
@@ -72,7 +72,7 @@ public function store(RestifyRequest $request)
     public function update(RestifyRequest $request, $model)
     {
         DB::transaction(function () use ($request, $model) {
-            [$model] = static::fillWhenUpdate($request, $model);
+            $model = static::fillWhenUpdate($request, $model);
 
             $model->save();
 
@@ -97,4 +97,10 @@ public function destroy(RestifyRequest $request)
         return $this->response()
             ->setStatusCode(RestResponse::REST_RESPONSE_DELETED_CODE);
     }
+
+    /**
+     * @param  null  $request
+     * @return mixed
+     */
+    abstract public function response($request = null);
 }

src/Repositories/RepositoryFillFields.php

@@ -21,12 +21,16 @@ trait RepositoryFillFields
      */
     public static function fillWhenStore(RestifyRequest $request, $model)
     {
-        return [$model, static::fillFields(
+        static::fillFields(
             $request, $model,
             (new static($model))->collectFields($request)
-        ), static::fillExtra($request, $model,
+        );
+
+        static::fillExtra($request, $model,
             (new static($model))->collectFields($request)
-        )];
+        );
+
+        return $model;
     }
 
     /**
@@ -36,12 +40,15 @@ public static function fillWhenStore(RestifyRequest $request, $model)
      */
     public static function fillWhenUpdate(RestifyRequest $request, $model)
     {
-        return [$model, static::fillFields(
+        static::fillFields(
             $request, $model,
             (new static($model))->collectFields($request)
-        ), static::fillExtra($request, $model,
+        );
+        static::fillExtra($request, $model,
             (new static($model))->collectFields($request)
-        )];
+        );
+
+        return $model;
     }
 
     /**