Merge branch '2.3' into 2.7

* 2.3:
  Static code analysis
  Update AnnotationDirectoryLoader.php
  [FrameworkBundle] Fix template location for PHP templates
  [FrameworkBundle] Add path verification to the template parsing test cases

Author: fabpot

Resources/views/Profiler/body.css.twig

@@ -116,7 +116,7 @@ build: 56
     background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAcAAAAcCAYAAACtQ6WLAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAR1JREFUeNpiPHnyZCMDA8MNID5gZmb2nAEJMH7//v3N169fX969e/cYkL8WqGAHXPLv37//QYzfv39/fvPmzbUnT56sAXInmJub/2H5/x8sx8DCwsIrISFhDmQyPX78+CmQXs70798/BmQsKipqBNTgdvz4cWkmkE5kDATMioqKZkCFdiwg1eiAi4tLGqhQF24nMmBmZuYEigth1QkEbEBxTlySYPvJkwSJ00AnjYylgU6gxB8g/oFVEphkvgLF32KNMmCCewYUv4qhEyj47+HDhyeBzIMYOoEp8CxQw56wsLAncJ1//vz5/P79+2svX74EJc2V4BT58+fPd8CE/QKYHMGJOiIiAp6oWW7evDkNSF8DZYfIyEiU7AAQYACJ2vxVdJW4eQAAAABJRU5ErkJggg==) right top no-repeat;
 }
 .sf-button .btn-bg {
-    padding: 0px 14px;
+    padding: 0 14px;
     color: #636363;
     line-height: 28px;
     background: transparent url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAAcCAYAAACgXdXMAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAClJREFUeNpiPnny5EKGf//+/Wf6//8/A4QAcrGzKCZwGc9sa2urBBBgAIbDUoYVp9lmAAAAAElFTkSuQmCC) repeat-x top left;

Resources/views/Profiler/layout.html.twig

@@ -63,8 +63,7 @@
     <script>//<![CDATA[
 
         function toggleMenuPanels(state, doSave) {
-            var menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'),
-                displayState, elem, className;
+            var menu = document.getElementById('navigation'), savedState = Sfjs.getPreference('menu/displayState'), displayState;
 
             if (null === savedState) {
                 savedState = 'block';

Resources/views/Profiler/profiler.css.twig

@@ -134,7 +134,7 @@ pre, code {
 }
 #menu-profiler li a span.label {
     display: block;
-    padding: 20px 0px 16px 65px;
+    padding: 20px 0 16px 65px;
     min-height: 16px;
     overflow: hidden;
 }
@@ -285,7 +285,6 @@ ul.alt li.scream, ul.alt li.scream strong {
     color: gray;
 }
 ul.sf-call-stack li {
-    text-size: small;
     padding: 0 0 0 20px;
 }
 td.main, td.menu {
@@ -385,13 +384,12 @@ td.main, td.menu {
     line-height: 1.5em;
 }
 .sf-profiler-timeline .legends span {
-    border-left-width: 10px;
-    border-left-style: solid;
+    border-left: 10px solid;
     padding: 0 10px 0 5px;
 }
 .sf-profiler-timeline canvas {
-    border: 1px solid #999;
-    border-width: 1px 0;
+    border: 1px #999;
+    border-style: solid none;
 }
 .collapsed-menu-parents #resume,
 .collapsed-menu-parents #collector-content {

Resources/views/Profiler/toolbar.css.twig

@@ -104,9 +104,9 @@
 }
 
 .sf-toolbar-block .sf-toolbar-info-piece .sf-toolbar-status {
-    padding: 0px 5px;
+    padding: 0 5px;
     border-radius: 5px;
-    margin-bottom: 0px;
+    margin-bottom: 0;
     vertical-align: top;
 }
 
@@ -140,13 +140,11 @@
     display: none;
     position: absolute;
     background-color: #fff;
-    border: 1px solid #bbb;
     padding: 9px 0;
     margin-left: -1px;
 
     bottom: 38px;
-    border-bottom-width: 0;
-    border-bottom: 1px solid #bbb;
+    border: 1px solid #bbb;
     border-radius: 4px 4px 0 0;
 }
 
@@ -205,7 +203,7 @@
 }
 
 .sf-toolbar-block .sf-toolbar-icon > a,
-.sf-toolbar-block .sf-toolbar-icon > a:link
+.sf-toolbar-block .sf-toolbar-icon > a:link,
 .sf-toolbar-block .sf-toolbar-icon > a:hover {
     color: black !important;
 }

Tests/Controller/ProfilerControllerTest.php

@@ -62,8 +62,6 @@ public function testReturns404onTokenNotFound()
                 if ('found' == $token) {
                     return new Profile($token);
                 }
-
-                return;
             }))
         ;