Merge pull request #3 from rvanvelzen/master

Fix phpDocumentor/phpDocumentor2#467
Fixed the case where the dot does not properly terminate the short description.
2026-08-18 01:57:13 +00:00 · 2012-06-04 13:34:54 -07:00 · 2012-06-04 09:27:56 +02:00
2 changed files with 22 additions and 4 deletions
@@ -127,11 +127,11 @@ class DocBlock implements \Reflector
            preg_match(
                '/(?x)
        \A (
-          [^\n]+
+          [^\n.]+
          (?:
-            (?! (?<=\.) \n | \n{2} ) # disallow the first seperator here
-            \n (?! [ \t]* @\pL ) # disallow second seperator
-            [^\n]+
+            (?! \. \s | \n{2} ) # disallow the first seperator here
+            [\n.] (?! [ \t]* @\pL ) # disallow second seperator
+            [^\n.]+
          )*
          \.?
        )
@@ -44,4 +44,22 @@ DOCBLOCK;
        $this->assertTrue($object->hasTag('see'));
        $this->assertTrue($object->hasTag('return'));
    }
+
+    public function testDotSeperation()
+    {
+        $fixture = <<<DOCBLOCK
+/**
+ * This is a short description. This is a long description.
+ * This is a continuation of the long description.
+ */
+DOCBLOCK;
+        $object = new DocBlock($fixture);
+        $this->assertEquals(
+            'This is a short description.', $object->getShortDescription()
+        );
+        $this->assertEquals(
+            "This is a long description.\nThis is a continuation of the long description.", $object->getLongDescription()->getContents()
+	        );
+    }
 }
+
Author	SHA1	Message	Date
Mike van Riel	8f8cbd9ab6	Merge pull request #3 from rvanvelzen/master Fix phpDocumentor/phpDocumentor2#467	2012-06-04 13:34:54 -07:00
Richard van Velzen	a5b50ba482	Fixed the case where the dot does not properly terminate the short description. The regular expression only took into account newlines, not general whitespace after the dot. Added a test case as well.	2012-06-04 09:27:56 +02:00