Explicitly fail when file does not exist on import

SpartnerNL · Feb 19, 2024 · 53f9137 · 53f9137
1 parent 36ca9cb
commit 53f9137
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 4 deletions.
diff --git a/.phpunit.cache/test-results b/.phpunit.cache/test-results
diff --git a/src/Files/TemporaryFile.php b/src/Files/TemporaryFile.php
@@ -2,6 +2,7 @@
 
 namespace Maatwebsite\Excel\Files;
 
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 abstract class TemporaryFile
@@ -45,8 +46,9 @@ public function sync(): TemporaryFile
     }
 
     /**
-     * @param  string|UploadedFile  $filePath
-     * @param  string|null  $disk
+     * @param string|UploadedFile $filePath
+     * @param string|null         $disk
+     *
      * @return TemporaryFile
      */
     public function copyFrom($filePath, string $disk = null): TemporaryFile
@@ -56,7 +58,19 @@ public function copyFrom($filePath, string $disk = null): TemporaryFile
         } elseif ($disk === null && realpath($filePath) !== false) {
             $readStream = fopen($filePath, 'rb');
         } else {
-            $readStream = app('filesystem')->disk($disk)->readStream($filePath);
+            $diskInstance = app('filesystem')->disk($disk);
+
+            if (!$diskInstance->exists($filePath)) {
+                $logPath = '[' . $filePath . ']';
+
+                if ($disk) {
+                    $logPath .= ' (' . $disk . ')';
+                }
+
+                throw new FileNotFoundException('File '. $logPath .' does not exist and can therefor not be imported.');
+            }
+
+            $readStream = $diskInstance->readStream($filePath);
         }
 
         $this->put($readStream);

diff --git a/tests/Concerns/ImportableTest.php b/tests/Concerns/ImportableTest.php
@@ -2,6 +2,7 @@
 
 namespace Maatwebsite\Excel\Tests\Concerns;
 
+use Illuminate\Contracts\Filesystem\FileNotFoundException;
 use Maatwebsite\Excel\Concerns\Importable;
 use Maatwebsite\Excel\Concerns\ToArray;
 use Maatwebsite\Excel\Excel;
@@ -131,4 +132,16 @@ public function array(array $array)
 
         $this->assertInstanceOf(Importer::class, $imported);
     }
+
+    public function test_cannot_import_a_non_existing_xlsx_file()
+    {
+        $this->expectException(FileNotFoundException::class);
+
+        $import = new class
+        {
+            use Importable;
+        };
+
+        $import->import('doesnotexistanywhere.xlsx');
+    }
 }