Merge branch 'develop' into trunk
This commit is contained in:
commit
4af9251ccc
1 changed files with 2 additions and 2 deletions
|
|
@ -101,11 +101,11 @@ class MailContactData extends Model
|
|||
'consumptionDateYear' => '0000',
|
||||
];
|
||||
|
||||
public function __construct(array $attributes = [], string $filePath = '')
|
||||
public function __construct(array $attributes = [], string|null $filePath = '')
|
||||
{
|
||||
parent::__construct($attributes);
|
||||
|
||||
$this->joinFile = self::getFileName($filePath);
|
||||
$this->joinFile = self::getFileName($filePath ?? '');
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue