From 80c175f0e6f18a2b49c1c5c5d8fb0d863915c29a Mon Sep 17 00:00:00 2001
From: Javier Eguiluz <javier.eguiluz@gmail.com>
Date: Tue, 9 Apr 2019 17:48:07 +0200
Subject: [PATCH] Don't use Flex config in 3.4 branch

---
 cache.rst                             | 36 +++++++++++------------
 configuration/external_parameters.rst | 42 +++++++++++++--------------
 form/bootstrap4.rst                   |  6 ++--
 frontend/encore/advanced-config.rst   |  2 +-
 reference/configuration/framework.rst | 12 ++++----
 5 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/cache.rst b/cache.rst
index 0a869a76dc6..8f02f0de48f 100644
--- a/cache.rst
+++ b/cache.rst
@@ -50,7 +50,7 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
 
     .. code-block:: yaml
 
-        # config/packages/cache.yaml
+        # app/config/config.yml
         framework:
             cache:
                 app: cache.adapter.filesystem
@@ -58,7 +58,7 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
 
     .. code-block:: xml
 
-        <!-- config/packages/cache.xml -->
+        <!-- app/config/config.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"
@@ -75,7 +75,7 @@ adapter (template) they use by using the ``app`` and ``system`` key like:
 
     .. code-block:: php
 
-        // config/packages/cache.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 'app' => 'cache.adapter.filesystem',
@@ -109,7 +109,7 @@ will create pool with service id of ``cache.[type]``
 
     .. code-block:: yaml
 
-        # config/packages/cache.yaml
+        # app/config/config.yml
         framework:
             cache:
                 directory: '%kernel.cache_dir%/pools' # Only used with cache.adapter.filesystem
@@ -127,7 +127,7 @@ will create pool with service id of ``cache.[type]``
 
     .. code-block:: xml
 
-        <!-- config/packages/cache.xml -->
+        <!-- app/config/config.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"
@@ -155,7 +155,7 @@ will create pool with service id of ``cache.[type]``
 
     .. code-block:: php
 
-        // config/packages/cache.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 // Only used with cache.adapter.filesystem
@@ -183,7 +183,7 @@ You can also create more customized pools. All you need is an adapter:
 
     .. code-block:: yaml
 
-        # config/packages/cache.yaml
+        # app/config/config.yml
         framework:
             cache:
                 default_memcached_provider: 'memcached://localhost'
@@ -198,7 +198,7 @@ You can also create more customized pools. All you need is an adapter:
 
     .. code-block:: xml
 
-        <!-- config/packages/cache.xml -->
+        <!-- app/config/config.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"
@@ -217,7 +217,7 @@ You can also create more customized pools. All you need is an adapter:
 
     .. code-block:: php
 
-        // config/packages/cache.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 'default_memcached_provider' => 'memcached://localhost',
@@ -249,7 +249,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
 
     .. code-block:: yaml
 
-        # config/packages/cache.yaml
+        # app/config/config.yml
         framework:
             cache:
                 app: my_configured_app_cache
@@ -270,7 +270,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
 
     .. code-block:: xml
 
-        <!-- config/packages/cache.xml -->
+        <!-- app/config/config.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"
@@ -291,7 +291,7 @@ For advanced configurations it could sometimes be useful to use a pool as an ada
 
     .. code-block:: php
 
-        // config/packages/cache.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 'app' => 'my_configured_app_cache',
@@ -330,7 +330,7 @@ and use that when configuring the pool.
 
     .. code-block:: yaml
 
-        # config/packages/cache.yaml
+        # app/config/config.yml
         framework:
             cache:
                 pools:
@@ -348,7 +348,7 @@ and use that when configuring the pool.
 
 .. code-block:: xml
 
-        <!-- config/packages/cache.xml -->
+        <!-- app/config/config.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"
@@ -375,7 +375,7 @@ and use that when configuring the pool.
 
     .. code-block:: php
 
-        // config/packages/cache.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 'pools' => [
@@ -407,7 +407,7 @@ case the value needs to be recalculated.
 
     .. code-block:: yaml
 
-        # config/packages/cache.yaml
+        # app/config/config.yml
         framework:
             cache:
                 pools:
