From 138aa07a7310a0b62ce76dd1bde291f78dd40f74 Mon Sep 17 00:00:00 2001 From: TomasVotruba Date: Wed, 22 Apr 2020 14:41:39 +0200 Subject: [PATCH] reorganize phpdoc reprint test --- .../Property_/GeneratedValueTagValueNode.php | 2 +- .../Symfony/SymfonyRouteTagValueNode.php | 2 +- .../Constraints/AssertChoiceTagValueNode.php | 2 +- .../Constraints/AssertTypeTagValueNode.php | 2 +- .../src/PhpDocParser/BetterPhpDocParser.php | 4 +- .../PhpDocParser/AbstractPhpDocInfoTest.php | 25 +++---- .../DoctrineOrmTagNodeTest.php | 72 ------------------- .../Source/ExistingRepositoryClass.php | 10 --- .../GedmoTagParser/GedmoTagParserTest.php | 43 ----------- .../SymfonyRouteClassMethodTest.php | 28 -------- .../AssertChoiceTagValueNodeTest.php | 28 -------- .../AssertTypeTagValueNodeTest.php | 28 -------- .../Fixture/AssertChoice}/AssertChoice.php | 2 +- .../AssertChoiceNonQuoteValues.php | 2 +- .../AssertChoice}/AssertChoiceQuoteValues.php | 2 +- .../AssertChoiceWithManyGroups.php | 2 +- .../AssertChoice}/AssertQuoteChoice.php | 2 +- .../Fixture/AssertType}/AssertArrayType.php | 2 +- .../AssertType}/AssertStringQuotedType.php | 2 +- .../Fixture/AssertType}/AssertStringType.php | 2 +- .../Fixture/AssertType}/AssertType.php | 2 +- .../AssertType}/AssertTypeWithMessage.php | 2 +- .../Fixture/Blameable/BlameableTag.php | 2 +- .../DoctrineColumn}/FromOfficialDocs.php | 2 +- .../DoctrineColumn}/PropertyWithName.php | 2 +- .../DoctrineColumn}/QuotesInNestedArray.php | 2 +- .../Fixture/DoctrineColumn}/SomeProperty.php | 2 +- .../CustomIdGenerator.php | 2 +- .../GeneratedValue.php | 2 +- .../GeneratedValueWithStrategy.php | 2 +- .../Fixture/DoctrineJoinTable}/JoinTable.php | 2 +- .../FormattingDoctrineEntity.php | 2 +- .../Fixture/DoctrineTable}/SomeEntity.php | 2 +- .../DoctrineTable}/TableWithIndexes.php | 2 +- .../Fixture/Slug/SomeClassMethod.php | 2 +- .../Fixture/SymfonyRoute}/RouteName.php | 2 +- .../SymfonyRoute}/RouteWithCondition.php | 2 +- .../SymfonyRoute}/RouteWithExtraNewline.php | 2 +- .../Fixture/SymfonyRoute}/RouteWithHost.php | 2 +- .../SymfonyRoute}/RouteWithHostWithPath.php | 2 +- .../Fixture/SymfonyRoute}/SomeClassMethod.php | 2 +- .../Source/ExistingRepositoryClass.php | 10 +++ .../TagValueNodeReprintTest.php | 66 +++++++++++++++++ .../EntityRepositoryConstant.php | 2 +- .../FormattingDoctrineEntity.php | 2 +- .../Fixture/DoctrineEntity}/SomeEntity.php | 2 +- .../DoctrineEntity}/SomeEntityBrackets.php | 2 +- .../DoctrineEntity}/SomeEntitySimple.php | 2 +- .../PhpDocParser/TypeNodeAnalyzerTest.php | 34 ++++++--- src/Testing/StaticFixtureProvider.php | 15 ++++ 50 files changed, 163 insertions(+), 276 deletions(-) delete mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/DoctrineOrmTagNodeTest.php delete mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Source/ExistingRepositoryClass.php delete mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/GedmoTagParserTest.php delete mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/SymfonyRouteClassMethodTest.php delete mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertChoiceTagValueNodeTest.php delete mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertTypeTagValueNodeTest.php rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Choice => TagValueNodeReprint/Fixture/AssertChoice}/AssertChoice.php (82%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Choice => TagValueNodeReprint/Fixture/AssertChoice}/AssertChoiceNonQuoteValues.php (67%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Choice => TagValueNodeReprint/Fixture/AssertChoice}/AssertChoiceQuoteValues.php (67%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Choice => TagValueNodeReprint/Fixture/AssertChoice}/AssertChoiceWithManyGroups.php (73%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Choice => TagValueNodeReprint/Fixture/AssertChoice}/AssertQuoteChoice.php (76%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Type => TagValueNodeReprint/Fixture/AssertType}/AssertArrayType.php (68%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Type => TagValueNodeReprint/Fixture/AssertType}/AssertStringQuotedType.php (68%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Type => TagValueNodeReprint/Fixture/AssertType}/AssertStringType.php (67%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Type => TagValueNodeReprint/Fixture/AssertType}/AssertType.php (74%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyValidation/Fixture/Type => TagValueNodeReprint/Fixture/AssertType}/AssertTypeWithMessage.php (73%) rename packages/better-php-doc-parser/tests/PhpDocParser/{GedmoTagParser => TagValueNodeReprint}/Fixture/Blameable/BlameableTag.php (66%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/Column => TagValueNodeReprint/Fixture/DoctrineColumn}/FromOfficialDocs.php (71%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/Column => TagValueNodeReprint/Fixture/DoctrineColumn}/PropertyWithName.php (69%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/Column => TagValueNodeReprint/Fixture/DoctrineColumn}/QuotesInNestedArray.php (66%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/Column => TagValueNodeReprint/Fixture/DoctrineColumn}/SomeProperty.php (59%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/CustomIdGenerator => TagValueNodeReprint/Fixture/DoctrineCustomIdGenerator}/CustomIdGenerator.php (62%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/GeneratedValue => TagValueNodeReprint/Fixture/DoctrineGeneratedValue}/GeneratedValue.php (66%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/GeneratedValue => TagValueNodeReprint/Fixture/DoctrineGeneratedValue}/GeneratedValueWithStrategy.php (76%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Property/JoinTable => TagValueNodeReprint/Fixture/DoctrineJoinTable}/JoinTable.php (79%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Table => TagValueNodeReprint/Fixture/DoctrineTable}/FormattingDoctrineEntity.php (82%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Entity => TagValueNodeReprint/Fixture/DoctrineTable}/SomeEntity.php (73%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Table => TagValueNodeReprint/Fixture/DoctrineTable}/TableWithIndexes.php (73%) rename packages/better-php-doc-parser/tests/PhpDocParser/{GedmoTagParser => TagValueNodeReprint}/Fixture/Slug/SomeClassMethod.php (71%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyRouteTagParser/Fixture => TagValueNodeReprint/Fixture/SymfonyRoute}/RouteName.php (69%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyRouteTagParser/Fixture => TagValueNodeReprint/Fixture/SymfonyRoute}/RouteWithCondition.php (82%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyRouteTagParser/Fixture => TagValueNodeReprint/Fixture/SymfonyRoute}/RouteWithExtraNewline.php (71%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyRouteTagParser/Fixture => TagValueNodeReprint/Fixture/SymfonyRoute}/RouteWithHost.php (71%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyRouteTagParser/Fixture => TagValueNodeReprint/Fixture/SymfonyRoute}/RouteWithHostWithPath.php (72%) rename packages/better-php-doc-parser/tests/PhpDocParser/{SymfonyRouteTagParser/Fixture => TagValueNodeReprint/Fixture/SymfonyRoute}/SomeClassMethod.php (68%) create mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Source/ExistingRepositoryClass.php create mode 100644 packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/TagValueNodeReprintTest.php rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Entity => TagValueNodeReprting/Fixture/DoctrineEntity}/EntityRepositoryConstant.php (88%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Entity => TagValueNodeReprting/Fixture/DoctrineEntity}/FormattingDoctrineEntity.php (92%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Table => TagValueNodeReprting/Fixture/DoctrineEntity}/SomeEntity.php (88%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Entity => TagValueNodeReprting/Fixture/DoctrineEntity}/SomeEntityBrackets.php (81%) rename packages/better-php-doc-parser/tests/PhpDocParser/{DoctrineOrmTagParser/Fixture/Class_/Entity => TagValueNodeReprting/Fixture/DoctrineEntity}/SomeEntitySimple.php (81%) diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php index f644c9ff3009..4d5889adf43c 100644 --- a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Property_/GeneratedValueTagValueNode.php +++ b/packages/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 index afe9383d5ae6..90ef1b9930af 100644 --- 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/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php index 730c706627d8..ea0084d583be 100644 --- a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertChoiceTagValueNode.php +++ b/packages/better-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/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php index 2f1fc2fabdb1..71d9c618c4f6 100644 --- a/packages/better-php-doc-parser/src/PhpDocNode/Symfony/Validator/Constraints/AssertTypeTagValueNode.php +++ b/packages/better-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 index 02a1db9404f1..8d1d85be4613 100644 --- 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 index 4151e27f92ca..2b2f5e037f88 100644 --- 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/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/DoctrineOrmTagNodeTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/DoctrineOrmTagNodeTest.php deleted file mode 100644 index 9848ac0b52d1..000000000000 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/DoctrineOrmTagNodeTest.php +++ /dev/null @@ -1,72 +0,0 @@ -markTestSkipped('Quoting nested keys in annotations is in progress'); - } - - $this->doTestPrintedPhpDocInfo($filePath, $expectedTagValueNodeType); - } - - public function provideData(): Iterator - { - $filePaths = StaticFixtureProvider::yieldFileFromDirectory(__DIR__ . '/Fixture/Property/Column', '*.php'); - foreach ($filePaths as $filePath) { - yield [$filePath, ColumnTagValueNode::class]; - } - - $filePaths = StaticFixtureProvider::yieldFileFromDirectory(__DIR__ . '/Fixture/Property/JoinTable', '*.php'); - foreach ($filePaths as $filePath) { - yield [$filePath, JoinTableTagValueNode::class]; - } - - $filePaths = StaticFixtureProvider::yieldFileFromDirectory(__DIR__ . '/Fixture/Class_/Entity', '*.php'); - foreach ($filePaths as $filePath) { - yield [$filePath, EntityTagValueNode::class]; - } - - $filePaths = StaticFixtureProvider::yieldFileFromDirectory(__DIR__ . '/Fixture/Class_/Table', '*.php'); - foreach ($filePaths as $filePath) { - yield [$filePath, TableTagValueNode::class]; - } - - $filePaths = StaticFixtureProvider::yieldFileFromDirectory( - __DIR__ . '/Fixture/Property/CustomIdGenerator', - '*.php' - ); - foreach ($filePaths as $filePath) { - yield [$filePath, CustomIdGeneratorTagValueNode::class]; - } - - $filePaths = StaticFixtureProvider::yieldFileFromDirectory( - __DIR__ . '/Fixture/Property/GeneratedValue', - '*.php' - ); - foreach ($filePaths as $filePath) { - yield [$filePath, GeneratedValueTagValueNode::class]; - } - } -} diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Source/ExistingRepositoryClass.php b/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Source/ExistingRepositoryClass.php deleted file mode 100644 index a497e889f6e4..000000000000 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Source/ExistingRepositoryClass.php +++ /dev/null @@ -1,10 +0,0 @@ -doTestPrintedPhpDocInfo($filePath, BlameableTagValueNode::class); - } - - public function provideDataForBlameable(): Iterator - { - return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture/Blameable'); - } - - /** - * @dataProvider provideDataForBlameable() - */ - public function testSlug(string $filePath): void - { - $this->doTestPrintedPhpDocInfo($filePath, SlugTagValueNode::class); - } - - public function provideDataForSlug(): Iterator - { - return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture/Slug'); - } -} diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/SymfonyRouteClassMethodTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/SymfonyRouteClassMethodTest.php deleted file mode 100644 index 18c36687253e..000000000000 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/SymfonyRouteClassMethodTest.php +++ /dev/null @@ -1,28 +0,0 @@ -doTestPrintedPhpDocInfo($filePath, SymfonyRouteTagValueNode::class); - } - - public function provideData(): Iterator - { - return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture'); - } -} diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertChoiceTagValueNodeTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertChoiceTagValueNodeTest.php deleted file mode 100644 index 9ffdb1df9614..000000000000 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertChoiceTagValueNodeTest.php +++ /dev/null @@ -1,28 +0,0 @@ -doTestPrintedPhpDocInfo($filePath, AssertChoiceTagValueNode::class); - } - - public function provideData(): Iterator - { - return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture/Choice'); - } -} diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertTypeTagValueNodeTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertTypeTagValueNodeTest.php deleted file mode 100644 index fbf8772bbaa1..000000000000 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/AssertTypeTagValueNodeTest.php +++ /dev/null @@ -1,28 +0,0 @@ -doTestPrintedPhpDocInfo($filePath, AssertTypeTagValueNode::class); - } - - public function provideData(): Iterator - { - return $this->yieldFilesFromDirectory(__DIR__ . '/Fixture/Type'); - } -} diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoice.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoice.php similarity index 82% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoice.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoice.php index 601c9dba4507..ccefbc9cc389 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoice.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceNonQuoteValues.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoiceNonQuoteValues.php similarity index 67% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceNonQuoteValues.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoiceNonQuoteValues.php index f01888bf617c..50476db2ca5e 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceNonQuoteValues.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceQuoteValues.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoiceQuoteValues.php similarity index 67% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceQuoteValues.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoiceQuoteValues.php index 8934b7323d61..7a3a39818d53 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceQuoteValues.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceWithManyGroups.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoiceWithManyGroups.php similarity index 73% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceWithManyGroups.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertChoiceWithManyGroups.php index 260d5ae708b6..c785e72b2603 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertChoiceWithManyGroups.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertQuoteChoice.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertQuoteChoice.php similarity index 76% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertQuoteChoice.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertChoice/AssertQuoteChoice.php index cf54a2df4835..90e654a97cdd 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Choice/AssertQuoteChoice.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertArrayType.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertArrayType.php similarity index 68% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertArrayType.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertArrayType.php index a1a963025fb8..b5d6dd3ace0c 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertArrayType.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertStringQuotedType.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertStringQuotedType.php similarity index 68% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertStringQuotedType.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertStringQuotedType.php index f78925dbe385..6d4fe76fc9d3 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertStringQuotedType.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertStringType.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertStringType.php similarity index 67% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertStringType.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertStringType.php index 61185874f12e..cd016f87f800 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertStringType.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/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/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertType.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertType.php similarity index 74% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertType.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertType.php index 2bed6e0fd5fd..f4b93f09b6ca 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertType.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/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; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertTypeWithMessage.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertTypeWithMessage.php similarity index 73% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertTypeWithMessage.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertTypeWithMessage.php index 911a37eb6c60..54bb7a5733c4 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyValidation/Fixture/Type/AssertTypeWithMessage.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/AssertType/AssertTypeWithMessage.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/packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/Fixture/Blameable/BlameableTag.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/Blameable/BlameableTag.php similarity index 66% rename from packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/Fixture/Blameable/BlameableTag.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/Blameable/BlameableTag.php index d440ea276b92..cf4072dfba52 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/Fixture/Blameable/BlameableTag.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/Blameable/BlameableTag.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\GedmoTagParser\Fixture\Blameable; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\Blameable; use Gedmo\Mapping\Annotation as Gedmo; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/FromOfficialDocs.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/FromOfficialDocs.php similarity index 71% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/FromOfficialDocs.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/FromOfficialDocs.php index 59d8a552a0a9..6b69ea1f9370 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/FromOfficialDocs.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/FromOfficialDocs.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\Column; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineColumn; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/PropertyWithName.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/PropertyWithName.php similarity index 69% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/PropertyWithName.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/PropertyWithName.php index 2f0ceba71329..d172295a1b8e 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/PropertyWithName.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/PropertyWithName.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\Column; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineColumn; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/QuotesInNestedArray.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/QuotesInNestedArray.php similarity index 66% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/QuotesInNestedArray.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/QuotesInNestedArray.php index af02fd09f077..ccb1b577198c 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/QuotesInNestedArray.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/QuotesInNestedArray.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\Column; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineColumn; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/SomeProperty.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/SomeProperty.php similarity index 59% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/SomeProperty.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/SomeProperty.php index be483df7acba..5b9428a9c1d5 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/Column/SomeProperty.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineColumn/SomeProperty.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\Column; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineColumn; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/CustomIdGenerator/CustomIdGenerator.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineCustomIdGenerator/CustomIdGenerator.php similarity index 62% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/CustomIdGenerator/CustomIdGenerator.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineCustomIdGenerator/CustomIdGenerator.php index 88b4617e3e01..8efc681d3732 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/CustomIdGenerator/CustomIdGenerator.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineCustomIdGenerator/CustomIdGenerator.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\CustomIdGenerator; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineCustomIdGenerator; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/GeneratedValue/GeneratedValue.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineGeneratedValue/GeneratedValue.php similarity index 66% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/GeneratedValue/GeneratedValue.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineGeneratedValue/GeneratedValue.php index b66141a73b19..f0c96b2bf56d 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/GeneratedValue/GeneratedValue.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineGeneratedValue/GeneratedValue.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\GeneratedValue; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineGeneratedValue; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/GeneratedValue/GeneratedValueWithStrategy.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineGeneratedValue/GeneratedValueWithStrategy.php similarity index 76% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/GeneratedValue/GeneratedValueWithStrategy.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineGeneratedValue/GeneratedValueWithStrategy.php index 4eac734d3aab..279ab7ac4013 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/GeneratedValue/GeneratedValueWithStrategy.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineGeneratedValue/GeneratedValueWithStrategy.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\GeneratedValue; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineGeneratedValue; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/JoinTable/JoinTable.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineJoinTable/JoinTable.php similarity index 79% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/JoinTable/JoinTable.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineJoinTable/JoinTable.php index 9b4fe9cd840a..6bd8ba509733 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Property/JoinTable/JoinTable.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineJoinTable/JoinTable.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Property\JoinTable; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineJoinTable; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/FormattingDoctrineEntity.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/FormattingDoctrineEntity.php similarity index 82% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/FormattingDoctrineEntity.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/FormattingDoctrineEntity.php index 371cadca402c..0aa9949fa53f 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/FormattingDoctrineEntity.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/FormattingDoctrineEntity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Table; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineTable; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntity.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/SomeEntity.php similarity index 73% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntity.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/SomeEntity.php index 9b9ae68280aa..160f9cb6a76c 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntity.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/SomeEntity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Entity; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineTable; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/TableWithIndexes.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/TableWithIndexes.php similarity index 73% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/TableWithIndexes.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/TableWithIndexes.php index 736ef1dd86eb..882b7d26e085 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/TableWithIndexes.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/DoctrineTable/TableWithIndexes.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Table; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\DoctrineTable; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/Fixture/Slug/SomeClassMethod.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/Slug/SomeClassMethod.php similarity index 71% rename from packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/Fixture/Slug/SomeClassMethod.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/Slug/SomeClassMethod.php index 6e6c82f159ac..ad85fda4d8e0 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/GedmoTagParser/Fixture/Slug/SomeClassMethod.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/Slug/SomeClassMethod.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\GedmoTagParser\Fixture\Slug; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\Slug; use Gedmo\Mapping\Annotation as Gedmo; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteName.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteName.php similarity index 69% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteName.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteName.php index 4083d87fe8e8..3d88705592d5 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteName.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteName.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\Fixture; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute; use Symfony\Component\Routing\Annotation\Route; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithCondition.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithCondition.php similarity index 82% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithCondition.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithCondition.php index 9b1a3ea2fc79..610f34874dd4 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithCondition.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithCondition.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\Fixture; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute; use Symfony\Component\Routing\Annotation\Route; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithExtraNewline.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithExtraNewline.php similarity index 71% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithExtraNewline.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithExtraNewline.php index ddad652b6b02..b7fab200117e 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithExtraNewline.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithExtraNewline.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\Fixture; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute; use Symfony\Component\Routing\Annotation\Route; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithHost.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithHost.php similarity index 71% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithHost.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithHost.php index 763f5a63c186..eb78cd0e33b9 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithHost.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithHost.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\Fixture; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute; use Symfony\Component\Routing\Annotation\Route; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithHostWithPath.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithHostWithPath.php similarity index 72% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithHostWithPath.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithHostWithPath.php index 2ad9e21fa283..f54a21e29e2f 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/RouteWithHostWithPath.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/RouteWithHostWithPath.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\Fixture; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute; use Symfony\Component\Routing\Annotation\Route; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/SomeClassMethod.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/SomeClassMethod.php similarity index 68% rename from packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/SomeClassMethod.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/SomeClassMethod.php index 14a4cca49686..56fe7ca376c0 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/SymfonyRouteTagParser/Fixture/SomeClassMethod.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Fixture/SymfonyRoute/SomeClassMethod.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\SymfonyRouteTagParser\Fixture; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\TagValueNodeReprint\Fixture\SymfonyRoute; use Symfony\Component\Routing\Annotation\Route; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Source/ExistingRepositoryClass.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Source/ExistingRepositoryClass.php new file mode 100644 index 000000000000..47be03ec9fce --- /dev/null +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprint/Source/ExistingRepositoryClass.php @@ -0,0 +1,10 @@ +markTestSkipped('Quoting nested keys in annotations is in progress'); + } + + $this->doTestPrintedPhpDocInfo($filePath, $tagValueNodeClass); + } + + public function provideData(): Iterator + { + foreach ($this->getDirectoriesByTagValueNodes() as $tagValueNode => $directory) { + foreach ($this->findFilesFromDirectory($directory) as $filePath) { + yield [$filePath, $tagValueNode]; + } + } + } + + /** + * @return string[] + */ + private function getDirectoriesByTagValueNodes(): array + { + return [ + BlameableTagValueNode::class => __DIR__ . '/Fixture/Blameable', + SlugTagValueNode::class => __DIR__ . '/Fixture/Slug', + AssertChoiceTagValueNode::class => __DIR__ . '/Fixture/AssertChoice', + AssertTypeTagValueNode::class => __DIR__ . '/Fixture/AssertType', + SymfonyRouteTagValueNode::class => __DIR__ . '/Fixture/SymfonyRoute', + // Doctrine + ColumnTagValueNode::class => __DIR__ . '/Fixture/DoctrineColumn', + JoinTableTagValueNode::class => __DIR__ . '/Fixture/DoctrineJoinTable', + EntityTagValueNode::class => __DIR__ . '/Fixture/DoctrineEntity', + TableTagValueNode::class => __DIR__ . '/Fixture/DoctrineTable', + CustomIdGeneratorTagValueNode::class => __DIR__ . '/Fixture/DoctrineCustomIdGenerator', + GeneratedValueTagValueNode::class => __DIR__ . '/Fixture/DoctrineGeneratedValue', + ]; + } +} diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/EntityRepositoryConstant.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/EntityRepositoryConstant.php similarity index 88% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/EntityRepositoryConstant.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/EntityRepositoryConstant.php index e80b989526f3..896597e07725 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/EntityRepositoryConstant.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/EntityRepositoryConstant.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Entity; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\DoctrineEntity; use Doctrine\ORM\Mapping as ORM; use Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Source\ExistingRepositoryClass; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/FormattingDoctrineEntity.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/FormattingDoctrineEntity.php similarity index 92% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/FormattingDoctrineEntity.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/FormattingDoctrineEntity.php index 783ffc78fa72..ce3781091f4b 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/FormattingDoctrineEntity.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/FormattingDoctrineEntity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Entity; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\DoctrineEntity; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/SomeEntity.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntity.php similarity index 88% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/SomeEntity.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntity.php index 02b651712faa..358d0f737fe7 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Table/SomeEntity.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntity.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Table; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\DoctrineEntity; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntityBrackets.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntityBrackets.php similarity index 81% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntityBrackets.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntityBrackets.php index d733b5b0213b..6838a983f19d 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntityBrackets.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntityBrackets.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Entity; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\DoctrineEntity; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntitySimple.php b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntitySimple.php similarity index 81% rename from packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntitySimple.php rename to packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntitySimple.php index 2c9c429e5e36..568e3c113bd8 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/DoctrineOrmTagParser/Fixture/Class_/Entity/SomeEntitySimple.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TagValueNodeReprting/Fixture/DoctrineEntity/SomeEntitySimple.php @@ -2,7 +2,7 @@ declare(strict_types=1); -namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\Entity; +namespace Rector\BetterPhpDocParser\Tests\PhpDocParser\DoctrineOrmTagParser\Fixture\Class_\DoctrineEntity; use Doctrine\ORM\Mapping as ORM; diff --git a/packages/better-php-doc-parser/tests/PhpDocParser/TypeNodeAnalyzerTest.php b/packages/better-php-doc-parser/tests/PhpDocParser/TypeNodeAnalyzerTest.php index 1ecd716e8342..a1860cd32b21 100644 --- a/packages/better-php-doc-parser/tests/PhpDocParser/TypeNodeAnalyzerTest.php +++ b/packages/better-php-doc-parser/tests/PhpDocParser/TypeNodeAnalyzerTest.php @@ -4,10 +4,12 @@ namespace Rector\BetterPhpDocParser\Tests\PhpDocParser; +use Iterator; use PHPStan\PhpDocParser\Ast\Type\ArrayTypeNode; use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode; use PHPStan\PhpDocParser\Ast\Type\IntersectionTypeNode; use PHPStan\PhpDocParser\Ast\Type\NullableTypeNode; +use PHPStan\PhpDocParser\Ast\Type\TypeNode; use PHPStan\PhpDocParser\Ast\Type\UnionTypeNode; use Rector\BetterPhpDocParser\PhpDocParser\TypeNodeAnalyzer; use Rector\Core\HttpKernel\RectorKernel; @@ -23,25 +25,37 @@ final class TypeNodeAnalyzerTest extends AbstractKernelTestCase protected function setUp(): void { $this->bootKernel(RectorKernel::class); - $this->typeNodeAnalyzer = self::$container->get(TypeNodeAnalyzer::class); } - public function testContainsArrayType(): void + /** + * @dataProvider provideDataForArrayType() + */ + public function testContainsArrayType(TypeNode $typeNode, bool $expectedContains): void + { + $this->assertSame($expectedContains, $this->typeNodeAnalyzer->containsArrayType($typeNode)); + } + + public function provideDataForArrayType(): Iterator { $arrayTypeNode = new ArrayTypeNode(new IdentifierTypeNode('int')); - $this->assertFalse($this->typeNodeAnalyzer->containsArrayType(new IdentifierTypeNode('int'))); - $this->assertTrue($this->typeNodeAnalyzer->containsArrayType($arrayTypeNode)); - $this->assertTrue($this->typeNodeAnalyzer->containsArrayType(new UnionTypeNode([$arrayTypeNode]))); + yield [new IdentifierTypeNode('int'), false]; + yield [$arrayTypeNode, true]; + yield [new UnionTypeNode([$arrayTypeNode]), true]; } - public function testIsIntersectionAndNotNullable(): void + /** + * @dataProvider provideDataForIntersectionAndNotNullable() + */ + public function testIsIntersectionAndNotNullable(TypeNode $typeNode, bool $expectedIs): void { - $intersectionTypeNode = new IntersectionTypeNode([new IdentifierTypeNode('int')]); - $nullableTypeNode = new IntersectionTypeNode([new NullableTypeNode(new IdentifierTypeNode('int'))]); + $this->assertSame($expectedIs, $this->typeNodeAnalyzer->isIntersectionAndNotNullable($typeNode)); + } - $this->assertTrue($this->typeNodeAnalyzer->isIntersectionAndNotNullable($intersectionTypeNode)); - $this->assertFalse($this->typeNodeAnalyzer->isIntersectionAndNotNullable($nullableTypeNode)); + public function provideDataForIntersectionAndNotNullable(): Iterator + { + yield [new IntersectionTypeNode([new IdentifierTypeNode('int')]), true]; + yield [new IntersectionTypeNode([new NullableTypeNode(new IdentifierTypeNode('int'))]), false]; } } diff --git a/src/Testing/StaticFixtureProvider.php b/src/Testing/StaticFixtureProvider.php index 48c34a0b3ec9..0925e43c24c9 100644 --- a/src/Testing/StaticFixtureProvider.php +++ b/src/Testing/StaticFixtureProvider.php @@ -19,6 +19,21 @@ public static function yieldFilesFromDirectory(string $directory, string $suffix } } + /** + * @return string[] + */ + public static function findFilesFromDirectory(string $directory, string $suffix): array + { + $fileInfos = self::findFilesInDirectory($directory, $suffix); + + $filePaths = []; + foreach ($fileInfos as $fileInfo) { + $filePaths[] = $fileInfo->getPathName(); + } + + return $filePaths; + } + public static function yieldFileFromDirectory(string $directory, string $suffix): Iterator { $fileInfos = self::findFilesInDirectory($directory, $suffix);