|
7 | 7 | use DebugBar\DataFormatter\DataFormatter; |
8 | 8 | use DebugBar\DataFormatter\DataFormatterInterface; |
9 | 9 | use Illuminate\Contracts\Http\Kernel; |
| 10 | +use Illuminate\Foundation\Application; |
10 | 11 | use Illuminate\Routing\Router; |
11 | 12 | use Illuminate\Session\SessionManager; |
12 | 13 | use Illuminate\Support\Collection; |
@@ -62,28 +63,35 @@ function ($app) { |
62 | 63 |
|
63 | 64 | $this->app->extend( |
64 | 65 | 'view.engine.resolver', |
65 | | - function (EngineResolver $resolver): EngineResolver { |
66 | | - $debugbarConfig = $this->app['config']->get('debugbar', []); |
67 | | - if (empty($debugbarConfig['enabled']) || |
68 | | - empty($debugbarConfig['collectors']['time']) || |
69 | | - empty($debugbarConfig['collectors']['views'])) { |
| 66 | + function (EngineResolver $resolver, Application $application): EngineResolver { |
| 67 | + $laravelDebugbar = $application->make(LaravelDebugbar::class); |
| 68 | + |
| 69 | + $shouldTrackViewTime = $laravelDebugbar->isEnabled() && |
| 70 | + $laravelDebugbar->shouldCollect('time', true) && |
| 71 | + $laravelDebugbar->shouldCollect('views', true); |
| 72 | + |
| 73 | + if (! $shouldTrackViewTime) { |
70 | 74 | /* Do not swap the engine to save performance */ |
71 | 75 | return $resolver; |
72 | 76 | } |
73 | | - return new class($resolver) extends EngineResolver { |
74 | 77 |
|
75 | | - public function __construct(EngineResolver $resolver) |
| 78 | + return new class($resolver, $laravelDebugbar) extends EngineResolver { |
| 79 | + |
| 80 | + private $laravelDebugbar; |
| 81 | + |
| 82 | + public function __construct(EngineResolver $resolver, LaravelDebugbar $laravelDebugbar) |
76 | 83 | { |
77 | 84 | foreach ($resolver->resolvers as $engine => $resolver) { |
78 | 85 | $this->register($engine, $resolver); |
79 | 86 | } |
| 87 | + $this->laravelDebugbar = $laravelDebugbar; |
80 | 88 | } |
81 | 89 |
|
82 | 90 | public function register($engine, \Closure $resolver) |
83 | 91 | { |
84 | 92 | parent::register($engine, function () use ($resolver) { |
85 | 93 | /* Inject the root facade to avoid calling it on every view generation */ |
86 | | - return new DebugbarViewEngine($resolver(), DebugBar::getFacadeRoot()); |
| 94 | + return new DebugbarViewEngine($resolver(), $this->laravelDebugbar); |
87 | 95 | }); |
88 | 96 | } |
89 | 97 | }; |
|
0 commit comments