minor symfony#24074 Fix deprecations regarding core commands registered as services (chalasr)

fabpot · fabpot · commit b80d8c891799 · 2017-09-03T08:42:17.000-07:00
This PR was merged into the 3.4 branch. Discussion ---------- Fix deprecations regarding core commands registered as services | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | no | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | symfony#23624 (comment) | License | MIT | Doc PR | n/a Current deprecation messages can be confusing (see fixed ticket), this improves them and adds a bunch of missing CHANGELOG/UPGRADE entries on the same topic Commits ------- 4659975 Fix deprecations regarding core commands registered as services
diff --git a/UPGRADE-3.4.md b/UPGRADE-3.4.md
@@ -120,7 +120,52 @@ FrameworkBundle
    class has been deprecated and will be removed in 4.0. Use the
    `Symfony\Component\Translation\Reader\TranslationReader` class instead.
    
- * The `translation.loader` service has been deprecated and will be removed in 4.0. Use the `translation.reader` service instead.
+ * The `translation.loader` service has been deprecated and will be removed in 4.0.
+   Use the `translation.reader` service instead..
+
+ * `AssetsInstallCommand::__construct()` now takes an instance of
+   `Symfony\Component\Filesystem\Filesystem` as first argument.
+   Not passing it is deprecated and will throw a `TypeError` in 4.0.
+
+ * `CacheClearCommand::__construct()` now takes an instance of
+   `Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `CachePoolClearCommand::__construct()` now takes an instance of
+   `Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `EventDispatcherDebugCommand::__construct()` now takes an instance of
+   `Symfony\Component\EventDispatcher\EventDispatcherInterface` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `RouterDebugCommand::__construct()` now takes an instance of
+   `Symfony\Component\Routing\RouterInteface` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `RouterMatchCommand::__construct()` now takes an instance of
+   `Symfony\Component\Routing\RouterInteface` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `TranslationDebugCommand::__construct()` now takes an instance of
+   `Symfony\Component\Translation\TranslatorInterface` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `TranslationUpdateCommand::__construct()` now takes an instance of
+   `Symfony\Component\Translation\TranslatorInterface` as
+    first argument. Not passing it is deprecated and will throw
+    a `TypeError` in 4.0.
+
+ * `AssetsInstallCommand`, `CacheClearCommand`, `CachePoolClearCommand`,
+   `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`,
+   `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
+    and `YamlLintCommand` classes have been marked as final
 
 HttpKernel
 ----------
@@ -170,6 +215,15 @@ SecurityBundle
 
  * `FirewallContext::getListeners()` now returns `\Traversable|array`
 
+ * `InitAclCommand::__construct()` now takes an instance of
+   `Doctrine\DBAL\Connection`  as first argument. Not passing it is
+    deprecated and will throw a `TypeError` in 4.0.
+
+ * `SetAclCommand::__construct()` now takes an instance of
+   `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
+    as first argument. Not passing it is deprecated and will throw a `TypeError`
+    in 4.0.
+
 Translation
 -----------
 
diff --git a/UPGRADE-4.0.md b/UPGRADE-4.0.md
@@ -419,8 +419,40 @@ FrameworkBundle
    class has been deprecated and will be removed in 4.0. Use the
    `Symfony\Component\Translation\Reader\TranslationReader` class instead.
 
- * The `translation.loader` service has been deprecated and will be removed in 4.0. Use the `translation.reader` service instead.
+ * The `translation.loader` service has been removed.
+   Use the `translation.reader` service instead.
  
+ * `AssetsInstallCommand::__construct()` now requires an instance of
+   `Symfony\Component\Filesystem\Filesystem` as first argument.
+
+ * `CacheClearCommand::__construct()` now requires an instance of
+   `Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface` as
+    first argument.
+
+ * `CachePoolClearCommand::__construct()` now requires an instance of
+   `Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer` as
+    first argument.
+
+ * `EventDispatcherDebugCommand::__construct()` now requires an instance of
+   `Symfony\Component\EventDispatcher\EventDispatcherInterface` as
+    first argument.
+
+ * `RouterDebugCommand::__construct()` now requires an instance of
+   `Symfony\Component\Routing\RouterInteface` as
+    first argument.
+
+ * `RouterMatchCommand::__construct()` now requires an instance of
+   `Symfony\Component\Routing\RouterInteface` as
+    first argument.
+
+ * `TranslationDebugCommand::__construct()` now requires an instance of
+   `Symfony\Component\Translation\TranslatorInterface` as
+    first argument.
+
+ * `TranslationUpdateCommand::__construct()` now requires an instance of
+   `Symfony\Component\Translation\TranslatorInterface` as
+    first argument.
+
 HttpFoundation
 --------------
 
