Movatterモバイル変換

[0]ホーム
URL:

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

 Sign up
Appearance settings

Commit27de3cc

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [Security] Remove duplicated line Minor: remove duplicated lines Formatting typo [AssetMapper] Minor [Container] Missing link RST link begin Minor: remove duplicated lines
2 parents9804422 +8275d65 commit27de3cc

File tree

10 files changed

+4
-38
lines changed

10 files changed

+4
-38
lines changed

‎components/dependency_injection.rst‎

Lines 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

‎frontend/asset_mapper.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1012,8 +1012,8 @@ both ``app`` and ``checkout``:
10121012
10131013
{# templates/products/checkout.html.twig #}
10141014
{#
1015-
Override an "importmap" blockin base.html.twig.
1016-
If you don't havethis, add it around the {{ importmap('app') }} call.
1015+
Override an "importmap" blockfrom base.html.twig.
1016+
If you don't havethat block, add it around the {{ importmap('app') }} call.
10171017
#}
10181018
{% block importmap %}
10191019
{# do NOT call parent() #}

‎migration.rst‎

Lines 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/framework.rst‎

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2860,32 +2860,6 @@ annotation changes). For performance reasons, it is recommended to disable
28602860
debug mode in production, which will happen automatically if you use the
28612861
default value.
28622862

2863-
secrets
2864-
~~~~~~~
2865-
2866-
decryption_env_var
2867-
..................
2868-
2869-
**type**: ``string`` **default**: ``base64:default::SYMFONY_DECRYPTION_SECRET``
2870-
2871-
The environment variable that contains the decryption key.
2872-
2873-
local_dotenv_file
2874-
.................
2875-
2876-
**type**: ``string`` **default**: ``%kernel.project_dir%/.env.%kernel.environment%.local``
2877-
2878-
Path to an dotenv file that holds secrets. This is primarily used for testing.
2879-
2880-
vault_directory
2881-
...............
2882-
2883-
**type**: ``string`` **default**: ``%kernel.project_dir%/config/secrets/%kernel.environment%``
2884-
2885-
The directory where the vault of secrets is stored.
2886-
2887-
.. _configuration-framework-serializer:
2888-
28892863
serializer
28902864
~~~~~~~~~~
28912865

‎reference/configuration/security.rst‎

Lines 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‎

Lines 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
This is defines the key or keys in a collection that should be checked for
10099
uniqueness. By default, all collection keys are checked for uniqueness.
101100

‎reference/constraints/UniqueEntity.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ the combination value is unique (e.g. two users could have the same email,
269269
as long as they don't have the same name also).
270270

271271
If you need to require two fields to be individually unique (e.g. a unique
272-
``email``*and* a unique ``username``), you use two ``UniqueEntity`` entries,
272+
``email`` and a unique ``username``), you use two ``UniqueEntity`` entries,
273273
each with a single field.
274274

275275
..include::/reference/constraints/_groups-option.rst.inc

‎security.rst‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -625,9 +625,6 @@ are public). On the other hand, all pages that you want to be *aware* of a logge
625625
user have to be under the same firewall. So if you want to display a *"You are logged in
626626
as ..."* message on every page, they all have to be included in the same firewall.
627627

628-
The same firewall can have many modes of authentication. In other words, it
629-
enables many ways to ask the question *"Who are you?"*.
630-
631628
You'll learn how to restrict access to URLs, controllers or
632629
anything else within your firewall in the:ref:`access control
633630
<security-access-control>` section.

‎service_container.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1367,7 +1367,7 @@ and ``site_update_manager.normal_users``. Thanks to the alias, if you type-hint
13671367
``SiteUpdateManager`` the first (``site_update_manager.superadmin``) will be passed.
13681368

13691369
If you want to pass the second, you'll need to:ref:`manually wire the service<services-wire-specific-service>`
1370-
or to create a named ref:`autowiring alias <autowiring-alias>`.
1370+
or to create a named:ref:`autowiring alias<autowiring-alias>`.
13711371

13721372
..caution::
13731373

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

Lines 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
Automatic and Manual Validation
287286
-------------------------------
288287

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp