bbs/clrghouz
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix is an optional argument, so default it to blank

Browse Source
This commit is contained in:
Deon George 2024-06-04 18:40:04 +10:00
parent 27cdb02b06
commit 1753111f8f
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/EchoareaImport.php
View File

@ -35,6 +35,6 @@ class EchoareaImport extends Command
public function handle(): int public function handle(): int
{ {
$do = Domain::where('name',strtolower($this->argument('domain')))->singleOrFail(); $do = Domain::where('name',strtolower($this->argument('domain')))->singleOrFail();
return Job::dispatchSync($this->argument('file'),$do,$this->option('prefix'),$this->option('unlink')); return Job::dispatchSync($this->argument('file'),$do,$this->option('prefix') ?: '',$this->option('unlink'));
} }
} }

2
app/Console/Commands/FileareaImport.php
View File

@ -35,6 +35,6 @@ class FileareaImport extends Command
public function handle(): int public function handle(): int
{ {
$do = Domain::where('name',strtolower($this->argument('domain')))->singleOrFail(); $do = Domain::where('name',strtolower($this->argument('domain')))->singleOrFail();
return Job::dispatchSync($this->argument('file'),$do,$this->option('prefix'),$this->option('unlink')); return Job::dispatchSync($this->argument('file'),$do,$this->option('prefix') ?: '',$this->option('unlink'));
} }
} }

2
app/Jobs/EchoareaImport.php
View File

@ -35,7 +35,7 @@ class EchoareaImport implements ShouldQueue
* @param bool $delete_recs * @param bool $delete_recs
* @param bool $delete_file * @param bool $delete_file
*/ */
public function __construct(string $file,Domain $do,string $prefix,bool $delete_recs=FALSE,bool $delete_file=FALSE) public function __construct(string $file,Domain $do,string $prefix='',bool $delete_recs=FALSE,bool $delete_file=FALSE)
{ {
$this->file = $file; $this->file = $file;
$this->do = $do; $this->do = $do;

2
app/Jobs/FileareaImport.php
View File

@ -35,7 +35,7 @@ class FileareaImport implements ShouldQueue
* @param bool $delete_recs * @param bool $delete_recs
* @param bool $delete_file * @param bool $delete_file
*/ */
public function __construct(string $file,Domain $do,string $prefix,bool $delete_recs=FALSE,bool $delete_file=FALSE) public function __construct(string $file,Domain $do,string $prefix='',bool $delete_recs=FALSE,bool $delete_file=FALSE)
{ {
$this->file = $file; $this->file = $file;
$this->do = $do; $this->do = $do;