[3.0]Closures support $this in PHP >= 5.4 #14365
Conversation
|
@dosten you need change |
|
@aitboudad done |
|
It would be better to group in one PR all changes for closures support > 5.4, not only |
|
I will go to make all changes in this PR since this only makes some changes missing in #12841 |
dosten
changed the title
| @@ -354,8 +352,6 @@ public function addExpressionLanguageProvider(ExpressionFunctionProviderInterfac | |||
| } | |||
|
|
|||
| /** | |||
| * This method is public because it needs to be callable from a closure in PHP 5.3. It should be converted back to protected in 3.0. | |||
| * @internal | |||
| * @return GeneratorDumperInterface | |||
| */ | |||
| public function getGeneratorDumperInstance() | |||
There was a problem hiding this comment.
It should be converted to protected
There was a problem hiding this comment.
no it was protected before 2.7
There was a problem hiding this comment.
|
@aitboudad done, something more? |
|
no it's ok for me, 👍 |
aitboudad
changed the title
|
👍 |
|
As the one who wrote most of this (or that) code, thanks for bringing this up! 👍 |
| $baseClass = $this->options['matcher_base_class']; | ||
| $expressionLanguageProviders = $this->expressionLanguageProviders; | ||
| $that = $this; // required for PHP 5.3 where "$this" cannot be use()d in anonymous functions. Change in Symfony 3.0. | ||
|
|
||
| $cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$class.'.php', |
There was a problem hiding this comment.
$class is not defined, please look at tests
There was a problem hiding this comment.
it should be $this->options['matcher_cache_class']
|
ping @fabpot |
| @@ -320,25 +315,22 @@ public function getGenerator() | |||
| if (null === $this->options['cache_dir'] || null === $this->options['generator_cache_class']) { | |||
| $this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context, $this->logger); | |||
| } else { | |||
| $class = $this->options['generator_cache_class']; | |||
| $baseClass = $this->options['generator_base_class']; | |||
| $that = $this; // required for PHP 5.3 where "$this" cannot be use()d in anonymous functions. Change in Symfony 3.0. | |||
| $cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$class.'.php', | |||
|
@dosten the code is still broken. please make sure the tests pass before pinging people. |
|
@Tobion sorry, fixed and rebased but the tests still failing: |
|
@dosten can you please rebase+squash? |
|
@nicolas-grekas done |
|
Thank you @dosten. |
This PR was merged into the 3.0-dev branch. Discussion ---------- [3.0]Closures support $this in PHP >= 5.4 | Q | A | ------------- | --- | Bug fix? | no | New feature? | no | BC breaks? | yes | Deprecations? | no | Tests pass? | yes | License | MIT Closures support `$this` in PHP >= 5.4 ping @aitboudad Commits ------- 38f32c1 $this can be used inside a closure in PHP >= 5.4
Closures support
$thisin PHP >= 5.4ping @aitboudad