TomasVotruba · Oct 16, 2026 · Oct 16, 2026 · Oct 16, 2026 · Oct 16, 2026
diff --git a/...t-repository/e2e/rector-prefixed-rule-test/utils/rector/src/Rector/RenameSimpleRector.php b/...t-repository/e2e/rector-prefixed-rule-test/utils/rector/src/Rector/RenameSimpleRector.php
@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\Variable;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 /**
  * @see \Rector\Tests\TypeDeclaration\Rector\RenameSimpleRectorTest

diff --git a/e2e/parallel-unfinished-jobs/utils/ExitWorkerRector.php b/e2e/parallel-unfinished-jobs/utils/ExitWorkerRector.php
@@ -7,8 +7,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Expr\FuncCall;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\CodeSample\CodeSample;
+use Rector\RuleDoc\RuleDefinition;
 
 /**
  * Ends the worker process on exit_worker(), like a worker that dies before reporting its files

diff --git a/phpstan.neon b/phpstan.neon
@@ -189,11 +189,6 @@ parameters:
             identifier: offsetAccess.nonArray
             path: src/PhpParser/NodeTraverser/RectorNodeTraverser.php
 
-        -
-            identifier: offsetAccess.notFound
-            message: '#Offset float\|int\|string might not exist on string#'
-            path: rules/Php70/EregToPcreTransformer.php
-
         # phpstan internalls
         - identifier: phpstanApi.class
         - identifier: phpstanApi.classConstant

diff --git a/rules/Php70/EregToPcreTransformer.php b/rules/Php70/EregToPcreTransformer.php
@@ -90,7 +90,7 @@ public function transform(string $content, bool $ignorecase): string
     /**
      * Recursively converts ERE into PCRE, starting at the position $i.
      *
-     * @return float[]|int[]|string[]
+     * @return array{string, int}
      */
     private function _ere2pcre(string $content, int $i): array
     {
@@ -223,7 +223,7 @@ private function processBracket(string $content, int $i, int $l, array &$r, int
     }
 
     /**
-     * @return float[]|int[]|string[]
+     * @return array{string, int}
      */
     private function processSquareBracket(string $s, int $i, int $l, string $cls, bool $start): array
     {
@@ -313,7 +313,7 @@ private function processCurlyBracket(string $s, int $i, array &$r, int $rr): int
     }
 
     /**
-     * @return int[]|string[]
+     * @return array{string, int}
      */
     private function processCharacterClass(string $content, int $i, string $cls): array
     {

diff --git a/src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php b/src/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/ArrayParser.php
@@ -107,7 +107,7 @@ public function createArrayFromValues(array $values): array
 
     /**
      * Mimics https://github.com/doctrine/annotations/blob/c66f06b7c83e9a2a7523351a9d5a4b55f885e574/lib/Doctrine/Common/Annotations/DocParser.php#L1354-L1385
-     * @return array<null|mixed, mixed>
+     * @return array{mixed, mixed}
      */
     private function resolveArrayItem(BetterTokenIterator $tokenIterator, Node $currentPhpNode): array
     {

diff --git a/tests/Configuration/Source/DeprecatedRectorStub.php b/tests/Configuration/Source/DeprecatedRectorStub.php
@@ -8,8 +8,8 @@
 use PhpParser\Node\Stmt\Class_;
 use Rector\Configuration\Deprecation\Contract\DeprecatedInterface;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\CodeSample\CodeSample;
+use Rector\RuleDoc\RuleDefinition;
 
 final class DeprecatedRectorStub extends AbstractRector implements DeprecatedInterface
 {

diff --git a/tests/Configuration/Source/RemoveDoubleAssignRector.php b/tests/Configuration/Source/RemoveDoubleAssignRector.php
@@ -4,7 +4,7 @@
 
 use PhpParser\Node;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 /**
  * Dummy rector with same class name as an official one

diff --git a/tests/Console/Command/Source/ComposerBoundRector.php b/tests/Console/Command/Source/ComposerBoundRector.php
@@ -8,8 +8,8 @@
 use Rector\Rector\AbstractRector;
 use Rector\VersionBonding\Contract\ComposerPackageConstraintInterface;
 use Rector\VersionBonding\ValueObject\ComposerPackageConstraint;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\CodeSample\CodeSample;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ComposerBoundRector extends AbstractRector implements ComposerPackageConstraintInterface
 {

diff --git a/tests/Issues/AttributeAndArgValueRefresh/Source/SetArrayArgValueRector.php b/tests/Issues/AttributeAndArgValueRefresh/Source/SetArrayArgValueRector.php
@@ -10,7 +10,7 @@
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Scalar\String_;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class SetArrayArgValueRector extends AbstractRector
 {

diff --git a/tests/Issues/AttributeAndArgValueRefresh/Source/SetArrayAttributeValueRector.php b/tests/Issues/AttributeAndArgValueRefresh/Source/SetArrayAttributeValueRector.php
@@ -11,7 +11,7 @@
 use PhpParser\Node\Expr\Array_;
 use PhpParser\Node\Scalar\String_;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class SetArrayAttributeValueRector extends AbstractRector
 {

diff --git a/tests/Issues/ChangeSwitchTernary/Source/AnotherExpressionRector.php b/tests/Issues/ChangeSwitchTernary/Source/AnotherExpressionRector.php
@@ -8,7 +8,7 @@
 use PhpParser\Node\Stmt\Expression;
 use Rector\PHPStan\ScopeFetcher;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class AnotherExpressionRector extends AbstractRector
 {

diff --git a/...portFullyQualifiedIdentifierDocblock/Source/AddFullyQualifiedIdentifierDocblockRector.php b/...portFullyQualifiedIdentifierDocblock/Source/AddFullyQualifiedIdentifierDocblockRector.php
@@ -11,7 +11,7 @@
 use Rector\BetterPhpDocParser\ValueObject\Type\FullyQualifiedIdentifierTypeNode;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class AddFullyQualifiedIdentifierDocblockRector extends AbstractRector
 {

diff --git a/tests/Issues/IndexedStmt/Source/ChangeLastIndex1Rector.php b/tests/Issues/IndexedStmt/Source/ChangeLastIndex1Rector.php
@@ -9,7 +9,7 @@
 use PhpParser\Node\Stmt\Expression;
 use Rector\Contract\PhpParser\Node\StmtsAwareInterface;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ChangeLastIndex1Rector extends AbstractRector
 {

diff --git a/tests/Issues/IndexedStmt/Source/RemoveIndex1Rector.php b/tests/Issues/IndexedStmt/Source/RemoveIndex1Rector.php
@@ -9,7 +9,7 @@
 use PhpParser\Node\Stmt\Expression;
 use PhpParser\NodeVisitor;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class RemoveIndex1Rector extends AbstractRector
 {

diff --git a/tests/Issues/Issue9388/Source/Rule/ExtbaseAnnotationToAttributeRector.php b/tests/Issues/Issue9388/Source/Rule/ExtbaseAnnotationToAttributeRector.php
@@ -24,8 +24,8 @@
 use Rector\Tests\Issues\Issue9388\Source\AnnotationToAttribute\AttributeDecorator;
 use Rector\ValueObject\PhpVersionFeature;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\CodeSample\CodeSample;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ExtbaseAnnotationToAttributeRector extends AbstractRector implements MinPhpVersionInterface
 {

diff --git a/tests/Issues/PartialValueDocblockUpdate/Source/PartialUpdateTestRector.php b/tests/Issues/PartialValueDocblockUpdate/Source/PartialUpdateTestRector.php
@@ -12,7 +12,7 @@
 use Rector\BetterPhpDocParser\ValueObject\PhpDoc\DoctrineAnnotation\CurlyListNode;
 use Rector\Comments\NodeDocBlock\DocBlockUpdater;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class PartialUpdateTestRector extends AbstractRector
 {

diff --git a/tests/Issues/PrintStringNowDocUnderAttributeTarget/Source/SomeAttributeTargetRector.php b/tests/Issues/PrintStringNowDocUnderAttributeTarget/Source/SomeAttributeTargetRector.php
@@ -8,7 +8,7 @@
 use PhpParser\Node\Attribute;
 use PhpParser\Node\Name\FullyQualified;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class SomeAttributeTargetRector extends AbstractRector
 {

diff --git a/tests/Issues/ReturnEmptyNodes/Source/ReturnEmptyStmtsRector.php b/tests/Issues/ReturnEmptyNodes/Source/ReturnEmptyStmtsRector.php
@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\If_;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ReturnEmptyStmtsRector extends AbstractRector
 {

diff --git a/tests/Rector/RectorRunner/Source/ReturnNullRector.php b/tests/Rector/RectorRunner/Source/ReturnNullRector.php
@@ -7,8 +7,8 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\CodeSample\CodeSample;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\CodeSample\CodeSample;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ReturnNullRector extends AbstractRector
 {

diff --git a/tests/Testing/RectorRuleShouldNotBeApplied/Source/NoChangeRector.php b/tests/Testing/RectorRuleShouldNotBeApplied/Source/NoChangeRector.php
@@ -7,7 +7,7 @@
 use PhpParser\Node;
 use PhpParser\Node\Stmt\Class_;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class NoChangeRector extends AbstractRector
 {

diff --git a/tests/VersionBonding/Fixture/ComposerPackageConstraintRector.php b/tests/VersionBonding/Fixture/ComposerPackageConstraintRector.php
@@ -8,7 +8,7 @@
 use Rector\Rector\AbstractRector;
 use Rector\VersionBonding\Contract\ComposerPackageConstraintInterface;
 use Rector\VersionBonding\ValueObject\ComposerPackageConstraint;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ComposerPackageConstraintRector extends AbstractRector implements ComposerPackageConstraintInterface
 {

diff --git a/tests/VersionBonding/Fixture/ComposerPackageConstraintsRector.php b/tests/VersionBonding/Fixture/ComposerPackageConstraintsRector.php
@@ -8,7 +8,7 @@
 use Rector\Rector\AbstractRector;
 use Rector\VersionBonding\Contract\ComposerPackageConstraintInterface;
 use Rector\VersionBonding\ValueObject\ComposerPackageConstraint;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class ComposerPackageConstraintsRector extends AbstractRector implements ComposerPackageConstraintInterface
 {

diff --git a/tests/VersionBonding/Fixture/NoInterfaceRector.php b/tests/VersionBonding/Fixture/NoInterfaceRector.php
@@ -6,7 +6,7 @@
 
 use PhpParser\Node;
 use Rector\Rector\AbstractRector;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class NoInterfaceRector extends AbstractRector
 {

diff --git a/tests/VersionBonding/Fixture/PolyfillPhp83Rector.php b/tests/VersionBonding/Fixture/PolyfillPhp83Rector.php
@@ -10,7 +10,7 @@
 use Rector\ValueObject\PolyfillPackage;
 use Rector\VersionBonding\Contract\MinPhpVersionInterface;
 use Rector\VersionBonding\Contract\RelatedPolyfillInterface;
-use Symplify\RuleDocGenerator\ValueObject\RuleDefinition;
+use Rector\RuleDoc\RuleDefinition;
 
 final class PolyfillPhp83Rector extends AbstractRector implements MinPhpVersionInterface, RelatedPolyfillInterface
 {