From ac60582a0e1ff8b5208527c2dbe524ec49013140 Mon Sep 17 00:00:00 2001
From: Daniel Mecke <daniel.mecke@cunningsoft.de>
Date: Fri, 28 Feb 2014 14:34:03 +0100
Subject: [PATCH 1/2] added stracktraces for queries

---
 Controller/ProfilerController.php             | 29 ++++++++
 Resources/views/Collector/db.html.twig        | 72 ++++++++++++++++++-
 .../views/Collector/stacktrace.html.twig      | 33 +++++++++
 3 files changed, 131 insertions(+), 3 deletions(-)
 create mode 100644 Resources/views/Collector/stacktrace.html.twig

diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php
index 859b6c694..68084afd4 100644
--- a/Controller/ProfilerController.php
+++ b/Controller/ProfilerController.php
@@ -65,4 +65,33 @@ public function explainAction($token, $connectionName, $query)
             'query' => $query,
         ));
     }
+
+    /**
+     * Renders the stacktrace for the given token and query.
+     *
+     * @param string $token
+     * @param string $connectionName
+     * @param integer $query
+     *
+     * @return Response
+     */
+    public function stacktraceAction($token, $connectionName, $query)
+    {
+        /** @var $profiler \Symfony\Component\HttpKernel\Profiler\Profiler */
+        $profiler = $this->container->get('profiler');
+        $profiler->disable();
+
+        $profile = $profiler->loadProfile($token);
+        $queries = $profile->getCollector('db')->getQueries();
+
+        if (!isset($queries[$connectionName][$query])) {
+            return new Response('This query does not exist.');
+        }
+
+        return $this->container->get('templating')->renderResponse('DoctrineBundle:Collector:stacktrace.html.twig', array(
+            'connectionName' => $connectionName,
+            'position' => $query,
+            'stacktrace' => $queries[$connectionName][$query]['stacktrace'],
+        ));
+    }
 }
diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
index 8e276f56f..98137c9f6 100644
--- a/Resources/views/Collector/db.html.twig
+++ b/Resources/views/Collector/db.html.twig
@@ -1,5 +1,10 @@
 {% extends app.request.isXmlHttpRequest ? 'WebProfilerBundle:Profiler:ajax_layout.html.twig' : 'WebProfilerBundle:Profiler:layout.html.twig' %}
 
+{% block head %}
+    {{ parent() }}
+    <link href="{{ asset('bundles/framework/css/exception.css') }}" rel="stylesheet" type="text/css" media="all" />
+{% endblock %}
+
 {% block toolbar %}
     {% set icon %}
         <img width="20" height="28" alt="Database" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABQAAAAcCAYAAABh2p9gAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAQRJREFUeNpi/P//PwM1ARMDlcGogZQDlpMnT7pxc3NbA9nhQKxOpL5rQLwJiPeBsI6Ozl+YBOOOHTv+AOllQNwtLS39F2owKYZ/gRq8G4i3ggxEToggWzvc3d2Pk+1lNL4fFAs6ODi8JzdS7mMRVyDVoAMHDsANdAPiOCC+jCQvQKqBQB/BDbwBxK5AHA3E/kB8nKJkA8TMQBwLxaBIKQbi70AvTADSBiSadwFXpCikpKQU8PDwkGTaly9fHFigkaKIJid4584dkiMFFI6jkTJII0WVmpHCAixZQEXWYhDeuXMnyLsVlEQKI45qFBQZ8eRECi4DBaAlDqle/8A48ip6gAADANdQY88Uc0oGAAAAAElFTkSuQmCC" />
@@ -64,6 +69,13 @@
             'connectionName': app.request.query.get('connection'),
             'query': app.request.query.get('query')
         })) }}
+    {% elseif 'stacktrace' == page %}
+        {{ render(controller('DoctrineBundle:Profiler:stacktrace', {
+            'token': token,
+            'panel': 'db',
+            'connectionName': app.request.query.get('connection'),
+            'query': app.request.query.get('query')
+        })) }}
     {% else %}
         {{ block('queries') }}
     {% endif %}
@@ -100,7 +112,7 @@
                                     {{ query.sql|doctrine_minify_query|raw }}
                                 </span>
                             </div>
