Merge branch 'main' into __sleep__

Author: arshidkv12

build/build-rector-scoped.sh

@@ -28,7 +28,7 @@ note "Starts"
 
 # 2. scope it
 note "Downloading php-scoper.phar"
-wget https://github.com/humbug/php-scoper/releases/download/0.18.10/php-scoper.phar -N --no-verbose
+wget https://github.com/humbug/php-scoper/releases/download/0.18.17/php-scoper.phar -N --no-verbose
 
 # avoid phpstan/phpstan dependency duplicate
 note "Remove PHPStan to avoid duplicating it"

config/set/php83.php

@@ -3,6 +3,7 @@
 declare(strict_types=1);
 
 use Rector\Config\RectorConfig;
+use Rector\Php83\Rector\BooleanAnd\JsonValidateRector;
 use Rector\Php83\Rector\Class_\ReadOnlyAnonymousClassRector;
 use Rector\Php83\Rector\ClassConst\AddTypeToConstRector;
 use Rector\Php83\Rector\ClassMethod\AddOverrideAttributeToOverriddenMethodsRector;
@@ -18,5 +19,6 @@
         RemoveGetClassGetParentClassNoArgsRector::class,
         ReadOnlyAnonymousClassRector::class,
         DynamicClassConstFetchRector::class,
+        JsonValidateRector::class,
     ]);
 };

config/set/php85.php

@@ -13,6 +13,7 @@
 use Rector\Php85\Rector\Const_\DeprecatedAnnotationToDeprecatedAttributeRector;
 use Rector\Php85\Rector\FuncCall\ArrayKeyExistsNullToEmptyStringRector;
 use Rector\Php85\Rector\FuncCall\ChrArgModuloRector;
+use Rector\Php85\Rector\FuncCall\OrdSingleByteRector;
 use Rector\Php85\Rector\FuncCall\RemoveFinfoBufferContextArgRector;
 use Rector\Php85\Rector\Switch_\ColonAfterSwitchCaseRector;
 use Rector\Removing\Rector\FuncCall\RemoveFuncCallArgRector;
@@ -39,6 +40,7 @@
             ArrayKeyExistsNullToEmptyStringRector::class,
             ChrArgModuloRector::class,
             SleepToSerializeRector::class,
+            OrdSingleByteRector::class,
         ]
     );
 
@@ -205,10 +207,7 @@
     );
 
     // https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_filter_default_constant
-    $rectorConfig->ruleWithConfiguration(
-        RenameConstantRector::class,
-        [
-            'FILTER_DEFAULT' => 'FILTER_UNSAFE_RAW',
-        ]
-    );
+    $rectorConfig->ruleWithConfiguration(RenameConstantRector::class, [
+        'FILTER_DEFAULT' => 'FILTER_UNSAFE_RAW',
+    ]);
 };

e2e/parallel-custom-config/expected-output.diff

@@ -9,6 +9,9 @@
  {
      public function __construct(
 -        private readonly \stdClass $stdClass
++        /**
++         * @readonly
++         */
 +        private \stdClass $stdClass
      )
      {

phpstan.neon

@@ -218,6 +218,8 @@ parameters:
 
         - '#Register "Rector\\Php81\\Rector\\ClassMethod\\NewInInitializerRector" service to "php81\.php" config set#'
 
+        - '#Register "Rector\\Php80\\Rector\\NotIdentical\\MbStrContainsRector" service to "php80\.php" config set#'
+
         # closure detailed
         - '#Method Rector\\Config\\RectorConfig\:\:singleton\(\) has parameter \$concrete with no signature specified for Closure#'
 
@@ -338,3 +340,7 @@ parameters:
             identifier: rector.upgradeDowngradeRegisteredInSet
             count: 1
             path: rules/Php74/Rector/Double/RealToFloatTypeCastRector.php
+
+        -
+            message: '#Offset float\|int\|string might not exist on string#'
+            path: rules/Php70/EregToPcreTransformer.php

rules-tests/Assert/Rector/ClassMethod/AddAssertArrayFromClassMethodDocblockRector/BeberleiTest.php

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

rules-tests/Assert/Rector/ClassMethod/AddAssertArrayFromClassMethodDocblockRector/FixtureBeberlei/beberlei_assert.php.inc

@@ -0,0 +1,39 @@
+<?php
+
+namespace Rector\Tests\Assert\Rector\ClassMethod\AddAssertArrayFromClassMethodDocblockRector\FixtureBeberlei;
+
+final class FloatIntBool
+{
+    /**
+     * @param int[] $items
+     * @param float[] $numbers
+     * @param bool[] $options
+     */
+    public function run(array $items, array $numbers, array $options)
+    {
+
+    }
+}
+
+?>
+-----
+<?php
+
+namespace Rector\Tests\Assert\Rector\ClassMethod\AddAssertArrayFromClassMethodDocblockRector\FixtureBeberlei;
+
+final class FloatIntBool
+{
+    /**
+     * @param int[] $items
+     * @param float[] $numbers
+     * @param bool[] $options
+     */
+    public function run(array $items, array $numbers, array $options)
+    {
+        \Assert\Assertion::allInteger($items);
+        \Assert\Assertion::allFloat($numbers);
+        \Assert\Assertion::allBoolean($options);
+    }
+}
+
+?>

rules-tests/Assert/Rector/ClassMethod/AddAssertArrayFromClassMethodDocblockRector/config/beberlei_assert.php

@@ -0,0 +1,13 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Assert\Enum\AssertClassName;
+use Rector\Assert\Rector\ClassMethod\AddAssertArrayFromClassMethodDocblockRector;
+use Rector\Config\RectorConfig;
+
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->ruleWithConfiguration(AddAssertArrayFromClassMethodDocblockRector::class, [
+        AssertClassName::BEBERLEI,
+    ]);
+};

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/mashup.php.inc

@@ -17,7 +17,7 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 class Mashup
 {
-    public function run($required, $yetRequired, $optional = 1, $anotherOptional = false)
+    public function run($optional = 1, $required = null, $anotherOptional = false, $yetRequired = null)
     {
     }
 }

rules-tests/CodeQuality/Rector/ClassMethod/OptionalParametersAfterRequiredRector/Fixture/new_the_constructor.php.inc

@@ -26,13 +26,13 @@ namespace Rector\Tests\CodeQuality\Rector\ClassMethod\OptionalParametersAfterReq
 
 final class NewTheConstructor
 {
-    public function __construct($required, $optional = 1)
+    public function __construct($optional = 1, $required = null)
     {
     }
 
     public function create()
     {
-        return new self(5, 1);
+        return new self(1, 5);
     }
 }