Merge branch 'main' into php-85-Pipe

Author: arshidkv12

.github/workflows/e2e.yaml

@@ -24,23 +24,24 @@ jobs:
             matrix:
                 php_version: ['8.2']
                 directory:
+                    - 'e2e/applied-auto-import'
+                    - 'e2e/applied-polyfill-php80'
                     - 'e2e/applied-rule-change-docblock'
-                    - 'e2e/applied-rule-return-array-nodes'
-                    - 'e2e/no-parallel-reflection-resolver'
-                    - 'e2e/parallel-custom-config'
-                    - 'e2e/parallel-reflection-resolver'
                     - 'e2e/applied-rule-removed-node'
-                    - 'e2e/parallel with space'
+                    - 'e2e/applied-rule-return-array-nodes'
                     - 'e2e/different-path-over-skip-config'
                     - 'e2e/invalid-paths'
-                    - 'e2e/applied-polyfill-php80'
-                    - 'e2e/print-new-node'
+                    - 'e2e/no-parallel-reflection-resolver'
                     - 'e2e/only-option'
                     - 'e2e/only-option-quote-double-equalnone'
                     - 'e2e/only-option-quote-single'
                     - 'e2e/only-option-quote-single-bsdouble'
                     - 'e2e/only-option-quote-single-equalnone'
+                    - 'e2e/parallel-custom-config'
                     - 'e2e/parallel-kaizen-applied-rules'
+                    - 'e2e/parallel-reflection-resolver'
+                    - 'e2e/parallel with space'
+                    - 'e2e/print-new-node'
 
         name: End to end test - ${{ matrix.directory }}
 

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"

build/target-repository/composer.json

@@ -9,7 +9,7 @@
     ],
     "require": {
         "php": "^7.4|^8.0",
-        "phpstan/phpstan": "^2.1.18"
+        "phpstan/phpstan": "^2.1.26"
     },
     "autoload": {
         "files": [

composer.json

@@ -24,7 +24,7 @@
         "ocramius/package-versions": "^2.10",
         "ondram/ci-detector": "^4.2",
         "phpstan/phpdoc-parser": "^2.2",
-        "phpstan/phpstan": "^2.1.18",
+        "phpstan/phpstan": "^2.1.26",
         "react/event-loop": "^1.5",
         "react/promise": "^3.2",
         "react/socket": "^1.16",

config/set/assert.php

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

config/set/php81.php

@@ -6,6 +6,7 @@
 use Rector\Php81\Rector\Array_\FirstClassCallableRector;
 use Rector\Php81\Rector\Class_\MyCLabsClassToEnumRector;
 use Rector\Php81\Rector\Class_\SpatieEnumClassToEnumRector;
+use Rector\Php81\Rector\FuncCall\NullToStrictIntPregSlitFuncCallLimitArgRector;
 use Rector\Php81\Rector\FuncCall\NullToStrictStringFuncCallArgRector;
 use Rector\Php81\Rector\MethodCall\MyCLabsMethodCallToEnumConstRector;
 use Rector\Php81\Rector\MethodCall\RemoveReflectionSetAccessibleCallsRector;
@@ -24,6 +25,7 @@
         SpatieEnumClassToEnumRector::class,
         SpatieEnumMethodCallToEnumConstRector::class,
         NullToStrictStringFuncCallArgRector::class,
+        NullToStrictIntPregSlitFuncCallLimitArgRector::class,
         FirstClassCallableRector::class,
         RemoveReflectionSetAccessibleCallsRector::class,
     ]);

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

@@ -8,15 +8,20 @@
 use PhpParser\Node\Expr\Cast\String_;
 use Rector\Config\RectorConfig;
 use Rector\Php85\Rector\ArrayDimFetch\ArrayFirstLastRector;
