format codes

Author: inhere

src/auth/User.php

@@ -10,7 +10,6 @@
 
 use inhere\librarys\collections\SimpleCollection;
 use inhere\librarys\helpers\ObjectHelper;
-use Psr\Http\Message\ResponseInterface;
 use inhere\exceptions\InvalidArgumentException;
 use inhere\exceptions\InvalidConfigException;
 
@@ -25,7 +24,7 @@ class User extends SimpleCollection
     /**
      * @var string
      */
-    protected static $saveKey = '_slim_auth';
+    protected static $saveKey = '_user_auth_data';
 
     /**
      * Exclude fields that don't need to be saved.
@@ -260,7 +259,7 @@ public function sets(array $data)
      */
     public function getAccessChecker()
     {
-        return $this->accessChecker ? : \Slim::get('accessChecker');
+        return $this->accessChecker; // ? : \Slim::get('accessChecker');
     }
 
     /**

src/collections/ActiveData.php

@@ -87,7 +87,7 @@ public function all($toArray = false)
 
     /**
      * 以点连接 快速获取子级节点的值
-     * @param $name
+     * @param array|string $name
      * @return ActiveData|null
      */
     public function get($name)
@@ -166,6 +166,15 @@ public function offsetUnset($offset)
         unset($this->$offset);
     }
 
