fix(Collector): Improve file upload error handling

- Update property names in RequestFileCollector for consistency
- Replace 'Error' with 'ErrorMessage' for clearer error reporting
- Modify test cases to reflect updated file names in error handling
- Correct JSON snapshot data for accurate test results

Author: guanguans

src/Collectors/RequestFileCollector.php

@@ -24,6 +24,8 @@ public function __construct(private Request $request) {}
     /**
      * @noinspection CallableParameterUseCaseInTypeContextInspection
      *
+     * @see tests/FeatureTest.php
+     *
      * ```json
      * {
      *     "name": "images.jpeg",
@@ -41,10 +43,12 @@ public function collect(): array
 
         array_walk_recursive($files, static function (UploadedFile &$uploadedFile): void {
             $uploadedFile = [
-                'Name' => $uploadedFile->getClientOriginalName(),
-                'Type' => $uploadedFile->getMimeType(),
-                'Error' => $uploadedFile->getError(),
-                'Size' => Utils::humanBytes($uploadedFile->getSize()),
+                'name' => $uploadedFile->getClientOriginalName(),
+                'type' => $uploadedFile->getMimeType(),
+                'tmp_name' => $uploadedFile->getPathname(),
+                // 'error' => $uploadedFile->getError(),
+                'error' => $uploadedFile->getErrorMessage(),
+                'size' => Utils::humanBytes($uploadedFile->getSize()),
             ];
         });
 

tests/FeatureTest.php

@@ -21,61 +21,31 @@
 use Illuminate\Http\UploadedFile;
 
 it('can proactive report exception', function (): void {
-    $jpgFile = UploadedFile::fake()->image('jpg.jpg');
-    $pngFile = UploadedFile::fake()->image('png.png');
     $this
         ->post('proactive-report-exception?foo=bar', [
             'bar' => 'baz',
             'password' => 'password',
-            'image' => new UploadedFile(
-                path: $jpgFile->path(),
-                originalName: $jpgFile->getBasename(),
-                mimeType: $jpgFile->getMimeType(),
-                error: null,
-                test: true
-            ),
-            'images_list' => [
-                new UploadedFile(
-                    path: $jpgFile->path(),
-                    originalName: $jpgFile->getBasename(),
-                    mimeType: $jpgFile->getMimeType(),
-                    error: \UPLOAD_ERR_INI_SIZE,
-                    test: true
-                ),
-                new UploadedFile(
-                    path: $pngFile->path(),
-                    originalName: $pngFile->getBasename(),
-                    mimeType: $pngFile->getMimeType(),
-                    error: \UPLOAD_ERR_PARTIAL,
-                    test: true
-                ),
-            ],
-            'images_map' => [
-                'jpg' => new UploadedFile(
-                    path: $jpgFile->path(),
-                    originalName: $jpgFile->getBasename(),
-                    mimeType: $jpgFile->getMimeType(),
-                    error: \UPLOAD_ERR_CANT_WRITE,
-                    test: true
-                ),
-                'png' => new UploadedFile(
-                    path: $pngFile->path(),
-                    originalName: $pngFile->getBasename(),
-                    mimeType: $pngFile->getMimeType(),
-                    error: \UPLOAD_ERR_EXTENSION,
-                    test: true
-                ),
-            ],
         ])
         ->assertOk();
 })->group(__DIR__, __FILE__);
 
 it('can automatic report exception', function (): void {
+    $jpgFile = UploadedFile::fake()->image($jpgName = 'image.jpg');
+    $pngFile = UploadedFile::fake()->image($pngName = 'image.png');
+
     $this
         ->post('automatic-report-exception?foo=bar', [
             'bar' => 'baz',
             'password' => 'password',
-            // 'file' => new UploadedFile(__FILE__, basename(__FILE__)),
+            'image' => new UploadedFile($jpgFile->path(), $jpgName, $jpgFile->getMimeType(), null, true),
+            'images_list' => [
+                new UploadedFile($jpgFile->path(), $jpgName, $jpgFile->getMimeType(), \UPLOAD_ERR_INI_SIZE, true),
+                new UploadedFile($pngFile->path(), $pngName, $pngFile->getMimeType(), \UPLOAD_ERR_PARTIAL, true),
+            ],
+            'images_map' => [
+                'jpg' => new UploadedFile($jpgFile->path(), $jpgName, $jpgFile->getMimeType(), \UPLOAD_ERR_CANT_WRITE, true),
+                'png' => new UploadedFile($pngFile->path(), $pngName, $pngFile->getMimeType(), \UPLOAD_ERR_EXTENSION, true),
+            ],
         ])
         ->assertServerError();
 })->group(__DIR__, __FILE__);

tests/TestCase.php

@@ -17,7 +17,6 @@
 namespace Guanguans\LaravelExceptionNotifyTests;
 
 use Guanguans\LaravelExceptionNotify\Channels\Channel;
-use Guanguans\LaravelExceptionNotify\Channels\DumpChannel;
 use Guanguans\LaravelExceptionNotify\Collectors\ApplicationCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\ChoreCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\ExceptionBasicCollector;
@@ -28,7 +27,6 @@
 use Guanguans\LaravelExceptionNotify\Collectors\RequestHeaderCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\RequestPostCollector;
 use Guanguans\LaravelExceptionNotify\Collectors\RequestQueryCollector;
-use Guanguans\LaravelExceptionNotify\Events\ReportingEvent;
 use Guanguans\LaravelExceptionNotify\ExceptionNotifyServiceProvider;
 use Guanguans\LaravelExceptionNotify\Exceptions\RuntimeException;
 use Guanguans\LaravelExceptionNotify\Facades\ExceptionNotify;
@@ -47,7 +45,6 @@
 use Mockery\Adapter\Phpunit\MockeryPHPUnitIntegration;
 use phpmock\phpunit\PHPMock;
 use Symfony\Component\VarDumper\Test\VarDumperTestTrait;
-use function Spatie\Snapshots\assertMatchesJsonSnapshot;
 
 class TestCase extends \Orchestra\Testbench\TestCase
 {
@@ -146,28 +143,6 @@ protected function defineRoutes($router): void
             static fn () => tap(
                 response('proactive-report-exception'),
                 static function (): void {
-                    config()->set('exception-notify.channels.stack.channels', [
-                        'dump',
-                        'log',
-                        'mail',
-                        'bark',
-                        'chanify',
-                        'dingTalk',
-                        'discord',
-                        'lark',
-                        'ntfy',
-                        'pushDeer',
-                        'slack',
-                        'telegram',
-                        'weWork',
-                    ]);
-
-                    ExceptionNotify::reporting(static function (ReportingEvent $reportingEvent): void {
-                        if ($reportingEvent->channelContract instanceof DumpChannel) {
-                            assertMatchesJsonSnapshot($reportingEvent->content);
-                        }
-                    });
-
                     ExceptionNotify::report(new RuntimeException('What happened?'));
                 }
             )
@@ -176,6 +151,22 @@ static function (): void {
         $router->any(
             'automatic-report-exception',
             static fn () => tap(response('automatic-report-exception'), static function (): void {
+                config()->set('exception-notify.channels.stack.channels', [
+                    'dump',
+                    'log',
+                    'mail',
+                    'bark',
+                    'chanify',
+                    'dingTalk',
+                    'discord',
+                    'lark',
+                    'ntfy',
+                    'pushDeer',
+                    'slack',
+                    'telegram',
+                    'weWork',
+                ]);
+
                 throw new RuntimeException('What happened?');
             })
         );