Merge pull request #44 from koriym/psalm

koriym · web-flow · commit 01334b91dc0e · 2023-01-10T14:42:09.000+09:00
Soothe psalm
diff --git a/composer.json b/composer.json
@@ -29,7 +29,8 @@
     "phpmd/phpmd": "^2.6",
     "rector/rector": "^0.15.3",
     "ray/rector-ray": "^1.0",
-    "doctrine/coding-standard": "^11.1"
+    "doctrine/coding-standard": "^11.1",
+    "vimeo/psalm": "^5.4"
   },
   "autoload":{
     "psr-4":{
@@ -50,7 +51,8 @@
     "tests": ["@cs", "phpstan analyse -l max src tests -c phpstan.neon --no-progress", "@test"],
     "coverage": ["php -dzend_extension=xdebug.so -dxdebug.mode=coverage ./vendor/bin/phpunit --coverage-text --coverage-html=build/coverage"],
     "cs": ["php-cs-fixer fix -v --dry-run", "phpcs --standard=phpcs.xml src;"],
-    "cs-fix": ["phpcbf src tests"]
+    "cs-fix": ["phpcbf src tests"],
+    "sa": "psalm"
   },
   "config": {
     "allow-plugins": {
diff --git a/psalm.xml b/psalm.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<psalm
+    errorLevel="4"
+    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>
diff --git a/src/Annotation/TwigDebug.php b/src/Annotation/TwigDebug.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Annotation;
 
 use Attribute;
diff --git a/src/Annotation/TwigErrorPath.php b/src/Annotation/TwigErrorPath.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Annotation;
 
 use Attribute;
diff --git a/src/Annotation/TwigLoader.php b/src/Annotation/TwigLoader.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Annotation;
 
 use Attribute;
diff --git a/src/Annotation/TwigOptions.php b/src/Annotation/TwigOptions.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Annotation;
 
 use Attribute;
diff --git a/src/Annotation/TwigPaths.php b/src/Annotation/TwigPaths.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Annotation;
 
 use Attribute;
diff --git a/src/Annotation/TwigRedirectPath.php b/src/Annotation/TwigRedirectPath.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Annotation;
 
 use Attribute;
diff --git a/src/AppPathProvider.php b/src/AppPathProvider.php
@@ -2,15 +2,12 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\AppMeta\AbstractAppMeta;
 use Ray\Di\ProviderInterface;
 
+/** @implements ProviderInterface<array<string>> */
 class AppPathProvider implements ProviderInterface
 {
     public function __construct(
diff --git a/src/ErrorPagerRenderer.php b/src/ErrorPagerRenderer.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\RenderInterface;
diff --git a/src/Exception/RuntimeException.php b/src/Exception/RuntimeException.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Exception;
 
 class RuntimeException extends \RuntimeException
diff --git a/src/Exception/TemplateNotFound.php b/src/Exception/TemplateNotFound.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule\Exception;
 
 class TemplateNotFound extends RuntimeException
diff --git a/src/MobileTemplateFinder.php b/src/MobileTemplateFinder.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use Madapaja\TwigModule\Annotation\TwigPaths;
diff --git a/src/MobileTwigModule.php b/src/MobileTwigModule.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use Ray\Di\AbstractModule;
diff --git a/src/OptionProvider.php b/src/OptionProvider.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\AppMeta\AbstractAppMeta;
@@ -16,6 +12,7 @@
 use function file_exists;
 use function mkdir;
 
+/** @implements ProviderInterface<array{"debug":bool, "cache":string}> */
 class OptionProvider implements ProviderInterface
 {
     /** @SuppressWarnings(PHPMD.BooleanArgumentFlag) */
diff --git a/src/TemplateFinder.php b/src/TemplateFinder.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use function str_replace;
diff --git a/src/TemplateFinderInterface.php b/src/TemplateFinderInterface.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 interface TemplateFinderInterface
diff --git a/src/TwigErrorHandler.php b/src/TwigErrorHandler.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\Code;
diff --git a/src/TwigErrorPage.php b/src/TwigErrorPage.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\RenderInterface;
diff --git a/src/TwigErrorPageHandler.php b/src/TwigErrorPageHandler.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\Code;
diff --git a/src/TwigErrorPageModule.php b/src/TwigErrorPageModule.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\RenderInterface;
diff --git a/src/TwigModule.php b/src/TwigModule.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\RenderInterface;
diff --git a/src/TwigRenderer.php b/src/TwigRenderer.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\Code;
diff --git a/tests/AppMetaTest.php b/tests/AppMetaTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\RenderInterface;
diff --git a/tests/AppPathProviderTest.php b/tests/AppPathProviderTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/AppPathProviderTestModule.php b/tests/AppPathProviderTestModule.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\AppMeta\AbstractAppMeta;
diff --git a/tests/ArrayLoaderTest.php b/tests/ArrayLoaderTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use Madapaja\TwigModule\Exception\TemplateNotFound;
diff --git a/tests/ExtensionTest.php b/tests/ExtensionTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use Madapaja\TwigModule\Resource\Page\TwigFilter;
diff --git a/tests/FileLoaderTest.php b/tests/FileLoaderTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\Code;
diff --git a/tests/MobileTemplateFinderTest.php b/tests/MobileTemplateFinderTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/OptionProviderTest.php b/tests/OptionProviderTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use PHPUnit\Framework\TestCase;
diff --git a/tests/TwigErrorPageHandlerTest.php b/tests/TwigErrorPageHandlerTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use BEAR\Resource\Exception\ResourceNotFoundException as NotFound;
diff --git a/tests/WeavedResourceTest.php b/tests/WeavedResourceTest.php
@@ -2,10 +2,6 @@
 
 declare(strict_types=1);
 
-/**
- * This file is part of the Madapaja.TwigModule package.
- */
-
 namespace Madapaja\TwigModule;
 
 use Madapaja\TwigModule\Resource\Page\Index;
diff --git a/tests/bootstrap.php b/tests/bootstrap.php
