validation-bugsnag-email

vendor/maatwebsite/excel/CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [3.1.46] - 2023-01-27
+
+- Support Laravel 10
+
 ## [3.1.45] - 2023-01-02
 
 ### Added
@@ -262,7 +266,13 @@ All notable changes to this project will be documented in this file.
 - Raw() method now also available on Exportable.
 - Fix for breaking changes in PhpSpreadsheet with empty enclosures.
 
-[Unreleased]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.40...HEAD
+[Unreleased]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.46...HEAD
+[3.1.46]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.45...3.1.46
+[3.1.45]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.44...3.1.45
+[3.1.44]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.43...3.1.44
+[3.1.43]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.42...3.1.43
+[3.1.42]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.41...3.1.42
+[3.1.41]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.40...3.1.41
 [3.1.40]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.39...3.1.40
 [3.1.39]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.38...3.1.39
 [3.1.38]: https://github.com/Maatwebsite/Laravel-Excel/compare/3.1.37...3.1.38

vendor/maatwebsite/excel/composer.json

@@ -23,12 +23,12 @@
     "ext-json": "*",
     "php": "^7.0|^8.0",
     "phpoffice/phpspreadsheet": "^1.18",
-    "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0",
+    "illuminate/support": "5.8.*|^6.0|^7.0|^8.0|^9.0|^10.0",
     "psr/simple-cache": "^1.0|^2.0|^3.0",
     "composer/semver": "^3.3"
   },
   "require-dev": {
-    "orchestra/testbench": "^6.0|^7.0",
+    "orchestra/testbench": "^6.0|^7.0|^8.0",
     "predis/predis": "^1.1"
   },
   "autoload": {

vendor/maatwebsite/excel/src/ChunkReader.php

@@ -2,8 +2,12 @@
 
 namespace Maatwebsite\Excel;
 
+use Illuminate\Bus\Queueable;
+use Illuminate\Container\Container;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\PendingDispatch;
+use Illuminate\Queue\InteractsWithQueue;
+use Illuminate\Queue\Jobs\SyncJob;
 use Illuminate\Support\Collection;
 use Maatwebsite\Excel\Concerns\ShouldQueueWithoutChain;
 use Maatwebsite\Excel\Concerns\WithChunkReading;
@@ -20,6 +24,16 @@ use Throwable;
 
 class ChunkReader
 {
+    /**
+     * @var Container
+     */
+    protected $container;
+
+    public function __construct(Container $container)
+    {
+        $this->container = $container;
+    }
+
     /**
      * @param  WithChunkReading  $import
      * @param  Reader  $reader
@@ -87,7 +101,9 @@ class ChunkReader
 
         $jobs->each(function ($job) {
             try {
-                dispatch_now($job);
+                function_exists('dispatch_now')
+                    ? dispatch_now($job)
+                    : $this->dispatchNow($job);
             } catch (Throwable $e) {
                 if (method_exists($job, 'failed')) {
                     $job->failed($e);
@@ -104,4 +120,26 @@ class ChunkReader
 
         return null;
     }
+
+    /**
+     * Dispatch a command to its appropriate handler in the current process without using the synchronous queue.
+     *
+     * @param  object  $command
+     * @param  mixed  $handler
+     * @return mixed
+     */
+    protected function dispatchNow($command, $handler = null)
+    {
+        $uses = class_uses_recursive($command);
+
+        if (in_array(InteractsWithQueue::class, $uses) &&
+            in_array(Queueable::class, $uses) && !$command->job
+        ) {
+            $command->setJob(new SyncJob($this->container, json_encode([]), 'sync', 'sync'));
+        }
+
+        $method = method_exists($command, 'handle') ? 'handle' : '__invoke';
+
+        return $this->container->call([$command, $method]);
+    }
 }

vendor/maatwebsite/excel/src/Reader.php

@@ -102,7 +102,7 @@ class Reader
         $this->reader = $this->getReader($import, $filePath, $readerType, $disk);
 
         if ($import instanceof WithChunkReading) {
-            return (new ChunkReader)->read($import, $this, $this->currentFile);
+            return app(ChunkReader::class)->read($import, $this, $this->currentFile);
         }
 
         try {