Skip to content

Commit 0fe1050

Browse files
committed
Merge branch '2.7' into 2.8
2 parents 9538919 + 6d17756 commit 0fe1050

31 files changed

+240
-12
lines changed

book/security.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ A) Configuring how your Users will Authenticate
128128
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
129129

130130
The main job of a firewall is to configure *how* your users will authenticate.
131-
Will they use a login form? Http Basic? An API token? All of the above?
131+
Will they use a login form? HTTP basic authentication? An API token? All of the above?
132132

133-
Let's start with Http Basic (the old-school pop-up) and work up from there.
133+
Let's start with HTTP basic authentication (the old-school prompt) and work up from there.
134134
To activate this, add the ``http_basic`` key under your firewall:
135135

136136
.. configuration-block::
@@ -265,7 +265,7 @@ user to be logged in to access this URL:
265265
You'll learn more about this ``ROLE_ADMIN`` thing and denying access
266266
later in the :ref:`security-authorization` section.
267267

268-
Great! Now, if you go to ``/admin``, you'll see the HTTP Basic popup:
268+
Great! Now, if you go to ``/admin``, you'll see the HTTP basic auth prompt:
269269

270270
.. image:: /images/book/security_http_basic_popup.png
271271
:align: center
@@ -376,7 +376,7 @@ probably only need one. If you *do* have multiple, you can configure which
376376
Try to login using username ``admin`` and password ``kitten``. You should
377377
see an error!
378378

379-
No encoder has been configured for account "Symfony\Component\Security\Core\User\User"
379+
No encoder has been configured for account "Symfony\\Component\\Security\\Core\\User\\User"
380380

381381
To fix this, add an ``encoders`` key:
382382

@@ -598,8 +598,8 @@ before inserting them into the database? Don't worry, see
598598
D) Configuration Done!
599599
~~~~~~~~~~~~~~~~~~~~~~
600600

601-
Congratulations! You now have a working authentication system that uses Http
602-
Basic and loads users right from the ``security.yml`` file.
601+
Congratulations! You now have a working authentication system that uses HTTP
602+
basic auth and loads users right from the ``security.yml`` file.
603603

604604
Your next steps depend on your setup:
605605

components/class_loader/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,7 @@ You can install the component in 2 different ways:
4141
on `Packagist`_);
4242
* Use the official Git repository (https://github.com/symfony/ClassLoader).
4343

44+
.. include:: /components/require_autoload.rst.inc
45+
4446
.. _`autoloading mechanism`: http://php.net/manual/en/language.oop5.autoload.php
4547
.. _Packagist: https://packagist.org/packages/symfony/class-loader

components/config/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ You can install the component in 2 different ways:
1717
* :doc:`Install it via Composer </components/using_components>` (``symfony/config`` on `Packagist`_);
1818
* Use the official Git repository (https://github.com/symfony/Config).
1919

20+
.. include:: /components/require_autoload.rst.inc
21+
2022
Sections
2123
--------
2224

components/console/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ You can install the component in 2 different ways:
2020
* :doc:`Install it via Composer </components/using_components>` (``symfony/console`` on `Packagist`_);
2121
* Use the official Git repository (https://github.com/symfony/Console).
2222

23+
.. include:: /components/require_autoload.rst.inc
24+
2325
Creating a basic Command
2426
------------------------
2527

components/css_selector.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ You can install the component in 2 different ways:
1515
* :doc:`Install it via Composer </components/using_components>` (``symfony/css-selector`` on `Packagist`_);
1616
* Use the official Git repository (https://github.com/symfony/CssSelector).
1717

18+
.. include:: /components/require_autoload.rst.inc
19+
1820
Usage
1921
-----
2022

components/debug/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ You can install the component in many different ways:
1919
* :doc:`Install it via Composer </components/using_components>` (``symfony/debug`` on `Packagist`_);
2020
* Use the official Git repository (https://github.com/symfony/Debug).
2121

22+
.. include:: /components/require_autoload.rst.inc
23+
2224
Usage
2325
-----
2426

components/dependency_injection/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
1919
* :doc:`Install it via Composer </components/using_components>` (``symfony/dependency-injection`` on `Packagist`_);
2020
* Use the official Git repository (https://github.com/symfony/DependencyInjection).
2121

22+
.. include:: /components/require_autoload.rst.inc
23+
2224
Basic Usage
2325
-----------
2426

components/dom_crawler.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ You can install the component in 2 different ways:
2020
* :doc:`Install it via Composer </components/using_components>` (``symfony/dom-crawler`` on `Packagist`_);
2121
* Use the official Git repository (https://github.com/symfony/DomCrawler).
2222

23+
.. include:: /components/require_autoload.rst.inc
24+
2325
Usage
2426
-----
2527

components/event_dispatcher/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ You can install the component in 2 different ways:
5656
* :doc:`Install it via Composer </components/using_components>` (``symfony/event-dispatcher`` on `Packagist`_);
5757
* Use the official Git repository (https://github.com/symfony/EventDispatcher).
5858

59+
.. include:: /components/require_autoload.rst.inc
60+
5961
Usage
6062
-----
6163

components/filesystem/introduction.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ You can install the component in 2 different ways:
1919
* :doc:`Install it via Composer </components/using_components>` (``symfony/filesystem`` on `Packagist`_);
2020
* Use the official Git repository (https://github.com/symfony/Filesystem).
2121

22+
.. include:: /components/require_autoload.rst.inc
23+
2224
Usage
2325
-----
2426

0 commit comments

Comments
 (0)