Merge branch '2.5' into 2.6

* 2.5:
  Use the new build env on Travis
  required PHPUnit version in the docs should be updated to 4.2 (or later) since the atLeast() method which is used in some of the tests
  Reverts a commit to 2.3 for 2.4 features. This re-adds them to the 2.5 branch
  Fixing bad merge
  Replace form_enctype(form) with form_start(form).
  Remove ExpressionLanguage reference for 2.3 version

Author: weaverryan

.travis.yml

@@ -3,6 +3,8 @@ language: python
 python:
     - "2.7"
 
+sudo: false
+
 install: 
     - "pip install -q -r requirements.txt --use-mirrors"
 

best_practices/forms.rst

@@ -139,12 +139,12 @@ view layer:
 
 .. code-block:: html+jinja
 
-    <form method="POST" {{ form_enctype(form) }}>
+    {{ form_start(form) }}
         {{ form_widget(form) }}
 
         <input type="submit" value="Create"
                class="btn btn-default pull-right" />
-    </form>
+    {{ form_end(form) }}
 
 Rendering the Form
 ------------------

best_practices/security.rst

@@ -350,6 +350,8 @@ If your company uses a user login method not supported by Symfony, you can
 develop :doc:`your own user provider </cookbook/security/custom_provider>` and
 :doc:`your own authentication provider </cookbook/security/custom_authentication_provider>`.
 
+.. _`Security Cookbook Section`: http://symfony.com/doc/current/cookbook/security/index.html
+.. _`security.yml`: http://symfony.com/doc/current/reference/configuration/security.html
 .. _`ParamConverter`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/converters.html
 .. _`@Security annotation`: http://symfony.com/doc/current/bundles/SensioFrameworkExtraBundle/annotations/security.html
 .. _`security voter`: http://symfony.com/doc/current/cookbook/security/voters_data_permission.html

contributing/code/tests.rst

@@ -9,7 +9,7 @@ Symfony test suite to check that you have not broken anything.
 PHPUnit
 -------
 
-To run the Symfony test suite, `install PHPUnit`_ 3.7 (or later) first.
+To run the Symfony test suite, `install PHPUnit`_ 4.2 (or later) first.
 
 Dependencies (optional)
 -----------------------