update some tool class

Author: inhere

src/Collections/CollectionInterface.php

@@ -11,13 +11,30 @@ public function set($key, $value);
 
     public function get(string $key, $default = null);
 
+    /**
+     * @param array $items
+     */
     public function replace(array $items);
 
+    /**
+     * @return array
+     */
     public function all();
 
+    /**
+     * @param string $key
+     * @return bool
+     */
     public function has(string $key);
 
+    /**
+     * @param $key
+     * @return mixed
+     */
     public function remove($key);
 
+    /**
+     * clear all data
+     */
     public function clear();
 }

src/Collections/LiteCollection.php

@@ -0,0 +1,115 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: inhere
+ * Date: 2017/10/21
+ * Time: 下午2:04
+ */
+
+namespace Inhere\Library\Collections;
+
+/**
+ * Class LiteCollection
+ * @package Inhere\Http
+ */
+class LiteCollection extends \ArrayObject implements CollectionInterface
+{
+    /**
+     * @param string $name
+     * @param null|mixed $default
+     * @return mixed|null
+     */
+    public function get(string $name, $default = null)
+    {
+        return $this[$name] ?? $default;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return mixed|null
+     */
+    public function add($name, $value)
+    {
+        if (isset($this[$name])) {
+            return null;
+        }
+
+        $this[$name] = $value;
+
+        return $this;
+    }
+
+    /**
+     * @param string $name
+     * @param mixed $value
+     * @return mixed|null
+     */
+    public function set($name, $value)
+    {
+        return $this[$name] = $value;
+    }
+
+    /**
+     * @param array $items
+     */
+    public function replace(array $items)
+    {
+        foreach ($items as $key => $value) {
+            $this->set($key, $value);
+        }
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function all()
+    {
+        return $this->getArrayCopy();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function has(string $key)
+    {
+        return array_key_exists($key, $this->data);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function remove($key)
+    {
+        if (isset($this[$key])) {
+            $val = $this[$key];
+            unset($this[$key]);
+
+            return $val;
+        }
+
+        return null;
+    }
+
+    /**
+     * clear all data
+     */
+    public function clear()
+    {
+        foreach ($this as $key) {
+            unset($this[$key]);
+        }
+    }
+
+    /**
+     * Specify data which should be serialized to JSON
+     * @link http://php.net/manual/en/jsonserializable.jsonserialize.php
+     * @return mixed data which can be serialized by <b>json_encode</b>,
+     * which is a value of any type other than a resource.
+     * @since 5.4.0
+     */
+    public function jsonSerialize()
+    {
+        return json_encode($this->getArrayCopy());
+    }
+}

src/Collections/SimpleCollection.php

@@ -34,9 +34,7 @@ public static function make($items = null)
      */
     public function __construct(array $items = [])
     {
-        foreach ($items as $key => $value) {
-            $this->set($key, $value);
-        }
+        $this->replace($items);
     }
 
     public function __destruct()

src/Files/parsers/BaseParser.php src/Files/Parsers/BaseParser.phpsrc/Files/parsers/BaseParser.php renamed to src/Files/Parsers/BaseParser.php

@@ -18,33 +18,22 @@
 class ObjectHelper
 {
     /**
-     * 给对象设置属性值
-     * @param $object
-     * @param array $options
-     */
-    public static function setAttrs($object, array $options)
-    {
-        self::configure($object, $options);
-    }
-
-    /**
-     * 给对象设置属性值
-     * @param $object
+     * @param mixed $object An object instance
      * @param array $options
+     * @return mixed
      */
-    public static function configure($object, array $options)
+    public static function init($object, array $options)
     {
-        foreach ($options as $property => $value) {
-            $object->$property = $value;
-        }
+        return self::smartConfigure($object, $options);
     }
 
     /**
      * 给对象设置属性值
      * - 会先尝试用 setter 方法设置属性
      * - 再尝试直接设置属性
-     * @param $object
+     * @param mixed $object An object instance
      * @param array $options
+     * @return mixed
      */
     public static function smartConfigure($object, array $options)
     {
@@ -55,12 +44,37 @@ public static function smartConfigure($object, array $options)
 
             $setter = 'set' . ucfirst($property);
 
+            // has setter
             if (method_exists($object, $setter)) {
                 $object->$setter($value);
             } else {
                 $object->$property = $value;
             }
         }
+
+        return $object;
+    }
+
+    /**
+     * 给对象设置属性值
+     * @param $object
+     * @param array $options
+     */
+    public static function setAttrs($object, array $options)
+    {
+        self::configure($object, $options);
+    }
+
+    /**
+     * 给对象设置属性值
+     * @param $object
+     * @param array $options
+     */
+    public static function configure($object, array $options)
+    {
+        foreach ($options as $property => $value) {
+            $object->$property = $value;
+        }
     }
 
     /**

src/Files/parsers/IniParser.php src/Files/Parsers/IniParser.phpsrc/Files/parsers/IniParser.php renamed to src/Files/Parsers/IniParser.php

@@ -7,6 +7,7 @@
  */
 
 namespace Inhere\Library\Traits;
+use Inhere\Library\Helpers\Php;
 
 /**
  * Trait LiteEventStaticTrait - 简洁版的事件处理trait，一个事件只允许一个回调
@@ -47,11 +48,7 @@ public static function fire($name, array $args = [])
             return null;
         }
 
-        if (is_object($cb) || (is_string($cb) && function_exists($cb))) {
-            return $cb(...$args);
-        }
-
-        return call_user_func_array($cb, $args);
+        return Php::call($cb, ...$args);
     }
 
     /**

src/Files/parsers/JsonParser.php src/Files/Parsers/JsonParser.phpsrc/Files/parsers/JsonParser.php renamed to src/Files/Parsers/JsonParser.php

@@ -8,6 +8,8 @@
 
 namespace Inhere\Library\Traits;
 
+use Inhere\Library\Helpers\Php;
+
 /**
  * Trait LiteEventTrait - 简洁版的事件处理trait，一个事件只允许一个回调
  * @package Inhere\Library\Traits
@@ -47,11 +49,7 @@ protected function fire($name, array $args = [])
             return null;
         }
 
-        if (is_object($cb) || (is_string($cb) && function_exists($cb))) {
-            return $cb(...$args);
-        }
-
-        return call_user_func_array($cb, $args);
+        return Php::call($cb, ...$args);
     }
 
     /**