refactor: move some abstract class to Concern dir

inhere · Dec 25, 2021 · 7259524 · 7259524
1 parent bc61390
commit 7259524
Show file tree

Hide file tree

Showing 15 changed files with 39 additions and 25 deletions.
diff --git a/src/AbstractApplication.php b/src/AbstractApplication.php
@@ -13,10 +13,10 @@
 use Inhere\Console\Component\ErrorHandler;
 use Inhere\Console\Component\Router;
 use Inhere\Console\Component\Formatter\Title;
-use Inhere\Console\Concern\InputOutputAwareTrait;
-use Inhere\Console\Concern\SimpleEventAwareTrait;
+use Inhere\Console\Decorate\SimpleEventAwareTrait;
 use Inhere\Console\Contract\ApplicationInterface;
 use Inhere\Console\Contract\ErrorHandlerInterface;
+use Inhere\Console\Decorate\InputOutputAwareTrait;
 use Inhere\Console\Decorate\ApplicationHelpTrait;
 use Inhere\Console\Decorate\StyledOutputAwareTrait;
 use Inhere\Console\IO\Input;
@@ -90,7 +90,7 @@ abstract class AbstractApplication implements ApplicationInterface
      */
     protected string $commandName = '';
 
-    /**
+    /*
      * @var string Command delimiter char. e.g dev:serve
      */
 

diff --git a/src/Component/Interact/AbstractSelect.php b/src/Component/Interact/AbstractSelect.php
@@ -9,7 +9,7 @@
 
 namespace Inhere\Console\Component\Interact;
 
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 
 /**
  * class AbstractSelect

diff --git a/src/Component/Interact/Confirm.php b/src/Component/Interact/Confirm.php
@@ -9,7 +9,7 @@
 
 namespace Inhere\Console\Component\Interact;
 
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 use Inhere\Console\Console;
 use Inhere\Console\Util\Show;
 use function stripos;

diff --git a/src/Component/Interact/IShell.php b/src/Component/Interact/IShell.php
@@ -11,7 +11,7 @@
 
 use Closure;
 use Inhere\Console\Component\Formatter\Title;
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 use Inhere\Console\Console;
 use Inhere\Console\Util\Interact;
 use Inhere\Console\Util\Show;

diff --git a/src/Component/Interact/LimitedAsk.php b/src/Component/Interact/LimitedAsk.php
@@ -10,7 +10,7 @@
 namespace Inhere\Console\Component\Interact;
 
 use Closure;
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 use Inhere\Console\Console;
 use Inhere\Console\Util\Show;
 use function sprintf;

diff --git a/src/Component/Interact/Password.php b/src/Component/Interact/Password.php
@@ -9,7 +9,7 @@
 
 namespace Inhere\Console\Component\Interact;
 
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 use RuntimeException;
 use Toolkit\Sys\Sys;
 use Toolkit\Sys\Util\ShellUtil;

diff --git a/src/Component/Interact/Question.php b/src/Component/Interact/Question.php
@@ -10,7 +10,7 @@
 namespace Inhere\Console\Component\Interact;
 
 use Closure;
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 use Inhere\Console\Console;
 use Inhere\Console\Util\Show;
 use function trim;

diff --git a/src/Component/Interact/Terminal.php b/src/Component/Interact/Terminal.php
@@ -9,7 +9,7 @@
 
 namespace Inhere\Console\Component\Interact;
 
-use Inhere\Console\Component\InteractiveHandle;
+use Inhere\Console\Concern\InteractiveHandle;
 
 /**
  * Class Terminal

diff --git a/src/Component/Symbol/GitEmoji.php b/src/Component/Symbol/GitEmoji.php
@@ -0,0 +1,16 @@
+<?php declare(strict_types=1);
+
+namespace Inhere\Console\Component\Symbol;
+
+/**
+ * class GitEmoji
+ *
+ * @author inhere
+ */
+class GitEmoji
+{
+    public static function search(string $key): array
+    {
+        return [];
+    }
+}
diff --git a/src/Component/Interact/AbstractQuestion.php → src/Concern/AbstractQuestion.php b/src/Component/Interact/AbstractQuestion.php → src/Concern/AbstractQuestion.php
@@ -7,9 +7,8 @@
  * @license  https://github.com/inhere/php-console/blob/master/LICENSE
  */
 
