minor #23523 [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer (ro0NL)

fabpot · fabpot · commit 0d72e822eee4 · 2017-07-17T12:07:08.000+02:00
This PR was merged into the 3.3 branch. Discussion ---------- [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer | Q | A | ------------- | --- | Branch? | 3.3 | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #...  | License | MIT | Doc PR | symfony/symfony-docs#...  @ogizanagi in 4.0 it will simply extend `Command` right.. wdyt? Also we dont deprecate `setContainer` is that intentional? Commits ------- 7ea2d04 [SecurityBundle] Clarify deprecation in UserPasswordEncoderCommand::getContainer
diff --git 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
@@ -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
@@ -51,7 +51,7 @@ public function __construct(EncoderFactoryInterface $encoderFactory = null, arra
      */
     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();
     }

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function __construct(EncoderFactoryInterface $encoderFactory = null, arra`
`51`	`51`	`*/`
`52`	`52`	`protected function getContainer()`
`53`	`53`	`{`
`54`		`- @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);`
	`54`	`+ @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);`
`55`	`55`
`56`	`56`	`return parent::getContainer();`
`57`	`57`	`}`