Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Debug] Fixed error handling when an error is already handled when another error is already handled (5) #30976

Merged
merged 1 commit into from Apr 7, 2019

Conversation

Projects
None yet
4 participants
@lyrixx
Copy link
Member

lyrixx commented Apr 7, 2019

Q A
Branch? 3.4
Bug fix? yes
New feature? no
BC breaks? no
Deprecations? no
Tests pass? yes
Fixed tickets
License MIT
Doc PR

Please, don't ask how to reproduce it :)

@fabpot

fabpot approved these changes Apr 7, 2019

@fabpot

This comment has been minimized.

Copy link
Member

fabpot commented Apr 7, 2019

@lyrixx Can you rebase on 3.4?

@lyrixx lyrixx changed the base branch from master to 3.4 Apr 7, 2019

@lyrixx

This comment has been minimized.

Copy link
Member Author

lyrixx commented Apr 7, 2019

@fabpot Oups, I made the fix against 3.4, but forgot to update the base branch. It's now fixed.

try {
$link = $fmt->format($path, $line);
} catch (\Exception $e) {
return sprintf('<span class="block trace-file-path">in <span title="%s%3$s"><strong>%s</strong>%s</span></span>', $this->escapeHtml($path), $file, 0 < $line ? ' line '.$line : '');

This comment has been minimized.

Copy link
@lyrixx

lyrixx Apr 7, 2019

Author Member

I could use a goto here to avoid code duplication and re-use the line 375... :D

@nicolas-grekas nicolas-grekas added this to the 3.4 milestone Apr 7, 2019

@fabpot

This comment has been minimized.

Copy link
Member

fabpot commented Apr 7, 2019

Thank you @lyrixx.

@fabpot fabpot merged commit a36c731 into symfony:3.4 Apr 7, 2019

2 of 3 checks passed

continuous-integration/travis-ci/pr The Travis CI build failed
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
fabbot.io Your code looks good.
Details

fabpot added a commit that referenced this pull request Apr 7, 2019

bug #30976 [Debug] Fixed error handling when an error is already hand…
…led when another error is already handled (5) (lyrixx)

This PR was merged into the 3.4 branch.

Discussion
----------

[Debug] Fixed error handling when an error is already handled when another error is already handled (5)

| Q             | A
| ------------- | ---
| Branch?       | 3.4
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets |
| License       | MIT
| Doc PR        |

---

Please, don't ask how to reproduce it :)

Commits
-------

a36c731 [Debug] Fixed error handling when an error is already handled when another error is already handled (5)

@lyrixx lyrixx deleted the lyrixx:debug-error-five branch Apr 7, 2019

This was referenced Apr 16, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.