symfony
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
Lines changed: 1 addition & 18 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/AssetsInstallCommand.php
Lines changed: 1 addition & 18 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
Lines changed: 1 addition & 18 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/CachePoolClearCommand.php
Lines changed: 1 addition & 18 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
Lines changed: 1 addition & 18 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/CacheWarmupCommand.php
Lines changed: 1 addition & 18 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
Lines changed: 1 addition & 29 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/EventDispatcherDebugCommand.php
Lines changed: 1 addition & 29 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
Lines changed: 1 addition & 38 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/RouterDebugCommand.php
Lines changed: 1 addition & 38 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
Lines changed: 1 addition & 38 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/RouterMatchCommand.php
Lines changed: 1 addition & 38 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
Lines changed: 1 addition & 38 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationDebugCommand.php
Lines changed: 1 addition & 38 deletions
diff --git a/‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
Lines changed: 1 addition & 34 deletions b/‎src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
Lines changed: 1 addition & 34 deletions
@@ -37,19 +37,8 @@ class AssetsInstallCommand extends ContainerAwareCommand
 
     private $filesystem;
 
-    /**
-     * @param Filesystem $filesystem
-     */
B41A
-    public function __construct($filesystem = null)
+    public function __construct(Filesystem $filesystem)
     {
-        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);
-
-            parent::__construct($filesystem);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->filesystem = $filesystem;
@@ -96,12 +85,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->filesystem) {
-            $this->filesystem = $this->getContainer()->get('filesystem');
-            $baseDir = $this->getContainer()->getParameter('kernel.project_dir');
-        }
-
         $kernel = $this->getApplication()->getKernel();
         $targetArg = rtrim($input->getArgument('target'), '/');
 
 
@@ -27,19 +27,8 @@ final class CachePoolClearCommand extends ContainerAwareCommand
 {
     private $poolClearer;
 
-    /**
-     * @param Psr6CacheClearer $poolClearer
-     */
-    public function __construct($poolClearer = null)
+    public function __construct(Psr6CacheClearer $poolClearer)
     {
-        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);
-
-            parent::__construct($poolClearer);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->poolClearer = $poolClearer;
@@ -70,12 +59,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->poolClearer) {
-            $this->poolClearer = $this->getContainer()->get('cache.global_clearer');
-            $cacheDir = $this->getContainer()->getParameter('kernel.cache_dir');
-        }
-
         $io = new SymfonyStyle($input, $output);
         $kernel = $this->getApplication()->getKernel();
         $pools = array();
 
@@ -28,19 +28,8 @@ class CacheWarmupCommand extends ContainerAwareCommand
 {
     private $cacheWarmer;
 
-    /**
-     * @param CacheWarmerAggregate $cacheWarmer
-     */
-    public function __construct($cacheWarmer = null)
+    public function __construct(CacheWarmerAggregate $cacheWarmer)
     {
-        if (!$cacheWarmer instanceof CacheWarmerAggregate) {
-            @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);
-
-            parent::__construct($cacheWarmer);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->cacheWarmer = $cacheWarmer;
@@ -77,12 +66,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->cacheWarmer) {
-            $this->cacheWarmer = $this->getContainer()->get('cache_warmer');
-            $cacheDir = $this->getContainer()->getParameter('kernel.cache_dir');
-        }
-
         $io = new SymfonyStyle($input, $output);
 
         $kernel = $this->getApplication()->getKernel();
 
@@ -30,19 +30,8 @@ class EventDispatcherDebugCommand extends ContainerAwareCommand
 {
     private $dispatcher;
 
-    /**
-     * @param EventDispatcherInterface $dispatcher
-     */
-    public function __construct($dispatcher = null)
+    public function __construct(EventDispatcherInterface $dispatcher)
     {
-        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);
-
-            parent::__construct($dispatcher);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->dispatcher = $dispatcher;
@@ -81,11 +70,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->dispatcher) {
-            $this->dispatcher = $this->getEventDispatcher();
-        }
-
         $io = new SymfonyStyle($input, $output);
 
         $options = array();
@@ -105,16 +89,4 @@ protected function execute(InputInterface $input, OutputInterface $output)
         $options['output'] = $io;
         $helper->describe($io, $this->dispatcher, $options);
     }
-
-    /**
-     * Loads the Event Dispatcher from the container.
-     *
-     * BC to removed in 4.0
-     *
-     * @return EventDispatcherInterface
-     */
-    protected function getEventDispatcher()
-    {
-        return $this->getContainer()->get('event_dispatcher');
-    }
 }
