Merge pull request #47 from LibreSign/refactor/tests-improvement

Make psalm more strict

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="5"
+    errorLevel="2"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"

src/RunServerListener.php

@@ -31,18 +31,12 @@
 
 class RunServerListener implements EventSubscriberInterface
 {
-    /** @var string */
-    private $pid = '0';
-    /** @var string */
-    private static $host;
-    /** @var int */
-    private static $port = 0;
-    /** @var ?int */
-    private $verbose = null;
-    /** @var string */
-    private $rootDir;
-    /** @var self */
-    private static $instance;
+    private string $pid = '0';
+    private static string $host;
+    private static int $port = 0;
+    private ?int $verbose = null;
+    private string $rootDir;
+    private static self $instance;
 
     public function __construct(?int $verbose, string $rootDir, string $host)
     {
@@ -99,7 +93,7 @@ public function start(): void
 
         $this->pid = (string)(int) exec($fullCmd);
 
-        if (!ctype_digit($this->pid)) {
+        if (!$this->pid) {
             throw new ServerException('Error starting server, received ' . $this->pid . ', expected int PID');
         }
 

src/Server.php

@@ -28,6 +28,7 @@
 use Exception;
 use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
 use Symfony\Component\Console\Input\ArgvInput;
+use Symfony\Component\Console\Output\OutputInterface;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Definition;
 
@@ -82,7 +83,9 @@ public function load(ContainerBuilder $container, array $config): void
         $rootDir = $this->getRootDir($config);
         if (is_numeric($verbose)) {
             $output = $container->get('cli.output');
-            $output->writeln('<info>Root dir: ' . $rootDir . '</info>');
+            if ($output instanceof OutputInterface) {
+                $output->writeln('<info>Root dir: ' . $rootDir . '</info>');
+            }
         }
         $host = $this->getHost($config);
         $definition = (new Definition('PhpBuiltin\RunServerListener'))