Upgrade phpstan and phpunit configuration (#13)

Author: akondas

composer.json

@@ -24,10 +24,10 @@
     "require-dev": {
         "friendsofphp/php-cs-fixer": "^3.11",
         "phpstan/extension-installer": "^1.0",
-        "phpstan/phpstan": "^0.12.14",
-        "phpstan/phpstan-phpunit": "^0.12.6",
-        "phpstan/phpstan-symfony": "^0.12.4",
-        "phpunit/phpunit": "^9.0"
+        "phpstan/phpstan": "^1.8",
+        "phpstan/phpstan-phpunit": "^1.1",
+        "phpstan/phpstan-symfony": "^1.2",
+        "phpunit/phpunit": "^9.5"
     },
     "autoload": {
         "psr-4": {

composer.lock

@@ -1,29 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!-- https://phpunit.readthedocs.io/en/latest/configuration.html -->
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
-         backupGlobals="false"
-         colors="true"
-         bootstrap="vendor/autoload.php"
-         beStrictAboutChangesToGlobalState="true"
-         beStrictAboutOutputDuringTests="true"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-        <server name="APP_ENV" value="test" force="true" />
-        <server name="SHELL_VERBOSITY" value="-1" />
-    </php>
-
-    <testsuites>
-        <testsuite name="unit">
-            <directory>tests/Unit</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src</directory>
-        </whitelist>
-    </filter>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd" backupGlobals="false" colors="true" bootstrap="vendor/autoload.php" beStrictAboutChangesToGlobalState="true" beStrictAboutOutputDuringTests="true">
+  <coverage>
+    <include>
+      <directory>./src</directory>
+    </include>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+    <server name="APP_ENV" value="test" force="true"/>
+    <server name="SHELL_VERBOSITY" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="unit">
+      <directory>tests/Unit</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

phpunit.xml.dist

@@ -33,7 +33,11 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $check = $this->agent->check((string) $input->getOption('name'));
+        $name = $input->getOption('name');
+        if (!is_string($name)) {
+            throw new \InvalidArgumentException('Option \'name\' must be a string.');
+        }
+        $check = $this->agent->check($name);
 
         if ($check->status() === 'passing') {
             $output->writeln(sprintf('<fg=green>Status: %s<fg=default>', $check->status()));

src/Command/DebugCheckCommand.php

@@ -33,9 +33,13 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->agent->deregisterService((string) $input->getOption('name'));
+        $name = $input->getOption('name');
+        if (!is_string($name)) {
+            throw new \InvalidArgumentException('Option \'name\' must be a string.');
+        }
+        $this->agent->deregisterService($name);
 
-        $output->writeln(sprintf('Service %s deregistered from Consul', (string) $input->getOption('name')));
+        $output->writeln(sprintf('Service %s deregistered from Consul', $name));
 
         return 0;
     }

src/Command/DeregisterServiceCommand.php

@@ -39,13 +39,22 @@ protected function configure(): void
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $this->agent->registerService(
-            (string) $input->getOption('name'),
-            (string) $input->getOption('host'),
-            (int) $input->getOption('port')
-        );
-
-        $output->writeln(sprintf('Service %s registered in Consul', (string) $input->getOption('name')));
+        $name = $input->getOption('name');
+        $host = $input->getOption('host');
+        $port = $input->getOption('port');
+        if (!is_string($name)) {
+            throw new \InvalidArgumentException('Option \'name\' must be a string.');
+        }
+        if (!is_string($host)) {
+            throw new \InvalidArgumentException('Option \'host\' must be a string.');
+        }
+        if (!is_numeric($port)) {
+            throw new \InvalidArgumentException('Option \'port\' must be numeric.');
+        }
+
+        $this->agent->registerService($name, $host, (int) $port);
+
+        $output->writeln(sprintf('Service %s registered in Consul', $name));
 
         return 0;
     }