Support event dispatcher for command by default. (#4678)

Author: limingxinleo

src/Command.php

@@ -29,7 +29,7 @@
 
 abstract class Command extends SymfonyCommand
 {
-    use EnableEventDispatcher;
+    use DisableEventDispatcher;
 
     /**
      * The name of the command.
@@ -96,7 +96,7 @@ public function __construct(string $name = null)
             ! empty($this->description) && $this->setDescription($this->description);
         }
 
-        $this->addEnableDispatcherOption();
+        $this->addDisableDispatcherOption();
     }
 
     /**
@@ -413,7 +413,8 @@ protected function configure()
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->enableDispatcher($input);
+        $this->disableDispatcher($input);
+
         $callback = function () {
             try {
                 $this->eventDispatcher && $this->eventDispatcher->dispatch(new Event\BeforeHandle($this));

src/DisableEventDispatcher.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  [email protected]
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Command;
+
+use Hyperf\Utils\ApplicationContext;
+use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+trait DisableEventDispatcher
+{
+    public function addDisableDispatcherOption()
+    {
+        $this->addOption('disable-event-dispatcher', null, InputOption::VALUE_NONE, 'Whether disable event dispatcher.');
+    }
+
+    public function disableDispatcher(InputInterface $input)
+    {
+        if (! $input->getOption('disable-event-dispatcher')) {
+            if (! ApplicationContext::hasContainer()) {
+                return;
+            }
+
+            $container = ApplicationContext::getContainer();
+            if (! $container->has(EventDispatcherInterface::class)) {
+                return;
+            }
+
+            $dispatcher = $container->get(EventDispatcherInterface::class);
+
+            $this->eventDispatcher = $dispatcher instanceof EventDispatcherInterface ? $dispatcher : null;
+        }
+    }
+}

src/EnableEventDispatcher.php

@@ -11,6 +11,7 @@
  */
 namespace HyperfTest\Command;
 
+use Hyperf\Utils\ApplicationContext;
 use Hyperf\Utils\Reflection\ClassInvoker;
 use HyperfTest\Command\Command\DefaultSwooleFlagsCommand;
 use HyperfTest\Command\Command\FooCommand;
@@ -19,6 +20,8 @@
 use HyperfTest\Command\Command\SwooleFlagsCommand;
 use Mockery;
 use PHPUnit\Framework\TestCase;
+use Psr\Container\ContainerInterface;
+use Psr\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 
@@ -47,6 +50,9 @@ public function testHookFlags()
      */
     public function testExitCodeWhenThrowException()
     {
+        ApplicationContext::setContainer($container = Mockery::mock(ContainerInterface::class));
+        $container->shouldReceive('has')->with(EventDispatcherInterface::class)->andReturnFalse();
+
         /** @var FooExceptionCommand $command */
         $command = new ClassInvoker(new FooExceptionCommand('foo'));
         $input = Mockery::mock(InputInterface::class);