Merge branch 'SpartnerNL:1.3' into 1.3

Author: SanderMuller

src/Actions/DownloadExcel.php

@@ -6,6 +6,7 @@
 use Illuminate\Support\Facades\URL;
 use Illuminate\Support\Str;
 use Laravel\Nova\Actions\Action;
+use Laravel\Nova\Actions\ActionResponse;
 use Laravel\Nova\Http\Requests\ActionRequest;
 use Maatwebsite\Excel\Facades\Excel;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
@@ -47,9 +48,9 @@ public function handle(ActionRequest $request, Action $exportable): mixed
 
         return \is_callable($this->onSuccess)
             ? ($this->onSuccess)($request, $response)
-            : Action::download(
-                $this->getDownloadUrl($response->getFile()->getPathname()),
-                $this->getFilename()
+            : ActionResponse::download(
+                $this->getFilename(),
+                $this->getDownloadUrl($response->getFile()->getPathname())
             );
     }
 
@@ -71,9 +72,9 @@ public function handleRemoteDisk(ActionRequest $request, Action $exportable): mi
 
         return \is_callable($this->onSuccess)
             ? ($this->onSuccess)($request, $temporaryFilePath)
-            : Action::download(
-                $this->getDownloadUrl($temporaryFilePath),
-                $this->getFilename()
+            : ActionResponse::download(
+                $this->getFilename(),
+                $this->getDownloadUrl($temporaryFilePath)
             );
     }
 

src/Actions/ExportToExcel.php

@@ -43,14 +43,14 @@ class ExportToExcel extends Action implements FromQuery, WithCustomChunkSize, Wi
         WithWriterType;
 
     /**
-     * @var ExportActionRequest|ActionRequest
+     * @var string
      */
-    protected $request;
+    public $resource;
 
     /**
-     * @var string
+     * @var ExportActionRequest|ActionRequest
      */
-    protected $resource;
+    protected $request;
 
     /**
      * @var Builder

src/Concerns/WithDisk.php

@@ -13,7 +13,7 @@ trait WithDisk
      * @param  string|null  $disk
      * @return $this
      */
-    public function withDisk(string $disk = null)
+    public function withDisk(?string $disk = null)
     {
         $this->disk = $disk;
 

src/Concerns/WithFilename.php

@@ -18,7 +18,7 @@ trait WithFilename
      * @param  string|null  $filename
      * @return $this
      */
-    public function withFilename(string $filename = null)
+    public function withFilename(?string $filename = null)
     {
         $this->filename = $filename;
 

src/Concerns/WithWriterType.php

@@ -15,7 +15,7 @@ trait WithWriterType
      * @param  string|null  $writerType
      * @return $this
      */
-    public function withWriterType(string $writerType = null)
+    public function withWriterType(?string $writerType = null)
     {
         $this->writerType = $writerType;
 

src/Interactions/AskForFilename.php

@@ -13,7 +13,7 @@ trait AskForFilename
      * @param  callable|null  $callback
      * @return $this
      */
-    public function askForFilename(string $label = null, callable $callback = null)
+    public function askForFilename(?string $label = null, ?callable $callback = null)
     {
         $field = Text::make($label ?? __('Filename'), 'filename');
 

src/Interactions/AskForWriterType.php

@@ -15,7 +15,7 @@ trait AskForWriterType
      * @param  callable|null  $callback
      * @return $this
      */
-    public function askForWriterType(array $options = null, string $label = null, callable $callback = null)
+    public function askForWriterType(?array $options = null, ?string $label = null, ?callable $callback = null)
     {
         $options = $options ?: [
             Excel::XLS  => 'XLS',

src/Requests/ExportActionRequest.php

@@ -30,5 +30,5 @@ public function resourceFields(Resource $resource): Collection;
      * @param  string|null  $default
      * @return string|null
      */
-    public function findHeading(string $attribute, string $default = null);
+    public function findHeading(string $attribute, ?string $default = null);
 }

src/Requests/ExportLensActionRequest.php

@@ -52,7 +52,7 @@ public function resourceFields(Resource $resource): Collection
      *
      * @return \Illuminate\Support\Collection
      */
-    public function availableLenses()
+    public function availableLenses(): Collection
     {
         if (!$this->resourceInstance) {
             $this->resourceInstance = $this->newResource();

src/Requests/SerializedRequest.php

@@ -28,7 +28,7 @@ class SerializedRequest
      * @param  string  $resource
      * @param  string|null  $lens
      */
-    public function __construct(string $className, string $resource, string $lens = null)
+    public function __construct(string $className, string $resource, ?string $lens = null)
     {
         $this->className = $className;
         $this->resource  = $resource;