Merge branch '5.4' into 6.4

javiereguiluz · javiereguiluz · commit 230adacb95e7 · 2024-02-09T12:02:50.000+01:00
* 5.4:
  Minor: remove duplicated lines
diff --git a/cache.rst b/cache.rst
@@ -467,7 +467,6 @@ and use that when configuring the pool.
                     ->adapters(['cache.adapter.redis'])
                     ->provider('app.my_custom_redis_provider');
 
-
             $container->register('app.my_custom_redis_provider', \Redis::class)
                 ->setFactory([RedisAdapter::class, 'createConnection'])
                 ->addArgument('redis://localhost')
diff --git a/components/cache.rst b/components/cache.rst
@@ -135,7 +135,6 @@ The following cache adapters are available:
 
     cache/adapters/*
 
-
 .. _cache-component-psr6-caching:
 
 Generic Caching (PSR-6)
diff --git a/components/cache/adapters/couchbasebucket_adapter.rst b/components/cache/adapters/couchbasebucket_adapter.rst
@@ -35,7 +35,6 @@ the second and third parameters::
         $defaultLifetime
     );
 
-
 Configure the Connection
 ------------------------
 
@@ -67,7 +66,6 @@ helper method allows creating and configuring a `Couchbase Bucket`_ class instan
         'couchbase:?host[localhost]&host[localhost:12345]'
     );
 
-
 Configure the Options
 ---------------------
 
diff --git a/components/cache/adapters/couchbasecollection_adapter.rst b/components/cache/adapters/couchbasecollection_adapter.rst
@@ -32,7 +32,6 @@ the second and third parameters::
         $defaultLifetime
     );
 
-
 Configure the Connection
 ------------------------
 
@@ -64,7 +63,6 @@ helper method allows creating and configuring a `Couchbase Collection`_ class in
         'couchbase:?host[localhost]&host[localhost:12345]'
     );
 
-
 Configure the Options
 ---------------------
 
diff --git a/components/cache/adapters/filesystem_adapter.rst b/components/cache/adapters/filesystem_adapter.rst
@@ -63,6 +63,5 @@ adapter offers better read performance when using tag-based invalidation::
 
     $cache = new FilesystemTagAwareAdapter();
 
-
 .. _`tmpfs`: https://wiki.archlinux.org/index.php/tmpfs
 .. _`RAM disk solutions`: https://en.wikipedia.org/wiki/List_of_RAM_drive_software
diff --git a/components/cache/cache_pools.rst b/components/cache/cache_pools.rst
@@ -25,7 +25,6 @@ ready to use in your applications.
 
     adapters/*
 
-
 Using the Cache Contracts
 -------------------------
 
diff --git a/components/event_dispatcher/generic_event.rst b/components/event_dispatcher/generic_event.rst
@@ -99,4 +99,3 @@ Filtering data::
             $event['data'] = strtolower($event['data']);
         }
     }
-
diff --git a/components/http_kernel.rst b/components/http_kernel.rst
@@ -26,7 +26,6 @@ The Workflow of a Request
     :doc:`/event_dispatcher` articles to learn about how to use it to create
     controllers and define events in Symfony applications.
 
-
 Every HTTP web interaction begins with a request and ends with a response.
 Your job as a developer is to create PHP code that reads the request information
 (e.g. the URL) and creates and returns a response (e.g. an HTML page or JSON string).
diff --git a/components/process.rst b/components/process.rst
@@ -10,7 +10,6 @@ Installation
 
     $ composer require symfony/process
 
-
 .. include:: /components/require_autoload.rst.inc
 
 Usage
diff --git a/configuration.rst b/configuration.rst
@@ -349,7 +349,6 @@ configuration file using a special syntax: wrap the parameter name in two ``%``
             ]);
         };
 
-
 .. note::
 
     If some parameter value includes the ``%`` character, you need to escape it
diff --git a/configuration/override_dir_structure.rst b/configuration/override_dir_structure.rst
@@ -74,7 +74,6 @@ Web front-controller::
     require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
     // ...
 
-
 .. _override-config-dir:
 
 Override the Configuration Directory
diff --git a/console.rst b/console.rst
@@ -563,7 +563,6 @@ call ``setAutoExit(false)`` on it to get the command result in ``CommandTester``
 
         $tester = new ApplicationTester($application);
 
-
 .. caution::
 
     When testing ``InputOption::VALUE_NONE`` command options, you must pass an
diff --git a/contributing/community/review-comments.rst b/contributing/community/review-comments.rst
@@ -149,7 +149,6 @@ you don't have to use "Please" all the time. But it wouldn't hurt.
 It may not seem like much, but saying "Thank you" does make others feel
 more welcome.
 
-
 Preventing Escalations
 ----------------------
 
diff --git a/contributing/documentation/standards.rst b/contributing/documentation/standards.rst
@@ -175,7 +175,6 @@ Images and Diagrams
             alt="Some concise description."
         ></object>
 
-
 English Language Standards
 --------------------------
 
diff --git a/doctrine/associations.rst b/doctrine/associations.rst
@@ -605,7 +605,6 @@ that behavior, use the `orphanRemoval`_ option inside ``Category``:
         #[ORM\OneToMany(targetEntity: Product::class, mappedBy: 'category', orphanRemoval: true)]
         private array $products;
 
-
 Thanks to this, if the ``Product`` is removed from the ``Category``, it will be
 removed from the database entirely.
 
diff --git a/form/create_custom_field_type.rst b/form/create_custom_field_type.rst
@@ -465,7 +465,6 @@ Symfony passes a series of variables to the template used to render the form
 type. You can also pass your own variables, which can be based on the options
 defined by the form or be completely independent::
 
-
     // src/Form/Type/PostalAddressType.php
     namespace App\Form\Type;
 
diff --git a/form/form_collections.rst b/form/form_collections.rst
@@ -573,7 +573,6 @@ Now, you need to put some code into the ``removeTag()`` method of ``Task``::
         }
     }
 
-
 The ``allow_delete`` option means that if an item of a collection
 isn't sent on submission, the related data is removed from the collection
 on the server. In order for this to work in an HTML form, you must remove
diff --git a/frontend/custom_version_strategy.rst b/frontend/custom_version_strategy.rst
@@ -141,7 +141,6 @@ After creating the strategy PHP class, register it as a Symfony service.
                 );
         };
 
-
 Finally, enable the new asset versioning for all the application assets or just
 for some :ref:`asset package <reference-framework-assets-packages>` thanks to
 the :ref:`version_strategy <reference-assets-version-strategy>` option:
diff --git a/frontend/encore/dev-server.rst b/frontend/encore/dev-server.rst
@@ -122,7 +122,6 @@ Live Reloading when changing PHP / Twig Files
 To utilize the HMR superpower along with live reload for your PHP code and
 templates, set the following options:
 
-
 .. code-block:: javascript
 
     // webpack.config.js
diff --git a/frontend/encore/reactjs.rst b/frontend/encore/reactjs.rst
@@ -9,7 +9,7 @@ Enabling React.js with Webpack Encore
 .. tip::
 
     Check out live demos of Symfony UX React component at `https://ux.symfony.com/react`_!
-    
+
 Using React? First add some dependencies with npm:
 
 .. code-block:: terminal
@@ -28,7 +28,6 @@ Enable react in your ``webpack.config.js``:
     +     .enableReactPreset()
       ;
 
-
 Then restart Encore. When you do, it will give you a command you can run to
 install any missing dependencies. After running that command and restarting
 Encore, you're done!
diff --git a/frontend/encore/split-chunks.rst b/frontend/encore/split-chunks.rst
@@ -22,7 +22,6 @@ To enable this, call ``splitEntryChunks()``:
 
     +     .splitEntryChunks()
 
-
 Now, each output file (e.g. ``homepage.js``) *may* be split into multiple file
 (e.g. ``homepage.js`` & ``vendors-node_modules_jquery_dist_jquery_js.js`` - the
 filename of the second will be less obvious when you build for production). This
diff --git a/mercure.rst b/mercure.rst
@@ -501,14 +501,12 @@ And here is the controller::
         }
     }
 
-
 .. tip::
 
     You cannot use the ``mercure()`` helper and the ``setCookie()``
     method at the same time (it would set the cookie twice on a single request). Choose
     either one method or the other.
 
-
 Programmatically Generating The JWT Used to Publish
 ---------------------------------------------------
 
diff --git a/messenger.rst b/messenger.rst
@@ -2770,7 +2770,6 @@ and a different instance will be created per bus.
                             - 'App\Middleware\MyMiddleware'
                             - 'App\Middleware\AnotherMiddleware'
 
-
     .. code-block:: xml
 
         <!-- config/packages/messenger.xml -->
diff --git a/profiler.rst b/profiler.rst
@@ -230,7 +230,6 @@ production. To do that, create an :doc:`event subscriber </event_dispatcher>`
 and listen to the :ref:`kernel.response <component-http-kernel-kernel-response>`
 event::
 
-
     use Symfony\Component\EventDispatcher\EventSubscriberInterface;
     use Symfony\Component\HttpKernel\Event\ResponseEvent;
     use Symfony\Component\HttpKernel\KernelInterface;
diff --git a/reference/configuration/framework.rst b/reference/configuration/framework.rst
@@ -2933,6 +2933,30 @@ annotation changes). For performance reasons, it is recommended to disable
 debug mode in production, which will happen automatically if you use the
 default value.
 
+secrets
+~~~~~~~
+
+decryption_env_var
+..................
+
+**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``
+
+The environment variable that contains the decryption key.
+
+local_dotenv_file
+.................
+
+**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``
+
+Path to an dotenv file that holds secrets. This is primarily used for testing.
+
+vault_directory
+...............
+
+**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.environment%``
+
+The directory where the vault of secrets is stored.
+
 .. _configuration-framework-serializer:
 
 serializer
diff --git a/reference/constraints/Country.rst b/reference/constraints/Country.rst
@@ -103,4 +103,3 @@ Parameter        Description
 
 .. _`ISO 3166-1 alpha-2`: https://en.wikipedia.org/wiki/ISO_3166-1#Current_codes
 .. _`ISO 3166-1 alpha-3`: https://en.wikipedia.org/wiki/ISO_3166-1_alpha-3#Current_codes
-
diff --git a/reference/constraints/EqualTo.rst b/reference/constraints/EqualTo.rst
@@ -10,7 +10,6 @@ To force that a value is *not* equal, see :doc:`/reference/constraints/NotEqualT
     equal. Use :doc:`/reference/constraints/IdenticalTo` to compare with
     ``===``.
 
-
 ==========  ===================================================================
 Applies to  :ref:`property or method <validation-property-target>`
 Class       :class:`Symfony\\Component\\Validator\\Constraints\\EqualTo`
diff --git a/reference/constraints/Length.rst b/reference/constraints/Length.rst
@@ -35,7 +35,6 @@ and ``50``, you might add the following:
             protected string $firstName;
         }
 
-
     .. code-block:: yaml
 
         # config/validator/validation.yaml
diff --git a/reference/constraints/Positive.rst b/reference/constraints/Positive.rst
@@ -63,7 +63,6 @@ positive number (greater than zero):
         use Symfony\Component\Validator\Constraints as Assert;
         use Symfony\Component\Validator\Mapping\ClassMetadata;
 
-
         class Employee
         {
             // ...
diff --git a/reference/constraints/Ulid.rst b/reference/constraints/Ulid.rst
@@ -95,5 +95,4 @@ Parameter        Description
 
 .. include:: /reference/constraints/_payload-option.rst.inc
 
-
 .. _`Universally Unique Lexicographically Sortable Identifier (ULID)`: https://github.com/ulid/spec
diff --git a/reference/formats/message_format.rst b/reference/formats/message_format.rst
@@ -63,7 +63,6 @@ The basic usage of the MessageFormat allows you to use placeholders (called
             'say_hello' => "Hello {name}!",
         ];
 
-
 .. caution::
 
     In the previous translation format, placeholders were often wrapped in ``%``
diff --git a/routing.rst b/routing.rst
@@ -1853,7 +1853,6 @@ host name:
             ;
         };
 
-
 The value of the ``host`` option can include parameters (which is useful in
 multi-tenant applications) and these parameters can be validated too with
 ``requirements``:
diff --git a/security/custom_authenticator.rst b/security/custom_authenticator.rst
@@ -281,7 +281,6 @@ The following credential classes are supported by default:
             $apiToken
         ));
 
-
 Self Validating Passport
 ~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/security/entry_point.rst b/security/entry_point.rst
@@ -67,7 +67,6 @@ You can configure this using the ``entry_point`` setting:
             $security->enableAuthenticatorManager(true);
             // ....
 
-
             // allow authentication using a form or HTTP basic
             $mainFirewall = $security->firewall('main');
             $mainFirewall
diff --git a/security/ldap.rst b/security/ldap.rst
@@ -197,7 +197,6 @@ use the ``ldap`` user provider.
             ;
         };
 
-
 .. caution::
 
     The Security component escapes provided input data when the LDAP user
@@ -535,4 +534,3 @@ Configuration example for form login and query_string
 .. _`LDAP PHP extension`: https://www.php.net/manual/en/intro.ldap.php
 .. _`RFC4515`: https://datatracker.ietf.org/doc/rfc4515/
 .. _`LDAP injection`: http://projects.webappsec.org/w/page/13246947/LDAP%20Injection
-
diff --git a/serializer/custom_encoders.rst b/serializer/custom_encoders.rst
@@ -46,7 +46,6 @@ create your own encoder that uses the
         }
     }
 
-
 Registering it in your app
 --------------------------
 
diff --git a/serializer/custom_normalizer.rst b/serializer/custom_normalizer.rst
@@ -93,6 +93,7 @@ is called.
     All built-in :ref:`normalizers and denormalizers <component-serializer-normalizers>`
     as well the ones included in `API Platform`_ natively implement this interface.
 
+<<<<<<< HEAD
 .. deprecated:: 6.3
 
     The :class:`Symfony\\Component\\Serializer\\Normalizer\\CacheableSupportsMethodInterface`
@@ -155,4 +156,6 @@ Here is an example of how to use the ``getSupportedTypes()`` method::
     The ``supports*()`` method implementations should not assume that
     ``getSupportedTypes()`` has been called before.
 
+=======
+>>>>>>> 5.4
 .. _`API Platform`: https://api-platform.com
diff --git a/service_container.rst b/service_container.rst
@@ -43,7 +43,6 @@ service's class or interface name. Want to :doc:`log </logging>` something? No p
         }
     }
 
-
 What other services are available? Find out by running:
 
 .. code-block:: terminal
@@ -502,7 +501,6 @@ pass here. No problem! In your configuration, you can explicitly set this argume
             ;
         };
 
-
 Thanks to this, the container will pass ``manager@example.com`` to the ``$adminEmail``
 argument of ``__construct`` when creating the ``SiteUpdateManager`` service. The
 other arguments will still be autowired.
diff --git a/service_container/autowiring.rst b/service_container/autowiring.rst
@@ -117,7 +117,6 @@ both services:
                 ->autowire();
         };
 
-
 Now, you can use the ``TwitterClient`` service immediately in a controller::
 
     // src/Controller/DefaultController.php
@@ -252,7 +251,6 @@ adding a service alias:
             $services->alias(Rot13Transformer::class, 'app.rot13.transformer');
         };
 
-
 This creates a service "alias", whose id is ``App\Util\Rot13Transformer``.
 Thanks to this, autowiring sees this and uses it whenever the ``Rot13Transformer``
 class is type-hinted.
@@ -357,7 +355,6 @@ To fix that, add an :ref:`alias <service-autowiring-alias>`:
             $services->alias(TransformerInterface::class, Rot13Transformer::class);
         };
 
-
 Thanks to the ``App\Util\TransformerInterface`` alias, the autowiring subsystem
 knows that the ``App\Util\Rot13Transformer`` service should be injected when
 dealing with the ``TransformerInterface``.
diff --git a/service_container/factories.rst b/service_container/factories.rst
diff --git a/service_container/service_decoration.rst b/service_container/service_decoration.rst
diff --git a/service_container/synthetic_services.rst b/service_container/synthetic_services.rst
diff --git a/service_container/tags.rst b/service_container/tags.rst
diff --git a/session.rst b/session.rst
diff --git a/setup/flex_private_recipes.rst b/setup/flex_private_recipes.rst
diff --git a/setup/web_server_configuration.rst b/setup/web_server_configuration.rst
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst

Original file line number	Diff line number	Diff line change
`@@ -99,4 +99,3 @@ Filtering data::`
`99`	`99`	`$event['data'] = strtolower($event['data']);`
`100`	`100`	`}`
`101`	`101`	`}`
`102`		`-`