Merge pull request #27976 from bzixilu/5.8

[5.8] don't add the path if it's null or empty
laravel · Mar 22, 2019 · 5d459fa · 5d459fa
2 parents e3593ad + 883e07a
commit 5d459fa
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/Illuminate/View/Compilers/BladeCompiler.php b/src/Illuminate/View/Compilers/BladeCompiler.php
@@ -118,10 +118,17 @@ public function compile($path = null)
         }
 
         if (! is_null($this->cachePath)) {
-            $contents = $this->compileString($this->files->get($this->getPath())).
-                        "\n<?php /* {$this->getPath()} */ ?>";
+            $contents = $this->compileString(
+                $this->files->get($this->getPath())
+            );
 
-            $this->files->put($this->getCompiledPath($this->getPath()), $contents);
+            if (! empty($this->getPath())) {
+                $contents .= "\n<?php /* {$this->getPath()} */ ?>";
+            }
+
+            $this->files->put(
+                $this->getCompiledPath($this->getPath()), $contents
+            );
         }
     }
 

diff --git a/tests/View/ViewBladeCompilerTest.php b/tests/View/ViewBladeCompilerTest.php
@@ -101,6 +101,24 @@ public function testIncludePathToTemplate()
         $compiler->compile('foo');
     }
 
+    public function testDontIncludeEmptyPath()
+    {
+        $compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
+        $files->shouldReceive('get')->once()->with('')->andReturn('Hello World');
+        $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1('').'.php', 'Hello World');
+        $compiler->setPath('');
+        $compiler->compile();
+    }
+
+    public function testDontIncludeNullPath()
+    {
+        $compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);
+        $files->shouldReceive('get')->once()->with(null)->andReturn('Hello World');
+        $files->shouldReceive('put')->once()->with(__DIR__.'/'.sha1(null).'.php', 'Hello World');
+        $compiler->setPath(null);
+        $compiler->compile();
+    }
+
     public function testShouldStartFromStrictTypesDeclaration()
     {
         $compiler = new BladeCompiler($files = $this->getFiles(), __DIR__);