@@ -426,7 +426,7 @@ case the value needs to be recalculated.
 
     .. code-block:: xml
 
-        <!-- config/packages/cache.xml -->
+        <!-- app/config/config.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"
@@ -455,7 +455,7 @@ case the value needs to be recalculated.
 
     .. code-block:: php
 
-        // config/packages/cache.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 'pools' => [
diff --git a/configuration/external_parameters.rst b/configuration/external_parameters.rst
index 4634a515901..a74378fd9f9 100644
--- a/configuration/external_parameters.rst
+++ b/configuration/external_parameters.rst
@@ -157,14 +157,14 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
 
     .. code-block:: yaml
 
-        # config/packages/framework.yaml
+        # app/config/config.yml
         framework:
             router:
                 http_port: env(int:HTTP_PORT)
 
     .. code-block:: xml
 
-        <!-- config/packages/framework.xml -->
+        <!-- app/config/config.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"
@@ -181,7 +181,7 @@ turn the value of the ``HTTP_PORT`` env var into an integer:
 
     .. code-block:: php
 
-        // config/packages/framework.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'router' => [
                 'http_port' => '%env(int:HTTP_PORT)%',
@@ -197,7 +197,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: yaml
 
-            # config/packages/framework.yaml
+            # app/config/config.yml
             parameters:
                 env(SECRET): 'some_secret'
             framework:
@@ -205,7 +205,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: xml
 
-            <!-- config/packages/framework.xml -->
+            <!-- app/config/config.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"
@@ -224,7 +224,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: php
 
