Merge branch '2.7'

* 2.7: [TwigBridge] fixed AppVariable compat with older Symfony versions [Validator] re-added support for 2.4 API version in tests fixed typos fixed typo fixed typo fixed BC layer [SecurityBundle] decouple the logout PHP helper and Twig extension [Validator] added Japanese translation for unresolvable host (id: 79) [Serializer] Fix PHPDoc Conflicts: src/Symfony/Bridge/Twig/AppVariable.php
Nuscly · Jan 25, 2015 · afb207a · afb207a
2 parents 69d0e42 + bdcea46
commit afb207a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/Resources/translations/validators.ja.xlf b/Resources/translations/validators.ja.xlf
@@ -302,6 +302,10 @@
                 <source>An empty file is not allowed.</source>
                 <target>空のファイルは許可されていません。</target>
             </trans-unit>
+            <trans-unit id="79">
+                <source>The host could not be resolved.</source>
+                <target>ホストを解決できませんでした。</target>
+            </trans-unit>
         </body>
     </file>
 </xliff>
diff --git a/Tests/Constraints/AbstractConstraintValidatorTest.php b/Tests/Constraints/AbstractConstraintValidatorTest.php
@@ -113,6 +113,7 @@ protected function createContext()
                     $translator
                 );
                 break;
+            case Validation::API_VERSION_2_4:
             case Validation::API_VERSION_2_5_BC:
                 $context = new LegacyExecutionContext(
                     $validator,