update some for obj helper

Author: inhere

src/Obj.php

@@ -10,8 +10,8 @@
 namespace Toolkit\Stdlib;
 
 use Toolkit\Stdlib\Obj\ObjectHelper;
-use Toolkit\Stdlib\Obj\Traits\CreateSingletonTrait;
 use Toolkit\Stdlib\Obj\Traits\ObjectPoolTrait;
+use Toolkit\Stdlib\Obj\Traits\SingletonPoolTrait;
 
 /**
  * Class Obj
@@ -21,5 +21,5 @@
  */
 class Obj extends ObjectHelper
 {
-    use ObjectPoolTrait, CreateSingletonTrait;
+    use ObjectPoolTrait, SingletonPoolTrait;
 }

src/Obj/ObjectHelper.php

@@ -16,9 +16,13 @@
 use ReflectionFunctionAbstract;
 use ReflectionMethod;
 use RuntimeException;
+use Toolkit\Stdlib\Helper\PhpHelper;
 use Traversable;
 use function base64_decode;
 use function base64_encode;
+use function basename;
+use function dirname;
+use function gettype;
 use function gzcompress;
 use function gzuncompress;
 use function is_array;
@@ -32,6 +36,8 @@
 use function serialize;
 use function spl_object_hash;
 use function sprintf;
+use function str_replace;
+use function strpos;
 use function ucfirst;
 use function unserialize;
 
@@ -49,7 +55,7 @@ class ObjectHelper
      * - 会先尝试用 setter 方法设置属性
      * - 再尝试直接设置属性
      *
-     * @param mixed $object An object instance
+     * @param object|mixed $object An object instance
      * @param array $options
      *
      * @return mixed
@@ -92,14 +98,30 @@ public static function configure($object, array $options): void
     /**
      * 给对象设置属性值
      *
-     * @param       $object
+     * @param object|mixed  $object
      * @param array $options
      */
     public static function setAttrs($object, array $options): void
     {
         self::configure($object, $options);
     }
 
+    /**
+     * @param object|mixed $object
+     * @param array $data
+     *
+     * @throws ReflectionException
+     */
+    public static function mappingProps($object, array $data): void
+    {
+        // TODO
+        $rftObj = PhpHelper::reflectClass($object);
+        foreach ($rftObj->getProperties() as $rftProp) {
+            // TODO
+            // $typeName = $rftProp->getType()
+        }
+    }
+
     /**
      * 定义一个用来序列化数据的函数
      *
@@ -160,7 +182,7 @@ public static function toArray($data, bool $recursive = false)
     }
 
     /**
-     * @param object $object
+     * @param object|mixed $object
      *
      * @return bool
      */
@@ -171,11 +193,11 @@ public static function isArrayable($object): bool
 
     /**
      * @param mixed $object
-     * @param bool  $unique
+     * @param bool $unique
      *
      * @return string
      */
-    public static function hash($object, $unique = true): string
+    public static function hash($object, bool $unique = true): string
     {
         if (is_object($object)) {
             $hash = spl_object_hash($object);
@@ -192,8 +214,7 @@ public static function hash($object, $unique = true): string
     }
 
     /**
-     * @from https://github.com/ventoviro/windwalker
-     * Build an array of constructor parameters.
+     * Build an array of class method parameters.
      *
      * @param ReflectionMethod $method      Method for which to build the argument array.
      * @param array            $provideArgs Manual provide params map.
@@ -245,6 +266,8 @@ public static function getMethodArgs(ReflectionMethod $method, array $provideArg
     }
 
     /**
+     * Build an array of class method parameters.
+     *
      * @param ReflectionFunctionAbstract $rftFunc
      * @param array                      $provideArgs
      *
@@ -264,9 +287,9 @@ public static function buildReflectCallArgs(ReflectionFunctionAbstract $rftFunc,
                 continue;
             }
 
-            // filling by param name
+            // filling by param name and type is same.
             $name = $param->getName();
-            if (isset($provideArgs[$name])) {
+            if (isset($provideArgs[$name]) && $typeName === gettype($provideArgs[$name])) {
                 $funcArgs[] = $provideArgs[$name];
                 continue;
             }
@@ -325,6 +348,7 @@ public static function create(string $class)
      */
     public static function createByArray($config)
     {
+        // is class name.
         if (is_string($config)) {
             return new $config;
         }
@@ -341,4 +365,34 @@ public static function createByArray($config)
 
         return null;
     }
+
+
+    /**
+     * Get class namespace
+     *
+     * @param string $fullClass
+     *
+     * @return string
+     */
+    public static function spaceName(string $fullClass): string
+    {
+        $fullClass = str_replace('\\', '/', $fullClass);
+
+        return strpos($fullClass, '/') ? dirname($fullClass) : '';
+    }
+
+    /**
+     * Get class name without namespace.
+     *
+     * @param null|string $fullClass
+     *
+     * @return string
+     */
+    public static function className(string $fullClass): string
+    {
+        $fullClass = str_replace('\\', '/', $fullClass);
+
+        return basename($fullClass);
+    }
+
 }

src/Obj/Traits/ObjectPoolTrait.php

@@ -58,12 +58,12 @@ public static function put($object): void
     }
 
     /**
-     * @param string  $class
+     * @param string $class
      * @param Closure $handler
      *
      * @return mixed
      */
-    public static function use($class, Closure $handler)
+    public static function use(string $class, Closure $handler)
     {
         $obj = self::get($class);
         $ret = $handler($obj);

src/Obj/Traits/CreateSingletonTrait.php renamed to src/Obj/Traits/SingletonPoolTrait.php

@@ -10,11 +10,11 @@
 namespace Toolkit\Stdlib\Obj\Traits;
 
 /**
- * Trait CreateSingletonTrait
+ * Trait SingletonPoolTrait
  *
  * @package Toolkit\Stdlib\Obj\Traits
  */
-trait CreateSingletonTrait
+trait SingletonPoolTrait
 {
     /**
      * @var array