Merge branch '4.4' into 5.1

* 4.4:
  [Stopwatch] Move component docs into framework guides

Author: javiereguiluz

_build/redirection_map

@@ -509,3 +509,4 @@
 /components/http_client /http_client
 /components/mailer /mailer
 /messenger/message-recorder messenger/dispatch_after_current_bus
+/components/stopwatch https://github.com/symfony/stopwatch

components/phpunit_bridge.rst

@@ -500,8 +500,8 @@ If you have this kind of time-related tests::
         }
     }
 
-You used the :doc:`Symfony Stopwatch Component </components/stopwatch>` to
-calculate the duration time of your process, here 10 seconds. However, depending
+You calculated the duration time of your process using the Stopwatch utilities to
+:ref:`profile Symfony applications <profiling-applications>`. However, depending
 on the load of the server or the processes running on your local machine, the
 ``$duration`` could for example be ``10.000023s`` instead of ``10s``.
 

components/stopwatch.rst

@@ -176,6 +176,8 @@ the debugging routes in the next section.
 
 You'll learn about many more commands as you continue!
 
+.. _web-debug-toolbar:
+
 The Web Debug Toolbar: Debugging Dream
 --------------------------------------
 

page_creation.rst

@@ -8,15 +8,25 @@ Symfony is fast, right out of the box. However, you can make it faster if you
 optimize your servers and your applications as explained in the following
 performance checklists.
 
-Symfony Application Checklist
------------------------------
+Performance Checklists
+----------------------
 
-These are the code and configuration changes that you can make in your Symfony
-application to improve its performance:
+Use these checklists to verify that your application and server are configured
+for maximum performance:
 
-#. :ref:`Install APCu Polyfill if your server uses APC <performance-install-apcu-polyfill>`
-#. :ref:`Dump the service container into a single file <performance-service-container-single-file>`
-#. :ref:`Restrict the number of locales enabled in the application <performance-enabled-locales>`
+* **Symfony Application Checklist**:
+
+  #. :ref:`Install APCu Polyfill if your server uses APC <performance-install-apcu-polyfill>`
+  #. :ref:`Restrict the number of locales enabled in the application <performance-enabled-locales>`
+
+* **Production Server Checklist**:
+
+  #. :ref:`Dump the service container into a single file <performance-service-container-single-file>`
+  #. :ref:`Use the OPcache byte code cache <performance-use-opcache>`
+  #. :ref:`Configure OPcache for maximum performance <performance-configure-opcache>`
+  #. :ref:`Don't check PHP files timestamps <performance-dont-check-timestamps>`
+  #. :ref:`Configure the PHP realpath Cache <performance-configure-realpath-cache>`
+  #. :ref:`Optimize Composer Autoloader <performance-optimize-composer-autoloader>`
 
 .. _performance-install-apcu-polyfill:
 
@@ -28,6 +38,14 @@ OPcache, install the `APCu Polyfill component`_ in your application to enable
 compatibility with `APCu PHP functions`_ and unlock support for advanced Symfony
 features, such as the APCu Cache adapter.
 
+.. _performance-enabled-locales:
+
+Restrict the Number of Locales Enabled in the Application
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Use the :ref:`framework.translator.enabled_locales <reference-translator-enabled-locales>`
+option to only generate the translation files actually used in your application.
+
 .. _performance-service-container-single-file:
 
 Dump the Service Container into a Single File
@@ -68,28 +86,6 @@ container into a single file, which could improve performance when using
         // ...
         $container->setParameter('container.dumper.inline_factories', true);
 
-
-.. _performance-enabled-locales:
-
-Restrict the Number of Locales Enabled in the Application
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Use the :ref:`framework.translator.enabled_locales <reference-translator-enabled-locales>`
-option to only generate the translation files actually used in your application.
-
-Production Server Checklist
----------------------------
-
-These are the changes that you can make in your production server to improve
-performance when running Symfony applications:
-
-#. :ref:`Use the OPcache byte code cache <performance-use-opcache>`
-#. :ref:`Use the OPcache class preloading <performance-use-preloading>`
-#. :ref:`Configure OPcache for maximum performance <performance-configure-opcache>`
-#. :ref:`Don't check PHP files timestamps <performance-dont-check-timestamps>`
-#. :ref:`Configure the PHP realpath Cache <performance-configure-realpath-cache>`
-#. :ref:`Optimize Composer Autoloader <performance-optimize-composer-autoloader>`
-
 .. _performance-use-opcache:
 
 Use the OPcache Byte Code Cache
@@ -217,6 +213,120 @@ deployment process too):
   used in your application and prevents Composer from scanning the file system for
   classes that are not found in the class map. (see: `Composer's autoloader optimization`_).
 
