update, some logic modify

Author: inhere

src/collections/Config.php

@@ -45,11 +45,15 @@ class Config extends DataCollector
     /**
      * __construct
      * @param mixed $data If mode is 'folder', $data is config folder path
-     * @param string $format
+     * @param array $options
      * @param string $name
      */
-    public function __construct($data = [], array $options = [], $name = 'config')
+    public function __construct($data = [], $options = [], $name = 'config')
     {
+        if (is_string($options)) {
+            $options = [ 'format' => $options ];
+        }
+
         $options = array_merge([
             'format'     => 'php',
             'readonly'   => true,

src/console/Input.php

@@ -8,18 +8,47 @@
 
 namespace inhere\librarys\console;
 
-use inhere\librarys\io\Input as BaseInput;
-
 /**
  * Class Input
  * @package inhere\librarys\console
+ * e.g:
+ *     ./bin/app image/packTask test -d -s=df --debug=true
+ *     php bin/cli.php start test -d -s=df --debug=true
  */
-class Input extends BaseInput
+class Input
 {
+    /**
+     * @var @resource
+     */
     protected $inputStream = STDIN;
 
+    /**
+     * Input data
+     * @var array
+     */
+    protected $data = [];
+
+    /**
+     * the script name
+     * e.g `./bin/app` OR `bin/cli.php`
+     * @var string
+     */
     public static $scriptName;
 
+    /**
+     * the script name
+     * e.g `image/packTask` OR `start`
+     * @var string
+     */
+    public static $command;
+
+    public function __construct($parseArgv = true, $fixServer = false, $fillToGlobal = false)
+    {
+        if ($parseArgv) {
+            $this->data = self::parseGlobalArgv($fixServer, $fillToGlobal);
+        }
+    }
+
     /**
      * @return string
      */
@@ -28,6 +57,20 @@ public function read()
         return trim(fgets($this->inputStream));
     }
 
+    /**
+     * @param null|string $name
+     * @param mixed $default
+     * @return mixed
+     */
+    public function get($name=null, $default = null)
+    {
+        if (null === $name) {
+            return $this->data;
+        }
+
+        return isset($this->data[$name]) ? $this->data[$name] : $default;
+    }
+
     /**
      * @param $key
      * @param bool $default
@@ -41,7 +84,31 @@ public function getBool($key, $default = false)
             return $default;
         }
 
-        return in_array($value, ['0', 0, 'false'], true) ? false : true;
+        return in_array($value, ['0', 0, 'false', false], true) ? false : true;
+    }
+
+    /**
+     * @return string
+     */
+    public function getScriptName()
+    {
+        return self::$scriptName;
+    }
+
+    /**
+     * @return string
+     */
+    public function getCommand()
+    {
+        return self::$command;
+    }
+
+    /**
+     * @return string
+     */
+    public function getData()
+    {
+        return $this->data;
     }
 
     /**
@@ -52,44 +119,64 @@ public function getInputStream()
         return $this->inputStream;
     }
 
-
     /**
-     * @param array $argv
      */
-    public static function parseConsoleArgs($argv)
+    public static function parseGlobalArgv($fixServer = false, $fillToGlobal = false)
     {
-        // fixed: '/home' is not equals to '/home/'
-        if (isset($_SERVER['REQUEST_URI'])) {
-            $_SERVER['REQUEST_URI'] = rtrim($_SERVER['REQUEST_URI'],'/ ');
-        }
+        // ./bin/app image/packTask start test -d -s=df --debug=true
+        // php bin/cli.php image/packTask start test -d -s=df --debug=true
+        global $argv;
+        $args = $argv;
 
-        // fixed: PHP_SELF = 'index.php', it is should be '/index.php'
-        if (isset($_SERVER['PHP_SELF'])) {
-            $_SERVER['PHP_SELF'] = '/' . ltrim($_SERVER['PHP_SELF'],'/ ');
+        if ($args[0] === 'php') {
+            array_shift($args);
         }
 
-        self::$scriptName = array_shift($argv);
+        self::$scriptName = array_shift($args);
+
+        if ($fixServer) {
+            // fixed: '/home' is not equals to '/home/'
+            if (isset($_SERVER['REQUEST_URI'])) {
+                $_SERVER['REQUEST_URI'] = rtrim($_SERVER['REQUEST_URI'],'/ ');
+            }
 
-        // $_SERVER['PHP_SELF'] = self::$scriptName;
-        $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
-        $_SERVER['REQUEST_METHOD'] = 'GET';
-        $_SERVER['REQUEST_URI'] = '/';
+            // fixed: PHP_SELF = 'index.php', it is should be '/index.php'
+            if (isset($_SERVER['PHP_SELF'])) {
+                $_SERVER['PHP_SELF'] = '/' . ltrim($_SERVER['PHP_SELF'],'/ ');
+            }
 
-        if ( isset($argv[0]) && strpos($argv[0], '=') === false ) {
-            $path = trim(array_shift($argv), '/');
 
-            $_SERVER['REQUEST_URI'] .= $path;
+            // $_SERVER['PHP_SELF'] = self::$scriptName;
+            $_SERVER['SERVER_PROTOCOL'] = 'HTTP/1.1';
+            $_SERVER['REQUEST_METHOD'] = 'GET';
+            $_SERVER['REQUEST_URI'] = '/';
         }
 
+        // collect command
+        if ( isset($args[0]) && strpos($args[0], '=') === false ) {
+            self::$command = trim(array_shift($args), '/');
+
+            if ($fixServer) {
+                $_SERVER['REQUEST_URI'] .= self::$command;
+            }
+        }
+
+        $data = [];
+
         // parse query params
         // ./bin/app image/packTask start test -d -s=df --debug=true
         // parse to
         // ./bin/app image/packTask?start&test&d&s=df&debug=true
-        if ($argv) {
-            $url = preg_replace('/&[-]+/', '&', implode('&',$argv));
+        if ($args) {
+            $url = preg_replace('/&[-]+/', '&', implode('&',$args));
 
             parse_str($url, $data);
-            $_REQUEST = $_GET = $data;
+
+            if ($fillToGlobal) {
+                $_REQUEST = $_GET = $data;
+            }
         }
+
+        return $data;
     }
 }

src/console/Interact.php

@@ -260,8 +260,7 @@ public static function block($messages, $type = null, $style='default')
             $text = "<{$style}>$text</{$style}>";
         }
 
-        $this->write($text);
-
+        // $this->write($text);
         static::write($text);
     }
 

src/console/Output.php

@@ -8,13 +8,11 @@
 
 namespace inhere\librarys\console;
 
-use inhere\librarys\StdBase;
-
 /**
  * Class Output
  * @package inhere\librarys\console
  */
-class Output extends StdBase
+class Output
 {
     /**
      * 正常输出流