Merge branch '2.3' into 2.5

fabpot · fabpot · commit f7a1adbce7a5 · 2015-02-05T07:31:40.000+01:00
* 2.3:
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Validator] fix DOS-style line endings
  [Validator] Add a Russian translation for invalid charset message
  [2.3] [Validator] spanish translation for invalid charset message
  [Routing] make host matching case-insensitive according to RFC 3986

Conflicts:
	src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
	src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
	src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
diff --git a/src/Symfony/Bridge/Twig/Extension/FormExtension.php b/src/Symfony/Bridge/Twig/Extension/FormExtension.php
@@ -144,7 +144,7 @@ public function humanize($text)
     public function isSelectedChoice(ChoiceView $choice, $selectedValue)
     {
         if (is_array($selectedValue)) {
-            return false !== array_search($choice->value, $selectedValue, true);
+            return in_array($choice->value, $selectedValue, true);
         }
 
         return $choice->value === $selectedValue;
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
@@ -246,7 +246,7 @@ public function testTranslator()
         $this->assertEquals(array('fr'), $calls[0][1][0]);
     }
 
-    public function testTranslatorMultipleFullback()
+    public function testTranslatorMultipleFallbacks()
     {
         $container = $this->createContainerFromFile('translator_fallbacks');
 
diff --git a/src/Symfony/Component/Console/Application.php b/src/Symfony/Component/Console/Application.php
@@ -253,7 +253,7 @@ public function getHelp()
             $this->getLongVersion(),
             '',
             '<comment>Usage:</comment>',
-            '  [options] command [arguments]',
+            '  command [options] [arguments]',
             '',
             '<comment>Options:</comment>',
         );
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
@@ -1,7 +1,7 @@
 <info>Console Tool</info>
 
 <comment>Usage:</comment>
-  [options] command [arguments]
+  command [options] [arguments]
 
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
@@ -1,7 +1,7 @@
 <info>My Symfony application</info> version <comment>v1.0</comment>
 
 <comment>Usage:</comment>
-  [options] command [arguments]
+  command [options] [arguments]
 
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
@@ -1,7 +1,7 @@
 <info>Console Tool</info>
 
 <comment>Usage:</comment>
-  [options] command [arguments]
+  command [options] [arguments]
 
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
@@ -1,7 +1,7 @@
 <info>Console Tool</info>
 
 <comment>Usage:</comment>
-  [options] command [arguments]
+  command [options] [arguments]
 
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
@@ -1,7 +1,7 @@
 <info>Console Tool</info>
 
 <comment>Usage:</comment>
-  [options] command [arguments]
+  command [options] [arguments]
 
 <comment>Options:</comment>
   <info>--help</info>           <info>-h</info> Display this help message
diff --git a/src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt b/src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt
@@ -1,7 +1,7 @@
 Console Tool
 
 Usage:
-  [options] command [arguments]
+  command [options] [arguments]
 
 Options:
   --help           -h Display this help message
