Merge branch '6.4' into 7.0

* 6.4:
  Update formatterhelper.rst
  Fix a code example
  [Logger] Switching to more modern config format
  [Form] Fix wrong return type for choice_loader

Author: OskarStark

components/console/helpers/formatterhelper.rst

@@ -132,3 +132,15 @@ precision (default ``1``) of the result::
     Helper::formatTime(125);       // 2 mins
     Helper::formatTime(125, 2);    // 2 mins, 5 secs
     Helper::formatTime(172799, 4); // 1 day, 23 hrs, 59 mins, 59 secs
+
+Formatting Memory
+-----------------
+
+Sometimes you want to format memory to GiB, MiB, KiB and B. This is possible with the
+:method:`Symfony\\Component\\Console\\Helper\\Helper::formatMemory` method.
+The only argument is the memory size to format::
+
+    Helper::formatMemory(512);                // 512 B
+    Helper::formatMemory(1024);               // 1 KiB
+    Helper::formatMemory(1024 * 1024);        // 1.0 MiB
+    Helper::formatMemory(1024 * 1024 * 1024); // 1 GiB

logging/channels_handlers.rst

@@ -23,27 +23,27 @@ Switching a Channel to a different Handler
 Now, suppose you want to log the ``security`` channel to a different file.
 To do this, create a new handler and configure it to log only messages
 from the ``security`` channel. The following example does that only in the
-``prod`` :ref:`configuration environment <configuration-environments>` but you
-can do it in any (or all) environments:
+``prod`` :ref:`configuration environment <configuration-environments>`:
 
 .. configuration-block::
 
     .. code-block:: yaml
 
-        # config/packages/prod/monolog.yaml
-        monolog:
-            handlers:
-                security:
-                    # log all messages (since debug is the lowest level)
-                    level:    debug
-                    type:     stream
-                    path:     '%kernel.logs_dir%/security.log'
-                    channels: [security]
-
-                # an example of *not* logging security channel messages for this handler
-                main:
-                    # ...
-                    # channels: ['!security']
+        # config/packages/monolog.yaml
+        when@prod:
+            monolog:
+                handlers:
+                    security:
+                        # log all messages (since debug is the lowest level)
+                        level:    debug
+                        type:     stream
+                        path:     '%kernel.logs_dir%/security.log'
+                        channels: [security]
+
+                    # an example of *not* logging security channel messages for this handler
+                    main:
+                        # ...
+                        # channels: ['!security']
 
     .. code-block:: xml
 
@@ -56,12 +56,15 @@ can do it in any (or all) environments:
                 http://symfony.com/schema/dic/monolog
                 https://symfony.com/schema/dic/monolog/monolog-1.0.xsd">
 
-            <monolog:config>
-                <monolog:handler name="security" type="stream" path="%kernel.logs_dir%/security.log">
-                    <monolog:channels>
-                        <monolog:channel>security</monolog:channel>
-                    </monolog:channels>
-                </monolog:handler>
+            <when env="prod">
+                <monolog:config>
+                    <monolog:handler name="security" type="stream" path="%kernel.logs_dir%/security.log">
+                        <monolog:channels>
+                            <monolog:channel>security</monolog:channel>
+                        </monolog:channels>
+                    </monolog:handler>
+                </monolog:config>
+            </when>
 
                 <monolog:handler name="main" type="stream" path="%kernel.logs_dir%/main.log">
                     <!-- ... -->
@@ -75,18 +78,21 @@ can do it in any (or all) environments:
     .. code-block:: php
 
         // config/packages/prod/monolog.php
+        use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
         use Symfony\Config\MonologConfig;
 
-        return static function (MonologConfig $monolog): void {
-            $monolog->handler('security')
-                ->type('stream')
-                ->path('%kernel.logs_dir%/security.log')
-                ->channels()->elements(['security']);
+        return static function (MonologConfig $monolog, ContainerConfigurator $container) {
+            if ('prod' === $container->env()) {
+                $monolog->handler('security')
+                    ->type('stream')
+                    ->path(param('kernel.logs_dir') . \DIRECTORY_SEPARATOR . 'security.log')
+                    ->channels()->elements(['security']);
 
-            $monolog->handler('main')
-                 // ...
+                $monolog->handler('main')
+                     // ...
 
-                ->channels()->elements(['!security']);
+                    ->channels()->elements(['!security']);
+            }
         };
 
 .. caution::
@@ -131,13 +137,13 @@ You can also configure additional channels without the need to tag your services
 
     .. code-block:: yaml
 
-        # config/packages/prod/monolog.yaml
+        # config/packages/monolog.yaml
         monolog:
             channels: ['foo', 'bar', 'foo_bar']
 
     .. code-block:: xml
 
-        <!-- config/packages/prod/monolog.xml -->
+        <!-- config/packages/monolog.xml -->
         <container xmlns="http://symfony.com/schema/dic/services"
             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
             xmlns:monolog="http://symfony.com/schema/dic/monolog"
@@ -155,7 +161,7 @@ You can also configure additional channels without the need to tag your services
 
     .. code-block:: php
 
-        // config/packages/prod/monolog.php
+        // config/packages/monolog.php
         use Symfony\Config\MonologConfig;
 
         return static function (MonologConfig $monolog): void {

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

@@ -46,6 +46,7 @@ better performance::
     use App\StaticClass;
     use Symfony\Component\Form\AbstractType;
     use Symfony\Component\Form\ChoiceList\ChoiceList;
+    use Symfony\Component\Form\ChoiceList\Loader\ChoiceLoaderInterface;
     use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
     use Symfony\Component\OptionsResolver\Options;
     use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -61,13 +62,13 @@ better performance::
         {
             $resolver->setDefaults([
                 // the example below will create a CallbackChoiceLoader from the callable
-                'choice_loader' => ChoiceList::lazy($this, function() {
+                'choice_loader' => ChoiceList::lazy($this, function () {
                     return StaticClass::getConstants();
                 }),
 
                 // you can pass your own loader as well, depending on other options
                 'some_key' => null,
-                'choice_loader' => function (Options $options): array {
+                'choice_loader' => function (Options $options): ChoiceLoaderInterface {
                     return ChoiceList::loader(
                         // pass the instance of the type or type extension which is
                         // currently configuring the choice list as first argument