Skip to content

Commit c4834f6

Browse files
committed
Remove more deprecations in 6.0 branch
1 parent 4c71e83 commit c4834f6

File tree

13 files changed

+12
-845
lines changed

13 files changed

+12
-845
lines changed

_build/redirection_map

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,3 +517,5 @@
517517
/security/named_encoders /security/named_hashers
518518
/components/inflector /components/string#inflector
519519
/security/experimental_authenticators /security/authenticator_manager
520+
/security/guard_authentication /security/authenticator_manager
521+
/security/multiple_guard_authenticators /security/authenticator_manager

cache.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ The Cache component comes with a series of adapters pre-configured:
9999

100100
* :doc:`cache.adapter.apcu </components/cache/adapters/apcu_adapter>`
101101
* :doc:`cache.adapter.array </components/cache/adapters/array_cache_adapter>`
102-
* :doc:`cache.adapter.doctrine </components/cache/adapters/doctrine_adapter>`
103102
* :doc:`cache.adapter.filesystem </components/cache/adapters/filesystem_adapter>`
104103
* :doc:`cache.adapter.memcached </components/cache/adapters/memcached_adapter>`
105104
* :doc:`cache.adapter.pdo </components/cache/adapters/pdo_doctrine_dbal_adapter>`
@@ -119,8 +118,6 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
119118
cache:
120119
directory: '%kernel.cache_dir%/pools' # Only used with cache.adapter.filesystem
121120
122-
# service: cache.doctrine
123-
default_doctrine_provider: 'app.doctrine_cache'
124121
# service: cache.psr6
125122
default_psr6_provider: 'app.my_psr6_service'
126123
# service: cache.redis
@@ -144,15 +141,13 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
144141
145142
<framework:config>
146143
<!--
147-
default_doctrine_provider: Service: cache.doctrine
148144
default_psr6_provider: Service: cache.psr6
149145
default_redis_provider: Service: cache.redis
150146
default_memcached_provider: Service: cache.memcached
151147
default_pdo_provider: Service: cache.pdo
152148
-->
153149
<!-- "directory" attribute is only used with cache.adapter.filesystem -->
154150
<framework:cache directory="%kernel.cache_dir%/pools"
155-
default_doctrine_provider="app.doctrine_cache"
156151
default_psr6_provider="app.my_psr6_service"
157152
default_redis_provider="redis://localhost"
158153
default_memcached_provider="memcached://localhost"
@@ -170,8 +165,6 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
170165
$framework->cache()
171166
// Only used with cache.adapter.filesystem
172167
->directory('%kernel.cache_dir%/pools')
173-
// Service: cache.doctrine
174-
->defaultDoctrineProvider('app.doctrine_cache')
175168
// Service: cache.psr6
176169
->defaultPsr6Provider('app.my_psr6_service')
177170
// Service: cache.redis
@@ -183,11 +176,6 @@ will create pools with service IDs that follow the pattern ``cache.[type]``.
183176
;
184177
};
185178
186-
.. deprecated:: 5.4
187-
188-
The ``default_doctrine_provider`` option was deprecated in Symfony 5.4 and
189-
it will be removed in Symfony 6.0.
190-
191179
.. _cache-create-pools:
192180

193181
Creating Custom (Namespaced) Pools

components/cache/adapters/doctrine_adapter.rst

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,4 @@ third parameters::
3434
$defaultLifetime = 0
3535
);
3636

37-
.. tip::
38-
39-
A :class:`Symfony\\Component\\Cache\\DoctrineProvider` class is also provided by the
40-
component to use any PSR6-compatible implementations with Doctrine-compatible classes.
41-
42-
.. deprecated:: 5.4
43-
44-
The ``DoctrineProvider`` class was deprecated in Symfony 5.4 and it will
45-
be removed in Symfony 6.0.
46-
4737
.. _`Doctrine Cache`: https://github.com/doctrine/cache

components/security/authentication.rst

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -296,14 +296,9 @@ Authentication Success and Failure Events
296296

297297
When a provider authenticates the user, a ``security.authentication.success``
298298
event is dispatched. But beware - this event may fire, for example, on *every*
299-
request if you have session-based authentication, if ``always_authenticate_before_granting``
300-
is enabled or if token is not authenticated before AccessListener is invoked.
301-
See ``security.interactive_login`` below if you need to do something when a user *actually* logs in.
302-
303-
.. deprecated:: 5.4
304-
305-
The ``always_authenticate_before_granting`` option was deprecated in
306-
Symfony 5.4 and it will be removed in Symfony 6.0.
299+
request if you have session-based authentication, if token is not authenticated
300+
before AccessListener is invoked. See ``security.interactive_login`` below if
301+
you need to do something when a user *actually* logs in.
307302

308303
When a provider attempts authentication but fails (i.e. throws an ``AuthenticationException``),
309304
a ``security.authentication.failure`` event is dispatched. You could listen on

reference/configuration/framework.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2710,12 +2710,6 @@ file
27102710
Use the filesystem to cache annotations
27112711
none
27122712
Disable the caching of annotations
2713-
a service id
2714-
A service id referencing a `Doctrine Cache`_ implementation
2715-
2716-
.. deprecated:: 5.3
2717-
2718-
Using a service ID as the value of ``cache`` is deprecated since Symfony 5.3.
27192713

27202714
file_cache_dir
27212715
..............
@@ -3510,7 +3504,6 @@ to know their differences.
35103504

