Skip to content

Commit f6e9f54

Browse files
authored
Fix deprecation issue with translator (#42216)
1 parent 832d1df commit f6e9f54

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

src/Illuminate/Translation/Translator.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,8 +218,8 @@ protected function makeReplacements($line, array $replace)
218218
$shouldReplace = [];
219219

220220
foreach ($replace as $key => $value) {
221-
$shouldReplace[':'.Str::ucfirst($key)] = Str::ucfirst($value);
222-
$shouldReplace[':'.Str::upper($key)] = Str::upper($value);
221+
$shouldReplace[':'.Str::ucfirst($key ?? '')] = Str::ucfirst($value ?? '');
222+
$shouldReplace[':'.Str::upper($key ?? '')] = Str::upper($value ?? '');
223223
$shouldReplace[':'.$key] = $value;
224224
}
225225

tests/Translation/TranslationTranslatorTest.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -203,6 +203,14 @@ public function testGetJsonForNonExistingReturnsSameKeyAndReplaces()
203203
$this->assertSame('foo baz', $t->get('foo :message', ['message' => 'baz']));
204204
}
205205

206+
public function testEmptyFallbacks()
207+
{
208+
$t = new Translator($this->getLoader(), 'en');
209+
$t->getLoader()->shouldReceive('load')->once()->with('en', '*', '*')->andReturn([]);
210+
$t->getLoader()->shouldReceive('load')->once()->with('en', 'foo :message', '*')->andReturn([]);
211+
$this->assertSame('foo ', $t->get('foo :message', ['message' => null]));
212+
}
213+
206214
protected function getLoader()
207215
{
208216
return m::mock(Loader::class);

0 commit comments

Comments
 (0)