From 7ea2d0437a10905a6352409cc64563864ae5d09f Mon Sep 17 00:00:00 2001 From: Roland Franssen Date: Sat, 15 Jul 2017 14:52:50 +0200 Subject: [PATCH] [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer --- UPGRADE-4.0.md | 2 +- src/Symfony/Bundle/SecurityBundle/CHANGELOG.md | 2 +- .../SecurityBundle/Command/UserPasswordEncoderCommand.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md index 3ce678b866..17818f7368 100644 --- a/UPGRADE-4.0.md +++ b/UPGRADE-4.0.md @@ -443,7 +443,7 @@ SecurityBundle * The `UserPasswordEncoderCommand` class does not allow `null` as the first argument anymore. - * `UserPasswordEncoderCommand` does not implement `ContainerAwareInterface` anymore. + * `UserPasswordEncoderCommand` does not extend `ContainerAwareCommand` nor implement `ContainerAwareInterface` anymore. Serializer ---------- diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md index 4185d409fb..238830fd85 100644 --- a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md +++ b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md @@ -7,7 +7,7 @@ CHANGELOG * Deprecated instantiating `UserPasswordEncoderCommand` without its constructor arguments fully provided. * Deprecated `UserPasswordEncoderCommand::getContainer()` and relying on the - `ContainerAwareInterface` interface for this command. + `ContainerAwareCommand` sub class or `ContainerAwareInterface` implementation for this command. * Deprecated the `FirewallMap::$map` and `$container` properties. * [BC BREAK] Keys of the `users` node for `in_memory` user provider are no longer normalized. * deprecated `FirewallContext::getListeners()` diff --git a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php index a588bdd331..6c3f032749 100644 --- a/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php +++ b/src/Symfony/Bundle/SecurityBundle/Command/UserPasswordEncoderCommand.php @@ -51,7 +51,7 @@ class UserPasswordEncoderCommand extends ContainerAwareCommand */ protected function getContainer() { - @trigger_error(sprintf('Method "%s" is deprecated since version 3.3 and "%s" won\'t implement "%s" anymore in 4.0.', __METHOD__, __CLASS__, ContainerAwareInterface::class), E_USER_DEPRECATED); + @trigger_error(sprintf('Method "%s" is deprecated since version 3.3 and "%s" won\'t extend "%s" nor implement "%s" anymore in 4.0.', __METHOD__, __CLASS__, ContainerAwareCommand::class, ContainerAwareInterface::class), E_USER_DEPRECATED); return parent::getContainer(); }