Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit a669d83

Browse filesBrowse files
weaverryanweaverryan
committed
Merge branch '2.3' into 2.4
Conflicts: reference/forms/types/options/error_mapping.rst.inc
2 parents 1dbf4f9 + 7288a33 commit a669d83
Copy full SHA for a669d83

File tree

Expand file treeCollapse file tree

9 files changed

+53
-36
lines changed
Filter options
Expand file treeCollapse file tree

9 files changed

+53
-36
lines changed

‎cookbook/configuration/web_server_configuration.rst

Copy file name to clipboardExpand all lines: cookbook/configuration/web_server_configuration.rst
+2-7Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,8 @@ are:
7777
root /var/www/project/web;
7878
7979
location / {
80-
# try to serve file directly, fallback to rewrite
81-
try_files $uri @rewriteapp;
82-
}
83-
84-
location @rewriteapp {
85-
# rewrite all to app.php
86-
rewrite ^(.*)$ /app.php/$1 last;
80+
# try to serve file directly, fallback to app.php
81+
try_files $uri /app.php$is_args$args;
8782
}
8883
8984
location ~ ^/(app|app_dev|config)\.php(/|$) {

‎cookbook/form/unit_testing.rst

Copy file name to clipboardExpand all lines: cookbook/form/unit_testing.rst
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ The Basics
3636

3737
The simplest ``TypeTestCase`` implementation looks like the following::
3838

39-
// src/Acme/TestBundle/Tests/Form/Type/TestedTypeTests.php
39+
// src/Acme/TestBundle/Tests/Form/Type/TestedTypeTest.php
4040
namespace Acme\TestBundle\Tests\Form\Type;
4141

4242
use Acme\TestBundle\Form\Type\TestedType;

‎reference/configuration/framework.rst

Copy file name to clipboardExpand all lines: reference/configuration/framework.rst
+34-10Lines changed: 34 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,25 +85,48 @@ If you're using an IDE like TextMate or Mac Vim, then Symfony can turn all
8585
of the file paths in an exception message into a link, which will open that
8686
file in your IDE.
8787

88-
If you use TextMate or Mac Vim, you can simply use one of the following built-in
89-
values:
88+
Symfony contains preconfigured urls for some popular IDEs, you can set them
89+
using the following keys:
9090

9191
* ``textmate``
9292
* ``macvim``
93+
* ``emacs``
94+
* ``sublime``
9395

94-
You can also specify a custom file link string. If you do this, all percentage
95-
signs (``%``) must be doubled to escape that character. For example, the
96-
full TextMate string would look like this:
96+
.. versionadded:: 2.3.14
97+
The ``emacs`` and ``sublime`` editors were introduced in Symfony 2.3.14.
9798

98-
.. code-block:: yaml
99+
You can also specify a custom url string. If you do this, all percentage
100+
signs (``%``) must be doubled to escape that character. For example, if you
101+
have installed `PhpStormOpener`_ and use PHPstorm, you will do something like:
99102

100-
framework:
101-
ide: "txmt://open?url=file://%%f&line=%%l"
103+
.. configuration-block::
104+
105+
.. code-block:: yaml
106+
107+
framework:
108+
ide: "pstorm://%%f:%%l"
109+
110+
.. code-block:: xml
111+
112+
<?xml version="1.0" charset="UTF-8" ?>
113+
<container xmlns="http://symfony.com/schema/dic/service"
114+
xmlns:framework="http://symfony.com/schema/dic/symfony">
115+
116+
<framework:config ide="pstorm://%%f:%%l" />
117+
118+
</container>
119+
120+
.. code-block:: php
121+
122+
$container->loadFromExtension('framework', array(
123+
'ide' => 'pstorm://%%f:%%l',
124+
));
102125
103126
Of course, since every developer uses a different IDE, it's better to set
104127
this on a system level. This can be done by setting the ``xdebug.file_link_format``
105-
``php.ini`` value to the file link string. If this configuration value is set, then
106-
the ``ide`` option does not need to be specified.
128+
in the ``php.ini`` configuration to the url string. If this configuration value
129+
is set, then the ``ide`` option will be ignored.
107130

108131
.. _reference-framework-test:
109132

@@ -574,3 +597,4 @@ Full default Configuration
574597
debug: %kernel.debug%
575598
576599
.. _`protocol-relative`: http://tools.ietf.org/html/rfc3986#section-4.2
600+
.. _`PhpStormOpener`: https://github.com/pinepain/PhpStormOpener

‎reference/forms/types/form.rst

Copy file name to clipboardExpand all lines: reference/forms/types/form.rst
+4-6Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ The ``form`` type predefines a couple of options that are then available
88
on all types for which ``form`` is the parent type.
99

1010
+-----------+--------------------------------------------------------------------+
11-
| Options | - `compound`_ |
12-
| | - `data`_ |
11+
| Options | - `data`_ |
1312
| | - `data_class`_ |
1413
| | - `empty_data`_ |
14+
| | - `compound`_ |
1515
| | - `required`_ |
1616
| | - `label_attr`_ |
1717
| | - `constraints`_ |
@@ -30,6 +30,8 @@ on all types for which ``form`` is the parent type.
3030
| | - `extra_fields_message`_ |
3131
| | - `post_max_size_message`_ |
3232
| | - `pattern`_ |
33+
| | - `action`_ |
34+
| | - `method`_ |
3335
+-----------+--------------------------------------------------------------------+
3436
| Inherited | - `block_name`_ |
3537
| options | - `disabled`_ |
@@ -50,10 +52,6 @@ Field Options
5052

5153
.. include:: /reference/forms/types/options/data_class.rst.inc
5254

53-
.. include:: /reference/forms/types/options/action.rst.inc
54-
55-
.. include:: /reference/forms/types/options/method.rst.inc
56-
5755
.. include:: /reference/forms/types/options/empty_data.rst.inc
5856

5957
.. include:: /reference/forms/types/options/compound.rst.inc

‎reference/forms/types/options/action.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/action.rst.inc
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.. versionadded:: 2.3
2-
The ``action`` option was introduced in Symfony 2.3.
3-
41
action
52
~~~~~~
63

4+
.. versionadded:: 2.3
5+
The ``action`` option was introduced in Symfony 2.3.
6+
77
**type**: ``string`` **default**: empty string
88

99
This option specifies where to send the form's data on submission (usually a

‎reference/forms/types/options/compound.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/compound.rst.inc
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
compound
22
~~~~~~~~
33

4-
**type**: ``boolean``
4+
**type**: ``boolean`` **default**: ``true``
55

66
This option specifies if a form is compound. This is independent of whether the
77
form actually has children. A form can be compound but not have any children

‎reference/forms/types/options/empty_value.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/empty_value.rst.inc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
empty_value
22
~~~~~~~~~~~
33

4-
**type**: ``string`` or ``Boolean``
5-
64
.. versionadded:: 2.3
75
Since Symfony 2.3, empty values are also supported if the ``expanded``
86
option is set to true.
97

8+
**type**: ``string`` or ``Boolean``
9+
1010
This option determines whether or not a special "empty" option (e.g. "Choose an option")
1111
will appear at the top of a select widget. This option only applies if the
1212
``multiple`` option is set to false.

‎reference/forms/types/options/method.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/method.rst.inc
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.. versionadded:: 2.3
2-
The ``method`` option was introduced in Symfony 2.3.
3-
41
method
52
~~~~~~
63

4+
.. versionadded:: 2.3
5+
The ``method`` option was introduced in Symfony 2.3.
6+
77
**type**: ``string`` **default**: ``POST``
88

99
This option specifies the HTTP method used to submit the form's data. Its

‎reference/forms/types/options/with_minutes.rst.inc

Copy file name to clipboardExpand all lines: reference/forms/types/options/with_minutes.rst.inc
+3-3Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
.. versionadded:: 2.2
2-
The ``with_minutes`` option was introduced in Symfony 2.2.
3-
41
with_minutes
52
~~~~~~~~~~~~
63

4+
.. versionadded:: 2.2
5+
The ``with_minutes`` option was introduced in Symfony 2.2.
6+
77
**type**: ``Boolean`` **default**: ``true``
88

99
Whether or not to include minutes in the input. This will result in an additional

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.