Merge branch '3.4' into 4.0

weaverryan · weaverryan · commit e5040d007499 · 2018-06-10T22:58:58.000-04:00
* 3.4:
  updating the guard session migration details for Symfony 3.4 changes
  Avoiding authentication on every request with Guard
  [Filesystem] Improved the code of an example
  Removed another usage of mt_rand()
  Transition from mt_rand to random_int
  remove not existent label_attr options from buttons
  Fixed some code indentation
  add missing XML and PHP code examples
diff --git a/components/filesystem.rst b/components/filesystem.rst
@@ -29,7 +29,7 @@ endpoint for filesystem operations::
     $fileSystem = new Filesystem();
 
     try {
-        $fileSystem->mkdir('/tmp/random/dir/'.mt_rand());
+        $fileSystem->mkdir(sys_get_temp_dir().'/'.random_int(0, 1000));
     } catch (IOExceptionInterface $exception) {
         echo "An error occurred while creating your directory at ".$exception->getPath();
     }
diff --git a/configuration/external_parameters.rst b/configuration/external_parameters.rst
@@ -140,7 +140,7 @@ Environment Variable Processors
 .. versionadded:: 3.4
     Environment variable processors were introduced in Symfony 3.4.
 
-The values of the environment variables are considered strings by default.
+The values of environment variables are considered strings by default.
 However, your code may expect other data types, like integers or booleans.
 Symfony solves this problem with *processors*, which modify the contents of the
 given environment variables. The following example uses the integer processor to
@@ -159,7 +159,6 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
 
         <!-- config/packages/framework.xml -->
         <?xml version="1.0" encoding="UTF-8" ?>
-
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:framework="http://symfony.com/schema/dic/symfony"
@@ -169,57 +168,152 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
                 http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
 
             <framework:config>
-                <framework:router http_port="%env(int:HTTP_PORT)%" />
+                <framework:router http-port="%env(int:HTTP_PORT)%" />
             </framework:config>
         </container>
 
     .. code-block:: php
 
-        // config/packages/doctrine.php
+        // config/packages/framework.php
         $container->loadFromExtension('framework', array(
             'router' => array(
                 'http_port' => '%env(int:HTTP_PORT)%',
-            )
+            ),
         ));
 
 Symfony provides the following env var processors:
 
 ``env(string:FOO)``
     Casts ``FOO`` to a string:
 
-    .. code-block:: yaml
+    .. configuration-block::
 
-        parameters:
-            env(SECRET): "some_secret"
-        framework:
-           secret: '%env(string:SECRET)%'
+        .. code-block:: yaml
+
+            # config/packages/framework.yaml
+            parameters:
+                env(SECRET): 'some_secret'
+            framework:
+               secret: '%env(string:SECRET)%'
+
+        .. code-block:: xml
+
+            <!-- config/packages/framework.xml -->
+            <?xml version="1.0" encoding="UTF-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:framework="http://symfony.com/schema/dic/symfony"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services
+                    http://symfony.com/schema/dic/services/services-1.0.xsd
+                    http://symfony.com/schema/dic/symfony
+                    http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+                <parameters>
+                    <parameter key="env(SECRET)">some_secret</parameter>
+                </parameters>
+
+                <framework:config secret="%env(string:SECRET)%" />
+            </container>
+
+        .. code-block:: php
+
+            // config/packages/framework.php
+            $container->setParameter('env(SECRET)', 'some_secret');
+            $container->loadFromExtension('framework', array(
+                'secret' => '%env(string:SECRET)%',
+            ));
 
 ``env(bool:FOO)``
     Casts ``FOO`` to a bool:
 
-    .. code-block:: yaml
+    .. configuration-block::
 
