8000 Merge branch '2.5' into 2.6 · saro0h/symfony@af0d5f9 · GitHub
[go: up one dir, main page]
Skip to content

Commit af0d5f9

Browse files
nicolas-grekasnicolas-grekas
committed
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
2 parents 993ef6a + d7bd259 commit af0d5f9

File tree

4 files changed

+39
-6
lines changed

4 files changed

+39
-6
lines changed

‎src/Symfony/Bundle/FrameworkBundle/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"symfony/dependency-injection" : "~2.6,>=2.6.2",
2121
"symfony/config" : "~2.4",
2222
"symfony/event-dispatcher": "~2.5",
23-
"symfony/http-foundation": "~2.4,>=2.4.9",
23+
"symfony/http-foundation": "~2.4.9|~2.5,>=2.5.4",
2424
"symfony/http-kernel": "~2.6",
2525
"symfony/filesystem": "~2.3",
2626
"symfony/routing": "~2.2",

‎src/Symfony/Bundle/SecurityBundle/DependencyInjection/SecurityExtension.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -601,17 +601,17 @@ private function createExpression($container, $expression)
601601

602602
private function createRequestMatcher($container, $path = null, $host = null, $methods = array(), $ip = null, array $attributes = array())
603603
{
604+
if ($methods) {
605+
$methods = array_map('strtoupper', (array) $methods);
606+
}
607+
604608
$serialized = serialize(array($path, $host, $methods, $ip, $attributes));
605609
$id = 'security.request_matcher.'.md5($serialized).sha1($serialized);
606610

607611
if (isset($this->requestMatchers[$id])) {
608612
return $this->requestMatchers[$id];
609613
}
610614

611-
if ($methods) {
612-
$methods = array_map('strtoupper', (array) $methods);
613-
}
614-
615615
// only add arguments that are necessary
616616
$arguments = array($path, $host, $methods, $ip, $attributes);
617617
while (count($arguments) > 0 && !end($arguments)) {

‎src/Symfony/Component/CssSelector/CssSelector.php

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,39 @@
2727
* This component is a port of the Python cssselector library,
2828
* which is copyright Ian Bicking, @see https://github.com/SimonSapin/cssselect.
2929
*
30+
* Copyright (c) 2007-2012 Ian Bicking and contributors. See AUTHORS
31+
* for more details.
32+
*
33+
* All rights reserved.
34+
*
35+
* Redistribution and use in source and binary forms, with or without
36+
* modification, are permitted provided that the following conditions are
37+
* met:
38+
*
39+
* 1. Redistributions of source code must retain the above copyright
40+
* notice, this list of conditions and the following disclaimer.
41+
*
42+
* 2. Redistributions in binary form must reproduce the above copyright
43+
* notice, this list of conditions and the following disclaimer in
44+
* the documentation and/or other materials provided with the
45+
* distribution.
46+
*
47+
* 3. Neither the name of Ian Bicking nor the names of its contributors may
48+
* be used to endorse or promote products derived from this software
49+
* without specific prior written permission.
50+
*
51+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
52+
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
53+
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
54+
* A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IAN BICKING OR
55+
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
56+
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
57+
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
58+
* PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
59+
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
60+
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
61+
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
62+
*
3063
* @author Fabien Potencier <fabien@symfony.com>
3164
*
3265
* @api

‎src/Symfony/Component/HttpKernel/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
],
1818
"require": {
1919
"php": ">=5.3.3",
20-
"symfony/event-dispatcher": "2.5.*,>2.5.8|~2.6,>2.6.1",
20+
"symfony/event-dispatcher": "~2.5.9|~2.6,>=2.6.2",
2121
"symfony/http-foundation": "~2.5,>=2.5.4",
2222
"symfony/debug": "~2.6",
2323
"psr/log": "~1.0"

0 commit comments

Comments
 (0)
0