Detect numeric strings, enable by default, allow to switch on/off

Author: sidz

rules.neon

@@ -1,90 +1,104 @@
 parameters:
 	sidzIgnoreMagicNumbers: [0, 1]
+	sidzIgnoreNumericStrings: false
 
 parametersSchema:
 	sidzIgnoreMagicNumbers: arrayOf(number())
+	sidzIgnoreNumericStrings: boolean()
 
 services:
     NoMagicNumberAsFunctionArgumentRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberAsFunctionArgumentRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberAssignedToPropertyRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberAssignedToPropertyRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInArithmeticOperatorRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInArithmeticOperatorRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInBitwiseOperatorRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInBitwiseOperatorRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInComparisonOperatorRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInComparisonOperatorRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInDefaultParameterRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInDefaultParameterRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInLogicalOperatorRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInLogicalOperatorRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInMatchRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInMatchRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInReturnStatementRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInReturnStatementRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInSwitchCaseRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInSwitchCaseRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberInTernaryOperatorRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberInTernaryOperatorRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule
 
     NoMagicNumberVariableAssignmentRule:
         class: Sid\PHPStan\Rules\MagicNumber\NoMagicNumberVariableAssignmentRule
         arguments:
             ignoreMagicNumbers: %sidzIgnoreMagicNumbers%
+            ignoreNumericStrings: %sidzIgnoreNumericStrings%
         tags:
             - phpstan.rules.rule

src/Rules/MagicNumber/AbstractMagicNumberRule.php

@@ -8,29 +8,28 @@
 use PhpParser\Node\Expr;
 use PhpParser\Node\Scalar\DNumber;
 use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\String_;
 use PHPStan\Rules\Rule;
 
 abstract class AbstractMagicNumberRule implements Rule
 {
-    /**
-     * @var list<numeric>
-     */
-    private $ignoreMagicNumbers;
-
     /**
      * @param list<numeric> $ignoreMagicNumbers
      */
-    public function __construct(array $ignoreMagicNumbers = [])
-    {
-        $this->ignoreMagicNumbers = $ignoreMagicNumbers;
+    public function __construct(
+        private readonly array $ignoreMagicNumbers = [],
+        private readonly bool $ignoreNumericStrings = false,
+    ) {
     }
 
-    protected function isNumber(?Expr $expr): bool
+    protected function isNumeric(?Expr $expr): bool
     {
         $isNumber = $expr instanceof LNumber
             || $expr instanceof DNumber
-            || ($expr instanceof Expr\UnaryMinus && $this->isNumber($expr->expr))
-            || ($expr instanceof Expr\UnaryPlus && $this->isNumber($expr->expr));
+            || ($expr instanceof Expr\UnaryMinus && $this->isNumeric($expr->expr))
+            || ($expr instanceof Expr\UnaryPlus && $this->isNumeric($expr->expr))
+            || ($expr instanceof Expr\Cast\String_ && $this->isNumeric($expr->expr))
+            || $this->isNumericString($expr);
 
         return $isNumber && !$this->ignoreNumber($expr);
     }
@@ -42,4 +41,11 @@ private function ignoreNumber(Expr $scalar): bool
     {
         return in_array($scalar->value, $this->ignoreMagicNumbers, true);
     }
+
+    private function isNumericString(?Expr $expr): bool
+    {
+        return !$this->ignoreNumericStrings
+            && $expr instanceof String_
+            && is_numeric($expr->value);
+    }
 }

src/Rules/MagicNumber/NoMagicNumberAsFunctionArgumentRule.php

@@ -26,7 +26,7 @@ public function getNodeType(): string
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        if ($this->isNumber($node->value)) {
+        if ($this->isNumeric($node->value)) {
             return [
                 RuleErrorBuilder::message(self::ERROR_MESSAGE)->line($node->getLine())->build(),
             ];

src/Rules/MagicNumber/NoMagicNumberAssignedToPropertyRule.php

@@ -26,7 +26,7 @@ public function getNodeType(): string
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        if ($node->default === null || !$this->isNumber($node->default)) {
+        if ($node->default === null || !$this->isNumeric($node->default)) {
             return [];
         }
 

src/Rules/MagicNumber/NoMagicNumberInArithmeticOperatorRule.php

@@ -31,7 +31,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        if (!$this->isNumber($node->left) && !$this->isNumber($node->right)) {
+        if (!$this->isNumeric($node->left) && !$this->isNumeric($node->right)) {
             return [];
         }
 

src/Rules/MagicNumber/NoMagicNumberInBitwiseOperatorRule.php

@@ -28,7 +28,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        if (!$this->isNumber($node->left) && !$this->isNumber($node->right)) {
+        if (!$this->isNumeric($node->left) && !$this->isNumeric($node->right)) {
             return [];
         }
 

src/Rules/MagicNumber/NoMagicNumberInComparisonOperatorRule.php

@@ -31,7 +31,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        if (!$this->isNumber($node->left) && !$this->isNumber($node->right)) {
+        if (!$this->isNumeric($node->left) && !$this->isNumeric($node->right)) {
             return [];
         }
 

src/Rules/MagicNumber/NoMagicNumberInDefaultParameterRule.php

@@ -26,7 +26,7 @@ public function getNodeType(): string
      */
     public function processNode(Node $node, Scope $scope): array
     {
-        if ($node->default === null || !$this->isNumber($node->default)) {
+        if ($node->default === null || !$this->isNumeric($node->default)) {
             return [];
         }
 

src/Rules/MagicNumber/NoMagicNumberInLogicalOperatorRule.php

@@ -27,7 +27,7 @@ public function processNode(Node $node, Scope $scope): array
             return [];
         }
 
-        if (!$this->isNumber($node->left) && !$this->isNumber($node->right)) {
+        if (!$this->isNumeric($node->left) && !$this->isNumeric($node->right)) {
             return [];
         }
 

src/Rules/MagicNumber/NoMagicNumberInMatchRule.php

@@ -29,13 +29,13 @@ public function processNode(Node $node, Scope $scope): array
     {
         $messages = [];
 
-        if ($this->isNumber($node->cond)) {
+        if ($this->isNumeric($node->cond)) {
             $messages[] = RuleErrorBuilder::message(self::MATCH_MESSAGE)->line($node->cond->getLine())->build();
         }
 
         foreach ($node->arms as $arm) {
             foreach ($arm->conds as $case) {
-                if (!$this->isNumber($case)) {
+                if (!$this->isNumeric($case)) {
                     continue;
                 }