Merge branch '2.2' into 2.3

* 2.2:
  [Locale] fixed build-data exit code in case of an error
  fixed request format of sub-requests when explicitely set by the developer (closes #8787)
  Sets _format attribute only if it wasn't set previously by the user.
  Exclude little words of 'ee' to 'oo' plural transformation
  fixed the format of the request used to render an exception
  Fix typo in the check_path validator
  added a missing use statement (closes #8808)
  fix for Process:isSuccessful()

Conflicts:
	UPGRADE-3.0.md
	src/Symfony/Component/Locale/Resources/data/build-data.php

Author: fabpot

DependencyInjection/MainConfiguration.php

@@ -287,7 +287,7 @@ private function addFirewallsSection(ArrayNodeDefinition $rootNode, array $facto
                             continue;
                         }
 
-                        if (false !== strpos('/', $firewall[$k]['check_path']) && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
+                        if (false !== strpos($firewall[$k]['check_path'], '/') && !preg_match('#'.$firewall['pattern'].'#', $firewall[$k]['check_path'])) {
                             throw new \LogicException(sprintf('The check_path "%s" for login method "%s" is not matched by the firewall pattern "%s".', $firewall[$k]['check_path'], $k, $firewall['pattern']));
                         }
                     }

Tests/DependencyInjection/Fixtures/php/invalid_check_path.php

@@ -0,0 +1,16 @@
+<?php
+
+$container->loadFromExtension('security', array(
+    'providers' => array(
+        'default' => array('id' => 'foo'),
+    ),
+
+    'firewalls' => array(
+        'some_firewall' => array(
+            'pattern' => '/secured_area/.*',
+            'form_login' => array(
+                'check_path' => '/some_area/login_check',
+            )
+        )
+    )
+));

Tests/DependencyInjection/Fixtures/xml/invalid_check_path.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<srv:container xmlns="http://symfony.com/schema/dic/security"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:srv="http://symfony.com/schema/dic/services"
+               xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+    <config>
+        <provider name="default" id="foo" />
+
+        <firewall name="some_firewall" pattern="/secured_area/.*">
+            <form-login check-path="/some_area/login_check" />
+        </firewall>
+    </config>
+
+</srv:container>

Tests/DependencyInjection/Fixtures/yml/invalid_check_path.yml

@@ -0,0 +1,9 @@
+security:
+    providers:
+        default: { id: foo }
+
+    firewalls:
+        some_firewall:
+            pattern: /secured_area/.*
+            form_login:
+                check_path: /some_area/login_check

Tests/DependencyInjection/SecurityExtensionTest.php

@@ -181,6 +181,15 @@ public function testCustomAclProvider()
         $this->assertEquals('foo', (string) $container->getAlias('security.acl.provider'));
     }
 
+    /**
+     * @expectedException \Symfony\Component\Config\Definition\Exception\InvalidConfigurationException
+     * @expectedExceptionMessage not matched by the firewall pattern
+     */
+    public function testInvalidCheckPath()
+    {
+        $container = $this->getContainer('invalid_check_path');
+    }
+
     protected function getContainer($file)
     {
         $container = new ContainerBuilder();