Merge pull request #36 from biigle/patch-1

Fix property name clash in request class
biigle · Jul 18, 2024 · 483e423 · 483e423
2 parents 15f5929 + 9a69073
commit 483e423
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/Http/Controllers/Api/StorageRequestDirectoryController.php b/src/Http/Controllers/Api/StorageRequestDirectoryController.php
@@ -27,11 +27,11 @@ class StorageRequestDirectoryController extends Controller
      */
     public function destroy(DestroyStorageRequestDirectory $request)
     {
-        $request->files->load('request');
-        Queue::bulk($request->files->map(function ($file) {
+        $request->srFiles->load('request');
+        Queue::bulk($request->srFiles->map(function ($file) {
             return new DeleteStorageRequestFile($file);
         })->toArray());
 
-        StorageRequestFile::whereIn('id', $request->files->pluck('id'))->delete();
+        StorageRequestFile::whereIn('id', $request->srFiles->pluck('id'))->delete();
     }
 }
diff --git a/src/Http/Requests/DestroyStorageRequestDirectory.php b/src/Http/Requests/DestroyStorageRequestDirectory.php
@@ -19,7 +19,7 @@ class DestroyStorageRequestDirectory extends FormRequest
      *
      * @var array
      */
-    public $files;
+    public $srFiles;
 
     /**
      * Determine if the user is authorized to make this request.
@@ -61,13 +61,13 @@ public function withValidator($validator)
 
             $files = $this->storageRequest->files;
             $allFilesCount = $files->count();
-            $this->files = $files->filter(function ($file) use ($directories) {
+            $this->srFiles = $files->filter(function ($file) use ($directories) {
                 return array_reduce($directories, function ($carry, $item) use ($file) {
                     return $carry || strpos($file->path, $item) === 0;
                 }, false);
             });
 
-            $filesCount = count($this->files);
+            $filesCount = count($this->srFiles);
 
             if ($filesCount === 0) {
                 $validator->errors()->add('directories', 'No files were found for the specified directories.');