Fix rector errors

Author: Kirill Nesmeyanov

rector.php

@@ -6,13 +6,15 @@
 use Rector\CodeQuality\Rector\Identical\FlipTypeControlToUseExclusiveTypeRector;
 use Rector\CodingStyle\Rector\Assign\SplitDoubleAssignRector;
 use Rector\CodingStyle\Rector\Catch_\CatchExceptionNameMatchingTypeRector;
+use Rector\CodingStyle\Rector\Encapsed\EncapsedStringsToSprintfRector;
 use Rector\Config\RectorConfig;
 use Rector\EarlyReturn\Rector\Return_\ReturnBinaryOrToEarlyReturnRector;
 use Rector\Php80\Rector\Class_\ClassPropertyAssignToConstructorPromotionRector;
 use Rector\Php81\Rector\ClassConst\FinalizePublicClassConstantRector;
 use Rector\Php81\Rector\Property\ReadOnlyPropertyRector;
 use Rector\Set\ValueObject\LevelSetList;
 use Rector\Set\ValueObject\SetList;
+use Rector\TypeDeclaration\Rector\FunctionLike\AddReturnTypeDeclarationFromYieldsRector;
 
 return static function (RectorConfig $config): void {
     $config->paths([__DIR__ . '/src']);
@@ -26,26 +28,15 @@
     ]);
 
     $config->skip([
-        //
-        // Do not replace classic properties to promoted eq. These are
-        // completely different statements.
-        //
         ClassPropertyAssignToConstructorPromotionRector::class,
-
-        //
-        // This rector can break the Doctrine that replaces implementations
-        // with proxies, like:
-        //  - private Collection $relation;          // OK This can be replaced with a proxy
-        //  + private readonly Collection $relation; // FAIL
-        //
         ReadOnlyPropertyRector::class,
-
-        // Totally pointless "improvements"
         CatchExceptionNameMatchingTypeRector::class,
         SplitDoubleAssignRector::class,
         FinalizePublicClassConstantRector::class,
         FlipTypeControlToUseExclusiveTypeRector::class,
         ReturnBinaryOrToEarlyReturnRector::class,
         LocallyCalledStaticMethodToNonStaticRector::class,
+        EncapsedStringsToSprintfRector::class,
+        AddReturnTypeDeclarationFromYieldsRector::class,
     ]);
 };

src/DocBlock/DescriptionFactory.php

@@ -50,7 +50,7 @@ public function create(string $contents): Description
      */
     private function createTagDescriptionChunk(int $tagId): string
     {
-        return "%$tagId\$s";
+        return "%{$tagId}\$s";
     }
 
     /**

src/DocBlock/StandardTagFactory.php

@@ -80,7 +80,8 @@ public function create(string $tag): TagInterface
     {
         [$name, $body] = $this->parts->extract($tag);
 
-        if ($factory = $this->getFactory($name)) {
+        $factory = $this->getFactory($name);
+        if ($factory !== null) {
             $body ??= '';
 
             try {

src/DocBlockFactory.php

@@ -168,11 +168,11 @@ private function splitByDocBlockTags(string $docblock): array
             }
 
             if (\str_starts_with($tag, ' ')) {
-                $description .= "\n@$tag";
+                $description .= "\n@{$tag}";
                 continue;
             }
 
-            $tags[] = $this->tags->create("@$tag");
+            $tags[] = $this->tags->create("@{$tag}");
         }
 
         return [$this->descriptions->create($description), $tags];