Merge branch '2.5' into 2.6

* 2.5:
  [FrameworkBundle] fix browserkit requirement
  [TwigBridge] fix form requirement
  [FrameworkBundle] fix http-foundation requirement
  [CssSelector] added the license of the Python library we ported to PHP
  [SecurityBundle] avoid unneeded work

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
	src/Symfony/Bundle/FrameworkBundle/composer.json
	src/Symfony/Component/HttpKernel/composer.json

Author: nicolas-grekas

DependencyInjection/SecurityExtension.php

@@ -601,17 +601,17 @@ private function createExpression($container, $expression)
 
     private function createRequestMatcher($container, $path = null, $host = null, $methods = array(), $ip = null, array $attributes = array())
     {
+        if ($methods) {
+            $methods = array_map('strtoupper', (array) $methods);
+        }
+
         $serialized = serialize(array($path, $host, $methods, $ip, $attributes));
         $id = 'security.request_matcher.'.md5($serialized).sha1($serialized);
 
         if (isset($this->requestMatchers[$id])) {
             return $this->requestMatchers[$id];
         }
 
-        if ($methods) {
-            $methods = array_map('strtoupper', (array) $methods);
-        }
-
         // only add arguments that are necessary
         $arguments = array($path, $host, $methods, $ip, $attributes);
         while (count($arguments) > 0 && !end($arguments)) {