Upgrade language level to php 7.4, add strong type hints, update dependencies and make PHPUnit tests compatible

Author: jkrzefski

.php_cs.dist

@@ -0,0 +1,29 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->notPath('vendor')
+    ->in(__DIR__)
+    ->name('*.php')
+    ->ignoreDotFiles(true)
+    ->ignoreVCS(true);
+
+return PhpCsFixer\Config::create()
+    ->setFinder($finder)
+    ->setRiskyAllowed(false)
+    ->setRules([
+            '@Symfony' => true,
+            '@PSR2' => true,
+            'array_syntax' => ['syntax' => 'short'],
+            'binary_operator_spaces' => ['align_equals' => false, 'align_double_arrow' => true],
+            'concat_space' => ['spacing' => 'one'],
+            'heredoc_to_nowdoc' => true,
+            'no_multiline_whitespace_before_semicolons' => true,
+            'no_unused_imports' => true,
+            'no_useless_return' => true,
+            'not_operator_with_successor_space' => true,
+            'ordered_imports' => true,
+            'phpdoc_add_missing_param_annotation' => true,
+            'phpdoc_order' => true,
+            'unary_operator_spaces' => false
+        ]
+    );

bin/redis-server.php

@@ -1,9 +1,11 @@
 <?php
 
+declare(strict_types=1);
+
+use Clue\Redis\Protocol\Model\ModelInterface;
 use Clue\Redis\Server\Client;
 use Clue\Redis\Server\Factory;
 use Clue\Redis\Server\Server;
-use Clue\Redis\Protocol\Model\ModelInterface;
 
 require __DIR__ . '/../vendor/autoload.php';
 
@@ -12,40 +14,40 @@
 
 // read port definition from command args
 $port = 6379;
-if (isset($argv[2]) && $argv[1] === '--port') {
-    $port = (int)$argv[2];
+if (isset($argv[2]) && '--port' === $argv[1]) {
+    $port = (int) $argv[2];
 }
 
 $address = '0.0.0.0:' . $port;
 $debug = false;
 
-$factory->createServer($address)->then(function(Server $server) use ($address, $debug) {
+$factory->createServer($address)->then(function (Server $server) use ($address, $debug): void {
     echo 'server listening on ' . $address . '!' . PHP_EOL;
 
     echo 'you can now connect to this server via redis-cli, redis-benchmark or any other redis client' . PHP_EOL;
 
     if ($debug) {
         echo 'Debugging is turned on, this will significantly decrease performance' . PHP_EOL;
 
-        $server->on('connection', function ($client) {
+        $server->on('connection', function (Client $client): void {
             echo 'client connected' . PHP_EOL;
         });
 
-        $server->on('error', function ($error, $client) {
+        $server->on('error', function ($error, Client $client): void {
             echo 'ERROR: ' . $error->getMessage() . PHP_EOL;
         });
 
         $server->on('request', function (ModelInterface $request, Client $client) {
             echo $client->getRequestDebug($request) . PHP_EOL;
         });
 
-        $server->on('disconnection', function ($client) {
+        $server->on('disconnection', function (Client $client): void {
             echo 'client disconnected' . PHP_EOL;
         });
     } else {
         echo 'Debugging is turned off, so you should not see any further output' . PHP_EOL;
     }
-}, function ($e) {
+}, function (\Throwable $e): void {
     fwrite(STDERR, 'ERROR: Unable to start listening server: ' . $e->getMessage() . PHP_EOL);
 });
 

composer.json

@@ -11,17 +11,28 @@
         }
     ],
     "require": {
-        "php": ">=5.3",
+        "php": ">=7.4",
         "react/promise": "~1.0|~2.0",
         "react/socket": "0.3.*|0.4.*",
         "react/event-loop": "0.3.*|0.4.*",
         "clue/redis-protocol": "0.3.*",
         "evenement/evenement": "~1.0|~2.0"
     },
     "autoload": {
-        "psr-4": { "Clue\\Redis\\Server\\": "src" }
+        "psr-4": {
+            "Clue\\Redis\\Server\\": "src"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
+            "Clue\\Redis\\Server\\Tests\\": "tests"
+        }
     },
     "bin": [
         "bin/redis-server.php"
-    ]
+    ],
+    "require-dev": {
+        "phpunit/phpunit": "^9",
+        "friendsofphp/php-cs-fixer": "^2.16"
+    }
 }