Merge pull request #36 from ockle/middleware-flatten-depth

Fix issue with middleware and images in multidimensional input arrays

Author: freekmurze

src/Middlewares/OptimizeImages.php

@@ -13,7 +13,7 @@ public function handle($request, Closure $next)
         $optimizerChain = app(OptimizerChain::class);
 
         collect($request->allFiles())
-            ->flatten(1)
+            ->flatten()
             ->each(function (UploadedFile $file) use ($optimizerChain) {
                 $optimizerChain->optimize($file->getPathname());
             });

tests/MiddlewareTest.php

@@ -25,6 +25,40 @@ public function it_will_try_to_optimize_all_files_in_a_request()
         $this->assertDecreasedFileSize($uploadPath, $originalImagePath);
     }
 
+    /** @test */
+    public function it_will_optimize_all_files_at_all_depths()
+    {
+        $originalImagePath1 = $this->getImagePath('logo.png');
+        $uploadPath1 = $this->getTempPath('logo.png');
+
+        $originalImagePath2 = $this->getImagePath('logo2.png');
+        $uploadPath2 = $this->getTempPath('logo2.png');
+
+        $originalImagePath3 = $this->getImagePath('logo3.png');
+        $uploadPath3 = $this->getTempPath('logo3.png');
+
+        copy($originalImagePath1, $uploadPath1);
+        copy($originalImagePath2, $uploadPath2);
+        copy($originalImagePath3, $uploadPath3);
+
+        Route::middleware(OptimizeImages::class)->post('/', function () {
+        });
+
+        $this->call('POST', '/', [], [], [
+            'upload' => $this->getUploadFile($uploadPath1),
+            'one' => [
+                'two' => $this->getUploadFile($uploadPath2),
+                'three' => [
+                    'four' => $this->getUploadFile($uploadPath3),
+                ],
+            ],
+        ]);
+
+        $this->assertDecreasedFileSize($uploadPath1, $originalImagePath1);
+        $this->assertDecreasedFileSize($uploadPath2, $originalImagePath2);
+        $this->assertDecreasedFileSize($uploadPath3, $originalImagePath3);
+    }
+
     protected function getUploadFile(string $path): UploadedFile
     {
         return new UploadedFile(