feat: Bump PHP to 8.1+

.github/workflows/ci.yml

@@ -20,40 +20,15 @@ jobs:
           - 6379:6379
 
     strategy:
+      fail-fast: false
       matrix:
         include:
-          # 7.x configurations
-          - php-version: 7.3
-            use-lowest-dependencies: true
-            shared-test-version: 4.x-dev
-          - php-version: 7.3
-            use-lowest-dependencies: false
-            shared-test-version: 4.x-dev
-
-          - php-version: 7.4
-            use-lowest-dependencies: true
-            shared-test-version: 4.x-dev
-          - php-version: 7.4
-            use-lowest-dependencies: false
-            shared-test-version: 4.x-dev
-
-          # 8.0 configurations
-          - php-version: 8.0
-            use-lowest-dependencies: true
-            shared-test-version: 4.x-dev
-          - php-version: 8.0
-            use-lowest-dependencies: false
-            shared-test-version: 5.x-dev
-
           # 8.1 configurations
           - php-version: 8.1
             use-lowest-dependencies: true
-            shared-test-version: 4.x-dev
-          - php-version: 8.1
-            use-lowest-dependencies: false
             shared-test-version: 5.x-dev
           - php-version: 8.1
-            use-lowest-dependencies: false
+            use-lowest-dependencies: true
             shared-test-version: dev-main
 
           # 8.2 configurations
@@ -64,6 +39,14 @@ jobs:
             use-lowest-dependencies: false
             shared-test-version: dev-main
 
+          # 8.3 configurations
+          - php-version: 8.3
+            use-lowest-dependencies: false
+            shared-test-version: 5.x-dev
+          - php-version: 8.3
+            use-lowest-dependencies: false
+            shared-test-version: dev-main
+
     steps:
       - uses: actions/checkout@v4
         with:

.gitignore

@@ -7,3 +7,4 @@ docs/build
 docs/.phpdoc
 phpunit/
 .phpunit.result.cache
+.php-cs-fixer.cache

.php-cs-fixer.php

@@ -0,0 +1,15 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()->in(__DIR__);
+
+$config = new PhpCsFixer\Config();
+return $config
+    ->setFinder($finder)
+    ->setUsingCache(true)
+    ->setRules([
+        '@PSR2' => true,
+        'blank_line_after_opening_tag' => true,
+        'ordered_imports' => true,
+        'no_unused_imports' => true,
+        'array_syntax' => ['syntax' => 'short'],
+    ]);

Makefile

@@ -0,0 +1,19 @@
+.PHONY: help
+help: #! Show this help message
+	@echo 'Usage: make [target] ... '
+	@echo ''
+	@echo 'Targets:'
+	@grep -h -F '#!' $(MAKEFILE_LIST) | grep -v grep | sed 's/:.*#!/:/' | column -t -s":"
+
+.PHONY: test
+test: #! Run unit tests
+	php -d xdebug.mode=coverage vendor/bin/phpunit
+
+.PHONY: coverage
+coverage: #! Run unit tests with test coverage
+	php -d xdebug.mode=coverage vendor/bin/phpunit
+
+.PHONY: lint
+lint: #! Run quality control tools (e.g. psalm)
+	./vendor/bin/psalm --no-cache
+	composer cs-check

composer.json

@@ -20,12 +20,15 @@
         }
     ],
     "require": {
-        "php": ">=7.3",
-        "predis/predis": ">=1.0.0 <3.0.0",
-        "launchdarkly/server-sdk": ">=4.0.0 <7.0.0"
+        "php": ">=8.1",
+        "predis/predis": ">=2.3.0 <3.0.0",
+        "launchdarkly/server-sdk": ">=6.3.0 <7.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9"
+        "friendsofphp/php-cs-fixer": "^3.68",
+        "phpunit/php-code-coverage": "^9",
+        "phpunit/phpunit": "^9",
+        "vimeo/psalm": "^5.26"
     },
     "autoload": {
         "psr-4": {
@@ -39,5 +42,10 @@
     },
     "config": {
         "sort-packages": true
+    },
+    "scripts": {
+        "cs-check": "vendor/bin/php-cs-fixer fix --diff --dry-run --verbose --config=.php-cs-fixer.php",
+        "cs-fix": "vendor/bin/php-cs-fixer fix --diff --verbose --config=.php-cs-fixer.php"
     }
+
 }

psalm.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="2"
+    resolveFromConfigFile="true"
+    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" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+</psalm>

src/LaunchDarkly/Impl/Integrations/RedisFeatureRequester.php

@@ -1,18 +1,15 @@
 <?php
+
 namespace LaunchDarkly\Impl\Integrations;
 
-use LaunchDarkly\Impl\Integrations\FeatureRequesterBase;
-use Predis\ClientInterface;
 use Predis\Client;
+use Predis\ClientInterface;
 
 class RedisFeatureRequester extends FeatureRequesterBase
 {
-    /** @var ClientInterface */
-    var $_connection;
-    /** @var array */
-    var $_redisOptions;
-    /** @var string */
-    var $_prefix;
+    public ?ClientInterface $_connection = null;
+    public ?array $_redisOptions = null;
+    public ?string $_prefix;
 
     const DEFAULT_PREFIX = 'launchdarkly';
 

src/LaunchDarkly/Integrations/Redis.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace LaunchDarkly\Integrations;
 
 use \LaunchDarkly\Impl\Integrations\RedisFeatureRequester;

tests/RedisFeatureRequesterTest.php

@@ -13,7 +13,7 @@ class RedisFeatureRequesterTest extends DatabaseFeatureRequesterTestBase
 
     public static function setUpBeforeClass(): void
     {
-        self::$predisClient = new Client(array());
+        self::$predisClient = new Client([]);
     }
 
     protected function clearExistingData($prefix): void

tests/RedisFeatureRequesterWithPredisOptionsTest.php

@@ -13,7 +13,7 @@ class RedisFeatureRequesterWithPredisOptionsTest extends DatabaseFeatureRequeste
 
     public static function setUpBeforeClass(): void
     {
-        self::$predisClient = new Client(array());
+        self::$predisClient = new Client([]);
     }
 
     protected function clearExistingData($prefix): void