move some classes, change some namespace. begin dev 3.x

Author: inhere

.travis.yml

@@ -0,0 +1,20 @@
+language: php
+
+php:
+  - 7.1
+  - 7.2
+  - 7.3
+
+#matrix:
+#  include:
+#    - php: 7.2
+#      env: ANALYSIS='true'
+
+before_script:
+  - composer require php-coveralls/php-coveralls:^2.1.0
+
+script:
+  - phpunit --coverage-clover clover.xml
+
+after_success:
+  - vendor/bin/php-coveralls --coverage_clover=clover.xml --json_path=coveralls-upload.json -v

src/Base/AbstractApplication.php renamed to src/AbstractApplication.php

@@ -6,9 +6,10 @@
  * Time: 18:37
  */
 
-namespace Inhere\Console\Base;
+namespace Inhere\Console;
 
 use Inhere\Console\BuiltIn\ErrorHandler;
+use Inhere\Console\Face\ApplicationInterface;
 use Inhere\Console\Face\CommandInterface;
 use Inhere\Console\Face\ErrorHandlerInterface;
 use Inhere\Console\IO\Input;
@@ -20,7 +21,6 @@
 use Inhere\Console\Components\Style\Style;
 use Inhere\Console\Utils\FormatUtil;
 use Inhere\Console\Utils\Helper;
-use Toolkit\Cli\Highlighter;
 
 /**
  * Class AbstractApplication

src/Base/AbstractCommand.php renamed to src/AbstractCommand.php

@@ -6,9 +6,9 @@
  * Time: 11:40
  */
 
-namespace Inhere\Console\Base;
+namespace Inhere\Console;
 
-use Inhere\Console\Application;
+use Inhere\Console\Face\BaseCommandInterface;
 use Inhere\Console\Face\CommandInterface;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\InputDefinition;

src/Application.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\Base\AbstractApplication;
+use Inhere\Console\AbstractApplication;
 use Inhere\Console\Utils\Helper;
 
 /**

src/BuiltIn/ErrorHandler.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Console\BuiltIn;
 
-use Inhere\Console\Base\AbstractApplication;
+use Inhere\Console\AbstractApplication;
 use Inhere\Console\Face\ErrorHandlerInterface;
 use Toolkit\Cli\Highlighter;
 

src/Command.php

@@ -8,7 +8,7 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\Base\AbstractCommand;
+use Inhere\Console\AbstractCommand;
 use Inhere\Console\Face\CommandInterface;
 
 /**

src/Controller.php

@@ -8,8 +8,8 @@
 
 namespace Inhere\Console;
 
-use Inhere\Console\Base\AbstractCommand;
-use Inhere\Console\Base\ControllerInterface;
+use Inhere\Console\AbstractCommand;
+use Inhere\Console\Face\ControllerInterface;
 use Inhere\Console\IO\Input;
 use Inhere\Console\IO\Output;
 use Inhere\Console\Utils\FormatUtil;

src/Base/ApplicationInterface.php renamed to src/Face/ApplicationInterface.php

@@ -6,7 +6,7 @@
  * Time: 16:51
  */
 
-namespace Inhere\Console\Base;
+namespace Inhere\Console\Face;
 
 /**
  * Interface ApplicationInterface
@@ -15,11 +15,11 @@
 interface ApplicationInterface
 {
     // event name list
-    const ON_BEFORE_RUN = 'beforeRun';
-    const ON_AFTER_RUN = 'afterRun';
-    const ON_RUN_ERROR = 'runError';
-    const ON_STOP_RUN = 'stopRun';
-    const ON_NOT_FOUND = 'notFound';
+    public const ON_BEFORE_RUN = 'app.beforeRun';
+    public const ON_AFTER_RUN = 'app.afterRun';
+    public const ON_RUN_ERROR = 'app.runError';
+    public const ON_STOP_RUN = 'app.stopRun';
+    public const ON_NOT_FOUND = 'app.notFound';
 
     /**
      * @param bool $exit

src/Base/BaseCommandInterface.php renamed to src/Face/BaseCommandInterface.php

@@ -6,21 +6,22 @@
  * Time: 18:57
  */
 
-namespace Inhere\Console\Base;
+namespace Inhere\Console\Face;
 
+use Inhere\Console\AbstractApplication;
 use Inhere\Console\IO\InputDefinition;
 
 /**
  * Interface BaseCommandInterface
- * @package Inhere\Console\Base
+ * @package Inhere\Console\Face
  */
 interface BaseCommandInterface
 {
-    const OK = 0;
-    const ERR = 2;
+    public const OK = 0;
+    public const ERR = 2;
 
     // name -> {name}
-    const ANNOTATION_VAR = '{%s}'; // '{$%s}';
+    public const ANNOTATION_VAR = '{%s}'; // '{$%s}';
 
     /**
      * run command
@@ -35,7 +36,7 @@ public function run(string $command = ''): int;
     public function getDefinition();
 
     /**
-     * @return AbstractApplication
+     * @return AbstractApplication|ApplicationInterface
      */
     public function getApp(): AbstractApplication;
 

src/Face/CommandInterface.php

@@ -8,8 +8,6 @@
 
 namespace Inhere\Console\Face;
 
-use Inhere\Console\Base\BaseCommandInterface;
-
 /**
  * Interface CommandInterface
  * @package Inhere\Console\Face