[VarDumper] Fixed dumping of terminated generator #21542
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
Member
lyrixx
commented
Feb 6, 2017
| Q | A |
|---|---|
| Branch? | 2.8 |
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Tests pass? | yes |
| Fixed tickets | - |
| License | MIT |
| Doc PR | - |
| try { | ||
| $reflectionGenerator = new \ReflectionGenerator($c); | ||
| } catch (\Exception $e) { | ||
| return $a; |
There was a problem hiding this comment.
let's add a virtual prop that says closed: true?
| @@ -99,28 +110,28 @@ public static function castReflectionGenerator(\ReflectionGenerator $c, array $a | |||
| if ($c->getThis()) { | |||
| $a[$prefix.'this'] = new CutStub($c->getThis()); | |||
| } | |||
| $x = $c->getFunction(); | |||
| $function = $c->getFunction(); | |||
There was a problem hiding this comment.
diff irrelevant for review
| @@ -76,7 +76,18 @@ public static function castClosure(\Closure $c, array $a, Stub $stub, $isNested) | |||
|
|
|||
| public static function castGenerator(\Generator $c, array $a, Stub $stub, $isNested) | |||
| { | |||
| return class_exists('ReflectionGenerator', false) ? self::castReflectionGenerator(new \ReflectionGenerator($c), $a, $stub, $isNested) : $a; | |||
| if (!class_exists('ReflectionGenerator', false)) { | |||
| return $a; | |||
There was a problem hiding this comment.
closed: true/false virtual prop?
There was a problem hiding this comment.
I can not because it alters the generator. That's why I used the try catch method and not ->valid().
3ce2bf1 to
c5094a0
Compare
| // Cannot create ReflectionGenerator based on a terminated Generator | ||
| try { | ||
| $reflectionGenerator = new \ReflectionGenerator($c); | ||
| } catch (\Exception $e) { |
There was a problem hiding this comment.
I confirm that an Exception is thrown here, even-though I'd personally have expected a ReflectionException
ping @jpauli.
There was a problem hiding this comment.
This has been fixed as part of PHP 7.2 in php/php-src@ed4216c
|
Thank you @lyrixx. |
nicolas-grekas
added a commit
that referenced
this pull request
Feb 6, 2017
This PR was merged into the 2.8 branch. Discussion ---------- [VarDumper] Fixed dumping of terminated generator | Q | A | ------------- | --- | Branch? | 2.8 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | - | License | MIT | Doc PR | - Commits ------- c5094a0 [VarDumper] Fixed dumping of terminated generator
Merged
Merged
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.