misc (#4748)

rectorphp · Aug 9, 2023 · db0388f · db0388f
1 parent ecdf208
commit db0388f
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php b/packages/BetterPhpDocParser/PhpDocInfo/PhpDocInfoFactory.php
@@ -90,7 +90,7 @@ public function createFromNode(Node $node): ?PhpDocInfo
     }
 
     /**
-     * @api
+     * @api downgrade
      */
     public function createEmpty(Node $node): PhpDocInfo
     {

diff --git a/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php b/packages/BetterPhpDocParser/PhpDocParser/StaticDoctrineAnnotationParser/PlainValueParser.php
@@ -76,7 +76,7 @@ public function parseValue(
             $tokenIterator->next();
         }
 
-        // nested entity!
+        // nested entity!, supported in attribute since PHP 8.1
         if ($tokenIterator->isCurrentTokenType(Lexer::TOKEN_OPEN_PARENTHESES)) {
             return $this->parseNestedDoctrineAnnotationTagValueNode($currentTokenValue, $tokenIterator);
         }

diff --git a/packages/PhpAttribute/AnnotationToAttributeMapper.php b/packages/PhpAttribute/AnnotationToAttributeMapper.php
@@ -14,6 +14,7 @@
 use Rector\PhpAttribute\Contract\AnnotationToAttributeMapperInterface;
 use Rector\PhpAttribute\Enum\DocTagNodeState;
 use Symfony\Component\DependencyInjection\Argument\RewindableGenerator;
+use Webmozart\Assert\Assert;
 
 /**
  * @see \Rector\Tests\PhpAttribute\AnnotationToAttributeMapper\AnnotationToAttributeMapperTest
@@ -35,6 +36,8 @@ public function __construct(iterable $annotationToAttributeMappers)
         } else {
             $this->annotationToAttributeMappers = $annotationToAttributeMappers;
         }
+
+        Assert::notEmpty($this->annotationToAttributeMappers);
     }
 
     /**

diff --git a/packages/Testing/PHPUnit/AbstractLazyTestCase.php b/packages/Testing/PHPUnit/AbstractLazyTestCase.php
@@ -6,7 +6,7 @@
 
 use Illuminate\Container\Container;
 use PHPUnit\Framework\TestCase;
-use Rector\Core\Contract\Rector\ConfigurableRectorInterface;
+use Rector\Core\Contract\Rector\NonPhpRectorInterface;
 use Rector\Core\Contract\Rector\PhpRectorInterface;
 use Rector\Core\Contract\Rector\RectorInterface;
 use Rector\Core\DependencyInjection\LazyContainerFactory;
@@ -61,12 +61,18 @@ protected function forgetRectorsRules(): void
     {
         $container = self::getContainer();
 
-        // remove all tagged rules
+        // 1. forget instance first! then remove tags
+        $rectors = $container->tagged(RectorInterface::class);
+        foreach ($rectors as $rector) {
+            $container->offsetUnset($rector::class);
+        }
+
+        // 2. remove all tagged rules
         $privatesAccessor = new PrivatesAccessor();
         $privatesAccessor->propertyClosure($container, 'tags', static function (array $tags): array {
             unset($tags[RectorInterface::class]);
             unset($tags[PhpRectorInterface::class]);
-            unset($tags[ConfigurableRectorInterface::class]);
+            unset($tags[NonPhpRectorInterface::class]);
             return $tags;
         });
 
@@ -75,8 +81,7 @@ protected function forgetRectorsRules(): void
             $container->offsetUnset($rector::class);
         }
 
-        // remove after binding too, to avoid setting configuration over and over again
-
+        // 3. remove after binding too, to avoid setting configuration over and over again
         $privatesAccessor->propertyClosure(
             $container,
             'afterResolvingCallbacks',

diff --git a/...hp55/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_nette_class.php.inc b/...hp55/Rector/String_/StringClassNameToClassConstantRector/Fixture/skip_nette_class.php.inc
diff --git a/...-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php b/...-tests/Php80/Rector/Class_/AnnotationToAttributeRector/config/nested_attributes_php81.php
@@ -9,7 +9,6 @@
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Source\GenericAnnotation;
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\All;
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\Length;
-use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\NotNull;
 use Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\SourcePhp81\NotNumber;
 
 return static function (RectorConfig $rectorConfig): void {
@@ -19,7 +18,6 @@
     $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [
         new AnnotationToAttribute(All::class),
         new AnnotationToAttribute(Length::class),
-        new AnnotationToAttribute(NotNull::class),
         new AnnotationToAttribute(NotNumber::class),
         new AnnotationToAttribute(GenericAnnotation::class),
     ]);

diff --git a/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php b/rules/Php80/Rector/Class_/AnnotationToAttributeRector.php
@@ -39,8 +39,10 @@
 
 /**
  * @changelog https://wiki.php.net/rfc/attributes_v2
+ * @changelog https://wiki.php.net/rfc/new_in_initializers
  *
  * @see \Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\AnnotationToAttributeRectorTest
+ * @see \Rector\Tests\Php80\Rector\Class_\AnnotationToAttributeRector\Php81NestedAttributesRectorTest
  */
 final class AnnotationToAttributeRector extends AbstractRector implements ConfigurableRectorInterface, MinPhpVersionInterface
 {

diff --git a/src/Console/ConsoleApplication.php b/src/Console/ConsoleApplication.php
@@ -36,7 +36,9 @@ public function __construct(iterable $commands)
             $commands = iterator_to_array($commands->getIterator());
         }
 
+        Assert::notEmpty($commands);
         Assert::allIsInstanceOf($commands, Command::class);
+
         $this->addCommands($commands);
 
         // remove unused commands