Updated Rector to commit 39cce5ccb84ce4ac40eeae113db339a961db9489

rectorphp/rector-src@39cce5c [ECS] Skip SelfAccessorFixer on *Rector.php to skip example code for using using self:: (#5363)
rectorphp · Dec 16, 2023 · bd56d13 · bd56d13
1 parent 7bf2453
commit bd56d13
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 21 deletions.
diff --git a/rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php b/rules/Php74/Rector/LNumber/AddLiteralSeparatorToNumberRector.php
@@ -75,7 +75,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-, [self::LIMIT_VALUE => 1000000])]);
+, [\Rector\Php74\Rector\LNumber\AddLiteralSeparatorToNumberRector::LIMIT_VALUE => 1000000])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php b/rules/Php80/Rector/Class_/ClassPropertyAssignToConstructorPromotionRector.php
@@ -144,7 +144,7 @@ public function __construct(
     }
 }
 CODE_SAMPLE
-, [self::INLINE_PUBLIC => \false])]);
+, [\Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector::INLINE_PUBLIC => \false])]);
     }
     public function configure(array $configuration) : void
     {

diff --git a/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php b/rules/Php82/Rector/Param/AddSensitiveParameterAttributeRector.php
@@ -78,7 +78,7 @@ public function run(#[\SensitiveParameter] string $password)
     }
 }
 CODE_SAMPLE
-, [self::SENSITIVE_PARAMETERS => ['password']])]);
+, [\Rector\Php82\Rector\Param\AddSensitiveParameterAttributeRector::SENSITIVE_PARAMETERS => ['password']])]);
     }
     public function provideMinPhpVersion() : int
     {

diff --git a/rules/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector.php b/rules/Strict/Rector/BooleanNot/BooleanInBooleanNotRuleFixerRector.php
@@ -57,7 +57,7 @@ public function run(string|null $name)
     }
 }
 CODE_SAMPLE
-, [self::TREAT_AS_NON_EMPTY => \true])]);
+, [\Rector\Strict\Rector\BooleanNot\BooleanInBooleanNotRuleFixerRector::TREAT_AS_NON_EMPTY => \true])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php b/rules/Strict/Rector/Empty_/DisallowedEmptyRuleFixerRector.php
@@ -58,7 +58,7 @@ public function run(array $items)
     }
 }
 CODE_SAMPLE
-, [self::TREAT_AS_NON_EMPTY => \false])]);
+, [\Rector\Strict\Rector\Empty_\DisallowedEmptyRuleFixerRector::TREAT_AS_NON_EMPTY => \false])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php b/rules/Strict/Rector/If_/BooleanInIfConditionRuleFixerRector.php
@@ -58,7 +58,7 @@ public function run(string $name)
     }
 }
 CODE_SAMPLE
-, [self::TREAT_AS_NON_EMPTY => \false])]);
+, [\Rector\Strict\Rector\If_\BooleanInIfConditionRuleFixerRector::TREAT_AS_NON_EMPTY => \false])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php b/rules/Strict/Rector/Ternary/BooleanInTernaryOperatorRuleFixerRector.php
@@ -49,7 +49,7 @@ public function run(array $data)
     }
 }
 CODE_SAMPLE
-, [self::TREAT_AS_NON_EMPTY => \false])]);
+, [\Rector\Strict\Rector\Ternary\BooleanInTernaryOperatorRuleFixerRector::TREAT_AS_NON_EMPTY => \false])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php b/rules/Strict/Rector/Ternary/DisallowedShortTernaryRuleFixerRector.php
@@ -54,7 +54,7 @@ public function run(array $array)
     }
 }
 CODE_SAMPLE
-, [self::TREAT_AS_NON_EMPTY => \false])]);
+, [\Rector\Strict\Rector\Ternary\DisallowedShortTernaryRuleFixerRector::TREAT_AS_NON_EMPTY => \false])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php b/rules/Transform/Rector/Attribute/AttributeKeyToClassConstFetchRector.php
@@ -3,6 +3,8 @@
 declare (strict_types=1);
 namespace Rector\Transform\Rector\Attribute;
 
+use PhpParser\Node\Arg;
+use PhpParser\Node\Expr\ClassConstFetch;
 use PhpParser\Node;
 use PhpParser\Node\AttributeGroup;
 use PhpParser\Node\Expr\ArrowFunction;
