mirror of
https://github.com/Combodo/iTop.git
synced 2026-04-25 19:48:49 +02:00
N°8834 - Add compatibility with PHP 8.4 (#819)
* N°8834 - Add compatibility with PHP 8.4 * Rollback of scssphp/scssphp version upgrade due to compilation error
This commit is contained in:
@@ -83,7 +83,7 @@ class Translator extends BaseTranslator implements WarmableInterface
|
||||
|
||||
// check option names
|
||||
if ($diff = array_diff(array_keys($options), array_keys($this->options))) {
|
||||
throw new InvalidArgumentException(sprintf('The Translator does not support the following options: \'%s\'.', implode('\', \'', $diff)));
|
||||
throw new InvalidArgumentException(\sprintf('The Translator does not support the following options: \'%s\'.', implode('\', \'', $diff)));
|
||||
}
|
||||
|
||||
$this->options = array_merge($this->options, $options);
|
||||
@@ -118,7 +118,7 @@ class Translator extends BaseTranslator implements WarmableInterface
|
||||
return [];
|
||||
}
|
||||
|
||||
public function addResource(string $format, mixed $resource, string $locale, string $domain = null): void
|
||||
public function addResource(string $format, mixed $resource, string $locale, ?string $domain = null): void
|
||||
{
|
||||
if ($this->resourceFiles) {
|
||||
$this->addResourceFiles();
|
||||
|
||||
Reference in New Issue
Block a user