From 773d818d6bdcdacd705d4d07a7291900e1a6e3d3 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Fri, 14 Dec 2012 11:45:40 +0100 Subject: [PATCH 1/2] [FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt() --- .../FrameworkBundle/Templating/Helper/CodeHelper.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php index df8b0501a7..b075fb41c7 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php @@ -143,6 +143,13 @@ class CodeHelper extends Helper public function fileExcerpt($file, $line) { if (is_readable($file)) { + if (extension_loaded('fileinfo')) { + $finfo = new \Finfo(); + if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) { + return; + } + } + $code = highlight_file($file, true); // remove main code/span tags $code = preg_replace('#^\s*(.*)\s*#s', '\\1', $code); From d3f5f3a44f51d8255924d69dfaf8e753d3d51bf9 Mon Sep 17 00:00:00 2001 From: Francis Besset Date: Fri, 14 Dec 2012 12:28:34 +0100 Subject: [PATCH 2/2] Added comment --- .../Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php index b075fb41c7..ef24fe8f69 100644 --- a/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php +++ b/src/Symfony/Bundle/FrameworkBundle/Templating/Helper/CodeHelper.php @@ -145,6 +145,8 @@ class CodeHelper extends Helper if (is_readable($file)) { if (extension_loaded('fileinfo')) { $finfo = new \Finfo(); + + // Check if the file is an application/octet-stream (eg. Phar file) because hightlight_file cannot parse these files if ('application/octet-stream' === $finfo->file($file, FILEINFO_MIME_TYPE)) { return; }