Merge branch 'v5' into singleton-view-namespaces

Author: pxpm

src/app/Library/CrudPanel/Traits/Create.php

@@ -264,7 +264,7 @@ private function handleManyRelationItemRemoval($modelInstance, $removedEntries,
         // developer set force_delete => true, so we don't care if it's nullable or not,
         // we just follow developer's will
         if ($forceDelete) {
-            return $removedEntries->delete();
+            return $removedEntries->lazy()->each->delete();
         }
 
         // get the default that could be set at database level.
@@ -273,7 +273,7 @@ private function handleManyRelationItemRemoval($modelInstance, $removedEntries,
         // if column is not nullable in database, and there is no column default (null),
         // we will delete the entry from the database, otherwise it will throw and ugly DB error.
         if (! $relationColumnIsNullable && $dbColumnDefault === null) {
-            return $removedEntries->delete();
+            return $removedEntries->lazy()->each->delete();
         }
 
         // if column is nullable we just set it to the column default (null when it does exist, or the default value when it does).
@@ -316,10 +316,10 @@ private function createManyEntries($entry, $relation, $relationMethod, $relation
             $this->createRelationsForItem($item, $relationInputs);
         }
 
-        // use the collection of sent ids to match agains database ids, delete the ones not found in the submitted ids.
+        // use the collection of sent ids to match against database ids, delete the ones not found in the submitted ids.
         if (! empty($relatedItemsSent)) {
             // we perform the cleanup of removed database items
-            $entry->{$relationMethod}()->whereNotIn($relatedModelLocalKey, $relatedItemsSent)->delete();
+            $entry->{$relationMethod}()->whereNotIn($relatedModelLocalKey, $relatedItemsSent)->lazy()->each->delete();
         }
     }
 }

src/app/Library/CrudPanel/Traits/Fields.php

@@ -479,19 +479,19 @@ public function getStrippedSaveRequest($request)
     {
         $setting = $this->getOperationSetting('strippedRequest');
 
+        // if a closure was passed
+        if (is_callable($setting)) {
+            return $setting($request);
+        }
+
         // if an invokable class was passed
         // eg. \App\Http\Requests\BackpackStrippedRequest
-        if (class_exists($setting)) {
+        if (is_string($setting) && class_exists($setting)) {
             $setting = new $setting();
 
             return is_callable($setting) ? $setting($request) : abort(500, get_class($setting).' is not invokable.');
         }
 
-        // if a closure was passed
-        if (is_callable($setting)) {
-            return $setting($request);
-        }
-
         return $request->only($this->getAllFieldNames());
     }
 

tests/Unit/CrudPanel/CrudPanelFieldsTest.php

@@ -4,6 +4,7 @@
 
 use Arr;
 use Backpack\CRUD\Tests\Unit\Models\User;
+use Illuminate\Http\Request;
 
 /**
  * @covers Backpack\CRUD\app\Library\CrudPanel\Traits\Fields
@@ -598,4 +599,44 @@ public function testFieldNameIsPartialRelationInCrudModel()
         $field = $this->crudPanel->fields()['articles_id'];
         $this->assertEquals($field['relation_type'], 'HasMany');
     }
+
+    public function testGetStrippedSaveRequestWithClosure()
+    {
+        $this->crudPanel->setOperationSetting(
+            'strippedRequest',
+            static function (Request $request) {
+                return $request->toArray();
+            },
+            'update'
+        );
+        $this->crudPanel->setOperation('update');
+        $this->crudPanel->setModel(User::class);
+        $request = request()->create('/users/1/edit', 'POST', ['name' => 'john']);
+        $result = $this->crudPanel->getStrippedSaveRequest($request);
+        $this->assertIsArray($result);
+        $this->assertSame(['name' => 'john'], $result);
+    }
+
+    public function testGetStrippedSaveRequestWithClass()
+    {
+        $this->crudPanel->setOperationSetting(
+            'strippedRequest',
+            Invokable::class,
+            'update'
+        );
+        $this->crudPanel->setOperation('update');
+        $this->crudPanel->setModel(User::class);
+        $request = request()->create('/users/1/edit', 'POST', ['name' => 'john']);
+        $result = $this->crudPanel->getStrippedSaveRequest($request);
+        $this->assertIsArray($result);
+        $this->assertSame(['invokable' => 'invokable'], $result);
+    }
+}
+
+class Invokable
+{
+    public function __invoke(): array
+    {
+        return ['invokable' => 'invokable'];
+    }
 }