[Php85] Add ChrArgModuloRector (#7190)

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

* Wrap chr() argument with % 256 to avoid deprecated out-of-range integers

---------

Co-authored-by: Arshid <arshid@Arshids-MacBook-Air.local>

Author: 2 people

config/set/php85.php

@@ -12,6 +12,7 @@
 use Rector\Php85\Rector\Const_\DeprecatedAnnotationToDeprecatedAttributeRector;
 use Rector\Php85\Rector\FuncCall\ArrayKeyExistsNullToEmptyStringRector;
 use Rector\Php85\Rector\FuncCall\OrdSingleByteRector;
+use Rector\Php85\Rector\FuncCall\ChrArgModuloRector;
 use Rector\Php85\Rector\FuncCall\RemoveFinfoBufferContextArgRector;
 use Rector\Php85\Rector\Switch_\ColonAfterSwitchCaseRector;
 use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector;
@@ -36,7 +37,6 @@
             DeprecatedAnnotationToDeprecatedAttributeRector::class,
             ColonAfterSwitchCaseRector::class,
             ArrayKeyExistsNullToEmptyStringRector::class,
-            OrdSingleByteRector::class,
         ]
     );
 

rules-tests/Php85/Rector/FuncCall/ChrArgModuloRector/ChrArgModuloRectorTest.php

@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\Tests\Php85\Rector\FuncCall\ChrArgModuloRector;
+
+use Iterator;
+use PHPUnit\Framework\Attributes\DataProvider;
+use Rector\Testing\PHPUnit\AbstractRectorTestCase;
+
+final class ChrArgModuloRectorTest extends AbstractRectorTestCase
+{
+    #[DataProvider('provideData')]
+    public function test(string $filePath): void
+    {
+        $this->doTestFile($filePath);
+    }
+
+    public static function provideData(): Iterator
+    {
+        return self::yieldFilesFromDirectory(__DIR__ . '/Fixture');
+    }
+
+    public function provideConfigFilePath(): string
+    {
+        return __DIR__ . '/config/configured_rule.php';
+    }
+}

rules-tests/Php85/Rector/FuncCall/ChrArgModuloRector/Fixture/chr.php.inc

@@ -0,0 +1,11 @@
+<?php
+namespace Rector\Tests\Php85\Rector\FuncCall\ChrArgModuloRector\Fixture;
+
+echo chr(300);
+?>
+-----
+<?php
+namespace Rector\Tests\Php85\Rector\FuncCall\ChrArgModuloRector\Fixture;
+
+echo chr(300 % 256);
+?>

rules-tests/Php85/Rector/FuncCall/ChrArgModuloRector/Fixture/chr_var.php.inc

@@ -0,0 +1,13 @@
+<?php
+namespace Rector\Tests\Php85\Rector\FuncCall\ChrArgModuloRector\Fixture;
+
+$n = 400;
+echo chr($n);
+?>
+-----
+<?php
+namespace Rector\Tests\Php85\Rector\FuncCall\ChrArgModuloRector\Fixture;
+
+$n = 400;
+echo chr($n % 256);
+?>

rules-tests/Php85/Rector/FuncCall/ChrArgModuloRector/Fixture/skip_chr_inbond.php.inc

@@ -0,0 +1,5 @@
+<?php
+namespace Rector\Tests\Php85\Rector\FuncCall\ChrArgModuloRector\Fixture;
+
+echo chr(44);
+?>

rules-tests/Php85/Rector/FuncCall/ChrArgModuloRector/config/configured_rule.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\Php85\Rector\FuncCall\ChrArgModuloRector;
+use Rector\ValueObject\PhpVersion;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rule(ChrArgModuloRector::class);
+
+    $rectorConfig->phpVersion(PhpVersion::PHP_85);
+};

rules/Php85/Rector/FuncCall/ChrArgModuloRector.php

@@ -6,7 +6,6 @@
 
 use PhpParser\Node;
 use PhpParser\Node\Expr\BinaryOp\Mod;
-use PhpParser\Node\Expr\Cast\Int_;
 use PhpParser\Node\Expr\FuncCall;
 use PhpParser\Node\Scalar\LNumber;
 use Rector\PhpParser\Node\Value\ValueResolver;
@@ -81,11 +80,11 @@ public function refactor(Node $node): ?Node
             return null;
         }
 
-        $modValue = $value % 256;
-
-        $modValue = new \PhpParser\Node\Scalar\Int_($modValue);
+        if ( $value >= 0 && $value <= 255) {
+            return null;
+        }
 
-        $args[0]->value = $modValue;
+        $args[0]->value = new Mod($argExpr, new LNumber(256));
         $node->args = $args;
 
         return $node;

src/ValueObject/PhpVersionFeature.php

@@ -810,4 +810,10 @@ final class PhpVersionFeature
      * @var int
      */
     public const DEPRECATE_ORD_WITH_MULTIBYTE_STRING = PhpVersion::PHP_85;
+
+    /**
+     * @see https://wiki.php.net/rfc/deprecations_php_8_5#eprecate_passing_integers_outside_the_interval_0_255_to_chr
+     * @var int
+     */
+    public const DEPRECATE_OUTSIDE_INTERVEL_VAL_IN_CHR_FUNCTION = PhpVersion::PHP_85;
 }