PHP 8.1 Implementation

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+github: byjg

.github/workflows/phpunit.yml

@@ -16,15 +16,15 @@ jobs:
     strategy:
       matrix:
         php-version:
+          - "8.3"
           - "8.2"
           - "8.1"
-          - "8.0"
-          - "7.4"
 
     steps:
       - uses: actions/checkout@v4
       - run: composer install
       - run: ./vendor/bin/phpunit
+      - run: ./vendor/bin/psalm
 
   Documentation:
     if: github.ref == 'refs/heads/master'

.run/PHPUnit.run.xml

@@ -0,0 +1,6 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PHPUnit" type="PHPUnitRunConfigurationType" factoryName="PHPUnit">
+    <TestRunner configuration_file="$PROJECT_DIR$/phpunit.xml.dist" scope="XML" use_alternative_configuration_file="true" />
+    <method v="2" />
+  </configuration>
+</component>

.run/PSalm.run.xml

@@ -0,0 +1,5 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="PSalm" type="PhpLocalRunConfigurationType" factoryName="PHP Console" path="$PROJECT_DIR$/vendor/bin/psalm">
+    <method v="2" />
+  </configuration>
+</component>

composer.json

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

psalm.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="4"
+    resolveFromConfigFile="true"
+    findUnusedBaselineEntry="true"
+    findUnusedCode="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <directory name="tests" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

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()
     {