Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 9c39688

Browse filesBrowse files
OskarStarkOskarStark
committed
minor #19542 Minor: remove duplicated lines (alamirault)
This PR was merged into the 6.4 branch. Discussion ---------- Minor: remove duplicated lines Continue #19537 on 6.4 branch Commits ------- 07c2d48 Minor: remove duplicated lines
2 parents 230adac + 07c2d48 commit 9c39688
Copy full SHA for 9c39688

File tree

9 files changed

+0
-11
lines changed
Filter options

9 files changed

+0
-11
lines changed

‎components/dependency_injection.rst

Copy file name to clipboardExpand all lines: components/dependency_injection.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,6 @@ You can override this behavior as follows::
178178
// the second argument is optional and defines what to do when the service doesn't exist
179179
$newsletterManager = $containerBuilder->get('newsletter_manager', ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE);
180180

181-
182181
These are all the possible behaviors:
183182

184183
* ``ContainerInterface::EXCEPTION_ON_INVALID_REFERENCE``: throws an exception

‎controller/value_resolver.rst

Copy file name to clipboardExpand all lines: controller/value_resolver.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,6 @@ Symfony ships with the following value resolvers in the
7979

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

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

‎messenger.rst

Copy file name to clipboardExpand all lines: messenger.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1191,7 +1191,6 @@ to retry them:
11911191

11921192
The ``--all`` option was introduced in Symfony 6.4.
11931193

1194-
11951194
If the message fails again, it will be re-sent back to the failure transport
11961195
due to the normal :ref:`retry rules <messenger-retries-failures>`. Once the max
11971196
retry has been hit, the message will be discarded permanently.

‎migration.rst

Copy file name to clipboardExpand all lines: migration.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ somewhat like this::
340340
throw new \Exception("Unhandled legacy mapping for $requestPathInfo");
341341
}
342342

343-
344343
public static function handleRequest(Request $request, Response $response, string $publicDirectory): void
345344
{
346345
$legacyScriptFilename = LegacyBridge::getLegacyScript($request);

‎reference/configuration/security.rst

Copy file name to clipboardExpand all lines: reference/configuration/security.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -495,7 +495,6 @@ user logs out::
495495
->domain('example.com');
496496
};
497497
498-
499498
clear_site_data
500499
...............
501500

‎reference/constraints/Unique.rst

Copy file name to clipboardExpand all lines: reference/constraints/Unique.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ Options
9595

9696
**type**: ``array`` | ``string``
9797

98-
9998
.. versionadded:: 6.1
10099

101100
The ``fields`` option was introduced in Symfony 6.1.

‎serializer.rst

Copy file name to clipboardExpand all lines: serializer.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,6 @@ given class:
555555

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

558-
559558
Going Further with the Serializer
560559
---------------------------------
561560

‎serializer/custom_normalizer.rst

Copy file name to clipboardExpand all lines: serializer/custom_normalizer.rst
-3Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ is called.
9393
All built-in :ref:`normalizers and denormalizers <component-serializer-normalizers>`
9494
as well the ones included in `API Platform`_ natively implement this interface.
9595

96-
<<<<<<< HEAD
9796
.. deprecated:: 6.3
9897

9998
The :class:`Symfony\\Component\\Serializer\\Normalizer\\CacheableSupportsMethodInterface`
@@ -156,6 +155,4 @@ Here is an example of how to use the ``getSupportedTypes()`` method::
156155
The ``supports*()`` method implementations should not assume that
157156
``getSupportedTypes()`` has been called before.
158157

159-
=======
160-
>>>>>>> 5.4
161158
.. _`API Platform`: https://api-platform.com

‎workflow/workflow-and-state-machine.rst

Copy file name to clipboardExpand all lines: workflow/workflow-and-state-machine.rst
-1Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,6 @@ machine type, use ``camelCased workflow name + StateMachine``::
282282
// ...
283283
}
284284

285-
286285
.. versionadded:: 6.2
287286

288287
All workflows and state machines services are tagged since in Symfony 6.2.

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.