[10.x] Fixes view engine resolvers leaking memory #51450
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -161,9 +161,14 @@ public function registerPhpEngine($resolver) | |||
| public function registerBladeEngine($resolver) | |||
| { | |||
| $resolver->register('blade', function () { | |||
| $compiler = new CompilerEngine($this->app['blade.compiler'], $this->app['files']); | |||
| $app = app(); | |||
There was a problem hiding this comment.
As the app() helper is pulled from the Foundation component, doesn't the View component's composer.json file need to be updated to account for that?
There was a problem hiding this comment.
One option is to call Container::getInstance() as the app() helper basically does only that, and the Container component is already required by the view component.
For the other usage, Container::getInstance()->make($dependency) can be used.
framework/src/Illuminate/Foundation/helpers.php
Lines 116 to 123 in bf7046f
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request fixes view engine resolvers leaking app instance in Octane: laravel/octane#887.
Note that I've spend a few time trying to write tests for this; but is not easy with our current Octane setup.
@driesvints This needs to be merged on 11.x.