handle spaces within docblock tag content

Author: stesie

src/DoctrineAnnotationCodingStandard/Helper/DocBlockHelper.php

@@ -97,19 +97,13 @@ private static function fetchTagContent(array $tokens, int $tagPos): string
  $tagName = substr($tokens[$tagPos]['content'], 1);
 
  $parenPos = strpos($tagName, '(');
- if ($parenPos !== false) {
- return substr($tagName, $parenPos);
- }
+ $content = ($parenPos !== false) ? substr($tagName, $parenPos) : '';
 
- if ($tokens[$tagPos + 1]['type'] !== 'T_DOC_COMMENT_WHITESPACE') {
- throw new ParseErrorException('Token after @tag not T_DOC_COMMENT_WHITESPACE');
- }
-
- if ($tokens[$tagPos + 2]['type'] !== 'T_DOC_COMMENT_STRING') {
- throw new ParseErrorException('T_DOC_COMMENT_STRING expected after @tag');
+ while (in_array($tokens[++$tagPos]['type'], ['T_DOC_COMMENT_WHITESPACE', 'T_DOC_COMMENT_STRING'])) {
+ $content .= $tokens[$tagPos]['content'];
  }
 
- return trim($tokens[$tagPos + 2]['content']);
+ return trim($content);
  }
 
  /**

tests/DoctrineAnnotationCodingStandard/Helper/DocBlockHelperTest.php

@@ -34,22 +34,16 @@ public function testGetVarTagContentPlain()
  $this->assertSame('foo', DocBlockHelper::getVarTagContent($file, 1));
  }
 
- /**
- * @expectedException \DoctrineAnnotationCodingStandard\Exception\ParseErrorException
- */
  public function testGetVarTagNoContent()
  {
  $file = $this->checkString('/** @var*/', DummySniff::class);
- DocBlockHelper::getVarTagContent($file, 1);
+ $this->assertSame('', DocBlockHelper::getVarTagContent($file, 1));
  }
 
- /**
- * @expectedException \DoctrineAnnotationCodingStandard\Exception\ParseErrorException
- */
  public function testGetVarTagWithJustSpaces()
  {
  $file = $this->checkString('/** @var */', DummySniff::class);
- DocBlockHelper::getVarTagContent($file, 1);
+ $this->assertSame('', DocBlockHelper::getVarTagContent($file, 1));
  }
 
  /**
@@ -96,6 +90,17 @@ public function testFindTagByClassWithSpaces()
  $this->assertSame('()', $tag);
  }
 
+ public function testFindTagByClassWithSpacesWithinContent()
+ {
+ $file = $this->checkString('/** @ORM\JoinColumn(onDelete="CASCADE", nullable=true) */', DummySniff::class);
+
+ $classMap = new ImportClassMap();
+ $classMap->add('ORM', 'Doctrine\\ORM\\Mapping');
+
+ $tag = DocBlockHelper::findTagByClass($file, 1, $classMap, ORM\JoinColumn::class);
+ $this->assertSame('(onDelete="CASCADE", nullable=true)', $tag);
+ }
+
  public function testFindTagMissing()
  {
  $file = $this->checkString('/** @ORM\Column() */', DummySniff::class);