upsome

Author: inhere

src/Obj.php

@@ -9,8 +9,8 @@
 
 namespace Toolkit\Stdlib;
 
-use ArrayAccess;
 use Toolkit\Stdlib\Obj\ObjectHelper;
+use Toolkit\Stdlib\Obj\Traits\CreateSingletonTrait;
 use Toolkit\Stdlib\Obj\Traits\ObjectPoolTrait;
 
 /**
@@ -21,48 +21,5 @@
  */
 class Obj extends ObjectHelper
 {
-    use ObjectPoolTrait;
-
-    /**
-     * @var array
-     */
-    private static $singletons = [];
-
-    /**
-     * @param string $class
-     *
-     * @return mixed
-     */
-    public static function singleton(string $class)
-    {
-        if (!isset(self::$singletons[$class])) {
-            self::$singletons[$class] = new $class;
-        }
-
-        return self::$singletons[$class];
-    }
-
-    /**
-     * @param string $class
-     *
-     * @return mixed
-     */
-    public static function factory(string $class)
-    {
-        if (!isset(self::$singletons[$class])) {
-            self::$singletons[$class] = new $class;
-        }
-
-        return clone self::$singletons[$class];
-    }
-
-    /**
-     * @param $object
-     *
-     * @return bool
-     */
-    public static function isArrayable($object): bool
-    {
-        return $object instanceof ArrayAccess || method_exists($object, 'toArray');
-    }
+    use ObjectPoolTrait, CreateSingletonTrait;
 }

src/Obj/Configurable.php

@@ -16,7 +16,7 @@
  *
  * @package Toolkit\Stdlib\Obj
  */
-class Configurable
+abstract class Configurable
 {
     use PropertyAccessByGetterSetterTrait;
 
@@ -28,7 +28,7 @@ class Configurable
     public function __construct(array $config = [])
     {
         if ($config) {
-            Obj::init($this, $config);
+            ObjectHelper::init($this, $config);
         }
 
         $this->init();

src/Obj/ObjectHelper.php

@@ -9,6 +9,7 @@
 
 namespace Toolkit\Stdlib\Obj;
 
+use ArrayAccess;
 use Closure;
 use ReflectionClass;
 use ReflectionException;
@@ -156,6 +157,16 @@ public static function toArray($data, bool $recursive = false)
         return $arr;
     }
 
+    /**
+     * @param object $object
+     *
+     * @return bool
+     */
+    public static function isArrayable($object): bool
+    {
+        return $object instanceof ArrayAccess || method_exists($object, 'toArray');
+    }
+
     /**
      * @param mixed $object
      * @param bool  $unique

src/Obj/Traits/CreateSingletonTrait.php

@@ -0,0 +1,45 @@
+<?php declare(strict_types=1);
+
+namespace Toolkit\Stdlib\Obj\Traits;
+
+/**
+ * Trait CreateSingletonTrait
+ *
+ * @package Toolkit\Stdlib\Obj\Traits
+ */
+trait CreateSingletonTrait
+{
+    /**
+     * @var array
+     */
+    private static $singletons = [];
+
+    /**
+     * @param string $class
+     *
+     * @return mixed
+     */
+    public static function singleton(string $class)
+    {
+        if (!isset(self::$singletons[$class])) {
+            self::$singletons[$class] = new $class;
+        }
+
+        return self::$singletons[$class];
+    }
+
+    /**
+     * @param string $class
+     *
+     * @return mixed
+     */
+    public static function factory(string $class)
+    {
+        if (!isset(self::$singletons[$class])) {
+            self::$singletons[$class] = new $class;
+        }
+
+        return clone self::$singletons[$class];
+    }
+
+}

src/Obj/Traits/SingletonTrait.php

@@ -9,7 +9,7 @@
 
 namespace Toolkit\Stdlib\Obj\Traits;
 
-use Toolkit\Stdlib\Obj\Obj;
+use Toolkit\Stdlib\Obj;
 
 /**
  * Trait SingletonTrait
@@ -21,7 +21,7 @@ trait SingletonTrait
     /**
      * @return mixed
      */
-    public static function own()
+    public static function new()
     {
         return Obj::singleton(static::class);
     }

src/Obj/Traits/StdObjectTrait.php

@@ -10,7 +10,7 @@
 namespace Toolkit\Stdlib\Obj\Traits;
 
 use InvalidArgumentException;
-use Toolkit\Stdlib\Obj\Obj;
+use Toolkit\Stdlib\Obj;
 use function basename;
 use function call_user_func_array;
 use function dirname;