Skip to content

Commit abd83ba

Browse files
committed
Merge branch '2.3' into 2.5
* 2.3: 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 Replace form_enctype(form) with form_start(form).
2 parents ee44fe4 + 8e2e988 commit abd83ba

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ language: python
33
python:
44
- "2.7"
55

6+
sudo: false
7+
68
install:
79
- "pip install -q -r requirements.txt --use-mirrors"
810

best_practices/forms.rst

+2-2
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ view layer:
139139

140140
.. code-block:: html+jinja
141141

142-
<form method="POST" {{ form_enctype(form) }}>
142+
{{ form_start(form) }}
143143
{{ form_widget(form) }}
144144

145145
<input type="submit" value="Create"
146146
class="btn btn-default pull-right" />
147-
</form>
147+
{{ form_end(form) }}
148148

149149
Rendering the Form
150150
------------------

contributing/code/tests.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Symfony test suite to check that you have not broken anything.
99
PHPUnit
1010
-------
1111

12-
To run the Symfony test suite, `install PHPUnit`_ 3.7 (or later) first.
12+
To run the Symfony test suite, `install PHPUnit`_ 4.2 (or later) first.
1313

1414
Dependencies (optional)
1515
-----------------------

0 commit comments

Comments
 (0)