Merge pull request #79 from sasezaki/strict-rules

Use phpstan-strict-rules
struggle-for-php · Feb 10, 2024 · ab70ce5 · ab70ce5
2 parents 29ef15c + 507befd
commit ab70ce5
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 8 deletions.
diff --git a/composer-require-checker.json b/composer-require-checker.json
@@ -12,6 +12,7 @@
     "PhpParser\\Node\\Scalar\\String_",
     "PHPStan\\Analyser\\Scope",
     "PHPStan\\Rules\\Rule",
+    "PHPStan\\Rules\\RuleError",
     "PHPStan\\Rules\\RuleErrorBuilder",
     "PHPStan\\Type\\ArrayType",
     "PHPStan\\Type\\Constant\\ConstantStringType",

diff --git a/composer.json b/composer.json
@@ -15,6 +15,7 @@
         "laminas/laminas-coding-standard": "^2.0.0",
         "maglnet/composer-require-checker": "^2|^3|^4",
         "phpstan/phpstan-phpunit": "^1.3",
+        "phpstan/phpstan-strict-rules": "^1.5",
         "phpunit/phpunit": "^8.5.31 || ^9.5.10",
         "roave/security-advisories": "dev-master",
         "squizlabs/php_codesniffer": "^3.7",

diff --git a/phpstan.neon b/phpstan.neon
@@ -10,3 +10,4 @@ includes:
 	- phar://phpstan.phar/conf/bleedingEdge.neon
 	- vendor/phpstan/phpstan-phpunit/extension.neon
 	- vendor/phpstan/phpstan-phpunit/rules.neon
+	- vendor/phpstan/phpstan-strict-rules/rules.neon
diff --git a/src/Rules/ContextKeyRule.php b/src/Rules/ContextKeyRule.php
@@ -66,7 +66,7 @@ public function processNode(Node $node, Scope $scope): array
 
         $methodName = $node->name->toLowerString();
 
-        if ($methodName !== 'log' && ! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS)) {
+        if ($methodName !== 'log' && ! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS, true)) {
             // @codeCoverageIgnoreStart
             return []; // @codeCoverageIgnoreEnd
         }

diff --git a/src/Rules/ContextRequireExceptionKeyRule.php b/src/Rules/ContextRequireExceptionKeyRule.php
@@ -93,7 +93,7 @@ public function processNode(Node $node, Scope $scope): array
             }
 
             $contextArgumentNo = 2;
-        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS)) {
+        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS, true)) {
             return [];
         }
 

diff --git a/src/Rules/MessageStaticStringRule.php b/src/Rules/MessageStaticStringRule.php
@@ -63,7 +63,7 @@ public function processNode(Node $node, Scope $scope): array
             }
 
             $messageArgumentNo = 1;
-        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS)) {
+        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS, true)) {
             // @codeCoverageIgnoreStart
             return []; // @codeCoverageIgnoreEnd
         }

diff --git a/src/Rules/PlaceholderCharactersRule.php b/src/Rules/PlaceholderCharactersRule.php
@@ -68,7 +68,7 @@ public function processNode(Node $node, Scope $scope): array
             }
 
             $messageArgumentNo = 1;
-        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS)) {
+        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS, true)) {
             // @codeCoverageIgnoreStart
             return []; // @codeCoverageIgnoreEnd
         }
@@ -86,13 +86,13 @@ public function processNode(Node $node, Scope $scope): array
             $message = $constantStringType->getValue();
 
             $doubleBraceError = self::checkDoubleBrace($message, $methodName);
-            if ($doubleBraceError) {
+            if ($doubleBraceError instanceof RuleError) {
                 $errors[] = $doubleBraceError;
                 continue;
             }
 
             $invalidCharError = self::checkInvalidChar($message, $methodName);
-            if ($invalidCharError) {
+            if ($invalidCharError instanceof RuleError) {
                 $errors[] = $invalidCharError;
             }
         }

diff --git a/src/Rules/PlaceholderCorrespondToKeysRule.php b/src/Rules/PlaceholderCorrespondToKeysRule.php
@@ -66,7 +66,7 @@ public function processNode(Node $node, Scope $scope): array
             }
 
             $contextArgumentNo = 2;
-        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS)) {
+        } elseif (! in_array($methodName, LogLevelListInterface::LOGGER_LEVEL_METHODS, true)) {
             // @codeCoverageIgnoreStart
             return []; // @codeCoverageIgnoreEnd
         }
@@ -99,7 +99,7 @@ public function processNode(Node $node, Scope $scope): array
             $context = $args[$contextArgumentNo];
 
             $doesNohHaveError = self::contextDoesNotHavePlaceholderKey($scope->getType($context->value), $methodName, $matches[0], $matches[1]);
-            if ($doesNohHaveError) {
+            if ($doesNohHaveError instanceof RuleError) {
                 $errors[] = $doesNohHaveError;
             }
         }