+    public function __isset($name)
+    {
+        return $this->offsetExists($name);
+    }
+
+    public function __set($name, $value)
+    {
+    }
+
     public function __get($name)
     {
         return $this->get($name);

src/collections/Config.php

@@ -48,7 +48,7 @@ class Config extends DataCollector
     /**
      * __construct
      * @param mixed $data If mode is 'folder', $data is config folder path
-     * @param array $options
+     * @param array|string $options
      * @param string $name
      */
     public function __construct($data = [], $options = [], $name = 'config')

src/collections/DataCollector.php

@@ -38,12 +38,6 @@
  */
 class DataCollector extends SimpleCollection
 {
-    /**
-     * data
-     * @var array
-     */
-    protected $data = [];
-
     /**
      * @var array
      */
@@ -159,22 +153,13 @@ public function clear()
         return $this->reset();
     }
 
-    public function toObject($class = 'stdClass')
-    {
-        return static::dataToObject($this->data, $class);
-    }
-
     /**
-     * get all Data
-     * @return array
+     * @param $class
+     * @return mixed
      */
-    public function all()
+    public function toObject($class = \stdClass::class)
     {
-        return $this->data;
-    }
-    public function toArray()
-    {
-        return $this->all();
+        return static::dataToObject($this->data, $class);
     }
 
     /**
@@ -513,11 +498,11 @@ public static function dataToArray($data, $recursive = false)
     }
 
     /**
-     * @param $array
+     * @param array $array
      * @param string $class
      * @return mixed
      */
-    public static function dataToObject($array, $class = 'stdClass')
+    public static function dataToObject($array, $class = \stdClass::class)
     {
         $object = new $class;
 
@@ -609,7 +594,7 @@ public static function parseYaml($data, $supportImport=false, callable $pathHand
 
             // if needed custom handle $importFile path. e.g: Maybe it uses custom alias path
             if ( $pathHandler && is_callable($pathHandler) ) {
-                $importFile = call_user_func($pathHandler, $importFile);
+                $importFile = $pathHandler($importFile);
             }
 
             // if $importFile is not exists AND $importFile is not a absolute path AND have $parentFile

src/collections/SimpleCollection.php

@@ -127,7 +127,6 @@ public function all()
     {
         return $this->data;
     }
-
     public function toArray()
     {
         return $this->all();

src/di/ContainerManager.php

@@ -166,7 +166,7 @@ static public function share($id, $service, $name='')
      * @param string $name 容器名称
      * @param array $params
      * @param int $bindType
-     * @return null|object
+     * @return mixed
      */
     static public function get($id, $name='', array $params=[], $bindType=self::OVERLOAD_PARAM)
     {
@@ -182,7 +182,7 @@ static public function get($id, $name='', array $params=[], $bindType=self::OVER
      * @param string $name
      * @param array $params
      * @param int $bindType
-     * @return null|object
+     * @return mixed
      */
     static public function getNew($id, $name='', array $params=[], $bindType=self::OVERLOAD_PARAM)
     {

src/di/Service.php

@@ -16,10 +16,16 @@
  */
 class Service
 {
+    /**
+     * @var callable
+     */
     protected $callback;
 
-    protected $instance  = null;
+    protected $instance;
 
+    /**
+     * @var array
+     */
     protected $arguments = [];
 
     /**
@@ -173,4 +179,4 @@ public function isShared()
     {
         return $this->shared;
     }
-}
+}

src/traits/TraitSimpleContainer.php src/di/TraitSimpleContainer.phpsrc/traits/TraitSimpleContainer.php renamed to src/di/TraitSimpleContainer.php

@@ -6,7 +6,7 @@
  * Time: 9:22
  */
 
-namespace inhere\librarys\traits;
+namespace inhere\librarys\di;
 
 /**
  * Class TraitSimpleContainer
@@ -33,7 +33,7 @@ trait TraitSimpleContainer
     /**
      * register a app service
      * @param string $name the service name
-     * @param object|\Closure $service service
+     * @param mixed $service service
      * @param bool $replace replace exists service
      * @return static
      */
@@ -47,7 +47,7 @@ public function register($name, $service, $replace = false)
     /**
      * register a app service
      * @param string $name
-     * @param object $service
+     * @param mixed $service service
      * @param bool $replace replace exists service
      * @return bool
      */
@@ -109,7 +109,7 @@ public function raw($name)
      * create a app service by name
      * it always return a new instance.
      * @param string $name
-     * @return object
+     * @return mixed
      */
     public function factory($name)
     {
@@ -143,6 +143,11 @@ public function getServiceNames()
         return array_keys(self::$services);
     }
 
+    public function __isset($name)
+    {
+        return $this->has($name);
+    }
+
     /**
      * allow register a app service by property
      * ```
@@ -151,7 +156,7 @@ public function getServiceNames()
      * };
      * ```
      * @param string $name
-     * @param object $service
+     * @param mixed $service
      * @return bool
      */
     public function __set($name, $service)
@@ -165,10 +170,10 @@ public function __set($name, $service)
      * $logger = Micro::$me->logger;
      * ```
      * @param  string $name service name
-     * @return object
+     * @return mixed
      */
     public function __get($name)
     {
         return $this->get($name);
     }
-}
+}

src/env/Client.php

@@ -110,9 +110,8 @@ public function init()
 
     protected function _handleInfo($info)
     {
-        return array_map(function($val)
-        {
-            return trim(strpos($val,';') ? strchr($val,';', true) : $val);
+        return array_map(function($val) {
+            return trim(strpos($val,';') ? strstr($val,';', true) : $val);
         },
         (array) explode(',', $info)
         );
@@ -138,7 +137,7 @@ protected function _handleInfo($info)
      *
      * ]
      */
-    private $_headers = null;
+    private $_headers;
 
     /**
      * @return array|false|null
@@ -152,7 +151,7 @@ public function getHeaders()
                 $this->_headers = http_get_request_headers();
             } else {
                 foreach ($_SERVER as $name => $value) {
-                    if ( $name = $this->_nameConver($name)) {
+                    if ( $name = $this->_nameConvert($name)) {
                         $this->_headers[$name] = $value;
                     }
                 }
@@ -185,14 +184,14 @@ public function getHeader($name, $default = null)
 
     // HTTP_X_TOKEN => xToken
     // HTTP_USER_AGENT => userAgent
-    protected function _nameConver($string)
+    protected function _nameConvert($string)
     {
         // if ( !strpos($string, '_') ) {
         //     return strtolower($string);
         // }
 
         if ( strpos($string,'HTTP_')!==false ) {
-            $string    = substr($string, strlen('HTTP_'));
+            $string = substr($string, strlen('HTTP_'));
         } else {
             return false;
         }
@@ -239,9 +238,9 @@ protected function _userAgentCheck()
         //// system check
 //        $isLinux = $isMac = $isAndroid = false;
 
-        if (preg_match('/win/i', $agent)) {
-
+        if (false !== strpos($agent, 'win') ) {
             $this->set('isWin', true);
+            $os = 'Windows other';
 
             if (preg_match('/nt 6.0/i', $agent)) {
                 $os = 'Windows Vista';
@@ -255,10 +254,7 @@ protected function _userAgentCheck()
                 $os = 'Windows XP';
             } else if (preg_match('/nt 5/i', $agent)) {
                 $os = 'Windows 2000';
-            } else {
-                $os = 'Windows other';
             }
-
         } elseif (strpos($agent, 'linux')) {
 
             if (strpos($agent, 'android')) {
@@ -340,7 +336,7 @@ protected function _userAgentCheck()
      * @from web
      * @return string
      */
-    public function getIP()
+    public function getIp()
     {
         $ip = '';
 
@@ -366,4 +362,4 @@ public function getBrowsers()
         return get_browser($this->get('userAgent'),true);
     }
 
-}// end class Client
+}// end class Client

src/env/Server.php

@@ -104,8 +104,8 @@ public function init()
             'os'   => PHP_OS,
             'osShort'      => strtoupper(substr(PHP_OS, 0, 3)),
             'isUnix'  => $this->isUnix(),
-        ])->set('isWin',   $this->get('osShort') == 'WIN')
-          ->set('isLinux', $this->get('osShort') == 'LIN');
+        ])->set('isWin',   $this->get('osShort') === 'Win')
+          ->set('isLinux', $this->get('osShort') === 'Lin');
     }
 
     /**
@@ -162,9 +162,9 @@ public static function value($name, $default = '')
      */
     public function isUnix()
     {
-        $unames = array('CYG', 'DAR', 'FRE', 'HP-', 'IRI', 'LIN', 'NET', 'OPE', 'SUN', 'UNI');
+        $uNames = array('CYG', 'DAR', 'FRE', 'HP-', 'IRI', 'LIN', 'NET', 'OPE', 'SUN', 'UNI');
 
-        return in_array($this->get('osShort'), $unames);
+        return in_array($this->get('osShort'), $uNames);
     }
 
     /**