+.. _profiling-applications:
+
+Profiling Applications
+----------------------
+
+`Blackfire`_ is the best tool to profile and optimize performance of Symfony
+applications during development, test and production. It's a commercial service,
+but provides free features that you can use to find bottlenecks in your projects.
+
+Symfony provides a basic performance profiler in the development
+:ref:`config environment <configuration-environments>`. Click on the "time panel"
+of the :ref:`web debug toolbar <web-debug-toolbar>` to see how much time Symfony
+spent on tasks such as making database queries and rendering templates.
+
+Custom Profiling
+~~~~~~~~~~~~~~~~
+
+You can measure the execution time and memory consumption of your own code and
+display the result in the Symfony profiler thanks to the `Stopwatch component`_.
+
+When using :ref:`autowiring <services-autowire>`, type-hint any controller or
+service argument with the :class:`Symfony\\Component\\Stopwatch\\Stopwatch` class
+and Symfony will inject the ``debug.stopwatch`` service::
+
+    use Symfony\Component\Stopwatch\Stopwatch;
+
+    class DataExporter
+    {
+        private $stopwatch;
+
+        public function __construct(Stopwatch $stopwatch)
+        {
+            $this->stopwatch = $stopwatch;
+        }
+
+        public function export()
+        {
+            // the argument is the name of the "profiling event"
+            $this->stopwatch->start('export-data');
+
+            // ...do things to export data...
+
+            // reset the stopwatch to delete all the data measured so far
+            // $this->stopwatch->reset();
+
+            $this->stopwatch->stop('export-data');
+        }
+    }
+
+If the request calls this service during its execution, you'll see a new
+event called ``export-data`` in the Symfony profiler.
+
+The ``start()``, ``stop()`` and ``getEvent()`` methods return a
+:class:`Symfony\\Component\\Stopwatch\\StopwatchEvent` object that provides
+information about the current event, even while it's still running. This
+object can be converted to a string for a quick summary::
+
+    // ...
+    dump((string) $this->stopwatch->getEvent()); // dumps e.g. '4.50 MiB - 26 ms'
+
+You can also profile your template code with the :ref:`stopwatch Twig tag <reference-twig-tag-stopwatch>`:
+
+.. code-block:: twig
+
+    {% stopwatch 'render-blog-posts' %}
+        {% for post in blog_posts%}
+            {# ... #}
+        {% endfor %}
+    {% endstopwatch %}
+
+Profiling Categories
+....................
+
+Use the second optional argument of the ``start()`` method to define the
+category or tag of the event. This helps keep events organized by type::
+
+    $this->stopwatch->start('export-data', 'export');
+
+Profiling Periods
+.................
+
+A `real-world stopwatch`_ not only includes the start/stop button but also a
+"lap button" to measure each partial lap. This is exactly what the ``lap()``
+method does, which stops an event and then restarts it immediately::
+
+    $this->stopwatch->start('process-data-records', 'export');
+
+    foreach ($records as $record) {
+        // ... some code goes here
+        $this->stopwatch->lap('process-data-records');
+    }
+
+    $event = $this->stopwatch->stop('process-data-records');
+    // $event->getDuration(), $event->getMemory(), etc.
+
+    // Lap information is stored as "periods" within the event:
+    // $event->getPeriods();
+
+Profiling Sections
+..................
+
+Sections are a way to split the profile timeline into groups. Example::
+
+    $this->stopwatch->openSection();
+    $this->stopwatch->start('validating-file', 'validation');
+    $this->stopwatch->stopSection('parsing');
+
+    $events = $this->stopwatch->getSectionEvents('parsing');
+
+    // later you can reopen a section passing its name to the openSection() method
+    $this->stopwatch->openSection('parsing');
+    $this->stopwatch->start('processing-file');
+    $this->stopwatch->stopSection('parsing');
+
 Learn more
 ----------
 
@@ -230,3 +340,6 @@ Learn more
 .. _`APCu PHP functions`: https://www.php.net/manual/en/ref.apcu.php
 .. _`cachetool`: https://github.com/gordalina/cachetool
 .. _`open_basedir`: https://www.php.net/manual/ini.core.php#ini.open-basedir
+.. _`Blackfire`: https://blackfire.io/docs/introduction?utm_source=symfony&utm_medium=symfonycom_docs&utm_campaign=performance
+.. _`Stopwatch component`: https://symfony.com/components/Stopwatch
+.. _`real-world stopwatch`: https://en.wikipedia.org/wiki/Stopwatch

performance.rst

@@ -98,23 +98,8 @@ Timing the Execution of the Application
 ---------------------------------------
 
 If you want to measure the time some tasks take in your application, there's no
-need to create a custom data collector. Instead, use the `Stopwatch component`_
-which provides utilities to profile code and displays the results on the
-"Performance" panel of the Profiler web interface.
-
-When using :ref:`autowiring <services-autowire>`, type-hint any argument with
-the :class:`Symfony\\Component\\Stopwatch\\Stopwatch` class and Symfony will
-inject the Stopwatch service. Then, use the ``start()``, ``lap()`` and
-``stop()`` methods to measure time::
-
-    // a user signs up and the timer starts...
-    $stopwatch->start('user-sign-up');
-
-    // ...do things to sign up the user...
-    $stopwatch->lap('user-sign-up');
-
-    // ...the sign up process is finished
-    $stopwatch->stop('user-sign-up');
+need to create a custom data collector. Instead, use the built-in utilities to
+:ref:`profile Symfony applications <profiling-applications>`.
 
 .. tip::
 
@@ -229,5 +214,4 @@ event::
     profiler/data_collector
 
 .. _`Single-page applications`: https://en.wikipedia.org/wiki/Single-page_application
-.. _`Stopwatch component`: https://symfony.com/components/Stopwatch
 .. _`Blackfire`: https://blackfire.io/docs/introduction?utm_source=symfony&utm_medium=symfonycom_docs&utm_campaign=profiler