Merge pull request #32 from citrus-framework/fix_php8

php8化対応

composer.json

@@ -16,14 +16,19 @@
         "citrus-framework/exception": "^1.0"
     },
     "require-dev": {
-        "php": "^7.3",
-        "phpunit/phpunit": "^8.4",
-        "nunomaduro/phpinsights": "^v1.13"
+        "php": "^8.1",
+        "phpunit/phpunit": "^9.5",
+        "nunomaduro/phpinsights": "^v2.0"
     },
     "autoload": {
         "psr-4": {
             "Citrus\\": "src/",
             "Test\\": "tests/"
         }
+    },
+    "config": {
+        "allow-plugins": {
+            "dealerdirect/phpcodesniffer-composer-installer": true
+        }
     }
 }

src/Variable/Singleton.php

@@ -22,11 +22,11 @@ trait Singleton
      */
     public static function sharedInstance(): self
     {
-        static $singleton;
-        if (true === is_null($singleton))
+        static $singletons = [];
+        if (false === array_key_exists(static::class, $singletons))
         {
-            $singleton = new static();
+            $singletons[static::class] = new static();
         }
-        return $singleton;
+        return $singletons[static::class];
     }
 }

tests/Variable/SingletonTest.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright   Copyright 2020, CitrusVariables. All Rights Reserved.
+ * @author      take64 <take64@citrus.tk>
+ * @license     http://www.citrus.tk/
+ */
+
+namespace Test\Variable;
+
+use Citrus\Variable\Singleton;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * シングルトンのテスト
+ */
+class SingletonTest extends TestCase
+{
+    /**
+     * @test
+     */
+    public function sharedInstance_想定通り()
+    {
+        // php8以降、メソッド内静的変数が共通領域になってしまった
+        $this->assertInstanceOf(TestA::class, TestA::sharedInstance());
+        $this->assertInstanceOf(TestB::class, TestB::sharedInstance());
+    }
+}
+
+class TestP
+{
+    use Singleton;
+}
+
+class TestA extends TestP
+{
+}
+
+class TestB extends TestP
+{
+}