Merge branch '3.2' into 3.3

* 3.2:
  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
  [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/WebProfilerBundle/Resources/views/Profiler/toolbar.css.twig

@@ -373,13 +373,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/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'),
-        );
-    }
 }

src/Symfony/Component/Security/Http/HttpUtils.php

@@ -108,7 +108,7 @@ public function checkRequestPath(Request $request, $path)
                     $parameters = $this->urlMatcher->match($request->getPathInfo());
                 }
 
-                return $path === $parameters['_route'];
+                return isset($parameters['_route']) && $path === $parameters['_route'];
             } catch (MethodNotAllowedException $e) {
                 return false;
             } catch (ResourceNotFoundException $e) {

src/Symfony/Component/Security/Http/Tests/HttpUtilsTest.php

@@ -221,6 +221,19 @@ public function testCheckRequestPathWithUrlMatcherLoadingException()
         $utils->checkRequestPath($this->getRequest(), 'foobar');
     }
 
+    public function testCheckPathWithoutRouteParam()
+    {
+        $urlMatcher = $this->getMockBuilder('Symfony\Component\Routing\Matcher\UrlMatcherInterface')->getMock();
+        $urlMatcher
+            ->expects($this->any())
+            ->method('match')
+            ->willReturn(array('_controller' => 'PathController'))
+        ;
+
+        $utils = new HttpUtils(null, $urlMatcher);
+        $this->assertFalse($utils->checkRequestPath($this->getRequest(), 'path/index.html'));
+    }
+
     /**
      * @expectedException \InvalidArgumentException
      * @expectedExceptionMessage Matcher must either implement UrlMatcherInterface or RequestMatcherInterface