-            // config/packages/framework.php
+            // app/config/config.php
             $container->setParameter('env(SECRET)', 'some_secret');
             $container->loadFromExtension('framework', [
                 'secret' => '%env(string:SECRET)%',
@@ -237,7 +237,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: yaml
 
-            # config/packages/framework.yaml
+            # app/config/config.yml
             parameters:
                 env(HTTP_METHOD_OVERRIDE): 'true'
             framework:
@@ -245,7 +245,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: xml
 
-            <!-- config/packages/framework.xml -->
+            <!-- app/config/config.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"
@@ -264,7 +264,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: php
 
-            // config/packages/framework.php
+            // app/config/config.php
             $container->setParameter('env(HTTP_METHOD_OVERRIDE)', 'true');
             $container->loadFromExtension('framework', [
                 'http_method_override' => '%env(bool:HTTP_METHOD_OVERRIDE)%',
@@ -283,7 +283,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: yaml
 
-            # config/packages/security.yaml
+            # app/config/config.yml
             parameters:
                 env(HEALTH_CHECK_METHOD): 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD'
             security:
@@ -292,7 +292,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: xml
 
-            <!-- config/packages/security.xml -->
+            <!-- app/config/config.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"
@@ -311,7 +311,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: php
 
-            // config/packages/security.php
+            // app/config/config.php
             $container->setParameter('env(HEALTH_CHECK_METHOD)', 'Symfony\Component\HttpFoundation\Request::METHOD_HEAD');
             $container->loadFromExtension('security', [
                 'access_control' => [
@@ -333,7 +333,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: yaml
 
-            # config/packages/framework.yaml
+            # app/config/config.yml
             parameters:
                 env(TRUSTED_HOSTS): '["10.0.0.1", "10.0.0.2"]'
             framework:
@@ -341,7 +341,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: xml
 
-            <!-- config/packages/framework.xml -->
+            <!-- app/config/config.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"
@@ -360,7 +360,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: php
 
-            // config/packages/framework.php
+            // app/config/config.php
             $container->setParameter('env(TRUSTED_HOSTS)', '["10.0.0.1", "10.0.0.2"]');
             $container->loadFromExtension('framework', [
                 'trusted_hosts' => '%env(json:TRUSTED_HOSTS)%',
@@ -374,7 +374,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: yaml
 
-            # config/packages/sentry.yaml
+            # app/config/config.yml
             parameters:
                 env(HOST): '10.0.0.1'
                 sentry_host: '%env(HOST)%'
@@ -384,7 +384,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: xml
 
-            <!-- config/packages/sentry.xml -->
+            <!-- app/config/config.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"
@@ -402,7 +402,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: php
 
-            // config/packages/sentry.php
+            // app/config/config.php
             $container->setParameter('env(HOST)', '10.0.0.1');
             $container->setParameter('sentry_host', '%env(HOST)%');
             $container->setParameter('env(SENTRY_DSN)', 'http://%sentry_host%/project');
@@ -417,7 +417,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: yaml
 
-            # config/packages/framework.yaml
+            # app/config/config.yml
             parameters:
                 env(AUTH_FILE): '../config/auth.json'
             google:
@@ -425,7 +425,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: xml
 
-            <!-- config/packages/framework.xml -->
+            <!-- app/config/config.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"
@@ -444,7 +444,7 @@ Symfony provides the following env var processors:
 
         .. code-block:: php
 
-            // config/packages/framework.php
+            // app/config/config.php
             $container->setParameter('env(AUTH_FILE)', '../config/auth.json');
             $container->loadFromExtension('google', [
                 'auth' => '%env(file:AUTH_FILE)%',
diff --git a/form/bootstrap4.rst b/form/bootstrap4.rst
index 60e5298b051..d833c0d53ce 100644
--- a/form/bootstrap4.rst
+++ b/form/bootstrap4.rst
@@ -30,13 +30,13 @@ configuration:
 
     .. code-block:: yaml
 
-        # config/packages/twig.yaml
+        # app/config/config.yml
         twig:
             form_themes: ['bootstrap_4_layout.html.twig']
 
     .. code-block:: xml
 
-        <!-- config/packages/twig.xml -->
+        <!-- app/config/config.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"
@@ -54,7 +54,7 @@ configuration:
 
     .. code-block:: php
 
-        // config/packages/twig.php
+        // app/config/config.php
         $container->loadFromExtension('twig', [
             'form_themes' => [
                 'bootstrap_4_layout.html.twig',
diff --git a/frontend/encore/advanced-config.rst b/frontend/encore/advanced-config.rst
index 8dbc5b9fcab..d901b78d767 100644
--- a/frontend/encore/advanced-config.rst
+++ b/frontend/encore/advanced-config.rst
@@ -104,7 +104,7 @@ Next, define the output directories of each build:
 
 .. code-block:: yaml
 
-    # config/packages/webpack_encore.yaml
+    # app/config/config.yml
     webpack_encore:
         output_path: '%kernel.public_dir%/web/default_build'
         builds:
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
index d24e2fb14ab..2e88b39b9f4 100644
--- a/reference/configuration/framework.rst
+++ b/reference/configuration/framework.rst
@@ -2044,7 +2044,7 @@ To configure a Redis cache pool with a default lifetime of 1 hour, do the follow
 
     .. code-block:: yaml
 
-        # config/packages/framework.yaml
+        # app/config/config.yml
         framework:
             cache:
                 pools:
@@ -2054,7 +2054,7 @@ To configure a Redis cache pool with a default lifetime of 1 hour, do the follow
 
     .. code-block:: xml
 
-        <!-- config/packages/framework.xml -->
+        <!-- app/config/config.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"
@@ -2077,7 +2077,7 @@ To configure a Redis cache pool with a default lifetime of 1 hour, do the follow
 
     .. code-block:: php
 
-        // config/packages/framework.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'cache' => [
                 'pools' => [
@@ -2191,7 +2191,7 @@ A list of workflows to be created by the framework extension:
 
     .. code-block:: yaml
 
-        # config/packages/workflow.yaml
+        # app/config/config.yml
         framework:
             workflows:
                 my_workflow:
@@ -2199,7 +2199,7 @@ A list of workflows to be created by the framework extension:
 
     .. code-block:: xml
 
-        <!-- config/packages/workflow.xml -->
+        <!-- app/config/config.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"
@@ -2219,7 +2219,7 @@ A list of workflows to be created by the framework extension:
 
     .. code-block:: php
 
-        // config/packages/workflow.php
+        // app/config/config.php
         $container->loadFromExtension('framework', [
             'workflows' => [
                 'my_workflow' => // ...