diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php index 20644358..b1cf6a90 100644 --- a/.phpstorm.meta.php +++ b/.phpstorm.meta.php @@ -6,7 +6,7 @@ namespace PHPSTORM_META { use Kiri\Di\Container; override(Container::get(0), map('@')); - override(Container::newObject(0), map('@')); + override(Container::create(0), map('@')); // override(\Hyperf\Utils\Context::get(0), map('@')); // override(\make(0), map('@')); override(\di(0), map('@')); diff --git a/http-server/ServerManager.php b/http-server/ServerManager.php index 14898cac..98485e75 100644 --- a/http-server/ServerManager.php +++ b/http-server/ServerManager.php @@ -460,7 +460,7 @@ class ServerManager */ private function getNewInstance(string $class): object { - return $this->container->newObject($class); + return $this->container->create($class); } diff --git a/kiri-engine/Di/Container.php b/kiri-engine/Di/Container.php index 9408c398..de4d6dc7 100644 --- a/kiri-engine/Di/Container.php +++ b/kiri-engine/Di/Container.php @@ -131,7 +131,7 @@ class Container extends BaseObject implements ContainerInterface * @return object * @throws */ - public function newObject($class, array $constrict = [], array $config = []): object + public function create($class, array $constrict = [], array $config = []): object { return $this->resolve($class, $constrict, $config); } diff --git a/kiri-engine/Kiri.php b/kiri-engine/Kiri.php index d9f0a2fe..55ab51d3 100644 --- a/kiri-engine/Kiri.php +++ b/kiri-engine/Kiri.php @@ -180,7 +180,7 @@ class Kiri } else if (is_array($className) && isset($className['class'])) { $class = $className['class']; unset($className['class']); - return static::$container->newObject($class, $construct, $className); + return static::$container->create($class, $construct, $className); } else if (is_callable($className, TRUE)) { return call_user_func($className, $construct); } else { diff --git a/kiri-engine/Pool/Connection.php b/kiri-engine/Pool/Connection.php index 3715777d..7abc603e 100644 --- a/kiri-engine/Pool/Connection.php +++ b/kiri-engine/Pool/Connection.php @@ -109,7 +109,7 @@ class Connection extends Component public function create($coroutineName, $config): Closure { return static function () use ($coroutineName, $config) { - return Kiri::getDi()->newObject(PDO::class, [ + return Kiri::getDi()->create(PDO::class, [ $config['database'], $config['cds'], $config['username'], $config['password'], $config['charset'] ?? 'utf8mb4' ]); }; diff --git a/kiri-engine/Pool/Redis.php b/kiri-engine/Pool/Redis.php index 55757865..9492c789 100644 --- a/kiri-engine/Pool/Redis.php +++ b/kiri-engine/Pool/Redis.php @@ -50,7 +50,7 @@ class Redis extends Component public function create(string $name, mixed $config): Closure { return static function () use ($name, $config) { - return Kiri::getDi()->newObject(\Kiri\Cache\Base\Redis::class, [ + return Kiri::getDi()->create(\Kiri\Cache\Base\Redis::class, [ $config['host'], (int)$config['port'], $config['databases'] ?? 0, $config['auth'], $config['prefix'] ?? '', $config['timeout'] ?? 30, $config['read_timeout'] ?? 30 diff --git a/kiri-note/Inject.php b/kiri-note/Inject.php index 4a462cf7..52336f67 100644 --- a/kiri-note/Inject.php +++ b/kiri-note/Inject.php @@ -94,7 +94,7 @@ use ReflectionProperty; { if (!Kiri::app()->has($this->value)) { if (!empty($this->construct)) { - return Kiri::getDi()->newObject($this->value, $this->construct); + return Kiri::getDi()->create($this->value, $this->construct); } return Kiri::getDi()->get($this->value); } else {