diff --git a/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php b/src/Symfony/Component/Form/Extension/Core/ChoiceList/ChoiceList.php
@@ -385,7 +385,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain
      */
     protected function isPreferred($choice, array $preferredChoices)
     {
-        return false !== array_search($choice, $preferredChoices, true);
+        return in_array($choice, $preferredChoices, true);
     }
 
     /**
diff --git a/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php b/src/Symfony/Component/Form/Extension/Core/Type/ChoiceType.php
@@ -110,7 +110,7 @@ public function buildView(FormView $view, FormInterface $form, array $options)
         // avoid making the type check inside the closure.
         if ($options['multiple']) {
             $view->vars['is_selected'] = function ($choice, array $values) {
-                return false !== array_search($choice, $values, true);
+                return in_array($choice, $values, true);
             };
         } else {
             $view->vars['is_selected'] = function ($choice, $value) {
diff --git a/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Form/Resources/translations/validators.bg.xlf
@@ -1,19 +1,19 @@
-<?xml version="1.0"?>
-<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
-    <file source-language="en" datatype="plaintext" original="file.ext">
-        <body>
-            <trans-unit id="28">
-                <source>This form should not contain extra fields.</source>
-                <target>Тази форма не трябва да съдържа допълнителни полета.</target>
-            </trans-unit>
-            <trans-unit id="29">
-                <source>The uploaded file was too large. Please try to upload a smaller file.</source>
-                <target>Каченият файл е твърде голям. Моля, опитайте да качите по-малък файл.</target>
-            </trans-unit>
-            <trans-unit id="30">
-                <source>The CSRF token is invalid. Please try to resubmit the form.</source>
-                <target>Невалиден CSRF токен. Моля, опитайте да изпратите формата отново.</target>
-            </trans-unit>
-        </body>
-    </file>
-</xliff>
+<?xml version="1.0"?>
+<xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+    <file source-language="en" datatype="plaintext" original="file.ext">
+        <body>
+            <trans-unit id="28">
+                <source>This form should not contain extra fields.</source>
+                <target>Тази форма не трябва да съдържа допълнителни полета.</target>
+            </trans-unit>
+            <trans-unit id="29">
+                <source>The uploaded file was too large. Please try to upload a smaller file.</source>
+                <target>Каченият файл е твърде голям. Моля, опитайте да качите по-малък файл.</target>
+            </trans-unit>
+            <trans-unit id="30">
+                <source>The CSRF token is invalid. Please try to resubmit the form.</source>
+                <target>Невалиден CSRF токен. Моля, опитайте да изпратите формата отново.</target>
+            </trans-unit>
+        </body>
+    </file>
+</xliff>
diff --git a/src/Symfony/Component/HttpFoundation/Request.php b/src/Symfony/Component/HttpFoundation/Request.php
@@ -1884,7 +1884,7 @@ private function getUrlencodedPrefix($string, $prefix)
 
         $len = strlen($prefix);
 
-        if (preg_match("#^(%[[:xdigit:]]{2}|.){{$len}}#", $string, $match)) {
+        if (preg_match(sprintf('#^(%%[[:xdigit:]]{2}|.){%d}#', $len), $string, $match)) {
             return $match[0];
         }
 
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -820,13 +820,13 @@ public function testIdleTimeoutNotExceededWhenOutputIsSent()
 
     public function testStartAfterATimeout()
     {
-        $process = $this->getProcess('php -r "$n = 1000; while ($n--) {echo \'\'; usleep(1000); }"');
+        $process = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 1000; while ($n--) {echo \'\'; usleep(1000); }')));
         $process->setTimeout(0.1);
 
         try {
             $process->run();
-            $this->fail('An exception should have been raised.');
-        } catch (\Exception $e) {
+            $this->fail('A RuntimeException should have been raised.');
+        } catch (RuntimeException $e) {
         }
         $process->start();
         usleep(1000);
diff --git a/src/Symfony/Component/Routing/Generator/UrlGenerator.php b/src/Symfony/Component/Routing/Generator/UrlGenerator.php
@@ -229,7 +229,7 @@ protected function doGenerate($variables, $defaults, $requirements, $tokens, $pa
                 $routeHost = '';
                 foreach ($hostTokens as $token) {
                     if ('variable' === $token[0]) {
-                        if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#', $mergedParams[$token[3]])) {
+                        if (null !== $this->strictRequirements && !preg_match('#^'.$token[2].'$#i', $mergedParams[$token[3]])) {
                             $message = sprintf('Parameter "%s" for route "%s" must match "%s" ("%s" given) to generate a corresponding URL.', $token[3], $name, $token[2], $mergedParams[$token[3]]);
 
                             if ($this->strictRequirements) {
diff --git a/src/Symfony/Component/Routing/RouteCompiler.php b/src/Symfony/Component/Routing/RouteCompiler.php
@@ -46,7 +46,7 @@ public static function compile(Route $route)
             $result = self::compilePattern($route, $host, true);
 
             $hostVariables = $result['variables'];
-            $variables = array_merge($variables, $hostVariables);
+            $variables = $hostVariables;
 
             $hostTokens = $result['tokens'];
             $hostRegex = $result['regex'];
@@ -163,7 +163,7 @@ private static function compilePattern(Route $route, $pattern, $isHost)
 
         return array(
             'staticPrefix' => 'text' === $tokens[0][0] ? $tokens[0][1] : '',
-            'regex' => self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'s',
+            'regex' => self::REGEX_DELIMITER.'^'.$regexp.'$'.self::REGEX_DELIMITER.'s'.($isHost ? 'i' : ''),
             'tokens' => array_reverse($tokens),
             'variables' => $variables,
         );
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher1.php
@@ -197,7 +197,7 @@ public function match($pathinfo)
 
         $host = $this->context->getHost();
 
-        if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route1
             if ($pathinfo === '/route1') {
                 return array('_route' => 'route1');
@@ -210,23 +210,23 @@ public function match($pathinfo)
 
         }
 
-        if (preg_match('#^b\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) {
             // route3
             if ($pathinfo === '/c2/route3') {
                 return array('_route' => 'route3');
             }
 
         }
 
-        if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route4
             if ($pathinfo === '/route4') {
                 return array('_route' => 'route4');
             }
 
         }
 
-        if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
             // route5
             if ($pathinfo === '/route5') {
                 return array('_route' => 'route5');
@@ -239,7 +239,7 @@ public function match($pathinfo)
             return array('_route' => 'route6');
         }
 
-        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) {
             if (0 === strpos($pathinfo, '/route1')) {
                 // route11
                 if ($pathinfo === '/route11') {
@@ -265,7 +265,7 @@ public function match($pathinfo)
 
         }
 
-        if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
             // route15
             if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#s', $pathinfo, $matches)) {
                 return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ());
diff --git a/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php b/src/Symfony/Component/Routing/Tests/Fixtures/dumper/url_matcher2.php
@@ -209,7 +209,7 @@ public function match($pathinfo)
 
         $host = $this->context->getHost();
 
-        if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route1
             if ($pathinfo === '/route1') {
                 return array('_route' => 'route1');
@@ -222,23 +222,23 @@ public function match($pathinfo)
 
         }
 
-        if (preg_match('#^b\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^b\\.example\\.com$#si', $host, $hostMatches)) {
             // route3
             if ($pathinfo === '/c2/route3') {
                 return array('_route' => 'route3');
             }
 
         }
 
-        if (preg_match('#^a\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^a\\.example\\.com$#si', $host, $hostMatches)) {
             // route4
             if ($pathinfo === '/route4') {
                 return array('_route' => 'route4');
             }
 
         }
 
-        if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
             // route5
             if ($pathinfo === '/route5') {
                 return array('_route' => 'route5');
@@ -251,7 +251,7 @@ public function match($pathinfo)
             return array('_route' => 'route6');
         }
 
-        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^(?P<var1>[^\\.]++)\\.example\\.com$#si', $host, $hostMatches)) {
             if (0 === strpos($pathinfo, '/route1')) {
                 // route11
                 if ($pathinfo === '/route11') {
@@ -277,7 +277,7 @@ public function match($pathinfo)
 
         }
 
-        if (preg_match('#^c\\.example\\.com$#s', $host, $hostMatches)) {
+        if (preg_match('#^c\\.example\\.com$#si', $host, $hostMatches)) {
             // route15
             if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#s', $pathinfo, $matches)) {
                 return $this->mergeDefaults(array_replace($matches, array('_route' => 'route15')), array ());
diff --git a/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php b/src/Symfony/Component/Routing/Tests/Generator/UrlGeneratorTest.php
@@ -461,6 +461,13 @@ public function testUrlWithInvalidParameterInHostInNonStrictMode()
         $this->assertNull($generator->generate('test', array('foo' => 'baz'), false));
     }
 
+    public function testHostIsCaseInsensitive()
+    {
+        $routes = $this->getRoutes('test', new Route('/', array(), array('locale' => 'en|de|fr'), array(), '{locale}.FooBar.com'));
+        $generator = $this->getGenerator($routes);
+        $this->assertSame('//EN.FooBar.com/app.php/', $generator->generate('test', array('locale' => 'EN'), UrlGeneratorInterface::NETWORK_PATH));
+    }
+
     public function testGenerateNetworkPathBC()
     {
         $routes = $this->getRoutes('test', new Route('/{name}', array(), array('_scheme' => 'http'), array(), '{locale}.example.com'));
diff --git a/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php b/src/Symfony/Component/Routing/Tests/Matcher/UrlMatcherTest.php
@@ -405,4 +405,25 @@ public function testWithOutHostHostDoesNotMatch()
         $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'example.com'));
         $matcher->match('/foo/bar');
     }
+
+    /**
+     * @expectedException \Symfony\Component\Routing\Exception\ResourceNotFoundException
+     */
+    public function testPathIsCaseSensitive()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/locale', array(), array('locale' => 'EN|FR|DE')));
+
+        $matcher = new UrlMatcher($coll, new RequestContext());
+        $matcher->match('/en');
+    }
+
+    public function testHostIsCaseInsensitive()
+    {
+        $coll = new RouteCollection();
+        $coll->add('foo', new Route('/', array(), array('locale' => 'EN|FR|DE'), array(), '{locale}.example.com'));
+
+        $matcher = new UrlMatcher($coll, new RequestContext('', 'GET', 'en.example.com'));
+        $this->assertEquals(array('_route' => 'foo', 'locale' => 'en'), $matcher->match('/'));
+    }
 }