-                            <code id="code-{{ i }}-{{ loop.parent.loop.index }}">
+                            <code id="code-{{ i }}-{{ loop.parent.loop.index }}" class="pretty_query">
                                 {{ query.sql|doctrine_pretty_query(i, loop.parent.loop.index)|raw }}
                             </code>
                             <span id="original-query-{{ i }}-{{ loop.parent.loop.index }}" style="display: none;">
@@ -120,10 +132,16 @@
                             {% else %}
                                 This query cannot be explained
                             {% endif %}
+                            [<a href="{{ path('_profiler', {'panel': 'db', 'token': token, 'page': 'stacktrace', 'connection': connection, 'query': i}) }}" onclick="return stacktrace(this);" style="text-decoration: none;" title="Show stacktrace" data-target-id="stacktrace-{{ i }}-{{ loop.parent.loop.index }}" >
+                                <img alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="display: inline; width: 12px; height: 12px;" />
+                                <img alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="display: none; width: 12px; height: 12px;" />
+                                <span style="vertical-align:top">Show stacktrace</span>
+                            </a>]
                         </div>
                         {% if query.explainable %}
                         <div id="explain-{{ i }}-{{ loop.parent.loop.index }}" class="loading"></div>
                         {% endif %}
+                        <div id="stacktrace-{{ i }}-{{ loop.parent.loop.index }}" class="loading"></div>
                     </li>
                 {% endfor %}
             </ul>
@@ -232,6 +250,24 @@
             return false;
         }
 
+        function stacktrace(link) {
+            var imgs = link.children,
+                target = link.getAttribute('data-target-id');
+
+            Sfjs.toggle(target, imgs[0], imgs[1])
+                .load(
+                    target,
+                    link.href,
+                    null,
+                    function(xhr, el) {
+                        el.innerHTML = 'An error occurred while loading the details';
+                        Sfjs.removeClass(el, 'loading');
+                    }
+                );
+
+            return false;
+        }
+
         function expandAllQueries(button) {
             var queries = document.getElementsByClassName('query-section'),
                 i = queries.length,
@@ -319,6 +355,36 @@
             }
         }
 
+        function toggleTrace(id, clazz) {
+            var el = document.getElementById(id),
+                current = el.style.display,
+                i;
+
+            if (clazz) {
+                var tags = document.getElementsByTagName('*');
+                for (i = tags.length - 1; i >= 0 ; i--) {
+                    if (tags[i].className === clazz) {
+                        tags[i].style.display = 'none';
+                    }
+                }
+            }
+
+            el.style.display = current === 'none' ? 'block' : 'none';
+        }
+
+        function switchIcons(id1, id2) {
+            var icon1, icon2, visibility1, visibility2;
+
+            icon1 = document.getElementById(id1);
+            icon2 = document.getElementById(id2);
+
+            visibility1 = icon1.style.visibility;
+            visibility2 = icon2.style.visibility;
+
+            icon1.style.visibility = visibility2;
+            icon2.style.visibility = visibility1;
+        }
+
     //]]></script>
 
     <style>
@@ -326,11 +392,11 @@
             margin-bottom: 0px;
         }
 