@@ -34,45 +34,13 @@ class RouterDebugCommand extends ContainerAwareCommand
 {
     private $router;
 
-    /**
-     * @param RouterInterface $router
-     */
-    public function __construct($router = null)
+    public function __construct(RouterInterface $router)
     {
-        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);
-
-            parent::__construct($router);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->router = $router;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
-     */
-    public function isEnabled()
-    {
-        if (null !== $this->router) {
-            return parent::isEnabled();
-        }
-        if (!$this->getContainer()->has('router')) {
-            return false;
-        }
-        $router = $this->getContainer()->get('router');
-        if (!$router instanceof RouterInterface) {
-            return false;
-        }
-
-        return parent::isEnabled();
     }
-
     /**
      * {@inheritdoc}
      */
@@ -104,11 +72,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->router) {
-            $this->router = $this->getContainer()->get('router');
-        }
-
         $io = new SymfonyStyle($input, $output);
         $name = $input->getArgument('name');
         $helper = new DescriptorHelper();
 
@@ -31,45 +31,13 @@ class RouterMatchCommand extends ContainerAwareCommand
 {
     private $router;
 
-    /**
-     * @param RouterInterface $router
-     */
-    public function __construct($router = null)
+    public function __construct(RouterInterface $router)
     {
-        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);
-
-            parent::__construct($router);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->router = $router;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
-     */
-    public function isEnabled()
-    {
-        if (null !== $this->router) {
-            return parent::isEnabled();
-        }
-        if (!$this->getContainer()->has('router')) {
-            return false;
-        }
-        $router = $this->getContainer()->get('router');
-        if (!$router instanceof RouterInterface) {
-            return false;
-        }
-
-        return parent::isEnabled();
-    }
-
     /**
      * {@inheritdoc}
      */
@@ -103,11 +71,6 @@ protected function configure()
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->router) {
-            $this->router = $this->getContainer()->get('router');
-        }
-
         $io = new SymfonyStyle($input, $output);
 
         $context = $this->router->getContext();
 
@@ -44,21 +44,8 @@ class TranslationDebugCommand extends ContainerAwareCommand
     private $loader;
     private $extractor;
 
-    /**
-     * @param TranslatorInterface $translator
-     * @param TranslationLoader   $loader
-     * @param ExtractorInterface  $extractor
-     */
-    public function __construct($translator = null, TranslationLoader $loader = null, ExtractorInterface $extractor = null)
+    public function __construct(TranslatorInterface $translator, TranslationLoader $loader, ExtractorInterface $extractor)
     {
-        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);
-
-            parent::__construct($translator);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->translator = $translator;
@@ -116,35 +103,11 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
-     */
-    public function isEnabled()
-    {
-        if (null !== $this->translator) {
-            return parent::isEnabled();
-        }
-        if (!class_exists('Symfony\Component\Translation\Translator')) {
-            return false;
-        }
-
-        return parent::isEnabled();
-    }
-
     /**
      * {@inheritdoc}
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->translator) {
-            $this->translator = $this->getContainer()->get('translator');
-            $this->loader = $this->getContainer()->get('translation.loader');
-            $this->extractor = $this->getContainer()->get('translation.extractor');
-        }
-
         $io = new SymfonyStyle($input, $output);
 
         $locale = $input->getArgument('locale');
 
@@ -44,16 +44,8 @@ class TranslationUpdateCommand extends ContainerAwareCommand
      * @param ExtractorInterface $extractor
      * @param string             $defaultLocale
      */
-    public function __construct($writer = null, TranslationLoader $loader = null, ExtractorInterface $extractor = null, $defaultLocale = null)
+    public function __construct(TranslationWriter $writer, TranslationLoader $loader, ExtractorInterface $extractor, $defaultLocale)
     {
-        if (!$writer instanceof TranslationWriter) {
-            @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);
-
-            parent::__construct($writer);
-
-            return;
-        }
-
         parent::__construct();
 
         $this->writer = $writer;
@@ -100,36 +92,11 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     *
-     * BC to be removed in 4.0
-     */
-    public function isEnabled()
-    {
-        if (null !== $this->writer) {
-            return parent::isEnabled();
-        }
-        if (!class_exists('Symfony\Component\Translation\Translator')) {
-            return false;
-        }
-
-        return parent::isEnabled();
-    }
-
     /**
      * {@inheritdoc}
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        // BC to be removed in 4.0
-        if (null === $this->writer) {
-            $this->writer = $this->getContainer()->get('translation.writer');
-            $this->loader = $this->getContainer()->get('translation.loader');
-            $this->extractor = $this->getContainer()->get('translation.extractor');
-            $this->defaultLocale = $this->getContainer()->getParameter('kernel.default_locale');
-        }
-
         $io = new SymfonyStyle($input, $output);
         $errorIo = $io->getErrorStyle();