Primo Committ
This commit is contained in:
117
vendor/facade/ignition/src/Views/Engines/CompilerEngine.php
vendored
Normal file
117
vendor/facade/ignition/src/Views/Engines/CompilerEngine.php
vendored
Normal file
@@ -0,0 +1,117 @@
|
||||
<?php
|
||||
|
||||
namespace Facade\Ignition\Views\Engines;
|
||||
|
||||
use Exception;
|
||||
use Facade\Ignition\Exceptions\ViewException;
|
||||
use Facade\Ignition\Exceptions\ViewExceptionWithSolution;
|
||||
use Facade\Ignition\Views\Compilers\BladeSourceMapCompiler;
|
||||
use Facade\Ignition\Views\Concerns\CollectsViewExceptions;
|
||||
use Facade\IgnitionContracts\ProvidesSolution;
|
||||
use Illuminate\Filesystem\Filesystem;
|
||||
use Illuminate\Support\Arr;
|
||||
use Illuminate\Support\Collection;
|
||||
use ReflectionProperty;
|
||||
use Throwable;
|
||||
|
||||
class CompilerEngine extends \Illuminate\View\Engines\CompilerEngine
|
||||
{
|
||||
use CollectsViewExceptions;
|
||||
|
||||
protected $currentPath = null;
|
||||
|
||||
/**
|
||||
* Get the evaluated contents of the view.
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $data
|
||||
*
|
||||
* @return string
|
||||
*/
|
||||
public function get($path, array $data = [])
|
||||
{
|
||||
$this->currentPath = $path;
|
||||
|
||||
$this->collectViewData($path, $data);
|
||||
|
||||
return parent::get($path, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a view exception.
|
||||
*
|
||||
* @param \Throwable $baseException
|
||||
* @param int $obLevel
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @throws \Throwable
|
||||
*/
|
||||
protected function handleViewException(Throwable $baseException, $obLevel)
|
||||
{
|
||||
while (ob_get_level() > $obLevel) {
|
||||
ob_end_clean();
|
||||
}
|
||||
|
||||
if ($baseException instanceof ViewException) {
|
||||
throw $baseException;
|
||||
}
|
||||
|
||||
$viewExceptionClass = ViewException::class;
|
||||
|
||||
if ($baseException instanceof ProvidesSolution) {
|
||||
$viewExceptionClass = ViewExceptionWithSolution::class;
|
||||
}
|
||||
|
||||
$exception = new $viewExceptionClass(
|
||||
$this->getMessage($baseException),
|
||||
0,
|
||||
1,
|
||||
$this->getCompiledViewName($baseException->getFile()),
|
||||
$this->getBladeLineNumber($baseException->getFile(), $baseException->getLine()),
|
||||
$baseException
|
||||
);
|
||||
|
||||
if ($baseException instanceof ProvidesSolution) {
|
||||
$exception->setSolution($baseException->getSolution());
|
||||
}
|
||||
|
||||
|
||||
$this->modifyViewsInTrace($exception);
|
||||
|
||||
$exception->setView($this->getCompiledViewName($baseException->getFile()));
|
||||
$exception->setViewData($this->getCompiledViewData($baseException->getFile()));
|
||||
|
||||
throw $exception;
|
||||
}
|
||||
|
||||
protected function getBladeLineNumber(string $compiledPath, int $exceptionLineNumber): int
|
||||
{
|
||||
$viewPath = $this->getCompiledViewName($compiledPath);
|
||||
|
||||
if (! $viewPath) {
|
||||
return $exceptionLineNumber;
|
||||
}
|
||||
|
||||
$sourceMapCompiler = new BladeSourceMapCompiler(app(Filesystem::class), 'not-needed');
|
||||
|
||||
return $sourceMapCompiler->detectLineNumber($viewPath, $exceptionLineNumber);
|
||||
}
|
||||
|
||||
protected function modifyViewsInTrace(ViewException $exception)
|
||||
{
|
||||
$trace = Collection::make($exception->getPrevious()->getTrace())
|
||||
->map(function ($trace) {
|
||||
if ($compiledData = $this->findCompiledView(Arr::get($trace, 'file', ''))) {
|
||||
$trace['file'] = $compiledData['path'];
|
||||
$trace['line'] = $this->getBladeLineNumber($trace['file'], $trace['line']);
|
||||
}
|
||||
|
||||
return $trace;
|
||||
})->toArray();
|
||||
|
||||
$traceProperty = new ReflectionProperty('Exception', 'trace');
|
||||
$traceProperty->setAccessible(true);
|
||||
$traceProperty->setValue($exception, $trace);
|
||||
}
|
||||
}
|
||||
47
vendor/facade/ignition/src/Views/Engines/PhpEngine.php
vendored
Normal file
47
vendor/facade/ignition/src/Views/Engines/PhpEngine.php
vendored
Normal file
@@ -0,0 +1,47 @@
|
||||
<?php
|
||||
|
||||
namespace Facade\Ignition\Views\Engines;
|
||||
|
||||
use Exception;
|
||||
use Facade\Ignition\Exceptions\ViewException;
|
||||
use Facade\Ignition\Views\Concerns\CollectsViewExceptions;
|
||||
use Throwable;
|
||||
|
||||
class PhpEngine extends \Illuminate\View\Engines\PhpEngine
|
||||
{
|
||||
use CollectsViewExceptions;
|
||||
|
||||
/**
|
||||
* Get the evaluated contents of the view.
|
||||
*
|
||||
* @param string $path
|
||||
* @param array $data
|
||||
* @return string
|
||||
*/
|
||||
public function get($path, array $data = [])
|
||||
{
|
||||
$this->collectViewData($path, $data);
|
||||
|
||||
return parent::get($path, $data);
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a view exception.
|
||||
*
|
||||
* @param \Throwable $baseException
|
||||
* @param int $obLevel
|
||||
*
|
||||
* @return void
|
||||
*
|
||||
* @throws \Throwable
|
||||
*/
|
||||
protected function handleViewException(Throwable $baseException, $obLevel)
|
||||
{
|
||||
$exception = new ViewException($baseException->getMessage(), 0, 1, $baseException->getFile(), $baseException->getLine(), $baseException);
|
||||
|
||||
$exception->setView($this->getCompiledViewName($baseException->getFile()));
|
||||
$exception->setViewData($this->getCompiledViewData($baseException->getFile()));
|
||||
|
||||
parent::handleViewException($exception, $obLevel);
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user