35113505
.. _`HTTP Host header attacks`: https://www.skeletonscribe.net/2013/05/practical-http-host-header-attacks.html
35123506
.. _`Security Advisory Blog post`: https://symfony.com/blog/security-releases-symfony-2-0-24-2-1-12-2-2-5-and-2-3-3-released#cve-2013-4752-request-gethost-poisoning
3513-
.. _`Doctrine Cache`: https://www.doctrine-project.org/projects/doctrine-cache/en/current/index.html
35143507
.. _`egulias/email-validator`: https://github.com/egulias/EmailValidator
35153508
.. _`RFC 5322`: https://tools.ietf.org/html/rfc5322
35163509
.. _`PhpStormProtocol`: https://github.com/aik099/PhpStormProtocol

reference/configuration/security.rst

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ Configuration
2828
**Basic Options**:
2929

3030
* `access_denied_url`_
31-
* `always_authenticate_before_granting`_
3231
* `anonymous`_
3332
* `erase_credentials`_
3433
* `hide_user_not_found`_
@@ -53,20 +52,6 @@ access_denied_url
5352
Defines the URL where the user is redirected after a ``403`` HTTP error (unless
5453
you define a custom access deny handler). Example: ``/no-permission``
5554

56-
always_authenticate_before_granting
57-
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
58-
59-
**type**: ``boolean`` **default**: ``false``
60-
61-
.. deprecated:: 5.4
62-
63-
The ``always_authenticate_before_granting`` option was deprecated in
64-
Symfony 5.4 and it will be removed in Symfony 6.0.
65-
66-
If ``true``, the user is asked to authenticate before each call to the
67-
``isGranted()`` method in services and controllers or ``is_granted()`` from
68-
templates.
69-
7055
anonymous
7156
~~~~~~~~~
7257

reference/forms/types/options/help.rst.inc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,3 @@ rendered below the field::
1919
'help' => new TranslatableMessage('order.status', ['%order_id%' => $order->getId()], 'store'),
2020
])
2121
;
22-
23-
.. versionadded:: 5.4
24-
25-
Support for passing ``TranslatableMessage`` objects was introduced in Symfony 5.4.

security.rst

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -452,18 +452,8 @@ you to control *every* part of the authentication process (see the next section)
452452
Guard Authenticators
453453
~~~~~~~~~~~~~~~~~~~~
454454

455-
.. deprecated:: 5.3
456-
457-
Guard authenticators are deprecated since Symfony 5.3 in favor of the
458-
:doc:`new authenticator-based system </security/authenticator_manager>`.
459-
460-
A Guard authenticator is a class that gives you *complete* control over your
461-
authentication process. There are many different ways to build an authenticator;
462-
here are a few common use-cases:
463-
464-
* :doc:`/security/form_login_setup`
465-
* :doc:`/security/guard_authentication` – see this for the most detailed
466-
description of authenticators and how they work
455+
Guard authenticators are deprecated in favor of the
456+
:doc:`new authenticator-based system </security/authenticator_manager>`.
467457

468458
Limiting Login Attempts
469459
~~~~~~~~~~~~~~~~~~~~~~~
@@ -1436,7 +1426,7 @@ Frequently Asked Questions
14361426
**Can I have Multiple Firewalls?**
14371427
Yes! But it's usually not necessary. Each firewall is like a separate security
14381428
system. And so, unless you have *very* different authentication needs, one
1439-
firewall usually works well. With :doc:`Guard authentication </security/guard_authentication>`,
1429+
firewall usually works well. With the :doc:`authenticator-based security </security/authenticator_manager>`,
14401430
you can create various, diverse ways of allowing authentication (e.g. form login,
14411431
API key authentication and LDAP) all under the same firewall.
14421432

@@ -1479,7 +1469,6 @@ Authentication (Identifying/Logging in the User)
14791469
security/form_login_setup
14801470
security/reset_password
14811471
security/json_login_setup
1482-
security/guard_authentication
14831472
security/password_migration
14841473
security/auth_providers
14851474
security/user_provider
@@ -1488,7 +1477,6 @@ Authentication (Identifying/Logging in the User)
14881477
security/impersonating_user
14891478
security/user_checkers
14901479
security/named_hashers
1491-
security/multiple_guard_authenticators
14921480
security/firewall_restriction
14931481
security/csrf
14941482
security/custom_authentication_provider

security/authenticator_manager.rst

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -266,14 +266,6 @@ The authenticator-based system dropped support for these providers and
266266
introduced a new authenticator interface as a base for custom
267267
authentication methods.
268268

269-
.. tip::
270-
271-
:doc:`Guard authenticators </security/guard_authentication>` are still
272-
supported in the authenticator-based system. It is however recommended
273-
to also update these when you're refactoring your application to the
274-
new system. The new authenticator interface has many similarities with the
275-
guard authenticator interface, making the rewrite easier.
276-
277269
Authenticators should implement the
278270
:class:`Symfony\\Component\\Security\\Http\\Authenticator\\AuthenticatorInterface`.
279271
You can also extend

security/form_login_setup.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ and your generated code may be slightly different:
4545
Support for login form authentication was added to ``make:auth`` in MakerBundle 1.8.
4646

4747
This generates the following: 1) login/logout routes & controller, 2) a template that
48-
renders the login form, 3) a :doc:`Guard authenticator </security/guard_authentication>`
48+
renders the login form, 3) an :doc:`authenticator </security/authenticator_manager>`
4949
class that processes the login submit and 4) updates the main security config file.
5050

5151
**Step 1.** The ``/login``/``/logout`` routes & controller::
@@ -405,9 +405,9 @@ you have:
405405
.. image:: /_images/security/symfony_loggedin_wdt.png
406406
:align: center
407407

408-
The Guard authentication system is powerful, and you can customize your authenticator
408+
The authentication system is powerful, and you can customize your authenticator
409409
class to do whatever you need. To learn more about what the individual methods do,
410-
see :doc:`/security/guard_authentication`.
410+
see :doc:`/security/authenticator_manager`.
411411

412412
Controlling Error Messages
413413
--------------------------

0 commit comments

Comments
 (0)