-        code {
+        .pretty_query {
             display: none;
         }
 
-        code pre {
+        .pretty_query pre {
             padding: 5px;
         }
     </style>
diff --git a/Resources/views/Collector/stacktrace.html.twig b/Resources/views/Collector/stacktrace.html.twig
new file mode 100644
index 000000000..2f9318892
--- /dev/null
+++ b/Resources/views/Collector/stacktrace.html.twig
@@ -0,0 +1,33 @@
+<div class="sf-reset">
+    <div class="block">
+        <h2>Stack Trace</h2>
+        <ol class="traces list-exception" id="traces-{{ connectionName ~ '-' ~ position }}">
+            {% for i, trace in stacktrace %}
+                <li>
+                    {% if trace.function %}
+                        at
+                        <strong>
+                            {% if trace.class is defined %}<abbr title="{{ trace.class }}">{{ trace.class }}</abbr>{% endif %}
+                            {{ trace.type ~ trace.function }}
+                        </strong>
+                        ({{ trace.args|format_args }})
+                    {% endif %}
+
+                    {% if trace.file is defined and trace.file and trace.line is defined and trace.line %}
+                        {{ trace.function ? '<br />' : '' }}
+                        in {{ trace.file|format_file(trace.line) }}&nbsp;
+                        {% spaceless %}
+                        <a href="#" onclick="toggleTrace('trace-{{ i }}'); switchIcons('icon-{{ i }}-open', 'icon-{{ i }}-close'); return false;">
+                            <img class="toggle" id="icon-{{ i }}-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: {{ 0 == i ? 'visible' : 'hidden' }}" />
+                            <img class="toggle" id="icon-{{ i }}-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: {{ 0 == i ? 'hidden' : 'visible' }}; margin-left: -18px" />
+                        </a>
+                        {% endspaceless %}
+                        <div id="trace-{{ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">
+                            {{ trace.file|file_excerpt(trace.line) }}
+                        </div>
+                    {% endif %}
+                </li>
+            {% endfor %}
+        </ol>
+    </div>
+</div>

From 50900aa5a9cb65393a0c3514a9749cb8605d74c7 Mon Sep 17 00:00:00 2001
From: Daniel Mecke <daniel.mecke@cunningsoft.de>
Date: Fri, 28 Feb 2014 15:18:09 +0100
Subject: [PATCH 2/2] simplyfied stacktrace integration

---
 Controller/ProfilerController.php             | 29 -------------------
 Resources/views/Collector/db.html.twig        | 22 ++------------
 .../views/Collector/stacktrace.html.twig      |  8 ++---
 3 files changed, 7 insertions(+), 52 deletions(-)

diff --git a/Controller/ProfilerController.php b/Controller/ProfilerController.php
index 68084afd4..859b6c694 100644
--- a/Controller/ProfilerController.php
+++ b/Controller/ProfilerController.php
@@ -65,33 +65,4 @@ public function explainAction($token, $connectionName, $query)
             'query' => $query,
         ));
     }
-
-    /**
-     * Renders the stacktrace for the given token and query.
-     *
-     * @param string $token
-     * @param string $connectionName
-     * @param integer $query
-     *
-     * @return Response
-     */
-    public function stacktraceAction($token, $connectionName, $query)
-    {
-        /** @var $profiler \Symfony\Component\HttpKernel\Profiler\Profiler */
-        $profiler = $this->container->get('profiler');
-        $profiler->disable();
-
-        $profile = $profiler->loadProfile($token);
-        $queries = $profile->getCollector('db')->getQueries();
-
-        if (!isset($queries[$connectionName][$query])) {
-            return new Response('This query does not exist.');
-        }
-
-        return $this->container->get('templating')->renderResponse('DoctrineBundle:Collector:stacktrace.html.twig', array(
-            'connectionName' => $connectionName,
-            'position' => $query,
-            'stacktrace' => $queries[$connectionName][$query]['stacktrace'],
-        ));
-    }
 }
diff --git a/Resources/views/Collector/db.html.twig b/Resources/views/Collector/db.html.twig
index 98137c9f6..9b970354f 100644
--- a/Resources/views/Collector/db.html.twig
+++ b/Resources/views/Collector/db.html.twig
@@ -69,13 +69,6 @@
             'connectionName': app.request.query.get('connection'),
             'query': app.request.query.get('query')
         })) }}
-    {% elseif 'stacktrace' == page %}
-        {{ render(controller('DoctrineBundle:Profiler:stacktrace', {
-            'token': token,
-            'panel': 'db',
-            'connectionName': app.request.query.get('connection'),
-            'query': app.request.query.get('query')
-        })) }}
     {% else %}
         {{ block('queries') }}
     {% endif %}
@@ -132,7 +125,7 @@
                             {% else %}
                                 This query cannot be explained
                             {% endif %}