diff --git a/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php b/src/Symfony/Component/Routing/Tests/RouteCompilerTest.php
@@ -208,7 +208,7 @@ public function provideCompileWithHostData()
                 '/hello', '#^/hello$#s', array(), array(), array(
                     array('text', '/hello'),
                 ),
-                '#^www\.example\.com$#s', array(), array(
+                '#^www\.example\.com$#si', array(), array(
                     array('text', 'www.example.com'),
                 ),
             ),
@@ -219,7 +219,7 @@ public function provideCompileWithHostData()
                     array('variable', '/', '[^/]++', 'name'),
                     array('text', '/hello'),
                 ),
-                '#^www\.example\.(?P<tld>[^\.]++)$#s', array('tld'), array(
+                '#^www\.example\.(?P<tld>[^\.]++)$#si', array('tld'), array(
                     array('variable', '.', '[^\.]++', 'tld'),
                     array('text', 'www.example'),
                 ),
@@ -230,7 +230,7 @@ public function provideCompileWithHostData()
                 '/hello', '#^/hello$#s', array('locale', 'tld'), array(), array(
                     array('text', '/hello'),
                 ),
-                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#s', array('locale', 'tld'), array(
+                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#si', array('locale', 'tld'), array(
                     array('variable', '.', '[^\.]++', 'tld'),
                     array('text', '.example'),
                     array('variable', '', '[^\.]++', 'locale'),
@@ -242,7 +242,7 @@ public function provideCompileWithHostData()
                 '/hello', '#^/hello$#s', array('locale', 'tld'), array(), array(
                     array('text', '/hello'),
                 ),
-                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#s', array('locale', 'tld'), array(
+                '#^(?P<locale>[^\.]++)\.example\.(?P<tld>[^\.]++)$#si', array('locale', 'tld'), array(
                     array('variable', '.', '[^\.]++', 'tld'),
                     array('text', '.example'),
                     array('variable', '', '[^\.]++', 'locale'),
diff --git a/src/Symfony/Component/Routing/Tests/RouteTest.php b/src/Symfony/Component/Routing/Tests/RouteTest.php
@@ -264,7 +264,7 @@ public function testSerializeWhenCompiled()
      */
     public function testSerializedRepresentationKeepsWorking()
     {
-        $serialized = 'C:31:"Symfony\Component\Routing\Route":933:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":568:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:30:"#^/prefix(?:/(?P<foo>\d+))?$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:38:"#^(?P<locale>[^\.]++)\.example\.net$#s";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
+        $serialized = 'C:31:"Symfony\Component\Routing\Route":934:{a:8:{s:4:"path";s:13:"/prefix/{foo}";s:4:"host";s:20:"{locale}.example.net";s:8:"defaults";a:1:{s:3:"foo";s:7:"default";}s:12:"requirements";a:1:{s:3:"foo";s:3:"\d+";}s:7:"options";a:1:{s:14:"compiler_class";s:39:"Symfony\Component\Routing\RouteCompiler";}s:7:"schemes";a:0:{}s:7:"methods";a:0:{}s:8:"compiled";C:39:"Symfony\Component\Routing\CompiledRoute":569:{a:8:{s:4:"vars";a:2:{i:0;s:6:"locale";i:1;s:3:"foo";}s:11:"path_prefix";s:7:"/prefix";s:10:"path_regex";s:30:"#^/prefix(?:/(?P<foo>\d+))?$#s";s:11:"path_tokens";a:2:{i:0;a:4:{i:0;s:8:"variable";i:1;s:1:"/";i:2;s:3:"\d+";i:3;s:3:"foo";}i:1;a:2:{i:0;s:4:"text";i:1;s:7:"/prefix";}}s:9:"path_vars";a:1:{i:0;s:3:"foo";}s:10:"host_regex";s:39:"#^(?P<locale>[^\.]++)\.example\.net$#si";s:11:"host_tokens";a:2:{i:0;a:2:{i:0;s:4:"text";i:1;s:12:".example.net";}i:1;a:4:{i:0;s:8:"variable";i:1;s:0:"";i:2;s:7:"[^\.]++";i:3;s:6:"locale";}}s:9:"host_vars";a:1:{i:0;s:6:"locale";}}}}}';
         $unserialized = unserialize($serialized);
 
         $route = new Route('/prefix/{foo}', array('foo' => 'default'), array('foo' => '\d+'));
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.bg.xlf
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.es.xlf
diff --git a/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf b/src/Symfony/Component/Validator/Resources/translations/validators.ru.xlf
diff --git a/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php b/src/Symfony/Component/Validator/Tests/Mapping/Loader/StaticMethodLoaderTest.php

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ public function humanize($text)`
`144`	`144`	`public function isSelectedChoice(ChoiceView $choice, $selectedValue)`
`145`	`145`	`{`
`146`	`146`	`if (is_array($selectedValue)) {`
`147`		`- return false !== array_search($choice->value, $selectedValue, true);`
	`147`	`+ return in_array($choice->value, $selectedValue, true);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`return $choice->value === $selectedValue;`
Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public function testTranslator()`
`246`	`246`	`$this->assertEquals(array('fr'), $calls[0][1][0]);`
`247`	`247`	`}`
`248`	`248`
`249`		`- public function testTranslatorMultipleFullback()`
	`249`	`+ public function testTranslatorMultipleFallbacks()`
`250`	`250`	`{`
`251`	`251`	`$container = $this->createContainerFromFile('translator_fallbacks');`
`252`	`252`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain`
`385`	`385`	`*/`
`386`	`386`	`protected function isPreferred($choice, array $preferredChoices)`
`387`	`387`	`{`
`388`		`- return false !== array_search($choice, $preferredChoices, true);`
	`388`	`+ return in_array($choice, $preferredChoices, true);`
`389`	`389`	`}`
`390`	`390`
`391`	`391`	`/**`