mirrors/barryvdh_ReflectionDocBlock
1
0
Fork 0
mirror of https://github.com/barryvdh/ReflectionDocBlock.git synced 2026-08-18 18:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #89 from Seldaek/fix_regex

Browse Source 
Fix regex for tag name extraction and restore disabled test
This commit is contained in:
Jaap van Otterdijk
2017-04-24 22:45:54 +02:00
committed by GitHub
parent 8331b5efe8 248e5f69dc
commit 1d3dd12a7f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/DocBlock/StandardTagFactory.php
+1 -1
View File
@@ -161,7 +161,7 @@ final class StandardTagFactory implements TagFactory
private function extractTagParts($tagLine) private function extractTagParts($tagLine)
{ {
$matches = array(); $matches = array();
if (! preg_match('/^@(' . self::REGEX_TAGNAME . ')(?:\s*([^\s].*)|$)?/us', $tagLine, $matches)) { if (! preg_match('/^@(' . self::REGEX_TAGNAME . ')(?:\s+([^\s].*)|$)/us', $tagLine, $matches)) {
throw new \InvalidArgumentException( throw new \InvalidArgumentException(
'The tag "' . $tagLine . '" does not seem to be wellformed, please check it for errors' 'The tag "' . $tagLine . '" does not seem to be wellformed, please check it for errors'
); );
tests/unit/DocBlock/StandardTagFactoryTest.php
+1 -5
View File
@@ -136,14 +136,10 @@ class StandardTagFactoryTest extends \PHPUnit_Framework_TestCase
* @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
* @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
* @expectedException \InvalidArgumentException * @expectedException \InvalidArgumentException
* @expectedExceptionMessage The tag "@user/myuser" does not seem to be wellformed, please check it for errors * @expectedExceptionMessage The tag "@user[myuser" does not seem to be wellformed, please check it for errors
*/ */
public function testExceptionIsThrownIfProvidedTagIsNotWellformed() public function testExceptionIsThrownIfProvidedTagIsNotWellformed()
{ {
$this->markTestIncomplete(
'For some reason this test fails; once I have access to a RegEx analyzer I will have to test the regex'
)
;
$tagFactory = new StandardTagFactory(m::mock(FqsenResolver::class)); $tagFactory = new StandardTagFactory(m::mock(FqsenResolver::class));
$tagFactory->create('@user[myuser'); $tagFactory->create('@user[myuser');
} }