bulletproofing forceReplace and forceOffsetUnset macros

Author: Marius

src/Providers/CrudProvider.php

@@ -42,35 +42,19 @@ function (...$arguments): Model {
         Request::macro('forceOffsetUnset', function (string $offset): Request {
             /** @var Request $this */
 
-            if ($this->json()->has($offset)) {
-                $this->json()->remove($offset);
-            }
-
-            if ($this->query->has($offset)) {
-                $this->query->remove($offset);
-            }
-
-            if ($this->request->has($offset)) {
-                $this->request->remove($offset);
-            }
+            $this->query->remove($offset);
+            $this->request->remove($offset);
+            $this->offsetUnset($offset);
 
             return $this;
         });
 
         Request::macro('forceReplace', function (array $data): Request {
             /** @var Request $this */
 
-            if ($this->isJson()) {
-                $this->json()->replace($data);
-            }
-
-            if ($this->query->count() > 0) {
-                $this->query->replace($data);
-            }
-
-            if ($this->request->count() > 0) {
-                $this->request->replace($data);
-            }
+            $this->query->replace();
+            $this->request->replace();
+            $this->replace($data);
 
             return $this;
         });