fix conflicts

Author: taylorotwell

src/Illuminate/View/Engines/CompilerEngine.php

@@ -3,8 +3,10 @@
 namespace Illuminate\View\Engines;
 
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Http\Exceptions\HttpResponseException;
 use Illuminate\View\Compilers\CompilerInterface;
 use Illuminate\View\ViewException;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 use Throwable;
 
 class CompilerEngine extends PhpEngine
@@ -100,6 +102,10 @@ public function get($path, array $data = [])
      */
     protected function handleViewException(Throwable $e, $obLevel)
     {
+        if ($e instanceof HttpException || $e instanceof HttpResponseException) {
+            parent::handleViewException($e, $obLevel);
+        }
+
         $e = new ViewException($this->getMessage($e), 0, 1, $e->getFile(), $e->getLine(), $e);
 
         parent::handleViewException($e, $obLevel);

tests/View/ViewCompilerEngineTest.php

@@ -11,6 +11,7 @@
 use Illuminate\View\ViewException;
 use Mockery as m;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\HttpKernel\Exception\HttpException;
 
 class ViewCompilerEngineTest extends TestCase
 {
@@ -43,6 +44,30 @@ public function testViewsAreNotRecompiledIfTheyAreNotExpired()
 ', $results);
     }
 
+    public function testRegularExceptionsAreReThrownAsViewExceptions()
+    {
+        $engine = $this->getEngine();
+        $engine->getCompiler()->shouldReceive('getCompiledPath')->with(__DIR__.'/fixtures/foo.php')->andReturn(__DIR__.'/fixtures/regular-exception.php');
+        $engine->getCompiler()->shouldReceive('isExpired')->once()->andReturn(false);
+
+        $this->expectException(ViewException::class);
+        $this->expectExceptionMessage('regular exception message');
+
+        $engine->get(__DIR__.'/fixtures/foo.php');
+    }
+
+    public function testHttpExceptionsAreNotReThrownAsViewExceptions()
+    {
+        $engine = $this->getEngine();
+        $engine->getCompiler()->shouldReceive('getCompiledPath')->with(__DIR__.'/fixtures/foo.php')->andReturn(__DIR__.'/fixtures/http-exception.php');
+        $engine->getCompiler()->shouldReceive('isExpired')->once()->andReturn(false);
+
+        $this->expectException(HttpException::class);
+        $this->expectExceptionMessage('http exception message');
+
+        $engine->get(__DIR__.'/fixtures/foo.php');
+    }
+
     public function testThatViewsAreNotAskTwiceIfTheyAreExpired()
     {
         $engine = $this->getEngine();

tests/View/fixtures/http-exception.php

@@ -0,0 +1,5 @@
+<?php
+
+use Symfony\Component\HttpKernel\Exception\HttpException;
+
+throw new HttpException(403, 'http exception message');

tests/View/fixtures/regular-exception.php

@@ -0,0 +1,3 @@
+<?php
+
+throw new Exception('regular exception message');