Merge branch '2.7'

fabpot · fabpot · commit d68cb61a747d · 2015-02-05T07:59:50.000+01:00
* 2.7: (61 commits)
  fixxed order of usage
  [2.7] [Form] Replaced calls to array_search() by in_array() where is no need to get the index
  removed the last deprecation notice
  [Serializer] Silent deprecation notice
  removed deprecation notice
  [PropertyAccess] Show property path in all exception messages
  added deprecation notice for HttpCache::createEsi()
  added missing deprecation notice when using the form_enctype function
  [Process] Make test AbstractProcessTest::testStartAfterATimeout useful again
  removed non-sense example
  Fixes small typo.
  [Validator] Remove unnecessary include in tests
  [HttpFoundation] minor: clarify Request::getUrlencodedPrefix() regex
  fixed typo
  [Serializer] Use Serializer's LogicException when applicable
  [Serializer] Use autoloader for annotations in tests
  [Validator] fix DOS-style line endings
  Drop useless execution bit
  bumped Symfony version to 2.6.5
  [Serializer] update changelog
  ...

Conflicts:
	CHANGELOG-2.3.md
	CHANGELOG-2.5.md
	CHANGELOG-2.6.md
	src/Symfony/Bridge/Twig/Node/FormEnctypeNode.php
	src/Symfony/Bundle/FrameworkBundle/HttpCache/HttpCache.php
	src/Symfony/Component/HttpFoundation/Session/Storage/Handler/NativeSessionHandler.php
diff --git a/Extension/Core/ChoiceList/ChoiceList.php b/Extension/Core/ChoiceList/ChoiceList.php
@@ -389,7 +389,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/Extension/Core/Type/ChoiceType.php b/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/Resources/translations/validators.bg.xlf b/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>

Original file line number	Diff line number	Diff line change
`@@ -389,7 +389,7 @@ protected function addChoice(array &$bucketForPreferred, array &$bucketForRemain`
`389`	`389`	`*/`
`390`	`390`	`protected function isPreferred($choice, array $preferredChoices)`
`391`	`391`	`{`
`392`		`- return false !== array_search($choice, $preferredChoices, true);`
	`392`	`+ return in_array($choice, $preferredChoices, true);`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`/**`