Merge branch '2.4'

Conflicts:
	reference/forms/types/form.rst

cookbook/configuration/web_server_configuration.rst

@@ -77,13 +77,8 @@ are:
         root /var/www/project/web;
 
         location / {
-            # try to serve file directly, fallback to rewrite
-            try_files $uri @rewriteapp;
-        }
-
-        location @rewriteapp {
-            # rewrite all to app.php
-            rewrite ^(.*)$ /app.php/$1 last;
+            # try to serve file directly, fallback to app.php
+            try_files $uri /app.php$is_args$args;
         }
 
         location ~ ^/(app|app_dev|config)\.php(/|$) {

cookbook/form/unit_testing.rst

@@ -36,7 +36,7 @@ The Basics
 
 The simplest ``TypeTestCase`` implementation looks like the following::
 
-    // src/Acme/TestBundle/Tests/Form/Type/TestedTypeTests.php
+    // src/Acme/TestBundle/Tests/Form/Type/TestedTypeTest.php
     namespace Acme\TestBundle\Tests\Form\Type;
 
     use Acme\TestBundle\Form\Type\TestedType;

reference/configuration/framework.rst

@@ -85,25 +85,48 @@ If you're using an IDE like TextMate or Mac Vim, then Symfony can turn all
 of the file paths in an exception message into a link, which will open that
 file in your IDE.
 
-If you use TextMate or Mac Vim, you can simply use one of the following built-in
-values:
+Symfony contains preconfigured urls for some popular IDEs, you can set them
+using the following keys:
 
 * ``textmate``
 * ``macvim``
+* ``emacs``
+* ``sublime``
 
-You can also specify a custom file link string. If you do this, all percentage
-signs (``%``) must be doubled to escape that character. For example, the
-full TextMate string would look like this:
+.. versionadded:: 2.3.14
+    The ``emacs`` and ``sublime`` editors were introduced in Symfony 2.3.14.
 
-.. code-block:: yaml
+You can also specify a custom url string. If you do this, all percentage
+signs (``%``) must be doubled to escape that character. For example, if you
+have installed `PhpStormOpener`_ and use PHPstorm, you will do something like:
 
-    framework:
-        ide:  "txmt://open?url=file://%%f&line=%%l"
+.. configuration-block::
+
+    .. code-block:: yaml
+
+        framework:
+            ide: "pstorm://%%f:%%l"
+            
+    .. code-block:: xml
+    
+        <?xml version="1.0" charset="UTF-8" ?>
+        <container xmlns="http://symfony.com/schema/dic/service"
+            xmlns:framework="http://symfony.com/schema/dic/symfony">
+            
+            <framework:config ide="pstorm://%%f:%%l" />
+            
+        </container>
+        
+    .. code-block:: php
+    
+        $container->loadFromExtension('framework', array(
+            'ide' => 'pstorm://%%f:%%l',
+        ));
 
 Of course, since every developer uses a different IDE, it's better to set
 this on a system level. This can be done by setting the ``xdebug.file_link_format``
-``php.ini`` value to the file link string. If this configuration value is set, then
-the ``ide`` option does not need to be specified.
+in the ``php.ini`` configuration to the url string. If this configuration value
+is set, then the ``ide`` option will be ignored.
 
 .. _reference-framework-test:
 
@@ -569,3 +592,4 @@ Full default Configuration
                 debug:                %kernel.debug%
 
 .. _`protocol-relative`: http://tools.ietf.org/html/rfc3986#section-4.2
+.. _`PhpStormOpener`: https://github.com/pinepain/PhpStormOpener

reference/forms/types/form.rst

@@ -8,10 +8,10 @@ The ``form`` type predefines a couple of options that are then available
 on all types for which ``form`` is the parent type.
 
 +-----------+--------------------------------------------------------------------+
-| Options   | - `compound`_                                                      |
-|           | - `data`_                                                          |
+| Options   | - `data`_                                                          |
 |           | - `data_class`_                                                    |
 |           | - `empty_data`_                                                    |
+|           | - `compound`_                                                      |
 |           | - `required`_                                                      |
 |           | - `label_attr`_                                                    |
 |           | - `constraints`_                                                   |
@@ -30,6 +30,8 @@ on all types for which ``form`` is the parent type.
 |           | - `extra_fields_message`_                                          |
 |           | - `post_max_size_message`_                                         |
 |           | - `pattern`_ (deprecated as of 2.5)                                |
+|           | - `action`_                                                        |
+|           | - `method`_                                                        |
 +-----------+--------------------------------------------------------------------+
 | Inherited | - `block_name`_                                                    |
 | options   | - `disabled`_                                                      |
@@ -50,10 +52,6 @@ Field Options
 
 .. include:: /reference/forms/types/options/data_class.rst.inc
 
-.. include:: /reference/forms/types/options/action.rst.inc
-
-.. include:: /reference/forms/types/options/method.rst.inc
-
 .. include:: /reference/forms/types/options/empty_data.rst.inc
 
 .. include:: /reference/forms/types/options/compound.rst.inc

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

@@ -1,9 +1,9 @@
-.. versionadded:: 2.3
-    The ``action`` option was introduced in Symfony 2.3.
-
 action
 ~~~~~~
 
+.. versionadded:: 2.3
+    The ``action`` option was introduced in Symfony 2.3.
+
 **type**: ``string`` **default**: empty string
 
 This option specifies where to send the form's data on submission (usually a

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

@@ -1,7 +1,7 @@
 compound
 ~~~~~~~~
 
-**type**: ``boolean``
+**type**: ``boolean`` **default**: ``true``
 
 This option specifies if a form is compound. This is independent of whether the
 form actually has children. A form can be compound but not have any children

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

@@ -1,12 +1,12 @@
 empty_value
 ~~~~~~~~~~~
 
-**type**: ``string`` or ``Boolean``
-
 .. versionadded:: 2.3
     Since Symfony 2.3, empty values are also supported if the ``expanded``
     option is set to true.
 
+**type**: ``string`` or ``Boolean``
+
 This option determines whether or not a special "empty" option (e.g. "Choose an option")
 will appear at the top of a select widget. This option only applies if the
 ``multiple`` option is set to false.

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

@@ -1,9 +1,9 @@
-.. versionadded:: 2.3
-    The ``method`` option was introduced in Symfony 2.3.
-
 method
 ~~~~~~
 
+.. versionadded:: 2.3
+    The ``method`` option was introduced in Symfony 2.3.
+
 **type**: ``string`` **default**: ``POST``
 
 This option specifies the HTTP method used to submit the form's data. Its

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

@@ -1,9 +1,9 @@
-.. versionadded:: 2.2
-    The ``with_minutes`` option was introduced in Symfony 2.2.
-
 with_minutes
 ~~~~~~~~~~~~
 
+.. versionadded:: 2.2
+    The ``with_minutes`` option was introduced in Symfony 2.2.
+
 **type**: ``Boolean`` **default**: ``true``
 
 Whether or not to include minutes in the input. This will result in an additional