8000 [DI] Fix Xdebug 3.0 detection by vertexvaar · Pull Request #39196 · symfony/symfony · GitHub
[go: up one dir, main page]
Skip to content

[DI] Fix Xdebug 3.0 detection #39196

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Dec 8, 2020
Merged

[DI] Fix Xdebug 3.0 detection #39196

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
[DI] Fix Xdebug 3.0 detection
  • Loading branch information
@vertexvaar @nicolas-grekas
vertexvaar authored and nicolas-grekas committed Dec 8, 2020
commit 38f8edddb16595ef4462c42347f971a775587bd5
5 changes: 4 additions & 1 deletion src/Symfony/Component/DependencyInjection/Exception/AutowiringFailedException.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,10 @@ public function __construct(string $serviceId, $message = '', int $code = 0, \Th
{
$this->serviceId = $serviceId;

if ($message instanceof \Closure && \function_exists('xdebug_is_enabled') && xdebug_is_enabled()) {
if (
$message instanceof \Closure
&& (\function_exists('xdebug_is_enabled') ? xdebug_is_enabled() : \function_exists('xdebug_info'))
) {
$message = $message();
Copy link
Member
@nicolas-grekas nicolas-grekas Nov 27, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@derickr FYI we have this check here because xdebug changes the behavior of PHP in a way that prevents us from doing a lazy evaluation here: native PHP allows one to set the $message property of throwables to a stringable. We use this below.
It would be great if xdebug could preserve this behavior, if possible.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i came up with a better solution. Please check the second commit, which replaces all xdebug-related stuff with resolving the messageCallback when the __toString method is called.
This will also eliminate performance drawbacks when xdebug is installed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think i came up with a better solution. Please check the second commit, which replaces all xdebug-related stuff with resolving the messageCallback when the __toString method is called.
This will also eliminate performance drawbacks when xdebug is installed.

I take this back. getMessage() does not return the actual message.

}

Expand Down
0