PHP 8.1 Implementation

Author: byjg

.github/workflows/phpunit.yml

@@ -16,10 +16,9 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "8.3"
           - "8.2"
           - "8.1"
-          - "8.0"
-          - "7.4"
 
     steps:
       - uses: actions/checkout@v4

composer.json

@@ -6,11 +6,16 @@
       "ByJG\\DesignPattern\\": "src/"
     }
   },
+  "autoload-dev": {
+    "psr-4": {
+      "Tests\\": "tests/"
+      }
+  },
   "require": {
-    "php": ">=7.4"
+    "php": ">=8.1"
   },
   "require-dev": {
-    "phpunit/phpunit": "5.7.*|7.4.*|^9.5"
+    "phpunit/phpunit": "^9.6"
   },
   "license": "MIT"
 }

src/Singleton.php

@@ -36,7 +36,7 @@ public function __wakeup()
     /**
      * @return static
      */
-    public static function getInstance()
+    public static function getInstance(): static
     {
         static $instances;
 

src/SingletonException.php

@@ -2,7 +2,9 @@
 
 namespace ByJG\DesignPattern;
 
-class SingletonException extends \Exception
+use Exception;
+
+class SingletonException extends Exception
 {
 
 }

tests/Sample1.php

@@ -1,12 +1,14 @@
 <?php
 
-require_once __DIR__ . "/../vendor/autoload.php";
+namespace Tests;
+
+use ByJG\DesignPattern\Singleton;
 
 class Sample1
 {
-    use \ByJG\DesignPattern\Singleton;
+    use Singleton;
 
-    public $property;
+    public int $property;
 
     private function __construct()
     {

tests/Sample2.php

@@ -1,10 +1,12 @@
 <?php
 
-require_once __DIR__ . "/../vendor/autoload.php";
+namespace Tests;
+
+use ByJG\DesignPattern\Singleton;
 
 class Sample2
 {
-    use \ByJG\DesignPattern\Singleton;
+    use Singleton;
 
-    public $property2;
+    public int $property2;
 }

tests/SingletonTest.php

@@ -1,12 +1,11 @@
 <?php
 
-use ByJG\DesignPattern\SingletonException;
+namespace Tests;
 
-require_once __DIR__ . "/../vendor/autoload.php";
-require_once "Sample1.php";
-require_once "Sample2.php";
+use ByJG\DesignPattern\SingletonException;
+use PHPUnit\Framework\TestCase;
 
-class SingletonTest extends \PHPUnit\Framework\TestCase
+class SingletonTest extends TestCase
 {
     public function testSingleton()
     {