version

Author: taylorotwell

src/Illuminate/Foundation/Application.php

@@ -35,7 +35,7 @@ class Application extends Container implements ApplicationContract, CachesConfig
      *
      * @var string
      */
-    const VERSION = '9.10.1';
+    const VERSION = '9.11.0';
 
     /**
      * The base path for the Laravel installation.

src/Illuminate/Foundation/Console/stubs/maintenance-mode.stub

@@ -69,6 +69,10 @@ if (isset($data['retry'])) {
     header('Retry-After: '.$data['retry']);
 }
 
+if (isset($data['refresh'])) {
+    header('Refresh: '.$data['refresh']);
+}
+
 echo $data['template'];
 
 exit;

src/Illuminate/Translation/Translator.php

@@ -217,8 +217,8 @@ protected function makeReplacements($line, array $replace)
         $shouldReplace = [];
 
         foreach ($replace as $key => $value) {
-            $shouldReplace[':'.Str::ucfirst($key)] = Str::ucfirst($value);
-            $shouldReplace[':'.Str::upper($key)] = Str::upper($value);
+            $shouldReplace[':'.Str::ucfirst($key ?? '')] = Str::ucfirst($value ?? '');
+            $shouldReplace[':'.Str::upper($key ?? '')] = Str::upper($value ?? '');
             $shouldReplace[':'.$key] = $value;
         }
 

tests/Translation/TranslationTranslatorTest.php

@@ -213,6 +213,14 @@ public function testGetJsonForNonExistingReturnsSameKeyAndReplaces()
         $this->assertSame('foo baz', $t->get('foo :message', ['message' => 'baz']));
     }
 
+    public function testEmptyFallbacks()
+    {
+        $t = new Translator($this->getLoader(), 'en');
+        $t->getLoader()->shouldReceive('load')->once()->with('en', '*', '*')->andReturn([]);
+        $t->getLoader()->shouldReceive('load')->once()->with('en', 'foo :message', '*')->andReturn([]);
+        $this->assertSame('foo ', $t->get('foo :message', ['message' => null]));
+    }
+
     protected function getLoader()
     {
         return m::mock(Loader::class);