Merge pull request #11 from throwexceptions/master

yajra · web-flow · commit 6d4592bf51d8 · 2021-10-13T10:36:44.000+08:00
Fix render method override
diff --git a/src/WithExportQueue.php b/src/WithExportQueue.php
@@ -15,7 +15,7 @@ trait WithExportQueue
      * @param  array  $mergeData
      * @return mixed
      */
-    public function render(string $view, array $data = [], array $mergeData = [])
+    public function render($view, $data = [], $mergeData = [])
     {
         if (! $this->request()->wantsJson() && $this->request()->get('action') == 'exportQueue') {
             return $this->exportQueue();

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ trait WithExportQueue`
`15`	`15`	`* @param array $mergeData`
`16`	`16`	`* @return mixed`
`17`	`17`	`*/`
`18`		`- public function render(string $view, array $data = [], array $mergeData = [])`
	`18`	`+ public function render($view, $data = [], $mergeData = [])`
`19`	`19`	`{`
`20`	`20`	`if (! $this->request()->wantsJson() && $this->request()->get('action') == 'exportQueue') {`
`21`	`21`	`return $this->exportQueue();`