Skip to content

Commit 6413b71

Browse files
committed
Merge branch '2.2' into 2.3
* 2.2: corrected English grammar (s/does not exists/does not exist) [Process] Add more precision to Process::stop timeout [Process] Avoid zombie process in case of unit tests failure [Process] Fix #8739 [Process] Add failing test for #8739 [Process] Fix CS Fixed documentation grammar for AuthenticationManagerInterface::authenticate() [Validator] fixed the wrong isAbstract() check against the class (fixed #8589) [TwigBridge] Prevent code extension to display warning Use strstr instead of strpos Conflicts: src/Symfony/Component/Finder/Shell/Command.php src/Symfony/Component/Process/Process.php
2 parents a3de3a0 + 2fbed1d commit 6413b71

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

Templating/Helper/CodeHelper.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,9 @@ public function fileExcerpt($file, $line)
131131
}
132132
}
133133

134-
$code = highlight_file($file, true);
134+
// highlight_file could throw warnings
135+
// see https://bugs.php.net/bug.php?id=25725
136+
$code = @highlight_file($file, true);
135137
// remove main code/span tags
136138
$code = preg_replace('#^<code.*?>\s*<span.*?>(.*)</span>\s*</code>#s', '\\1', $code);
137139
$content = preg_split('#<br />#', $code);

0 commit comments

Comments
 (0)