Unwrap errors in FlattenException #26028
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
derrabus
force-pushed
the
display-error-class
branch
from
4ce7ae8
to
c63a3d1
Compare
| public function __construct(\Throwable $e) | ||
| { | ||
| $this->throwable = $e; |
There was a problem hiding this comment.
We should only keep the class name, not the instance, to make this lighter
There was a problem hiding this comment.
We then would need to keep the original message as well, because FatalThrowableError tinkers with it. But yes, I can change that.
There was a problem hiding this comment.
then would need to keep the original message as well
Let's remove the tinkering yes
nicolas-grekas
added a commit
that referenced
this pull request
Feb 3, 2018
…rabus) This PR was merged into the 2.7 branch. Discussion ---------- Removed unused parameter from flattenDataProvider() | Q | A | ------------- | --- | Branch? | 2.7 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | no, but unrelated | Fixed tickets | N/A | License | MIT | Doc PR | N/A While working on #26028, I noticed that FlattenExceptionTest::FlattenExceptionTest.php() exposes two arguments although all tests consuming that provider only use the first one. This PR removes the unnecessary second argument. Commits ------- d6f4f51 Removed unused parameter from flattenDataProvider().
| @@ -253,7 +264,7 @@ function () {}, | |||
|
|
|||
| // assertEquals() does not like NAN values. | |||
| $this->assertEquals($array[$i][0], 'float'); | |||
| $this->assertTrue(is_nan($array[$i++][1])); | |||
| $this->assertNan($array[$i][1]); | |||
There was a problem hiding this comment.
should be revert as discussed previously
derrabus
force-pushed
the
display-error-class
branch
from
c63a3d1
to
d547ab9
Compare
derrabus
force-pushed
the
display-error-class
branch
from
d547ab9
to
f14d7d6
Compare
|
The fabbot failure can be ignored, see #26030 (comment) |
nicolas-grekas
approved these changes
Feb 4, 2018
chalasr
approved these changes
Feb 4, 2018
|
Thank you @derrabus. |
nicolas-grekas
added a commit
that referenced
this pull request
Feb 4, 2018
This PR was merged into the 4.1-dev branch. Discussion ---------- Unwrap errors in FlattenException | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | maybe | Deprecations? | no | Tests pass? | no (but probably unrelated?) | Fixed tickets | #26025 | License | MIT | Doc PR | N/A This is probably the most straightforward way to solve #26025. `FlattenException` is now unwrapping `FatalThrowableError` instances and logs the wrapped error instead. The consequence of this change is that the real error class is displayend on TwigBundle's exception page and the profiler. Regarding BC: If we assume that `FlattenException` is used for rendering and logging, everything should be fine. But this PR changes `FlattenException`'s internal behavior. If a piece of code relied on errors appearing `FatalThrowableError` inside a `FlattenException`, that code would break. <img width="402" alt="bildschirmfoto 2018-02-02 um 20 08 42" src="https://user-images.githubusercontent.com/1506493/35760077-0b202940-087e-11e8-9b98-8e4ba269780c.png"> Commits ------- f14d7d6 Unwrap errors in FlattenException.
This was referenced Mar 13, 2018
fabpot
added a commit
that referenced
this pull request
Apr 6, 2018
…on (derrabus) This PR was merged into the 4.1-dev branch. Discussion ---------- [Debug] Support any Throwable object in FlattenException | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | yes | Tests pass? | yes | Fixed tickets | #26429 | License | MIT | Doc PR | N/A Alternative to #26447 without BC breaks, follows #26028. This PR removes the need to convert `Throwable` objects into exceptions when working with `FlattenException`. ping @instabledesign @ostrolucky @nicolas-grekas Commits ------- 96c1a6f Support any Throwable object in FlattenException.
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.
This is probably the most straightforward way to solve #26025.
FlattenExceptionis now unwrappingFatalThrowableErrorinstances and logs the wrapped error instead. The consequence of this change is that the real error class is displayend on TwigBundle's exception page and the profiler.Regarding BC: If we assume that
FlattenExceptionis used for rendering and logging, everything should be fine. But this PR changesFlattenException's internal behavior. If a piece of code relied on errors appearingFatalThrowableErrorinside aFlattenException, that code would break.