@@ -123,15 +125,15 @@ private function processToClassConstFetch(AttributeGroup $attributeGroup, Attrib
         }
         return $hasChanged;
     }
-    private function processArg(Node\Arg $arg, AttributeKeyToClassConstFetch $attributeKeyToClassConstFetch) : bool
+    private function processArg(Arg $arg, AttributeKeyToClassConstFetch $attributeKeyToClassConstFetch) : bool
     {
         $value = $this->valueResolver->getValue($arg->value);
         $constName = $attributeKeyToClassConstFetch->getValuesToConstantsMap()[$value] ?? null;
         if ($constName === null) {
             return \false;
         }
         $newValue = $this->nodeFactory->createClassConstFetch($attributeKeyToClassConstFetch->getConstantClass(), $constName);
-        if ($arg->value instanceof Node\Expr\ClassConstFetch && $this->getName($arg->value) === $this->getName($newValue)) {
+        if ($arg->value instanceof ClassConstFetch && $this->getName($arg->value) === $this->getName($newValue)) {
             return \false;
         }
         $arg->value = $newValue;

diff --git a/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php b/rules/TypeDeclaration/Rector/Property/TypedPropertyFromAssignsRector.php
@@ -126,7 +126,7 @@ public function run()
     }
 }
 CODE_SAMPLE
-, [self::INLINE_PUBLIC => \false])]);
+, [\Rector\TypeDeclaration\Rector\Property\TypedPropertyFromAssignsRector::INLINE_PUBLIC => \false])]);
     }
     /**
      * @return array<class-string<Node>>

diff --git a/src/Application/VersionResolver.php b/src/Application/VersionResolver.php
@@ -19,12 +19,12 @@ final class VersionResolver
      * @api
      * @var string
      */
-    public const PACKAGE_VERSION = '227e97477c44de40c165bba4b72e48dd954151d5';
+    public const PACKAGE_VERSION = '39cce5ccb84ce4ac40eeae113db339a961db9489';
     /**
      * @api
      * @var string
      */
-    public const RELEASE_DATE = '2023-12-16 09:53:16';
+    public const RELEASE_DATE = '2023-12-16 16:40:38';
     /**
      * @var int
      */

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -858,17 +858,17 @@
         },
         {
             "name": "phpstan\/phpdoc-parser",
-            "version": "1.24.4",
-            "version_normalized": "1.24.4.0",
+            "version": "1.24.5",
+            "version_normalized": "1.24.5.0",
             "source": {
                 "type": "git",
                 "url": "https:\/\/github.com\/phpstan\/phpdoc-parser.git",
-                "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496"
+                "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc"
             },
             "dist": {
                 "type": "zip",
-                "url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/6bd0c26f3786cd9b7c359675cb789e35a8e07496",
-                "reference": "6bd0c26f3786cd9b7c359675cb789e35a8e07496",
+                "url": "https:\/\/api.github.com\/repos\/phpstan\/phpdoc-parser\/zipball\/fedf211ff14ec8381c9bf5714e33a7a552dd1acc",
+                "reference": "fedf211ff14ec8381c9bf5714e33a7a552dd1acc",
                 "shasum": ""
             },
             "require": {
@@ -885,7 +885,7 @@
                 "phpunit\/phpunit": "^9.5",
                 "symfony\/process": "^5.2"
             },
-            "time": "2023-11-26T18:29:22+00:00",
+            "time": "2023-12-16T09:33:33+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -902,7 +902,7 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https:\/\/github.com\/phpstan\/phpdoc-parser\/issues",
-                "source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.24.4"
+                "source": "https:\/\/github.com\/phpstan\/phpdoc-parser\/tree\/1.24.5"
             },
             "install-path": "..\/phpstan\/phpdoc-parser"
         },

diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
diff --git a/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php b/vendor/phpstan/phpdoc-parser/src/Printer/Printer.php
@@ -609,6 +609,9 @@ private function printNodeFormatPreserving(Node $node, TokenIterator $originalTo
             if ($subStartPos < 0 || $subEndPos < 0) {
                 throw new LogicException();
             }
+            if ($subEndPos < $subStartPos) {
+                return $this->print($node);
+            }
             if ($subNode === null) {
                 return $this->print($node);
             }