More strict psalm

.github/workflows/psalm.yml

@@ -10,7 +10,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
 
+      - name: Install dependencies
+        run: composer install
+
       - name: Psalm
-        uses: docker://vimeo/psalm-github-actions
-        with:
-          composer_require_dev: true
+        run: vendor/bin/psalm --output-format=github

.php-cs-fixer.php

@@ -1,12 +1,15 @@
 <?php
+
+declare(strict_types=1);
+
 use PhpCsFixer\Config;
 use PhpCsFixer\Finder;
-use PhpCsFixer\Fixer\Import\OrderedImportsFixer;
 
 return (new Config())
     ->setRiskyAllowed(true)
     ->setRules([
         '@Symfony' => true,
+        'declare_strict_types' => true,
         'ordered_imports' => [
             'imports_order' => [
                 'class',

config/config.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */

config/factory.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */

config/logger.php

@@ -1,4 +1,6 @@
 <?php
+
+declare(strict_types=1);
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */
@@ -8,6 +10,7 @@
 use Amp\ByteStream\ResourceOutputStream;
 use Amp\Log\StreamHandler;
 use Monolog\Logger;
+use Psr\Log\LogLevel;
 use const STDOUT;
 use function class_exists;
 
@@ -19,6 +22,6 @@
 
 return (new Logger('xdebug-proxy'))
     ->pushHandler(
-        (new StreamHandler(new ResourceOutputStream(STDOUT), Logger::NOTICE))
+        (new StreamHandler(new ResourceOutputStream(STDOUT), LogLevel::NOTICE))
             ->setFormatter(new LoggerFormatter())
     );

grumphp.yml

@@ -10,4 +10,8 @@ grumphp:
             config: .php-cs-fixer.php
         psalm:
             config: psalm.xml
+            no_cache: true
+            show_info: true
+            ignore_patterns:
+                - tests/
     extensions: []

psalm.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <psalm
-    errorLevel="4"
+    errorLevel="1"
     resolveFromConfigFile="true"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="https://getpsalm.org/schema/config"
@@ -12,4 +12,7 @@
             <directory name="vendor" />
         </ignoreFiles>
     </projectFiles>
+    <issueHandlers>
+        <UnnecessaryVarAnnotation errorLevel="suppress" />
+    </issueHandlers>
 </psalm>

softMocksConfig/config.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */

softMocksConfig/factory.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */

softMocksConfig/logger.php

@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */
@@ -8,6 +11,7 @@
 use Amp\ByteStream\ResourceOutputStream;
 use Amp\Log\StreamHandler;
 use Monolog\Logger;
+use Psr\Log\LogLevel;
 use const STDOUT;
 use function class_exists;
 
@@ -19,6 +23,6 @@
 
 return (new Logger('xdebug-proxy'))
     ->pushHandler(
-        (new StreamHandler(new ResourceOutputStream(STDOUT), Logger::NOTICE))
+        (new StreamHandler(new ResourceOutputStream(STDOUT), LogLevel::NOTICE))
             ->setFormatter(new LoggerFormatter())
     );

src/Config/Config.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Config;
 
 /**
@@ -22,11 +24,17 @@ class Config
         ],
     ];
 
-    protected $config;
-    protected $xdebugServer;
-    protected $ideRegistrationServer;
-    protected $ideServer;
+    /** @var array<array-key, array> */
+    protected array $config;
+    protected Server $xdebugServer;
+    protected Server $ideRegistrationServer;
+    protected IdeServer $ideServer;
 
+    /**
+     * @param array<array-key, array> $config
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArgumentTypeCoercion
+     */
     public function __construct(array $config)
     {
         $this->config = $config;

src/Config/IdeServer.php

@@ -1,15 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Config;
 
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */
 class IdeServer
 {
-    protected $config;
-    protected $defaultConfig;
+    /** @var array{defaultIde: string|null, predefinedIdeList: array<string, string>|null} */
+    protected array $config;
+    /** @var array{defaultIde: string, predefinedIdeList: array<string, string>} */
+    protected array $defaultConfig;
 
+    /**
+     * @param array{defaultIde: string|null, predefinedIdeList: array<string, string>|null} $config
+     * @param array{defaultIde: string, predefinedIdeList: array<string, string>} $defaultConfig
+     */
     public function __construct(array $config, array $defaultConfig)
     {
         $this->config = $config;
@@ -21,6 +29,9 @@ public function getDefaultIde(): string
         return $this->config['defaultIde'] ?? $this->defaultConfig['defaultIde'];
     }
 
+    /**
+     * @return array<string, string>
+     */
     public function getPredefinedIdeList(): array
     {
         return $this->config['predefinedIdeList'] ?? $this->defaultConfig['predefinedIdeList'];

src/Config/Server.php

@@ -1,15 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Config;
 
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */
 class Server
 {
-    protected $config;
-    protected $defaultConfig;
+    /** @var array{listen: string|null} */
+    protected array $config;
+    /** @var array{listen: string} */
+    protected array $defaultConfig;
 
+    /**
+     * @param array{listen: string|null} $config
+     * @param array{listen: string} $defaultConfig
+     */
     public function __construct(array $config, array $defaultConfig)
     {
         $this->config = $config;

src/Config/SoftMocks.php

@@ -1,15 +1,23 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Config;
 
 /**
  * @author Mougrim <rinat@mougrim.ru>
  */
 class SoftMocks
 {
-    protected $config;
-    protected $defaultConfig;
+    /** @var array{initScript: string|null} */
+    protected array $config;
+    /** @var array{initScript: string} */
+    protected array $defaultConfig;
 
+    /**
+     * @param array{initScript: string|null} $config
+     * @param array{initScript: string} $defaultConfig
+     */
     public function __construct(array $config, array $defaultConfig)
     {
         $this->config = $config;

src/Config/SoftMocksConfig.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Config;
 
 /**
@@ -11,8 +13,13 @@ class SoftMocksConfig extends Config
         'initScript' => '',
     ];
 
-    protected $softMocks;
+    protected SoftMocks $softMocks;
 
+    /**
+     * @param array<array-key, array> $config
+     * @psalm-suppress MixedArgument
+     * @psalm-suppress MixedArgumentTypeCoercion
+     */
     public function __construct(array $config)
     {
         parent::__construct($config);

src/Factory/DefaultFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Factory;
 
 use Mougrim\XdebugProxy\Config\Config;
@@ -19,6 +21,9 @@
  */
 class DefaultFactory implements Factory
 {
+    /**
+     * @param array<array-key, array> $config
+     */
     public function createConfig(array $config): Config
     {
         return new Config($config);

src/Factory/Factory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Factory;
 
 use Mougrim\XdebugProxy\Config\Config;
@@ -18,6 +20,9 @@
  */
 interface Factory
 {
+    /**
+     * @param array<array-key, array> $config
+     */
     public function createConfig(array $config): Config;
 
     public function createXmlConverter(LoggerInterface $logger): XmlConverter;

src/Factory/SoftMocksFactory.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Factory;
 
 use Mougrim\XdebugProxy\Config\Config;
@@ -20,6 +22,8 @@ class SoftMocksFactory extends DefaultFactory
      * @noinspection PhpMissingParentCallCommonInspection
      * {@inheritdoc}
      *
+     * @param array<array-key, array> $config
+     *
      * @return SoftMocksConfig
      */
     public function createConfig(array $config): Config

src/Handler/CommandToXdebugParser.php

@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace Mougrim\XdebugProxy\Handler;
 
 /**
@@ -12,5 +14,8 @@ interface CommandToXdebugParser
      */
     public function parseCommand(string $request): array;
 
+    /**
+     * @param array<string, string> $arguments
+     */
     public function buildCommand(string $command, array $arguments): string;
 }