rectorphp · TomasVotruba · Apr 22, 2020 · Apr 22, 2020
diff --git a/...es/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php b/...es/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php
@@ -7,7 +7,7 @@
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\AbstractDoctrineTagValueNode;
 
 /**
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\DoctrineOrmTagNodeTest
+ * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\TagValueNodeReprintTest
  */
 final class GeneratedValueTagValueNode extends AbstractDoctrineTagValueNode
 {

diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/SymfonyRouteTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/SymfonyRouteTagValueNode.php
@@ -10,7 +10,7 @@
 use Symfony\Component\Routing\Annotation\Route;
 
 /**
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\SymfonyRouteClassMethodTest
+ * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\TagValueNodeReprintTest
  */
 final class SymfonyRouteTagValueNode extends AbstractTagValueNode implements ShortNameAwareTagInterface
 {

diff --git a/...-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php b/...-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php
@@ -9,7 +9,7 @@
 use Rector\Symfony\PhpDocParser\Ast\PhpDoc\AbstractConstraintTagValueNode;
 
 /**
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\AssertChoiceTagValueNodeTest
+ * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\TagValueNodeReprintTest
  */
 final class AssertChoiceTagValueNode extends AbstractConstraintTagValueNode implements TypeAwareTagValueNodeInterface, ShortNameAwareTagInterface
 {

diff --git a/...er-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php b/...er-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php
@@ -10,7 +10,7 @@
 /**
  * @see \Rector\BetterPhpDocParser\PhpDocNodeFactory\Symfony\Validator\Constraints\AssertTypePhpDocNodeFactory
  *
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\AssertTypeTagValueNodeTest
+ * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\AssertTypeTagValueNodeTest
  */
 final class AssertTypeTagValueNode extends AbstractConstraintTagValueNode implements ShortNameAwareTagInterface
 {

diff --git a/packages/better-php-doc-parser/src/PhpDocParser/BetterPhpDocParser.php b/packages/better-php-doc-parser/src/PhpDocParser/BetterPhpDocParser.php
@@ -31,9 +31,7 @@
 use Symplify\PackageBuilder\Reflection\PrivatesCaller;
 
 /**
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\DoctrineOrmTagNodeTest
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\SymfonyRouteClassMethodTest
- * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\AssertTypeTagValueNodeTest
+ * @see \Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\TagValueNodeReprintTest
  */
 final class BetterPhpDocParser extends PhpDocParser
 {

diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/AbstractPhpDocInfoTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/AbstractPhpDocInfoTest.php
@@ -52,8 +52,6 @@ protected function doTestPrintedPhpDocInfo(string $filePath, string $tagValueNod
     {
         $nodeType = TagValueToPhpParserNodeMap::MAP[$tagValueNodeType];
 
-        $this->ensureIsNodeType($nodeType);
-
         $nodeWithPhpDocInfo = $this->parseFileAndGetFirstNodeOfType($filePath, $nodeType);
 
         $docComment = $nodeWithPhpDocInfo->getDocComment();
@@ -75,11 +73,19 @@ protected function yieldFilesFromDirectory(string $directory, string $suffix = '
         return StaticFixtureProvider::yieldFilesFromDirectory($directory, $suffix);
     }
 
+    /**
+     * @return string[]
+     */
+    protected function findFilesFromDirectory(string $directory, string $suffix = '*.php'): array
+    {
+        return StaticFixtureProvider::findFilesFromDirectory($directory, $suffix);
+    }
+
     private function doTestContainsTagValueNodeType(Node $node, string $tagValueNodeType): void
     {
         /** @var PhpDocInfo $phpDocInfo */
         $phpDocInfo = $node->getAttribute(AttributeKey::PHP_DOC_INFO);
-        $phpDocInfo->hasByType($tagValueNodeType);
+        $this->assertTrue($phpDocInfo->hasByType($tagValueNodeType));
     }
 
     /**
@@ -88,7 +94,6 @@ private function doTestContainsTagValueNodeType(Node $node, string $tagValueNode
     private function parseFileAndGetFirstNodeOfType(string $filePath, string $nodeType): Node
     {
         $nodes = $this->fileInfoParser->parseFileInfoToNodesAndDecorate(new SmartFileInfo($filePath));
-
         return $this->betterNodeFinder->findFirstInstanceOf($nodes, $nodeType);
     }
 
@@ -102,18 +107,6 @@ private function printNodePhpDocInfoToString(Node $node): string
         return $this->phpDocInfoPrinter->printFormatPreserving($phpDocInfo);
     }
 
-    /**
-     * @param class-string $nodeType
-     */
-    private function ensureIsNodeType(string $nodeType): void
-    {
-        if (is_a($nodeType, Node::class, true)) {
-            return;
-        }
-
-        throw new ShouldNotHappenException(sprintf('"%s" must be type of "%s"', $nodeType, Node::class));
-    }
-
     private function createErrorMessage(string $filePath): string
     {
         $fileInfo = new SmartFileInfo($filePath);

diff --git a/.../better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/DoctrineOrmTagNodeTest.php b/.../better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/DoctrineOrmTagNodeTest.php
diff --git a/...php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Source/ExistingRepositoryClass.php b/...php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Source/ExistingRepositoryClass.php
diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/GedmoTagParserTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/GedmoTagParserTest.php
diff --git a/...r-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/SymfonyRouteClassMethodTest.php b/...r-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/SymfonyRouteClassMethodTest.php
diff --git a/...tter-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertChoiceTagValueNodeTest.php b/...tter-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertChoiceTagValueNodeTest.php
diff --git a/...better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertTypeTagValueNodeTest.php b/...better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertTypeTagValueNodeTest.php
diff --git a/...alidation/Fixture/Choice/AssertChoice.php → ...int/Fixture/AssertChoice/AssertChoice.php b/...alidation/Fixture/Choice/AssertChoice.php → ...int/Fixture/AssertChoice/AssertChoice.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Choice;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertChoice;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...ure/Choice/AssertChoiceNonQuoteValues.php → ...sertChoice/AssertChoiceNonQuoteValues.php b/...ure/Choice/AssertChoiceNonQuoteValues.php → ...sertChoice/AssertChoiceNonQuoteValues.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Choice;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertChoice;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...ixture/Choice/AssertChoiceQuoteValues.php → .../AssertChoice/AssertChoiceQuoteValues.php b/...ixture/Choice/AssertChoiceQuoteValues.php → .../AssertChoice/AssertChoiceQuoteValues.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Choice;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertChoice;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...ure/Choice/AssertChoiceWithManyGroups.php → ...sertChoice/AssertChoiceWithManyGroups.php b/...ure/Choice/AssertChoiceWithManyGroups.php → ...sertChoice/AssertChoiceWithManyGroups.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Choice;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertChoice;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...tion/Fixture/Choice/AssertQuoteChoice.php → ...ixture/AssertChoice/AssertQuoteChoice.php b/...tion/Fixture/Choice/AssertQuoteChoice.php → ...ixture/AssertChoice/AssertQuoteChoice.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Choice;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertChoice;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...lidation/Fixture/Type/AssertArrayType.php → ...nt/Fixture/AssertType/AssertArrayType.php b/...lidation/Fixture/Type/AssertArrayType.php → ...nt/Fixture/AssertType/AssertArrayType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Type;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertType;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...n/Fixture/Type/AssertStringQuotedType.php → ...ure/AssertType/AssertStringQuotedType.php b/...n/Fixture/Type/AssertStringQuotedType.php → ...ure/AssertType/AssertStringQuotedType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Type;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertType;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...idation/Fixture/Type/AssertStringType.php → ...t/Fixture/AssertType/AssertStringType.php b/...idation/Fixture/Type/AssertStringType.php → ...t/Fixture/AssertType/AssertStringType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Type;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertType;
 
 use Symfony\Component\Validator\Constraints as Assert;
 

diff --git a/...onyValidation/Fixture/Type/AssertType.php → ...Reprint/Fixture/AssertType/AssertType.php b/...onyValidation/Fixture/Type/AssertType.php → ...Reprint/Fixture/AssertType/AssertType.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyValidation\Fixture\Type;
+namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\AssertType;
 
 use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Validator\Constraints as Assert;