-        parameters:
-            env(HTTP_METHOD_OVERRIDE): "true"
-        framework:
-           http_method_override: '%env(bool:HTTP_METHOD_OVERRIDE)%'
+        .. code-block:: yaml
+
+            # config/packages/framework.yaml
+            parameters:
+                env(HTTP_METHOD_OVERRIDE): 'true'
+            framework:
+               http_method_override: '%env(bool:HTTP_METHOD_OVERRIDE)%'
+
+        .. code-block:: xml
+
+            <!-- config/packages/framework.xml -->
+            <?xml version="1.0" encoding="UTF-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:framework="http://symfony.com/schema/dic/symfony"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services
+                    http://symfony.com/schema/dic/services/services-1.0.xsd
+                    http://symfony.com/schema/dic/symfony
+                    http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+                <parameters>
+                    <parameter key="env(HTTP_METHOD_OVERRIDE)">true</parameter>
+                </parameters>
+
+                <framework:config http-methode-override="%env(bool:HTTP_METHOD_OVERRIDE)%" />
+            </container>
+
+        .. code-block:: php
+
+            // config/packages/framework.php
+            $container->setParameter('env(HTTP_METHOD_OVERRIDE)', 'true');
+            $container->loadFromExtension('framework', array(
+                'http_method_override' => '%env(bool:HTTP_METHOD_OVERRIDE)%',
+            ));
 
 ``env(int:FOO)``
     Casts ``FOO`` to an int.
 
 ``env(float:FOO)``
-    Casts ``FOO`` to an float.
+    Casts ``FOO`` to a float.
 
 ``env(const:FOO)``
     Finds the const value named in ``FOO``:
 
