From 813572710229fdd0cb5c63dd255d16cc6c7e2ef0 Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 24 Dec 2014 16:04:14 +0100
Subject: [PATCH 1/3] [SecurityBundle] avoid unneeded work

---
 .../DependencyInjection/SecurityExtension.php             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
index 04978177fc..d6e0bad243 100644
--- a/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
+++ b/src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php
@@ -567,6 +567,10 @@ class SecurityExtension extends Extension
 
     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);
 
@@ -574,10 +578,6 @@ class SecurityExtension extends Extension
             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)) {

From fa36b981411b2b92e0cfd179e04e69696b670d2d Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 24 Dec 2014 16:07:20 +0100
Subject: [PATCH 2/3] [CssSelector] added the license of the Python library we
 ported to PHP

---
 .../Component/CssSelector/CssSelector.php     | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/src/Symfony/Component/CssSelector/CssSelector.php b/src/Symfony/Component/CssSelector/CssSelector.php
index 58d8466245..103c60d9e6 100644
--- a/src/Symfony/Component/CssSelector/CssSelector.php
+++ b/src/Symfony/Component/CssSelector/CssSelector.php
@@ -27,6 +27,39 @@ use Symfony\Component\CssSelector\XPath\Translator;
  * This component is a port of the Python cssselector library,
  * which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
  *
+ * Copyright (c) 2007-2012 Ian Bicking and contributors. See AUTHORS
+ * for more details.
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ *
+ * 3. Neither the name of Ian Bicking nor the names of its contributors may
+ * be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IAN BICKING OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
  * @author Fabien Potencier <fabien@symfony.com>
  *
  * @api

From d9053d9b558ddf62199f655c2aa4507d144efb3b Mon Sep 17 00:00:00 2001
From: Nicolas Grekas <nicolas.grekas@gmail.com>
Date: Thu, 25 Dec 2014 23:41:41 +0100
Subject: [PATCH 3/3] [TwigBridge] fix form requirement

---
 src/Symfony/Bridge/Twig/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Symfony/Bridge/Twig/composer.json b/src/Symfony/Bridge/Twig/composer.json
index e4314931b5..558d41cee2 100644
--- a/src/Symfony/Bridge/Twig/composer.json
+++ b/src/Symfony/Bridge/Twig/composer.json
@@ -21,7 +21,7 @@
     },
     "require-dev": {
         "symfony/finder": "~2.3",
-        "symfony/form": "~2.3,>=2.3.5",
+        "symfony/form": "~2.3.5",
         "symfony/http-kernel": "~2.3",
         "symfony/locale": "~2.0,>=2.0.5",
         "symfony/routing": "~2.2",