up

Author: inhere

src/DI/Container.php

@@ -333,11 +333,7 @@ public function createCallback($target, array $arguments = [], array $props = []
             // If there are no parameters, just return a new object.
             if (null === $reflectionMethod) {
                 $callback = function () use ($class, $props) {
-                    $object = new $class;
-
-                    Obj::smartConfigure($object, $props);
-
-                    return $object;
+                    return Obj::init(new $class, $props);
                 };
             } else {
                 $arguments = $arguments ?: Obj::getMethodArgs($reflectionMethod);
@@ -346,9 +342,7 @@ public function createCallback($target, array $arguments = [], array $props = []
                 $callback = function () use ($reflection, $arguments, $props) {
                     $object = $reflection->newInstanceArgs($arguments);
 
-                    Obj::smartConfigure($object, $props);
-
-                    return $object;
+                    return Obj::init($object, $props);
                 };
             }
 
@@ -428,6 +422,15 @@ public function del($id)
         }
     }
 
+    /**
+     * @param string|array $definition
+     * @return mixed
+     */
+    public function make($definition)
+    {
+        return Obj::smartCreate($definition);
+    }
+
     /*******************************************************************************
      * Helper
      ******************************************************************************/

src/Helpers/ObjectHelper.php

@@ -205,4 +205,27 @@ public static function create($class)
         // Create a callable for the dataStorage
         return $reflection->newInstanceArgs($newInstanceArgs);
     }
+
+    /**
+     * @param string|array $config
+     * @return mixed
+     */
+    public static function smartCreate($config)
+    {
+        if (is_string($config)) {
+            return new $config;
+        }
+
+        if (is_array($config) && !empty($config['target'])) {
+            $class = Arr::remove($config, 'target');
+            $args = Arr::remove($config, '_args', []);
+            $props = $config;
+
+            $obj = new $class(...$args);
+
+            return self::init($obj, $props);
+        }
+
+        return null;
+    }
 }