Merge branch '3.3' into 3.4

* 3.3:
  use Precise on Travis to keep PHP LDAP support
  Fix case sensitive sameSite cookie
  [PropertyInfo] Use rawurlencode to escape PSR-6 keys
  fix(security): ensure the 'route' index is set before attempting to use it
  Fix the design of the profiler exceptions when there is no message
  [Config] Minor fix
  [WebProfilerBundle] Fix full sized dump hovering in toolbar

Author: nicolas-grekas

.travis.yml

@@ -1,5 +1,6 @@
 language: php
 
+dist: precise
 sudo: false
 
 git:

src/Symfony/Bundle/TwigBundle/Resources/views/Exception/exception.html.twig

@@ -1,4 +1,4 @@
-<div class="exception-summary">
+<div class="exception-summary {{ exception.message is empty ? 'exception-without-message' }}">
     <div class="exception-metadata">
         <div class="container">
             <h2 class="exception-hierarchy">
@@ -13,9 +13,9 @@
             </h2>
         </div>
     </div>
-    {% if exception.message is not empty %}
-    <div class="container">
-        <div class="exception-message-wrapper">
+
+    <div class="exception-message-wrapper">
+        <div class="container">
             <h1 class="break-long-words exception-message {{ exception.message|length > 180 ? 'long' }}">
                 {{- exception.message|nl2br|format_file_from_text -}}
             </h1>
@@ -25,7 +25,6 @@
             </div>
         </div>
     </div>
-    {% endif %}
 </div>
 
 <div class="container">

src/Symfony/Bundle/TwigBundle/Resources/views/exception.css.twig

@@ -79,7 +79,8 @@ header .container { display: flex; justify-content: space-between; }
 .exception-hierarchy .icon { margin: 0 3px; opacity: .7; }
 .exception-hierarchy .icon svg { height: 13px; width: 13px; vertical-align: -2px; }
 
-.exception-message-wrapper { display: flex; align-items: flex-start; min-height: 70px; padding: 10px 0 8px; }
+.exception-without-message .exception-message-wrapper { display: none; }
+.exception-message-wrapper .container { display: flex; align-items: flex-start; min-height: 70px; padding: 10px 0 8px; }
 .exception-message { flex-grow: 1; }
 .exception-message, .exception-message a { color: #FFF; font-size: 21px; font-weight: 400; margin: 0; }
 .exception-message.long { font-size: 18px; }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Collector/exception.css.twig

@@ -16,6 +16,9 @@
     margin: 1em 0;
     padding: 10px;
 }
+.exception-summary.exception-without-message {
+    display: none;
+}
 
 .exception-message {
     color: #B0413E;
@@ -26,6 +29,6 @@
     display: none;
 }
 
-.exception-message-wrapper {
+.exception-message-wrapper .container {
     min-height: auto;
 }

src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

@@ -380,13 +380,12 @@
     100% { background: #222; }
 }
 
-.sf-toolbar-block.sf-toolbar-block-dump {
-    position: static;
-}
-
 .sf-toolbar-block.sf-toolbar-block-dump .sf-toolbar-info {
     max-width: none;
-    right: 0;
+    width: 100%;
+    position: fixed;
+    box-sizing: border-box;
+    left: 0;
 }
 
 .sf-toolbar-block-dump pre.sf-dump {

src/Symfony/Component/Config/Resource/ClassExistenceResource.php

@@ -149,7 +149,7 @@ private static function throwOnRequiredClass($class)
             $props = array(
                 'file' => $trace[$i]['file'],
                 'line' => $trace[$i]['line'],
-                'trace' => array_slice($trace, 0, 1 + $i),
+                'trace' => array_slice($trace, 1 + $i),
             );
 
             foreach ($props as $p => $v) {

src/Symfony/Component/HttpFoundation/Cookie.php

@@ -126,6 +126,10 @@ public function __construct($name, $value = null, $expire = 0, $path = '/', $dom
         $this->httpOnly = (bool) $httpOnly;
         $this->raw = (bool) $raw;
 
+        if (null !== $sameSite) {
+            $sameSite = strtolower($sameSite);
+        }
+
         if (!in_array($sameSite, array(self::SAMESITE_LAX, self::SAMESITE_STRICT, null), true)) {
             throw new \InvalidArgumentException('The "sameSite" parameter value is not valid.');
         }

src/Symfony/Component/HttpFoundation/Tests/CookieTest.php

@@ -214,4 +214,10 @@ public function testFromStringWithHttpOnly()
         $cookie = Cookie::fromString('foo=bar; expires=Fri, 20-May-2011 15:25:52 GMT; path=/; domain=.myfoodomain.com; secure');
         $this->assertFalse($cookie->isHttpOnly());
     }
+
+    public function testSameSiteAttributeIsCaseInsensitive()
+    {
+        $cookie = new Cookie('foo', 'bar', 0, '/', null, false, true, false, 'Lax');
+        $this->assertEquals('lax', $cookie->getSameSite());
+    }
 }

src/Symfony/Component/PropertyInfo/PropertyInfoCacheExtractor.php

@@ -108,7 +108,8 @@ private function extract($method, array $arguments)
             return call_user_func_array(array($this->propertyInfoExtractor, $method), $arguments);
         }
 
-        $key = $this->escape($method.'.'.$serializedArguments);
+        // Calling rawurlencode escapes special characters not allowed in PSR-6's keys
+        $key = rawurlencode($method.'.'.$serializedArguments);
 
         if (array_key_exists($key, $this->arrayCache)) {
             return $this->arrayCache[$key];
@@ -126,29 +127,4 @@ private function extract($method, array $arguments)
 
         return $this->arrayCache[$key] = $value;
     }
-
-    /**
-     * Escapes a key according to PSR-6.
-     *
-     * Replaces characters forbidden by PSR-6 and the _ char by the _ char followed by the ASCII
-     * code of the escaped char.
-     *
-     * @param string $key
-     *
-     * @return string
-     */
-    private function escape($key)
-    {
-        return strtr($key, array(
-            '{' => '_123',
-            '}' => '_125',
-            '(' => '_40',
-            ')' => '_41',
-            '/' => '_47',
-            '\\' => '_92',
-            '@' => '_64',
-            ':' => '_58',
-            '_' => '_95',
-        ));
-    }
 }

src/Symfony/Component/PropertyInfo/Tests/PropertyInfoCacheExtractorTest.php

@@ -61,29 +61,4 @@ public function testGetProperties()
         parent::testGetProperties();
         parent::testGetProperties();
     }
-
-    /**
-     * @dataProvider escapeDataProvider
-     */
-    public function testEscape($toEscape, $expected)
-    {
-        $reflectionMethod = new \ReflectionMethod($this->propertyInfo, 'escape');
-        $reflectionMethod->setAccessible(true);
-
-        $this->assertSame($expected, $reflectionMethod->invoke($this->propertyInfo, $toEscape));
-    }
-
-    public function escapeDataProvider()
-    {
-        return array(
-            array('foo_bar', 'foo_95bar'),
-            array('foo_95bar', 'foo_9595bar'),
-            array('foo{bar}', 'foo_123bar_125'),
-            array('foo(bar)', 'foo_40bar_41'),
-            array('foo/bar', 'foo_47bar'),
-            array('foo\bar', 'foo_92bar'),
-            array('foo@bar', 'foo_64bar'),
-            array('foo:bar', 'foo_58bar'),
-        );
-    }
 }