Move ConfirmableTrait/DisableEventDispatcher/NullDisableEventDispatcher to Concerns (#5882)

Author: huangdijia

src/Command.php

@@ -35,7 +35,7 @@
 
 abstract class Command extends SymfonyCommand
 {
-    use DisableEventDispatcher;
+    use Concerns\DisableEventDispatcher;
 
     /**
      * The name of the command.

src/Concerns/Confirmable.php

@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Command\Concerns;
+
+use Closure;
+
+use function Hyperf\Support\value;
+
+trait Confirmable
+{
+    /**
+     * Confirm before proceeding with the action.
+     *
+     * This method only asks for confirmation in production.
+     */
+    public function confirmToProceed(string $warning = 'Application In Production!', null|bool|Closure $callback = null): bool
+    {
+        $callback ??= $this->isShouldConfirm();
+
+        $shouldConfirm = value($callback);
+
+        if ($shouldConfirm) {
+            if ($this->input->getOption('force')) {
+                return true;
+            }
+
+            $this->alert($warning);
+
+            $confirmed = $this->confirm('Do you really wish to run this command?');
+
+            if (! $confirmed) {
+                $this->comment('Command Cancelled!');
+
+                return false;
+            }
+        }
+
+        return true;
+    }
+
+    protected function isShouldConfirm(): bool
+    {
+        return is_callable(['Composer\InstalledVersions', 'getRootPackage'])
+            && (\Composer\InstalledVersions::getRootPackage()['dev'] ?? false) === false;
+    }
+}

src/Concerns/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  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Command\Concerns;
+
+use Hyperf\Context\ApplicationContext;
+use Psr\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+
+trait DisableEventDispatcher
+{
+    public function addDisableDispatcherOption(): void
+    {
+        $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/Concerns/NullDisableEventDispatcher.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * This file is part of Hyperf.
+ *
+ * @link     https://www.hyperf.io
+ * @document https://hyperf.wiki
+ * @contact  group@hyperf.io
+ * @license  https://github.com/hyperf/hyperf/blob/master/LICENSE
+ */
+namespace Hyperf\Command\Concerns;
+
+use Symfony\Component\Console\Input\InputInterface;
+
+trait NullDisableEventDispatcher
+{
+    public function addDisableDispatcherOption(): void
+    {
+    }
+
+    public function disableDispatcher(InputInterface $input)
+    {
+    }
+}

src/ConfirmableTrait.php

@@ -11,45 +11,10 @@
  */
 namespace Hyperf\Command;
 
-use Closure;
-
-use function Hyperf\Support\value;
-
+/**
+ * @deprecated since 3.0.27, remove in 3.1.0, use \Hyperf\Command\Concerns\Confirmable instead.
+ */
 trait ConfirmableTrait
 {
-    /**
-     * Confirm before proceeding with the action.
-     *
-     * This method only asks for confirmation in production.
-     */
-    public function confirmToProceed(string $warning = 'Application In Production!', null|bool|Closure $callback = null): bool
-    {
-        $callback ??= $this->isShouldConfirm();
-
-        $shouldConfirm = value($callback);
-
-        if ($shouldConfirm) {
-            if ($this->input->getOption('force')) {
-                return true;
-            }
-
-            $this->alert($warning);
-
-            $confirmed = $this->confirm('Do you really wish to run this command?');
-
-            if (! $confirmed) {
-                $this->comment('Command Cancelled!');
-
-                return false;
-            }
-        }
-
-        return true;
-    }
-
-    protected function isShouldConfirm(): bool
-    {
-        return is_callable(['Composer\InstalledVersions', 'getRootPackage'])
-            && (\Composer\InstalledVersions::getRootPackage()['dev'] ?? false) === false;
-    }
+    use Concerns\Confirmable;
 }

src/DisableEventDispatcher.php

@@ -11,33 +11,10 @@
  */
 namespace Hyperf\Command;
 
-use Hyperf\Context\ApplicationContext;
-use Psr\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-
+/**
+ * @deprecated since 3.0.27, remove in 3.1.0, use \Hyperf\Command\Concerns\DisableEventDispatcher instead.
+ */
 trait DisableEventDispatcher
 {
-    public function addDisableDispatcherOption(): void
-    {
-        $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;
-        }
-    }
+    use Concerns\DisableEventDispatcher;
 }

src/NullDisableEventDispatcher.php

@@ -11,15 +11,10 @@
  */
 namespace Hyperf\Command;
 
-use Symfony\Component\Console\Input\InputInterface;
-
+/**
+ * @deprecated since 3.0.27, remove in 3.1.0, use \Hyperf\Command\Concerns\NullDisableEventDispatcher instead.
+ */
 trait NullDisableEventDispatcher
 {
-    public function addDisableDispatcherOption(): void
-    {
-    }
-
-    public function disableDispatcher(InputInterface $input)
-    {
-    }
+    use Concerns\NullDisableEventDispatcher;
 }