bug #29317 [WebProfiler] Detect non-file paths in file viewer (ro0NL)

fabpot · fabpot · commit f747ea90a37c · 2018-11-26T08:39:17.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [WebProfiler] Detect non-file paths in file viewer | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no  | Deprecations? | no | Tests pass? | yes  | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  We actually link directories sometimes :) now looks like: ![image](https://user-images.githubusercontent.com/1047696/48981263-7b2b4880-f0d3-11e8-9334-9e2f45d62c09.png) Commits ------- 71aade3 [WebProfiler] Detect empty file paths in file viewer
diff --git a/src/Symfony/Bridge/Twig/Extension/CodeExtension.php b/src/Symfony/Bridge/Twig/Extension/CodeExtension.php
@@ -134,7 +134,7 @@ public function formatArgsAsText($args)
      */
     public function fileExcerpt($file, $line, $srcContext = 3)
     {
-        if (is_readable($file)) {
+        if (is_file($file) && is_readable($file)) {
             // highlight_file could throw warnings
             // see https://bugs.php.net/bug.php?id=25725
             $code = @highlight_file($file, true);
@@ -157,6 +157,8 @@ public function fileExcerpt($file, $line, $srcContext = 3)
 
             return '<ol start="'.max($line - $srcContext, 1).'">'.implode("\n", $lines).'</ol>';
         }
+
+        return null;
     }
 
     /**
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.css.twig
@@ -54,6 +54,11 @@ a.doc:hover {
     text-decoration: underline;
 }
 
+.empty {
+    padding: 10px;
+    color: #555;
+}
+
 .source {
     margin-top: 41px;
 }
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/open.html.twig
@@ -7,11 +7,16 @@
 {% endblock %}
 
 {% block body %}
-<div class="header">
-    <h1>{{ file }}{% if 0 < line %} <small>line {{ line }}</small>{% endif %}</h1>
-    <a class="doc" href="https://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}/reference/configuration/framework.html#ide" rel="help">Open in your IDE?</a>
-</div>
-<div class="source">
-    {{ filename|file_excerpt(line, -1) }}
-</div>
+    {% set source = filename|file_excerpt(line, -1) %}
+    <div class="header">
+        <h1>{{ file }}{% if 0 < line %} <small>line {{ line }}</small>{% endif %}</h1>
+        <a class="doc" href="https://symfony.com/doc/{{ constant('Symfony\\Component\\HttpKernel\\Kernel::VERSION') }}/reference/configuration/framework.html#ide" rel="help">Open in your IDE?</a>
+    </div>
+    <div class="source">
+        {% if source is null %}
+            <p class="empty">The file is not readable.</p>
+        {% else %}
+            {{ source|raw }}
+        {% endif %}
+    </div>
 {% endblock %}
