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

Commit0ffb19b

Browse files
committed
Merge branch '6.1' into 6.2
* 6.1: Fix "WordPress" spelling typo Minor tweak [Framework] clearified base_uri behavior with extra examples Minor tweak Update property_info.rst Adding more info about chain provider
2 parentsbfdd89d +fa1d486 commit0ffb19b

File tree

4 files changed

+22
-15
lines changed

4 files changed

+22
-15
lines changed

‎components/property_info.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -323,13 +323,13 @@ this returns ``true`` if:
323323
``@var SomeClass<DateTime>``, ``@var SomeClass<integer,string>``,
324324
``@var Doctrine\Common\Collections\Collection<App\Entity\SomeEntity>``, etc.)
325325

326-
``Type::getCollectionKeyType()`` & ``Type::getCollectionValueType()``
327-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
326+
``Type::getCollectionKeyTypes()`` & ``Type::getCollectionValueTypes()``
327+
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
328328

329329
If the property is a collection, additional type objects may be returned
330330
for both the key and value types of the collection (if the information is
331-
available), via the:method:`Type::getCollectionKeyType() <Symfony\\Component\\PropertyInfo\\Type::getCollectionKeyType>`
332-
and:method:`Type::getCollectionValueType() <Symfony\\Component\\PropertyInfo\\Type::getCollectionValueType>`
331+
available), via the:method:`Type::getCollectionKeyTypes() <Symfony\\Component\\PropertyInfo\\Type::getCollectionKeyTypes>`
332+
and:method:`Type::getCollectionValueTypes() <Symfony\\Component\\PropertyInfo\\Type::getCollectionValueTypes>`
333333
methods.
334334

335335
.. _`components-property-info-extractors`:

‎create_framework/event_dispatcher.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ hook into the framework life cycle to modify the way the request is handled.
88
What kind of hooks are we talking about? Authentication or caching for
99
instance. To be flexible, hooks must be plug-and-play; the ones you "register"
1010
for an application are different from the next one depending on your specific
11-
needs. Many software have a similar concept like Drupal orWordpress. In some
11+
needs. Many software have a similar concept like Drupal orWordPress. In some
1212
languages, there is even a standard like `WSGI`_ in Python or `Rack`_ in Ruby.
1313

1414
As there is no standard for PHP, we are going to use a well-known design

‎reference/configuration/framework.rst‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -953,16 +953,21 @@ every request.
953953

954954
Here are some common examples of how ``base_uri`` merging works in practice:
955955

956-
======================= ================== ==========================
957-
``base_uri`` Relative URI Actual Requested URI
958-
======================= ================== ==========================
959-
http://example.org /bar http://example.org/bar
960-
http://example.org/foo /bar http://example.org/bar
961-
http://example.org/foo bar http://example.org/bar
962-
http://example.org/foo/ bar http://example.org/foo/bar
963-
http://example.org http://symfony.com http://symfony.com
964-
http://example.org/?bar bar http://example.org/bar
965-
======================= ================== ==========================
956+
========================== ================== =============================
957+
``base_uri`` Relative URI Actual Requested URI
958+
========================== ================== =============================
959+
http://example.org /bar http://example.org/bar
960+
http://example.org/foo /bar http://example.org/bar
961+
http://example.org/foo bar http://example.org/bar
962+
http://example.org/foo/ /bar http://example.org/bar
963+
http://example.org/foo/ bar http://example.org/foo/bar
964+
http://example.org http://symfony.com http://symfony.com
965+
http://example.org/?bar bar http://example.org/bar
966+
http://example.org/api/v4 /bar http://example.org/bar
967+
http://example.org/api/v4/ /bar http://example.org/bar
968+
http://example.org/api/v4 bar http://example.org/api/bar
969+
http://example.org/api/v4/ bar http://example.org/api/v4/bar
970+
========================== ================== =============================
966971

967972
bindto
968973
......

‎security.rst‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,8 @@ Symfony comes with several built-in user providers:
317317
Loads users from a configuration file;
318318
:ref:`Chain User Provider<security-chain-user-provider>`
319319
Merges two or more user providers into a new user provider.
320+
Since each firewall has exactly *one* user provider, you can use this
321+
to chain multiple providers together.
320322

321323
The built-in user providers cover the most common needs for applications, but you
322324
can also create your own:ref:`custom user provider<security-custom-user-provider>`.

0 commit comments

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