-    .. code-block:: yaml
-
-        parameters:
-            env(HEALTH_CHECK_METHOD): "Symfony\Component\HttpFoundation\Request:METHOD_HEAD"
-        security:
-           access_control:
-             - { path: '^/health-check$', methods: '%env(const:HEALTH_CHECK_METHOD)%' }
+    .. configuration-block::
+
+        .. code-block:: yaml
+
+            # config/packages/security.yaml
+            parameters:
+                env(HEALTH_CHECK_METHOD): 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD'
+            security:
+               access_control:
+                 - { path: '^/health-check$', methods: '%env(const:HEALTH_CHECK_METHOD)%' }
+
+        .. code-block:: xml
+
+            <!-- config/packages/security.xml -->
+            <?xml version="1.0" encoding="UTF-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:security="http://symfony.com/schema/dic/security"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services
+                    http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+                <parameters>
+                    <parameter key="env(HEALTH_CHECK_METHOD)">Symfony\Component\HttpFoundation\Request::METHOD_HEAD</parameter>
+                </parameters>
+
+                <security:config>
+                    <rule path="^/health-check$" methods="%env(const:HEALTH_CHECK_METHOD)%" />
+                </security:config>
+            </container>
+
+        .. code-block:: php
+
+            // config/packages/security.php
+            $container->setParameter('env(HEALTH_CHECK_METHOD)', 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD');
+            $container->loadFromExtension('security', array(
+                'access_control' => array(
+                    array(
+                        'path' => '^/health-check$',
+                        'methods' => '%env(const:HEALTH_CHECK_METHOD)%',
+                    ),
+                ),
+            ));
 
 ``env(base64:FOO)``
     Decodes the content of ``FOO``, which is a base64 encoded string.
@@ -228,24 +322,83 @@ Symfony provides the following env var processors:
     Decodes the content of ``FOO``, which is a JSON encoded string. It returns
     either an array or ``null``:
 
-    .. code-block:: yaml
+    .. configuration-block::
 
-        parameters:
-            env(TRUSTED_HOSTS): "['10.0.0.1', '10.0.0.2']"
-        framework:
-           trusted_hosts: '%env(json:TRUSTED_HOSTS)%'
+        .. code-block:: yaml
+
+            # config/packages/framework.yaml
+            parameters:
+                env(TRUSTED_HOSTS): '["10.0.0.1", "10.0.0.2"]'
+            framework:
+               trusted_hosts: '%env(json:TRUSTED_HOSTS)%'
+
+        .. code-block:: xml
+
+            <!-- config/packages/framework.xml -->
+            <?xml version="1.0" encoding="UTF-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:framework="http://symfony.com/schema/dic/symfony"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services
+                    http://symfony.com/schema/dic/services/services-1.0.xsd
+                    http://symfony.com/schema/dic/symfony
+                    http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+                <parameters>
+                    <parameter key="env(TRUSTED_HOSTS)">["10.0.0.1", "10.0.0.2"]</parameter>
+                </parameters>
+
+                <framework:config trusted-hosts="%env(json:TRUSTED_HOSTS)%" />
+            </container>
+
+        .. code-block:: php
+
+            // config/packages/framework.php
+            $container->setParameter('env(TRUSTED_HOSTS)', '["10.0.0.1", "10.0.0.2"]');
+            $container->loadFromExtension('framework', array(
+                'trusted_hosts' => '%env(json:TRUSTED_HOSTS)%',
+            ));
 
 ``env(resolve:FOO)``
     Replaces the string ``FOO`` by the value of a config parameter with the
     same name:
 
-    .. code-block:: yaml
+    .. configuration-block::
 
-        parameters:
-            env(HOST): '10.0.0.1'
-            env(SENTRY_DSN): "http://%env(HOST)%/project"
-        sentry:
-            dsn: '%env(resolve:SENTRY_DSN)%'
+        .. code-block:: yaml
+
+            # config/packages/sentry.yaml
+            parameters:
+                env(HOST): '10.0.0.1'
+                env(SENTRY_DSN): 'http://%env(HOST)%/project'
+            sentry:
+                dsn: '%env(resolve:SENTRY_DSN)%'
+
+        .. code-block:: xml
+
+            <!-- config/packages/sentry.xml -->
+            <?xml version="1.0" encoding="UTF-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services
+                    http://symfony.com/schema/dic/services/services-1.0.xsd">
+
+                <parameters>
+                    <parameter key="env(HOST)">10.0.0.1</parameter>
+                    <parameter key="env(SENTRY_DSN)">http://%env(HOST)%/project</parameter>
+                </parameters>
+
+                <sentry:config dsn="%env(resolve:SENTRY_DSN)%" />
+            </container>
+
+        .. code-block:: php
+
+            // config/packages/sentry.php
+            $container->setParameter('env(HOST)', '10.0.0.1');
+            $container->setParameter('env(SENTRY_DSN)', 'http://%env(HOST)%/project');
+            $container->loadFromExtension('sentry', array(
+                'dsn' => '%env(resolve:SENTRY_DSN)%',
+            ));
 
 ``env(csv:FOO)``
     Decodes the content of ``FOO``, which is a CSV-encoded string:
@@ -263,12 +416,42 @@ Symfony provides the following env var processors:
 ``env(file:FOO)``
     Returns the contents of a file whose path is the value of the ``FOO`` env var:
 
-    .. code-block:: yaml
+    .. configuration-block::
 
-        parameters:
-            env(AUTH_FILE): "../config/auth.json"
-        google:
-           auth: '%env(file:AUTH_FILE)%'
+        .. code-block:: yaml
+
+            # config/packages/framework.yaml
+            parameters:
+                env(AUTH_FILE): '../config/auth.json'
+            google:
+                auth: '%env(file:AUTH_FILE)%'
+
+        .. code-block:: xml
+
+            <!-- config/packages/framework.xml -->
+            <?xml version="1.0" encoding="UTF-8" ?>
+            <container xmlns="http://symfony.com/schema/dic/services"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:framework="http://symfony.com/schema/dic/symfony"
+                xsi:schemaLocation="http://symfony.com/schema/dic/services
+                    http://symfony.com/schema/dic/services/services-1.0.xsd
+                    http://symfony.com/schema/dic/symfony
+                    http://symfony.com/schema/dic/symfony/symfony-1.0.xsd">
+
+                <parameters>
+                    <parameter key="env(AUTH_FILE)">../config/auth.json</parameter>
+                </parameters>
+
+                <google auth="%env(file:AUTH_FILE)%" />
+            </container>
+
+        .. code-block:: php
+
+            // config/packages/framework.php
+            $container->setParameter('env(AUTH_FILE)', '../config/auth.json');
+            $container->loadFromExtension('google', array(
+                'auth' => '%env(file:AUTH_FILE)%',
+            ));
 
 It is also possible to combine any number of processors:
 
diff --git a/controller.rst b/controller.rst
@@ -38,7 +38,7 @@ class::
          */
         public function number($max)
         {
-            $number = mt_rand(0, $max);
+            $number = random_int(0, $max);
 
             return new Response(
                 '<html><body>Lucky number: '.$number.'</body></html>'
diff --git a/page_creation.rst b/page_creation.rst
@@ -53,7 +53,7 @@ random) number and prints it. To do that, create a "Controller class" and a
     {
         public function number()
         {
-            $number = mt_rand(0, 100);
+            $number = random_int(0, 100);
 
             return new Response(
                 '<html><body>Lucky number: '.$number.'</body></html>'
@@ -248,7 +248,7 @@ variable so you can use it in Twig::
          */
         public function number()
         {
-            $number = mt_rand(0, 100);
+            $number = random_int(0, 100);
 
             return $this->render('lucky/number.html.twig', array(
                 'number' => $number,
diff --git a/reference/forms/types/reset.rst b/reference/forms/types/reset.rst
@@ -12,7 +12,6 @@ A button that resets all fields to their original values.
 | Inherited            | - `attr`_                                                           |
 | options              | - `disabled`_                                                       |
 |                      | - `label`_                                                          |
-|                      | - `label_attr`_                                                     |
 |                      | - `translation_domain`_                                             |
 +----------------------+---------------------------------------------------------------------+
 | Parent type          | :doc:`ButtonType </reference/forms/types/button>`                   |
@@ -43,6 +42,4 @@ as a key. This can be useful when you need to set a custom class for the button:
 
 .. include:: /reference/forms/types/options/button_label.rst.inc
 
-.. include:: /reference/forms/types/options/label_attr.rst.inc
-
 .. include:: /reference/forms/types/options/button_translation_domain.rst.inc
diff --git a/reference/forms/types/submit.rst b/reference/forms/types/submit.rst
diff --git a/security/guard_authentication.rst b/security/guard_authentication.rst

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ endpoint for filesystem operations::`
`29`	`29`	`$fileSystem = new Filesystem();`
`30`	`30`
`31`	`31`	`try {`
`32`		`- $fileSystem->mkdir('/tmp/random/dir/'.mt_rand());`
	`32`	`+ $fileSystem->mkdir(sys_get_temp_dir().'/'.random_int(0, 1000));`
`33`	`33`	`} catch (IOExceptionInterface $exception) {`
`34`	`34`	`echo "An error occurred while creating your directory at ".$exception->getPath();`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ class::`
`38`	`38`	`*/`
`39`	`39`	`public function number($max)`
`40`	`40`	`{`
`41`		`- $number = mt_rand(0, $max);`
	`41`	`+ $number = random_int(0, $max);`
`42`	`42`
`43`	`43`	`return new Response(`
`44`	`44`	`'<html><body>Lucky number: '.$number.'</body></html>'`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ random) number and prints it. To do that, create a "Controller class" and a`
`53`	`53`	`{`
`54`	`54`	`public function number()`
`55`	`55`	`{`
`56`		`- $number = mt_rand(0, 100);`
	`56`	`+ $number = random_int(0, 100);`
`57`	`57`
`58`	`58`	`return new Response(`
`59`	`59`	`'<html><body>Lucky number: '.$number.'</body></html>'`
`@@ -248,7 +248,7 @@ variable so you can use it in Twig::`
`248`	`248`	`*/`
`249`	`249`	`public function number()`
`250`	`250`	`{`
`251`		`- $number = mt_rand(0, 100);`
	`251`	`+ $number = random_int(0, 100);`
`252`	`252`
`253`	`253`	`return $this->render('lucky/number.html.twig', array(`
`254`	`254`	`'number' => $number,`