Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork9.6k
[WebProfilerBundle] Fix missing indent on non php files opended in the profiler#60867
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
base:6.4
Are you sure you want to change the base?
Uh oh!
There was an error while loading.Please reload this page.
Conversation
The CI failures look related. |
5eb2fec to5aa9f2fCompare| @@ -241,7 +287,7 @@ protected static function fixCodeMarkup(string $line): string | |||
| // missing </span> tag at the end of line | |||
| $opening = strpos($line, '<span'); | |||
| $closing = strpos($line, '</span>'); | |||
| if (false !== $opening && (false === $closing || $closing> $opening)) { | |||
| if (false !== $opening && (false === $closing || $closing< $opening)) { | |||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
note: there was a double</span> at the end of the line ; maybe the logic was broken, it added a</span> at the end of the line when an opening span was found and the opening span was before the closing span which seems perfectly fine.
08bd097 to2951d06Compare| return $this->formatFileExcerpt( | ||
| array_map( | ||
| static fn (string $line): string => self::fixCodeMarkup($line), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
| staticfn (string$line):string =>self::fixCodeMarkup($line), | |
| self::fixCodeMarkup(...), |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
done.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Thanks for the PR.
Since this is a bugfix, it should target the lowest affected (and maintained) branch.
Can you please check which one it is and rebase+retarget?
2951d06 to26675ffCompare26675ff to2800a6aCompare2800a6a to268718dCompare
done. There are failing tests that seem unrelated to this PR and I couldn't change the milestone that was set by the automation |
| public static function fileExcerptIntegrationProvider() | ||
| { | ||
| $fixturesPath = realpath(__DIR__.\DIRECTORY_SEPARATOR.'..'.\DIRECTORY_SEPARATOR.'Fixtures'); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
note: I'm not sure if using a relative path to access fixtures path is ok, this testCodeExtensionTest.php was moved in upper branches so it will failed if fixtures are not also moved
Uh oh!
There was an error while loading.Please reload this page.
This fixes non-php files indent in profiler.
Testing
Considering any project running athttps://127.0.0.1:8000
Non-php file:https://127.0.0.1:8000/_profiler/open?file=config/packages/framework.yaml&line=0
PHP file:https://127.0.0.1:8000/_profiler/open?file=src/Kernel.php&line=0