Stop using DelegateCommand

doctrine · Dec 20, 2018 · 0a5fd39 · 0a5fd39
1 parent fe2d0dc
commit 0a5fd39
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 42 deletions.
diff --git a/Command/Proxy/CollectionRegionDoctrineCommand.php b/Command/Proxy/CollectionRegionDoctrineCommand.php
@@ -3,11 +3,14 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command\Proxy;
 
 use Doctrine\ORM\Tools\Console\Command\ClearCache\CollectionRegionCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command to clear a collection cache region.
  */
-class CollectionRegionDoctrineCommand extends DelegateCommand
+class CollectionRegionDoctrineCommand extends CollectionRegionCommand
 {
     /**
      * {@inheritDoc}
@@ -16,22 +19,16 @@ protected function configure()
     {
         parent::configure();
 
-        $this->setName('doctrine:cache:clear-collection-region');
+        $this
+            ->setName('doctrine:cache:clear-collection-region')
+            ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function createCommand()
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
-        return new CollectionRegionCommand();
-    }
+        DoctrineCommandHelper::setApplicationConnection($this->getApplication(), $input->getOption('connection'));
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function getMinimalVersion()
-    {
-        return '2.5.0-DEV';
+        return parent::execute($input, $output);
     }
+
 }
diff --git a/Command/Proxy/EntityRegionCacheDoctrineCommand.php b/Command/Proxy/EntityRegionCacheDoctrineCommand.php
@@ -3,11 +3,14 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command\Proxy;
 
 use Doctrine\ORM\Tools\Console\Command\ClearCache\EntityRegionCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command to clear a entity cache region.
  */
-class EntityRegionCacheDoctrineCommand extends DelegateCommand
+class EntityRegionCacheDoctrineCommand extends EntityRegionCommand
 {
     /**
      * {@inheritDoc}
@@ -16,22 +19,15 @@ protected function configure()
     {
         parent::configure();
 
-        $this->setName('doctrine:cache:clear-entity-region');
+        $this
+            ->setName('doctrine:cache:clear-entity-region')
+            ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function createCommand()
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
-        return new EntityRegionCommand();
-    }
+        DoctrineCommandHelper::setApplicationConnection($this->getApplication(), $input->getOption('connection'));
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function getMinimalVersion()
-    {
-        return '2.5.0-DEV';
+        return parent::execute($input, $output);
     }
 }
diff --git a/Command/Proxy/QueryRegionCacheDoctrineCommand.php b/Command/Proxy/QueryRegionCacheDoctrineCommand.php
@@ -3,11 +3,14 @@
 namespace Doctrine\Bundle\DoctrineBundle\Command\Proxy;
 
 use Doctrine\ORM\Tools\Console\Command\ClearCache\QueryRegionCommand;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
 
 /**
  * Command to clear a query cache region.
  */
-class QueryRegionCacheDoctrineCommand extends DelegateCommand
+class QueryRegionCacheDoctrineCommand extends QueryRegionCommand
 {
     /**
      * {@inheritDoc}
@@ -16,22 +19,15 @@ protected function configure()
     {
         parent::configure();
 
-        $this->setName('doctrine:cache:clear-query-region');
+        $this
+            ->setName('doctrine:cache:clear-query-region')
+            ->addOption('em', null, InputOption::VALUE_OPTIONAL, 'The entity manager to use for this command');
     }
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function createCommand()
+    protected function execute(InputInterface $input, OutputInterface $output)
     {
-        return new QueryRegionCommand();
-    }
+        DoctrineCommandHelper::setApplicationConnection($this->getApplication(), $input->getOption('connection'));
 
-    /**
-     * {@inheritDoc}
-     */
-    protected function getMinimalVersion()
-    {
-        return '2.5.0-DEV';
+        return parent::execute($input, $output);
     }
 }