[DependencyInjection] Remove static from closures #49474
Merged
Conversation
This file contains hidden or 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
As per request from @nicolas-grekas. symfony#49472 (comment)
|
Thank you @ruudk. |
stof
reviewed
Feb 21, 2023
| @@ -244,7 +244,7 @@ public function dump(array $options = []): string|array | |||
| if ($this->addGetService) { | |||
| $code = preg_replace( | |||
| "/(\r?\n\r?\n public function __construct.+?\\{\r?\n) ++([^\r\n]++)/s", | |||
| "\n protected \Closure \$getService;$1 \$containerRef = $2\n \$this->getService = static function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };", | |||
| "\n protected \Closure \$getService;$1 \$containerRef = $2\n \$this->getService = function () use (\$containerRef) { return \$containerRef->get()->getService(...\\func_get_args()); };", | |||
There was a problem hiding this comment.
this one does not look like a closure being in a static method, as it has $this->getService =
There was a problem hiding this comment.
@nicolas-grekas Do I need to create a PR to fix this?
There was a problem hiding this comment.
If it's needed, here it is: #49476
| @@ -1545,7 +1545,7 @@ private function addInlineRequires(bool $hasProxyClasses): string | |||
| $code .= "\n include_once __DIR__.'/proxy-classes.php';"; | |||
| } | |||
|
|
|||
| return $code ? sprintf("\n \$this->privates['service_container'] = static function (\$container) {%s\n };\n", $code) : ''; | |||
| return $code ? sprintf("\n \$this->privates['service_container'] = function (\$container) {%s\n };\n", $code) : ''; | |||
ruudk
added a commit
to ruudk/symfony
that referenced
this pull request
Feb 21, 2023
I removed a bit too much in 9a94e00 As per comment of @stof symfony#49474 (comment)
nicolas-grekas
added a commit
that referenced
this pull request
Feb 21, 2023
…ruudk) This PR was merged into the 6.3 branch. Discussion ---------- [DependencyInjection] Make some functions static again | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? |no | New feature? |no | Deprecations? |no | Tickets | | License | MIT | Doc PR | I removed a bit too much in 9a94e00 As per comment of `@stof` #49474 (comment) Commits ------- a9db56d Make some functions static again
symfony-splitter
pushed a commit
to symfony/dependency-injection
that referenced
this pull request
Feb 21, 2023
I removed a bit too much in 9a94e00c3a64fb9efe142db76d35aff37fb6fa51 As per comment of @stof symfony/symfony#49474 (comment)
symfony-splitter
pushed a commit
to symfony/dependency-injection
that referenced
this pull request
Feb 21, 2023
…ruudk) This PR was merged into the 6.3 branch. Discussion ---------- [DependencyInjection] Make some functions static again | Q | A | ------------- | --- | Branch? | 6.3 | Bug fix? |no | New feature? |no | Deprecations? |no | Tickets | | License | MIT | Doc PR | I removed a bit too much in 9a94e00c3a64fb9efe142db76d35aff37fb6fa51 As per comment of `@stof` symfony/symfony#49474 (comment) Commits ------- a9db56dee3 Make some functions static again
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.
As per request from @nicolas-grekas.
#49472 (comment)