[WebProfilerBundle] Fix missing indent on non php files opended in the profiler #60867
Conversation
|
The CI failures look related. |
phcorp
force-pushed
the
web-profiler-bundle-file-formatting
branch
from
5eb2fec to
5aa9f2f
Compare
| @@ -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.
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.
phcorp
force-pushed
the
web-profiler-bundle-file-formatting
branch
4 times, most recently
from
08bd097 to
2951d06
Compare
|
|
||
| return $this->formatFileExcerpt( | ||
| array_map( | ||
| static fn (string $line): string => self::fixCodeMarkup($line), |
There was a problem hiding this comment.
| static fn (string $line): string => self::fixCodeMarkup($line), | |
| self::fixCodeMarkup(...), |
phcorp
force-pushed
the
web-profiler-bundle-file-formatting
branch
from
2951d06 to
26675ff
Compare
phcorp
force-pushed
the
web-profiler-bundle-file-formatting
branch
from
26675ff to
2800a6a
Compare
phcorp
force-pushed
the
web-profiler-bundle-file-formatting
branch
from
2800a6a to
268718d
Compare
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.
note: I'm not sure if using a relative path to access fixtures path is ok, this test CodeExtensionTest.php was moved in upper branches so it will fail if fixtures are not also moved
This fixes non-php files indent in profiler.
Testing
Considering any project running at https://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