symfony · OskarStark · Feb 12, 2024 · Feb 9, 2024
diff --git a/components/dependency_injection.rst b/components/dependency_injection.rst
@@ -178,7 +178,6 @@ You can override this behavior as follows::
     // the second argument is optional and defines what to do when the service doesn't exist
     $newsletterManager = $containerBuilder->get('newsletter_manager', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE);
 
-
 These are all the possible behaviors:
 
  * ``ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE``: throws an exception

diff --git a/controller/value_resolver.rst b/controller/value_resolver.rst
@@ -79,7 +79,6 @@ Symfony ships with the following value resolvers in the
 
         The ``BackedEnumValueResolver`` and ``EnumRequirement`` were introduced in Symfony 6.1.
 
-
 :class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestPayloadValueResolver`
     Maps the request payload or the query string into the type-hinted object.
 

diff --git a/messenger.rst b/messenger.rst
@@ -1191,7 +1191,6 @@ to retry them:
 
     The ``--all`` option was introduced in Symfony 6.4.
 
-
 If the message fails again, it will be re-sent back to the failure transport
 due to the normal :ref:`retry rules <messenger-retries-failures>`. Once the max
 retry has been hit, the message will be discarded permanently.

diff --git a/migration.rst b/migration.rst
@@ -340,7 +340,6 @@ somewhat like this::
             throw new \Exception("Unhandled legacy mapping for $requestPathInfo");
         }
 
-
         public static function handleRequest(Request $request, Response $response, string $publicDirectory): void
         {
             $legacyScriptFilename = LegacyBridge::getLegacyScript($request);

diff --git a/reference/configuration/security.rst b/reference/configuration/security.rst
@@ -495,7 +495,6 @@ user logs out::
                         ->domain('example.com');
         };
 
-
 clear_site_data
 ...............
 

@@ -95,7 +95,6 @@ Options
 
 **type**: ``array`` | ``string``
 
-
 .. versionadded:: 6.1
 
     The ``fields`` option was introduced in Symfony 6.1.

diff --git a/serializer.rst b/serializer.rst
@@ -555,7 +555,6 @@ given class:
 
     The debug:serializer`` command was introduced in Symfony 6.3.
 
-
 Going Further with the Serializer
 ---------------------------------
 

diff --git a/serializer/custom_normalizer.rst b/serializer/custom_normalizer.rst
@@ -93,7 +93,6 @@ 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`
@@ -156,6 +155,4 @@ 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/workflow/workflow-and-state-machine.rst b/workflow/workflow-and-state-machine.rst
@@ -282,7 +282,6 @@ machine type, use ``camelCased workflow name + StateMachine``::
         // ...
     }
 
-
 .. versionadded:: 6.2
 
     All workflows and state machines services are tagged since in Symfony 6.2.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -79,7 +79,6 @@ Symfony ships with the following value resolvers in the

		The ``BackedEnumValueResolver`` and ``EnumRequirement`` were introduced in Symfony 6.1.


		:class:`Symfony\\Component\\HttpKernel\\Controller\\ArgumentResolver\\RequestPayloadValueResolver`
		Maps the request payload or the query string into the type-hinted object.

Expand Down
-Original file line number
+Diff line change
@@ Expand Up / @@ -340,7 +340,6 @@ somewhat like this:: @@
                 throw new \Exception("Unhandled legacy mapping for $requestPathInfo");
             }
             public static function handleRequest(Request $request, Response $response, string $publicDirectory): void
             {
                 $legacyScriptFilename = LegacyBridge::getLegacyScript($request);
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -95,7 +95,6 @@ Options

		type: ``array`` \| ``string``


		.. versionadded:: 6.1

		The ``fields`` option was introduced in Symfony 6.1.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -555,7 +555,6 @@ given class:

		The debug:serializer`` command was introduced in Symfony 6.3.


		Going Further with the Serializer
		---------------------------------

Expand Down