some class name modify

Author: inhere

src/Base/AbstractApplication.php

@@ -146,22 +146,22 @@ public function run($exit = true)
         $this->filterSpecialCommand($command);
 
         // call 'onBeforeRun' service, if it is registered.
-        self::fire(self::ON_BEFORE_RUN, [$this]);
+        $this->fire(self::ON_BEFORE_RUN, [$this]);
         $this->beforeRun();
 
         // do run ...
         try {
             $returnCode = $this->dispatch($command);
         } catch (\Throwable $e) {
-            self::fire(self::ON_RUN_ERROR, [$e, $this]);
+            $this->fire(self::ON_RUN_ERROR, [$e, $this]);
             $returnCode = $e->getCode() === 0 ? $e->getLine() : $e->getCode();
             $this->handleException($e);
         }
 
         $this->meta['_stats']['endTime'] = microtime(1);
 
         // call 'onAfterRun' service, if it is registered.
-        self::fire(self::ON_AFTER_RUN, [$this]);
+        $this->fire(self::ON_AFTER_RUN, [$this]);
         $this->afterRun();
 
         if ($exit) {
@@ -206,7 +206,7 @@ protected function afterRun()
     public function stop($code = 0)
     {
         // call 'onAppStop' service, if it is registered.
-        self::fire(self::ON_STOP_RUN, [$this]);
+        $this->fire(self::ON_STOP_RUN, [$this]);
 
         exit((int)$code);
     }

src/IO/Input.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Console\IO;
 
-use Inhere\Console\Utils\CommandLine;
+use Inhere\Console\Utils\InputParser;
 
 /**
  * Class Input - the input information. by parse global var $argv.
@@ -83,11 +83,11 @@ public function __construct($argv = null, $parsing = true)
 
         $this->pwd = $this->getPwd();
         $this->tokens = $argv;
-        $this->fullScript = implode(' ', $argv);
         $this->script = array_shift($argv);
+        $this->fullScript = implode(' ', $argv);
 
         if ($parsing) {
-            list($this->args, $this->sOpts, $this->lOpts) = CommandLine::parseByArgv($argv);
+            list($this->args, $this->sOpts, $this->lOpts) = InputParser::fromArgv($argv);
 
             // collect command. it is first argument.
             $this->command = isset($this->args[0]) ? array_shift($this->args) : null;
@@ -101,11 +101,11 @@ public function __toString()
     {
         $tokens = array_map(function ($token) {
             if (preg_match('{^(-[^=]+=)(.+)}', $token, $match)) {
-                return $match[1] . CommandLine::escapeToken($match[2]);
+                return $match[1] . InputParser::escapeToken($match[2]);
             }
 
             if ($token && $token[0] !== '-') {
-                return CommandLine::escapeToken($token);
+                return InputParser::escapeToken($token);
             }
 
             return $token;

src/Traits/SimpleEventTrait.php

@@ -45,7 +45,7 @@ trait SimpleEventTrait
      * @param callable $handler
      * @param bool $once
      */
-    public static function on($event, callable $handler, $once = false)
+    public function on(string $event, callable $handler, $once = false)
     {
         if (self::isSupportedEvent($event)) {
             self::$eventHandlers[$event][] = $handler;
@@ -61,9 +61,9 @@ public static function on($event, callable $handler, $once = false)
      * @param $event
      * @param callable $handler
      */
-    public static function once($event, callable $handler)
+    public function once(string $event, callable $handler)
     {
-        self::on($event, $handler, true);
+        $this->on($event, $handler, true);
     }
 
     /**
@@ -72,7 +72,7 @@ public static function once($event, callable $handler)
      * @param array $args
      * @return bool
      */
-    public static function fire($event, array $args = [])
+    public function fire(string $event, array $args = []): bool
     {
         if (!isset(self::$events[$event])) {
             return false;
@@ -88,7 +88,7 @@ public static function fire($event, array $args = [])
 
         // is a once event, remove it
         if (self::$events[$event]) {
-            return self::off($event);
+            return $this->off($event);
         }
 
         return true;
@@ -99,9 +99,9 @@ public static function fire($event, array $args = [])
      * @param $event
      * @return bool
      */
-    public static function off($event)
+    public function off(string $event): bool
     {
-        if (self::hasEvent($event)) {
+        if ($this->hasEvent($event)) {
             unset(self::$events[$event], self::$eventHandlers[$event]);
 
             return true;
@@ -114,7 +114,7 @@ public static function off($event)
      * @param $event
      * @return bool
      */
-    public static function hasEvent($event)
+    public function hasEvent(string $event): bool
     {
         return isset(self::$events[$event]);
     }
@@ -123,9 +123,9 @@ public static function hasEvent($event)
      * @param $event
      * @return bool
      */
-    public static function isOnce($event)
+    public function isOnce(string $event): bool
     {
-        if (self::hasEvent($event)) {
+        if ($this->hasEvent($event)) {
             return self::$events[$event];
         }
 
@@ -134,10 +134,10 @@ public static function isOnce($event)
 
     /**
      * check $name is a supported event name
-     * @param $event
+     * @param string $event
      * @return bool
      */
-    public static function isSupportedEvent($event)
+    public static function isSupportedEvent(string $event): bool
     {
         if (!$event || !preg_match('/[a-zA-z][\w-]+/', $event)) {
             return false;
@@ -153,7 +153,7 @@ public static function isSupportedEvent($event)
     /**
      * @return array
      */
-    public static function getSupportEvents()
+    public static function getSupportEvents(): array
     {
         return self::$supportedEvents;
     }
@@ -169,15 +169,15 @@ public static function setSupportEvents(array $supportedEvents)
     /**
      * @return array
      */
-    public static function getEvents()
+    public static function getEvents(): array
     {
         return self::$events;
     }
 
     /**
      * @return int
      */
-    public static function countEvents()
+    public static function countEvents(): int
     {
         return \count(self::$events);
     }

src/Utils/Annotation.php

@@ -14,8 +14,8 @@
  */
 final class Annotation
 {
-    /*
-     * 以下三个方法来自 yii2 console/Controller.php
+    /**
+     * 以下三个方法来自 yii2 console/Controller.php 做了一些调整
      */
 
     /**

src/Utils/CommandLine.php renamed to src/Utils/InputParser.php

@@ -9,10 +9,10 @@
 namespace Inhere\Console\Utils;
 
 /**
- * Class CommandLine - console argument and option parse
+ * Class InputParser - console argument and option parse
  * @package Inhere\Console\Utils
  */
-final class CommandLine
+final class InputParser
 {
     /**
      * These words will be as a Boolean value
@@ -27,7 +27,7 @@ final class CommandLine
      * php cli.php server start name=john city=chengdu -s=test --page=23 -d -rf --debug --task=off -y=false -D -e dev -v vvv
      * ```
      * ```php
-     * $result = CommandLineParse::byArgv($_SERVER['argv']);
+     * $result = InputParser::fromArgv($_SERVER['argv']);
      * ```
      * Supports args:
      * <value>
@@ -44,7 +44,7 @@ final class CommandLine
      * @param array $config
      * @return array
      */
-    public static function parseByArgv(array $params, array $config = []): array
+    public static function fromArgv(array $params, array $config = []): array
     {
         $config = array_merge([
             // List of parameters without values(bool option keys)
@@ -89,7 +89,7 @@ public static function parseByArgv(array $params, array $config = []): array
                 $nxt = current($params);
 
                 // next elem is value. fix: allow empty string ''
-                if ($val === true && self::nextIsValue($nxt) && !isset($noValues[$opt])) {
+                if ($val === true && !isset($noValues[$opt]) && self::nextIsValue($nxt)) {
                     // list(,$val) = each($params);
                     $val = $nxt;
                     next($params);
@@ -139,15 +139,15 @@ public static function parseByArgv(array $params, array $config = []): array
         return [$args, $sOpts, $lOpts];
     }
 
-    public static function parseByDefinition(array $tokens, array $allowArray = [], array $noValues = [])
+    public static function fromDefinition(array $tokens, array $allowArray = [], array $noValues = [])
     {
 
     }
 
     /**
      * parse custom array params
      * ```php
-     * $result = CommandLine::parseByArray([
+     * $result = InputParser::fromArray([
      *  'arg' => 'val',
      *  '--lp' => 'val2',
      *  '--s' => 'val3',
@@ -156,7 +156,7 @@ public static function parseByDefinition(array $tokens, array $allowArray = [],
      * @param array $params
      * @return array
      */
-    public static function parseByArray(array $params): array
+    public static function fromArray(array $params): array
     {
         $args = $sOpts = $lOpts = [];
 
@@ -179,12 +179,12 @@ public static function parseByArray(array $params): array
 
     /**
      * ```php
-     * $result = CommandLine::parseByString('foo --bar="foobar"');
+     * $result = InputParser::fromString('foo --bar="foobar"');
      * ```
      * @todo ...
      * @param string $string
      */
-    public static function parseByString(string $string)
+    public static function fromString(string $string)
     {
 
     }

src/Utils/FontSymbol.php renamed to src/Utils/Symbol/Char.php

@@ -13,21 +13,32 @@
  * - 字体符号
  * @package Inhere\Console\Utils
  */
-class FontSymbol
+final class Char
 {
     const OK = '✔';
     const NO = '✘';
     const PEN = '✎';
+
     const HEART = '❤';
+    const SMILE = '☺';
+
+    const FLOWER = '✿';
+    const MUSIC = '♬';
 
     const UP = '';
     const DOWN = '';
     const LEFT = '';
     const RIGHT = '';
+    const SEARCH = '';
 
     const MALE = '♂';
     const FEMALE = '♀';
 
+    const SUN = '☀';
+    const STAR = '★';
+    const SNOW = '❈';
+    const CLOUD = '☁';
+
     /**
      * @return array
      */

src/Utils/EmojiSymbol.php renamed to src/Utils/Symbol/Emoji.php

@@ -9,32 +9,50 @@
 namespace Inhere\Console\Utils;
 
 /**
- * Class EmojiSymbol
+ * Class Emoji
  * @package Inhere\Console\Utils
  */
-class EmojiSymbol
+final class Emoji
 {
     const KEY = '🔑';
     const BOX = '📦';
     const GIFT = '🎁';
     const CLOCK = '⏰';
     const FLAG = '🚩';
+    const TOOL = '🔧';
+    const GUN = '🔫';
 
     const DOC = '📄';
     const DIR = '📂';
     const BOOK = '📔';
+    const RECYCLE = '♻';
 
-    const TOOL = '🔧';
-    const GUN = '🔫';
+    const EDIT = '✍';
+    const SMILE = '😊';
+    const LAUGH = '😆';
+    const LIKE = '😍';
+    const ANGER = '😡';
+    const HAPPY = '😀';
+    const DOZE = '😴';
+
+    const OK = '👌';
+    const YES = '✌';
+    const NO = '✋';
+    const PRAISE = '👍';
+    const TREAD = '👎';
+    const STEP = '🐾';
 
-    const UP = '👍';
-    const DOWN = '👎';
+    const UP = '👆';
+    const DOWN = '👇';
+    const LEFT = '👈';
+    const RIGHT = '👉';
 
     const FIRE = '🔥';
     const SNOW = '❄';
     const WATER = '💧';
     const FLASH = '⚡';
 
+    const EYE = '👀';
     const HEART = '💖';
 
     const SUC = '✅';
@@ -55,6 +73,7 @@ class EmojiSymbol
     const SUN = '🌞';
     const STAR = '⭐';
     const MOON = '🌜';
+    const EARTH = '🌏';
 
     /**
      * @return array