@@ -570,6 +602,13 @@ SecurityBundle
 
  * `UserPasswordEncoderCommand` does not extend `ContainerAwareCommand` nor implement `ContainerAwareInterface` anymore.
 
+ * `InitAclCommand::__construct()` now requires an instance of
+   `Doctrine\DBAL\Connection`  as first argument.
+
+ * `SetAclCommand::__construct()` now requires an instance of
+   `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
+    as first argument.
+
 Serializer
 ----------
 
@@ -644,11 +683,12 @@ TwigBridge
  * The `TwigRendererEngine::setEnvironment()` method has been removed.
    Pass the Twig Environment as second argument of the constructor instead.
 
- * Removed `Symfony\Bridge\Twig\Command\DebugCommand::set/getTwigEnvironment` and the ability
-   to pass a command name as first argument.
+ * Removed `DebugCommand::set/getTwigEnvironment`. Pass an instance of
+   `Twig\Environment` as first argument of the constructor instead.
+
+ * Removed `LintCommand::set/getTwigEnvironment`. Pass an instance of
+   `Twig\Environment` as first argument of the constructor instead.
 
- * Removed `Symfony\Bridge\Twig\Command\LintCommand::set/getTwigEnvironment` and the ability
-   to pass a command name as first argument.
 
 Validator
 ---------
diff --git a/src/Symfony/Bridge/Twig/CHANGELOG.md b/src/Symfony/Bridge/Twig/CHANGELOG.md
@@ -5,8 +5,10 @@ CHANGELOG
 -----
 
  * deprecated `Symfony\Bridge\Twig\Form\TwigRenderer`
- * deprecated `Symfony\Bridge\Twig\Command\DebugCommand::set/getTwigEnvironment` and the ability to pass a command name as first argument
- * deprecated `Symfony\Bridge\Twig\Command\LintCommand::set/getTwigEnvironment` and the ability to pass a command name as first argument
+ * deprecated `DebugCommand::set/getTwigEnvironment`. Pass an instance of
+   `Twig\Environment` as first argument  of the constructor instead
+ * deprecated `LintCommand::set/getTwigEnvironment`. Pass an instance of
+   `Twig\Environment` as first argument of the constructor instead
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md b/src/Symfony/Bundle/FrameworkBundle/CHANGELOG.md
@@ -26,6 +26,33 @@ CHANGELOG
  * Deprecated `Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader`, use 
    `Symfony\Component\Translation\Reader\TranslationReader` instead
  * Deprecated `translation.loader` service, use `translation.reader` instead
+ * `AssetsInstallCommand::__construct()` now takes an instance of
+   `Symfony\Component\Filesystem\Filesystem` as first argument
+ * `CacheClearCommand::__construct()` now takes an instance of
+   `Symfony\Component\HttpKernel\CacheClearer\CacheClearerInterface` as
+    first argument
+ * `CachePoolClearCommand::__construct()` now takes an instance of
+   `Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer` as
+    first argument
+ * `EventDispatcherDebugCommand::__construct()` now takes an instance of
+   `Symfony\Component\EventDispatcher\EventDispatcherInterface` as
+    first argument
+ * `RouterDebugCommand::__construct()` now takes an instance of
+   `Symfony\Component\Routing\RouterInteface` as
+    first argument
+ * `RouterMatchCommand::__construct()` now takes an instance of
+   `Symfony\Component\Routing\RouterInteface` as
+    first argument
+ * `TranslationDebugCommand::__construct()` now takes an instance of
+   `Symfony\Component\Translation\TranslatorInterface` as
+    first argument
+ * `TranslationUpdateCommand::__construct()` now takes an instance of
+   `Symfony\Component\Translation\TranslatorInterface` as
+    first argument
+ * `AssetsInstallCommand`, `CacheClearCommand`, `CachePoolClearCommand`,
+   `EventDispatcherDebugCommand`, `RouterDebugCommand`, `RouterMatchCommand`,
+   `TranslationDebugCommand`, `TranslationUpdateCommand`, `XliffLintCommand`
+    and `YamlLintCommand` classes have been marked as final
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
@@ -45,7 +45,7 @@ class AssetsInstallCommand extends ContainerAwareCommand
     public function __construct($filesystem = null)
     {
         if (!$filesystem instanceof Filesystem) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Filesystem::class), E_USER_DEPRECATED);
 
             parent::__construct($filesystem);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CacheClearCommand.php
@@ -45,7 +45,7 @@ class CacheClearCommand extends ContainerAwareCommand
     public function __construct($cacheClearer = null, Filesystem $filesystem = null)
     {
         if (!$cacheClearer instanceof CacheClearerInterface) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, CacheClearerInterface::class), E_USER_DEPRECATED);
 
             parent::__construct($cacheClearer);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
@@ -35,7 +35,7 @@ final class CachePoolClearCommand extends ContainerAwareCommand
     public function __construct($poolClearer = null)
     {
         if (!$poolClearer instanceof Psr6CacheClearer) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Psr6CacheClearer::class), E_USER_DEPRECATED);
 
             parent::__construct($poolClearer);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
@@ -37,7 +37,7 @@ class EventDispatcherDebugCommand extends ContainerAwareCommand
     public function __construct($dispatcher = null)
     {
         if (!$dispatcher instanceof EventDispatcherInterface) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, EventDispatcherInterface::class), E_USER_DEPRECATED);
 
             parent::__construct($dispatcher);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
@@ -41,7 +41,7 @@ class RouterDebugCommand extends ContainerAwareCommand
     public function __construct($router = null)
     {
         if (!$router instanceof RouterInterface) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, RouterInterface::class), E_USER_DEPRECATED);
 
             parent::__construct($router);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
@@ -39,7 +39,7 @@ class RouterMatchCommand extends ContainerAwareCommand
     public function __construct($router = null)
     {
         if (!$router instanceof RouterInterface) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, RouterInterface::class), E_USER_DEPRECATED);
 
             parent::__construct($router);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
@@ -54,7 +54,7 @@ class TranslationDebugCommand extends ContainerAwareCommand
     public function __construct($translator = null, TranslationReaderInterface $reader = null, ExtractorInterface $extractor = null)
     {
         if (!$translator instanceof TranslatorInterface) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, TranslatorInterface::class), E_USER_DEPRECATED);
 
             parent::__construct($translator);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php b/src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
@@ -49,7 +49,7 @@ class TranslationUpdateCommand extends ContainerAwareCommand
     public function __construct($writer = null, TranslationReaderInterface $reader = null, ExtractorInterface $extractor = null, $defaultLocale = null)
     {
         if (!$writer instanceof TranslationWriterInterface) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, TranslationWriterInterface::class), E_USER_DEPRECATED);
 
             parent::__construct($writer);
 
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterDebugCommandTest.php
@@ -49,7 +49,7 @@ public function testDebugInvalidRoute()
 
     /**
      * @group legacy
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
      */
     public function testLegacyDebugCommand()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/RouterMatchCommandTest.php
@@ -43,8 +43,8 @@ public function testWithNotMatchPath()
 
     /**
      * @group legacy
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterMatchCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\RouterDebugCommand::__construct() expects an instance of "Symfony\Component\Routing\RouterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
      */
     public function testLegacyMatchCommand()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationDebugCommandTest.php
@@ -176,7 +176,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
 
     /**
      * @group legacy
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\TranslationDebugCommand::__construct() expects an instance of "Symfony\Component\Translation\TranslatorInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
      */
     public function testLegacyDebugCommand()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Command/TranslationUpdateCommandTest.php
@@ -155,7 +155,7 @@ private function createCommandTester($extractedMessages = array(), $loadedMessag
 
     /**
      * @group legacy
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\TranslationUpdateCommand::__construct() expects an instance of "Symfony\Component\Translation\Writer\TranslationWriterInterface" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
      */
     public function testLegacyUpdateCommand()
     {
diff --git a/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php b/src/Symfony/Bundle/FrameworkBundle/Tests/Functional/CachePoolClearCommandTest.php
@@ -77,7 +77,7 @@ public function testClearUnexistingPool()
 
     /**
      * @group legacy
-     * @expectedDeprecation Passing a command name as the first argument of "Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand::__construct" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.
+     * @expectedDeprecation Symfony\Bundle\FrameworkBundle\Command\CachePoolClearCommand::__construct() expects an instance of "Symfony\Component\HttpKernel\CacheClearer\Psr6CacheClearer" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.
      */
     public function testLegacyClearCommand()
     {
diff --git a/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md b/src/Symfony/Bundle/SecurityBundle/CHANGELOG.md
@@ -8,6 +8,11 @@ CHANGELOG
    `VoterInterface` on the class is now deprecated and will be removed in 4.0.
  * [BC BREAK] `FirewallContext::getListeners()` now returns `\Traversable|array`
  * added info about called security listeners in profiler 
+ * `InitAclCommand::__construct()` now takes an instance of
+   `Doctrine\DBAL\Connection`  as first argument
+ * `SetAclCommand::__construct()` now takes an instance of
+   `Symfony\Component\Security\Acl\Model\MutableAclProviderInterfaceConnection`
+   as first argument
 
 3.3.0
 -----
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/InitAclCommand.php
@@ -39,7 +39,7 @@ class InitAclCommand extends ContainerAwareCommand
     public function __construct($connection = null, Schema $schema = null)
     {
         if (!$connection instanceof Connection) {
-            @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);
+            @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Connection::class), E_USER_DEPRECATED);
 
             parent::__construct($connection);
 
diff --git a/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php b/src/Symfony/Bundle/SecurityBundle/Command/SetAclCommand.php

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class AssetsInstallCommand extends ContainerAwareCommand`
`45`	`45`	`public function __construct($filesystem = null)`
`46`	`46`	`{`
`47`	`47`	`if (!$filesystem instanceof Filesystem) {`
`48`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`48`	`+ @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Filesystem::class), E_USER_DEPRECATED);`
`49`	`49`
`50`	`50`	`parent::__construct($filesystem);`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ class CacheClearCommand extends ContainerAwareCommand`
`45`	`45`	`public function __construct($cacheClearer = null, Filesystem $filesystem = null)`
`46`	`46`	`{`
`47`	`47`	`if (!$cacheClearer instanceof CacheClearerInterface) {`
`48`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`48`	`+ @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, CacheClearerInterface::class), E_USER_DEPRECATED);`
`49`	`49`
`50`	`50`	`parent::__construct($cacheClearer);`
`51`	`51`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ final class CachePoolClearCommand extends ContainerAwareCommand`
`35`	`35`	`public function __construct($poolClearer = null)`
`36`	`36`	`{`
`37`	`37`	`if (!$poolClearer instanceof Psr6CacheClearer) {`
`38`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`38`	`+ @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, Psr6CacheClearer::class), E_USER_DEPRECATED);`
`39`	`39`
`40`	`40`	`parent::__construct($poolClearer);`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class EventDispatcherDebugCommand extends ContainerAwareCommand`
`37`	`37`	`public function __construct($dispatcher = null)`
`38`	`38`	`{`
`39`	`39`	`if (!$dispatcher instanceof EventDispatcherInterface) {`
`40`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`40`	`+ @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, EventDispatcherInterface::class), E_USER_DEPRECATED);`
`41`	`41`
`42`	`42`	`parent::__construct($dispatcher);`
`43`	`43`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class RouterDebugCommand extends ContainerAwareCommand`
`41`	`41`	`public function __construct($router = null)`
`42`	`42`	`{`
`43`	`43`	`if (!$router instanceof RouterInterface) {`
`44`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`44`	`+ @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, RouterInterface::class), E_USER_DEPRECATED);`
`45`	`45`
`46`	`46`	`parent::__construct($router);`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ class RouterMatchCommand extends ContainerAwareCommand`
`39`	`39`	`public function __construct($router = null)`
`40`	`40`	`{`
`41`	`41`	`if (!$router instanceof RouterInterface) {`
`42`		`- @trigger_error(sprintf('Passing a command name as the first argument of "%s" is deprecated since version 3.4 and will be removed in 4.0. If the command was registered by convention, make it a service instead.', __METHOD__), E_USER_DEPRECATED);`
	`42`	`+ @trigger_error(sprintf('%s() expects an instance of "%s" as first argument since version 3.4. Not passing it is deprecated and will throw a TypeError in 4.0.', __METHOD__, RouterInterface::class), E_USER_DEPRECATED);`
`43`	`43`
`44`	`44`	`parent::__construct($router);`
`45`	`45`