-                            [<a href="{{ path('_profiler', {'panel': 'db', 'token': token, 'page': 'stacktrace', 'connection': connection, 'query': i}) }}" onclick="return stacktrace(this);" style="text-decoration: none;" title="Show stacktrace" data-target-id="stacktrace-{{ i }}-{{ loop.parent.loop.index }}" >
+                            [<a href="#" onclick="return stacktrace(this);" style="text-decoration: none;" title="Show stacktrace" data-target-id="stacktrace-{{ i }}-{{ loop.parent.loop.index }}" >
                                 <img alt="+" src="{{ asset('bundles/framework/images/blue_picto_more.gif') }}" style="display: inline; width: 12px; height: 12px;" />
                                 <img alt="-" src="{{ asset('bundles/framework/images/blue_picto_less.gif') }}" style="display: none; width: 12px; height: 12px;" />
                                 <span style="vertical-align:top">Show stacktrace</span>
@@ -141,7 +134,7 @@
                         {% if query.explainable %}
                         <div id="explain-{{ i }}-{{ loop.parent.loop.index }}" class="loading"></div>
                         {% endif %}
-                        <div id="stacktrace-{{ i }}-{{ loop.parent.loop.index }}" class="loading"></div>
+                        <div id="stacktrace-{{ i }}-{{ loop.parent.loop.index }}" style="display: none">{{ include('DoctrineBundle:Collector:stacktrace.html.twig', { 'connectionName': connection, 'position': i, 'stacktrace': query.stacktrace } ) }}</div>
                     </li>
                 {% endfor %}
             </ul>
@@ -254,16 +247,7 @@
             var imgs = link.children,
                 target = link.getAttribute('data-target-id');
 
-            Sfjs.toggle(target, imgs[0], imgs[1])
-                .load(
-                    target,
-                    link.href,
-                    null,
-                    function(xhr, el) {
-                        el.innerHTML = 'An error occurred while loading the details';
-                        Sfjs.removeClass(el, 'loading');
-                    }
-                );
+            Sfjs.toggle(target, imgs[0], imgs[1]);
 
             return false;
         }
diff --git a/Resources/views/Collector/stacktrace.html.twig b/Resources/views/Collector/stacktrace.html.twig
index 2f9318892..6ec8de450 100644
--- a/Resources/views/Collector/stacktrace.html.twig
+++ b/Resources/views/Collector/stacktrace.html.twig
@@ -17,12 +17,12 @@
                         {{ trace.function ? '<br />' : '' }}
                         in {{ trace.file|format_file(trace.line) }}&nbsp;
                         {% spaceless %}
-                        <a href="#" onclick="toggleTrace('trace-{{ i }}'); switchIcons('icon-{{ i }}-open', 'icon-{{ i }}-close'); return false;">
-                            <img class="toggle" id="icon-{{ i }}-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: {{ 0 == i ? 'visible' : 'hidden' }}" />
-                            <img class="toggle" id="icon-{{ i }}-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: {{ 0 == i ? 'hidden' : 'visible' }}; margin-left: -18px" />
+                        <a href="#" onclick="toggleTrace('trace-{{ connectionName ~ '-' ~ position ~ '-' ~ i }}'); switchIcons('icon-{{ connectionName ~ '-' ~ position ~ '-' ~ i }}-open', 'icon-{{ connectionName ~ '-' ~ position ~ '-' ~ i }}-close'); return false;">
+                            <img class="toggle" id="icon-{{ connectionName ~ '-' ~ position ~ '-' ~ i }}-close" alt="-" src="data:image/gif;base64,R0lGODlhEgASAMQSANft94TG57Hb8GS44ez1+mC24IvK6ePx+Wa44dXs92+942e54o3L6W2844/M6dnu+P/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABIALAAAAAASABIAQAVCoCQBTBOd6Kk4gJhGBCTPxysJb44K0qD/ER/wlxjmisZkMqBEBW5NHrMZmVKvv9hMVsO+hE0EoNAstEYGxG9heIhCADs=" style="visibility: {{ 0 == i ? 'visible' : 'hidden' }}" />
+                            <img class="toggle" id="icon-{{ connectionName ~ '-' ~ position ~ '-' ~ i }}-open" alt="+" src="data:image/gif;base64,R0lGODlhEgASAMQTANft99/v+Ga44bHb8ITG52S44dXs9+z1+uPx+YvK6WC24G+944/M6W28443L6dnu+Ge54v/+/l614P///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACH5BAEAABMALAAAAAASABIAQAVS4DQBTiOd6LkwgJgeUSzHSDoNaZ4PU6FLgYBA5/vFID/DbylRGiNIZu74I0h1hNsVxbNuUV4d9SsZM2EzWe1qThVzwWFOAFCQFa1RQq6DJB4iIQA7" style="visibility: {{ 0 == i ? 'hidden' : 'visible' }}; margin-left: -18px" />
                         </a>
                         {% endspaceless %}
-                        <div id="trace-{{ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">
+                        <div id="trace-{{ connectionName ~ '-' ~ position ~ '-' ~ i }}" style="display: {{ 0 == i ? 'block' : 'none' }}" class="trace">
                             {{ trace.file|file_excerpt(trace.line) }}
                         </div>
                     {% endif %}