From 441c8661605ed37fd487940a1ebd0d77453ac646 Mon Sep 17 00:00:00 2001
From: sunxyw <xy2496419818@gmail.com>
Date: Tue, 5 Apr 2022 00:13:22 +0800
Subject: [PATCH] improve SingletonTrait compatibility

---
 phpstan.neon                    |  1 +
 src/ZM/Utils/SingletonTrait.php | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/phpstan.neon b/phpstan.neon
index 80cc3e85..b20bc6c3 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -7,5 +7,6 @@ parameters:
     - '#Used constant OS_TYPE_(LINUX|WINDOWS) not found#'
     - '#Constant .* not found#'
     - '#PHPDoc tag @throws with type Psr\\Container\\ContainerExceptionInterface is not subtype of Throwable#'
+    - '#Unsafe usage of new static#'
   dynamicConstantNames:
     - SWOOLE_VERSION
diff --git a/src/ZM/Utils/SingletonTrait.php b/src/ZM/Utils/SingletonTrait.php
index b7fe5e08..cfe8d81b 100644
--- a/src/ZM/Utils/SingletonTrait.php
+++ b/src/ZM/Utils/SingletonTrait.php
@@ -1,30 +1,34 @@
 <?php
 
-/** @noinspection PhpUnused */
-
 declare(strict_types=1);
 
 namespace ZM\Utils;
 
 trait SingletonTrait
 {
+    /**
+     * @deprecated 将会于未来版本移除
+     *
+     * @var array
+     */
     protected static $cached = [];
 
     /**
-     * @var self
+     * @var null|static
      */
-    private static $instance;
+    protected static $instance;
 
     /**
-     * @return self
-     * @noinspection PhpMissingReturnTypeInspection
+     * 获取类实例
+     *
+     * @return static
      */
     public static function getInstance()
     {
-        if (self::$instance === null) {
-            self::$instance = new self();
+        if (is_null(static::$instance)) {
+            static::$instance = new static();
         }
 
-        return self::$instance;
+        return static::$instance;
     }
 }