+use Rector\Php85\Rector\Class_\SleepToSerializeRector;
+use Rector\Php85\Rector\Class_\WakeupToUnserializeRector;
 use Rector\Php85\Rector\ClassMethod\NullDebugInfoReturnRector;
 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;
 use Rector\Removing\ValueObject\RemoveFuncCallArg;
 use Rector\Renaming\Rector\Cast\RenameCastRector;
 use Rector\Renaming\Rector\ClassConstFetch\RenameClassConstFetchRector;
+use Rector\Renaming\Rector\ConstFetch\RenameConstantRector;
 use Rector\Renaming\Rector\FuncCall\RenameFunctionRector;
 use Rector\Renaming\Rector\MethodCall\RenameMethodRector;
 use Rector\Renaming\ValueObject\MethodCallRename;
@@ -34,6 +39,10 @@
             DeprecatedAnnotationToDeprecatedAttributeRector::class,
             ColonAfterSwitchCaseRector::class,
             ArrayKeyExistsNullToEmptyStringRector::class,
+            ChrArgModuloRector::class,
+            SleepToSerializeRector::class,
+            OrdSingleByteRector::class,
+            WakeupToUnserializeRector::class,
         ]
     );
 
@@ -198,4 +207,9 @@
             new WrapFuncCallWithPhpVersionIdChecker('xml_parser_free', 80500),
         ]
     );
+
+    // https://wiki.php.net/rfc/deprecations_php_8_5#deprecate_filter_default_constant
+    $rectorConfig->ruleWithConfiguration(RenameConstantRector::class, [
+        'FILTER_DEFAULT' => 'FILTER_UNSAFE_RAW',
+    ]);
 };

config/set/type-declaration-docblocks.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnArrayDocblockBasedOnArrayMapRector;
+use Rector\TypeDeclaration\Rector\ClassMethod\AddReturnDocblockForScalarArrayFromAssignsRector;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\AddReturnDocblockDataProviderRector;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\ClassMethodArrayDocblockParamFromLocalCallsRector;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\DocblockVarArrayFromGetterReturnRector;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\DocblockVarArrayFromPropertyDefaultsRector;
+use Rector\TypeDeclarationDocblocks\Rector\Class_\DocblockVarFromParamDocblockInConstructorRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDataProviderRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddParamArrayDocblockFromDimFetchAccessRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForArrayDimAssignedObjectRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForCommonObjectDenominatorRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\AddReturnDocblockForJsonArrayRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockGetterReturnArrayFromPropertyDocblockVarRector;
+use Rector\TypeDeclarationDocblocks\Rector\ClassMethod\DocblockReturnArrayFromDirectArrayInstanceRector;
+
+/**
+ * @experimental * 2025-09, experimental hidden set for type declaration in docblocks
+ */
+return static function (RectorConfig $rectorConfig): void {
+    $rectorConfig->rules([
+        // property var
+        DocblockVarFromParamDocblockInConstructorRector::class,
+        DocblockVarArrayFromPropertyDefaultsRector::class,
+        DocblockVarArrayFromGetterReturnRector::class,
+
+        // param
+        AddParamArrayDocblockFromDimFetchAccessRector::class,
+        ClassMethodArrayDocblockParamFromLocalCallsRector::class,
+
+        // return
+        DocblockGetterReturnArrayFromPropertyDocblockVarRector::class,
+        AddReturnDocblockForCommonObjectDenominatorRector::class,
+        AddReturnArrayDocblockBasedOnArrayMapRector::class,
+        AddReturnDocblockForScalarArrayFromAssignsRector::class,
+        DocblockReturnArrayFromDirectArrayInstanceRector::class,
+        AddReturnDocblockForArrayDimAssignedObjectRector::class,
+        AddReturnDocblockForJsonArrayRector::class,
+
+        // tests
+        AddParamArrayDocblockFromDataProviderRector::class,
+        AddReturnDocblockDataProviderRector::class,
+    ]);
+};

e2e/applied-auto-import/.gitignore

@@ -0,0 +1 @@
+/vendor