Merge branch '2.0' into 2.1

* 2.0:
  [DependencyInjection] fixed composer.json
  [Form] Updated checks for the ICU version from 4.5+ to 4.7+ due to test failures with ICU 4.6
  fixed CS
  small fix of #5984 when the container param is not set
  fixed CS
  Use better default ports in urlRedirectAction
  Add tests for urlRedirectAction
  Update src/Symfony/Component/DomCrawler/Tests/FormTest.php
  Update src/Symfony/Component/DomCrawler/Form.php
  [Security] remove escape charters from username provided by Digest DigestAuthenticationListener
  [Security] added test extra for digest authentication
  fixed CS
  [Security] Fixed digest authentication
  [Security] Fixed digest authentication
  [SecurityBundle] Convert Http method to uppercase in the config
  Use Norm Data instead of Data

Conflicts:
	src/Symfony/Bridge/Doctrine/Form/EventListener/MergeCollectionListener.php
	src/Symfony/Bundle/FrameworkBundle/Controller/RedirectController.php
	src/Symfony/Component/DependencyInjection/composer.json

Author: fabpot

DependencyInjection/SecurityExtension.php

@@ -182,7 +182,7 @@ private function createAuthorization($config, ContainerBuilder $container)
                 $container,
                 $access['path'],
                 $access['host'],
-                count($access['methods']) === 0 ? null : $access['methods'],
+                $access['methods'],
                 $access['ip']
             );
 
@@ -574,7 +574,7 @@ private function createSwitchUserListener($container, $id, $config, $defaultProv
         return $switchUserListenerId;
     }
 
-    private function createRequestMatcher($container, $path = null, $host = null, $methods = null, $ip = null, array $attributes = array())
+    private function createRequestMatcher($container, $path = null, $host = null, $methods = array(), $ip = null, array $attributes = array())
     {
         $serialized = serialize(array($path, $host, $methods, $ip, $attributes));
         $id = 'security.request_matcher.'.md5($serialized).sha1($serialized);
@@ -583,6 +583,10 @@ private function createRequestMatcher($container, $path = null, $host = null, $m
             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)) {

Tests/DependencyInjection/Fixtures/php/container1.php

@@ -63,7 +63,7 @@
     ),
 
     'access_control' => array(
-        array('path' => '/blog/524', 'role' => 'ROLE_USER', 'requires_channel' => 'https'),
+        array('path' => '/blog/524', 'role' => 'ROLE_USER', 'requires_channel' => 'https', 'methods' => array('get', 'POST')),
         array('path' => '/blog/.*', 'role' => 'IS_AUTHENTICATED_ANONYMOUSLY'),
     ),
 

Tests/DependencyInjection/Fixtures/xml/container1.xml

@@ -57,7 +57,7 @@
         <role id="ROLE_SUPER_ADMIN">ROLE_USER,ROLE_ADMIN,ROLE_ALLOWED_TO_SWITCH</role>
         <role id="ROLE_REMOTE">ROLE_USER,ROLE_ADMIN</role>
 
-        <rule path="/blog/524" role="ROLE_USER" requires-channel="https" />
+        <rule path="/blog/524" role="ROLE_USER" requires-channel="https" methods="get,POST" />
         <rule role='IS_AUTHENTICATED_ANONYMOUSLY' path="/blog/.*" />
     </config>
 </srv:container>

Tests/DependencyInjection/Fixtures/yml/container1.yml

@@ -51,7 +51,7 @@ security:
         ROLE_REMOTE:      ROLE_USER,ROLE_ADMIN
 
     access_control:
-        - { path: /blog/524, role: ROLE_USER, requires_channel: https }
+        - { path: /blog/524, role: ROLE_USER, requires_channel: https, methods: [get, POST]}
         -
             path: /blog/.*
             role: IS_AUTHENTICATED_ANONYMOUSLY

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -102,6 +102,7 @@ public function testAccess()
         $matcherIds = array();
         foreach ($rules as $rule) {
             list($matcherId, $roles, $channel) = $rule;
+            $requestMatcher = $container->getDefinition($matcherId);
 
             $this->assertFalse(isset($matcherIds[$matcherId]));
             $matcherIds[$matcherId] = true;
@@ -110,9 +111,17 @@ public function testAccess()
             if (1 === $i) {
                 $this->assertEquals(array('ROLE_USER'), $roles);
                 $this->assertEquals('https', $channel);
+                $this->assertEquals(
+                    array('/blog/524', null, array('GET', 'POST')),
+                    $requestMatcher->getArguments()
+                );
             } elseif (2 === $i) {
                 $this->assertEquals(array('IS_AUTHENTICATED_ANONYMOUSLY'), $roles);
                 $this->assertNull($channel);
+                $this->assertEquals(
+                    array('/blog/.*'),
+                    $requestMatcher->getArguments()
+                );
             }
         }
     }