-namespace Inhere\Console\Component\Interact;
+namespace Inhere\Console\Concern;
 
-use Inhere\Console\Component\InteractiveHandle;
 use Toolkit\Stdlib\Str\StrValue;
 
 /**

diff --git a/src/Component/InteractiveHandle.php → src/Concern/InteractiveHandle.php b/src/Component/InteractiveHandle.php → src/Concern/InteractiveHandle.php
@@ -7,14 +7,14 @@
  * @license  https://github.com/inhere/php-console/blob/master/LICENSE
  */
 
-namespace Inhere\Console\Component;
+namespace Inhere\Console\Concern;
 
 use Toolkit\Stdlib\Obj;
 
 /**
  * Class InteractMessage
  *
- * @package Inhere\Console\Component
+ * @package Inhere\Console\Concern
  */
 abstract class InteractiveHandle
 {

diff --git a/src/Concern/AttachApplicationTrait.php → src/Decorate/AttachApplicationTrait.php b/src/Concern/AttachApplicationTrait.php → src/Decorate/AttachApplicationTrait.php
@@ -7,7 +7,7 @@
  * @license  https://github.com/inhere/php-console/blob/master/LICENSE
  */
 
-namespace Inhere\Console\Concern;
+namespace Inhere\Console\Decorate;
 
 use Inhere\Console\AbstractApplication;
 use Inhere\Console\Application;
@@ -17,13 +17,12 @@
 /**
  * Trait AttachApplicationTrait
  *
- * @package Inhere\Console\Concern
+ * @package Inhere\Console\Decorate
  */
 trait AttachApplicationTrait
 {
     use SimpleEventAwareTrait {
         fire as parentFire;
-
     }
 
     /**
@@ -47,9 +46,9 @@ public function getApp(): AbstractApplication
     }
 
     /**
-     * @param AbstractApplication $app
+     * @param Application $app
      */
-    public function setApp(AbstractApplication $app): void
+    public function setApp(Application $app): void
     {
         $this->app = $app;
 

diff --git a/src/Concern/InputOutputAwareTrait.php → src/Decorate/InputOutputAwareTrait.php b/src/Concern/InputOutputAwareTrait.php → src/Decorate/InputOutputAwareTrait.php
@@ -7,7 +7,7 @@
  * @license  https://github.com/inhere/php-console/blob/master/LICENSE
  */
 
-namespace Inhere\Console\Concern;
+namespace Inhere\Console\Decorate;
 
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
@@ -16,7 +16,7 @@
 /**
  * Class InputOutputAwareTrait
  *
- * @package Inhere\Console\Concern
+ * @package Inhere\Console\Decorate
  */
 trait InputOutputAwareTrait
 {

diff --git a/src/Concern/SimpleEventAwareTrait.php → src/Decorate/SimpleEventAwareTrait.php b/src/Concern/SimpleEventAwareTrait.php → src/Decorate/SimpleEventAwareTrait.php
@@ -7,15 +7,15 @@
  * @license  https://github.com/inhere/php-console/blob/master/LICENSE
  */
 
-namespace Inhere\Console\Concern;
+namespace Inhere\Console\Decorate;
 
 use function count;
 use function in_array;
 
 /**
  * Class SimpleEventStaticTrait
  *
- * @package Inhere\Console\Concern
+ * @package Inhere\Console\Decorate
  */
 trait SimpleEventAwareTrait
 {

diff --git a/src/Handler/AbstractHandler.php b/src/Handler/AbstractHandler.php
@@ -11,8 +11,8 @@
 
 use Inhere\Console\Annotate\DocblockRules;
 use Inhere\Console\Component\ErrorHandler;
-use Inhere\Console\Concern\AttachApplicationTrait;
-use Inhere\Console\Concern\InputOutputAwareTrait;
+use Inhere\Console\Decorate\AttachApplicationTrait;
+use Inhere\Console\Decorate\InputOutputAwareTrait;
 use Inhere\Console\Decorate\UserInteractAwareTrait;
 use Inhere\Console\Console;
 use Inhere\Console\ConsoleEvent;