Markdown is not required, so move to suggest

Markdown is only used once and a check is in place to see if the markdown classes exists. So perhaps it is better to move this to suggest instead of require, so the people who don't need it, don't have to download it.
Merge pull request #24 from tommygnr/travis-5.5
2026-08-18 10:07:12 +00:00 · 2013-08-08 18:25:04 +02:00 · 2013-08-07 04:04:22 -07:00 · 2013-08-07 13:08:11 +10:00 · 2013-08-01 12:16:50 -07:00 · 2013-08-02 02:40:14 +10:00
32 changed files with 1447 additions and 360 deletions
@@ -3,17 +3,18 @@ php:
  - 5.3.3
  - 5.3
  - 5.4
+  - 5.5

 script:
- - vendor/phpunit/phpunit/composer/bin/phpunit
+ - vendor/bin/phpunit

 before_script:
 - sudo apt-get -qq update > /dev/null
 - phpenv rehash > /dev/null
 - composer selfupdate --quiet
- - composer install --dev 
- - vendor/phpunit/phpunit/composer/bin/phpunit
- - composer update --dev 
+ - composer install --dev --prefer-source
+ - vendor/bin/phpunit
+ - composer update --dev --prefer-source

 notifications:
  irc: "irc.freenode.org#phpdocumentor"
@@ -1,4 +1,4 @@
-The ReflectionDocBlock Component
+The ReflectionDocBlock Component [![Build Status](https://secure.travis-ci.org/phpDocumentor/ReflectionDocBlock.png)](https://travis-ci.org/phpDocumentor/ReflectionDocBlock)
 ================================

 Introduction
@@ -7,7 +7,7 @@ Introduction
 The ReflectionDocBlock component of phpDocumentor provides a DocBlock parser
 that is 100% compatible with the [PHPDoc standard](http://phpdoc.org/docs/latest).

-With this component can a library provide support for annotations via DocBlocks
+With this component, a library can provide support for annotations via DocBlocks
 or otherwise retrieve information that is embedded in a DocBlock.

 > **Note**: *this is a core component of phpDocumentor and is constantly being
@@ -6,13 +6,20 @@
        {"name": "Mike van Riel", "email": "[email protected]"}
    ],
    "require": {
-        "php": ">=5.3.2",
-        "dflydev/markdown": "1.0.*"
+        "php": ">=5.3.3"
    },
    "autoload": {
        "psr-0": {"phpDocumentor": ["src/"]}
    },
    "require-dev": {
-        "phpunit/phpunit": "*@stable"
+        "phpunit/phpunit": "3.7.*@stable"
+    },
+    "suggest": {
+        "dflydev/markdown": "1.0.*"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
    }
 }
@@ -1,5 +1,5 @@
 {
-    "hash": "89c7387ec02d39de3c07849e525f95e4",
+    "hash": "c6115c20a4a284f6ca14e676e788b4d3",
    "packages": [
        {
            "name": "dflydev/markdown",
@@ -26,6 +26,7 @@
                    "dflydev\\markdown": "src"
                }
            },
+            "notification-url": "https://packagist.org/downloads/",
            "license": [
                "New BSD License"
            ],
@@ -56,12 +57,419 @@
            ]
        }
    ],
-    "packages-dev": null,
+    "packages-dev": [
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "1.2.7",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "1.2.7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage/archive/1.2.7.zip",
+                "reference": "1.2.7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.0@stable",
+                "phpunit/php-token-stream": ">=1.1.3@stable",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "suggest": {
+                "ext-dom": "*",
+                "ext-xdebug": ">=2.0.5"
+            },
+            "time": "2012-12-02 14:54:55",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "testing",
+                "coverage",
+                "xunit"
+            ]
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "1.3.3",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "1.3.3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator/zipball/1.3.3",
+                "reference": "1.3.3",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:44:38",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "File/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ]
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "1.1.4",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "1.1.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-text-template/zipball/1.1.4",
+                "reference": "1.1.4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-31 11:15:28",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "Text/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ]
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-timer.git",
+                "reference": "1.0.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-timer/zipball/1.0.4",
+                "reference": "1.0.4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:45:58",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "timer"
+            ]
+        },
+        {
+            "name": "phpunit/php-token-stream",
+            "version": "1.1.5",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/php-token-stream.git",
+                "reference": "1.1.5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/php-token-stream/zipball/1.1.5",
+                "reference": "1.1.5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-tokenizer": "*",
+                "php": ">=5.3.3"
+            },
+            "time": "2012-10-11 04:47:14",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHP/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Wrapper around PHP's tokenizer extension.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "tokenizer"
+            ]
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "3.7.10",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/phpunit.git",
+                "reference": "3.7.10"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/phpunit/archive/3.7.10.zip",
+                "reference": "3.7.10",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-file-iterator": ">=1.3.1",
+                "phpunit/php-text-template": ">=1.1.1",
+                "phpunit/php-code-coverage": ">=1.2.1",
+                "phpunit/php-timer": ">=1.0.2",
+                "phpunit/phpunit-mock-objects": ">=1.2.0,<1.3.0",
+                "symfony/yaml": ">=2.1.0",
+                "ext-dom": "*",
+                "ext-pcre": "*",
+                "ext-reflection": "*",
+                "ext-spl": "*"
+            },
+            "suggest": {
+                "phpunit/php-invoker": ">=1.1.0",
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "ext-tokenizer": "*"
+            },
+            "time": "2012-12-02 14:56:55",
+            "bin": [
+                "composer/bin/phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.7.x-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "",
+                "../../symfony/yaml/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "http://www.phpunit.de/",
+            "keywords": [
+                "testing",
+                "phpunit",
+                "xunit"
+            ]
+        },
+        {
+            "name": "phpunit/phpunit-mock-objects",
+            "version": "1.2.2",
+            "source": {
+                "type": "git",
+                "url": "git://github.com/sebastianbergmann/phpunit-mock-objects.git",
+                "reference": "1.2.2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects/archive/1.2.2.zip",
+                "reference": "1.2.2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3",
+                "phpunit/php-text-template": ">=1.1.1@stable"
+            },
+            "suggest": {
+                "ext-soap": "*"
+            },
+            "time": "2012-11-05 10:39:13",
+            "type": "library",
+            "installation-source": "dist",
+            "autoload": {
+                "classmap": [
+                    "PHPUnit/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                ""
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "[email protected]",
+                    "role": "lead"
+                }
+            ],
+            "description": "Mock Object library for PHPUnit",
+            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
+            "keywords": [
+                "mock",
+                "xunit"
+            ]
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v2.1.4",
+            "target-dir": "Symfony/Component/Yaml",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/Yaml",
+                "reference": "v2.1.4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/symfony/Yaml/archive/v2.1.4.zip",
+                "reference": "v2.1.4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.3"
+            },
+            "time": "2012-11-08 09:51:48",
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.1-dev"
+                }
+            },
+            "installation-source": "dist",
+            "autoload": {
+                "psr-0": {
+                    "Symfony\\Component\\Yaml": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "[email protected]"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "http://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony Yaml Component",
+            "homepage": "http://symfony.com"
+        }
+    ],
    "aliases": [

    ],
    "minimum-stability": "stable",
-    "stability-flags": [
-
-    ]
+    "stability-flags": {
+        "phpunit/phpunit": 0
+    }
 }
@@ -12,6 +12,7 @@

 namespace phpDocumentor\Reflection;

+use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Context;
 use phpDocumentor\Reflection\DocBlock\Location;

@@ -28,13 +29,13 @@ class DocBlock implements \Reflector
    protected $short_description = '';

    /**
-     * @var \phpDocumentor\Reflection\DocBlock\LongDescription The actual
+     * @var DocBlock\Description The actual
     *     description for this docblock.
     */
    protected $long_description = null;

    /**
-     * @var \phpDocumentor\Reflection\DocBlock\Tags[] An array containing all
+     * @var Tag[] An array containing all
     *     the tags in this docblock; except inline.
     */
    protected $tags = array();
@@ -142,7 +143,7 @@ class DocBlock implements \Reflector
             * Splits the docblock into a short description, long description and
             * tags section
             * - The short description is started from the first character until
-             *   a dot is encountered followed by a whitespace OR
+             *   a dot is encountered followed by a newline OR
             *   two consecutive newlines (horizontal whitespace is taken into
             *   account to consider spacing errors)
             * - The long description, any character until a new line is
@@ -157,7 +158,7 @@ class DocBlock implements \Reflector
        \A (
          [^\n.]+
          (?:
-            (?! \. \s | \n{2} ) # disallow the first seperator here
+            (?! \. \n | \n{2} ) # disallow the first seperator here
            [\n.] (?! [ \t]* @\pL ) # disallow second seperator
            [^\n.]+
          )*
@@ -221,13 +222,50 @@ class DocBlock implements \Reflector

            // create proper Tag objects
            foreach ($result as $key => $tag_line) {
-                $result[$key] = DocBlock\Tag::createInstance($tag_line, $this);
+                $result[$key] = Tag::createInstance($tag_line, $this);
            }
        }

        $this->tags = $result;
    }

+    /**
+     * Gets the text portion of the doc block.
+     * 
+     * Gets the text portion (short and long description combined) of the doc
+     * block.
+     * 
+     * @return string The text portion of the doc block.
+     */
+    public function getText()
+    {
+        $short = $this->getShortDescription();
+        $long = $this->getLongDescription()->getContents();
+
+        if ($long) {
+            return "{$short}\n\n{$long}";
+        } else {
+            return $short;
+        }
+    }
+
+    /**
+     * Set the text portion of the doc block.
+     * 
+     * Sets the text portion (short and long description combined) of the doc
+     * block.
+     *
+     * @param string $docblock The new text portion of the doc block.
+     * 
+     * @return $this This doc block.
+     */
+    public function setText($comment)
+    {
+        list($short, $long) = $this->splitDocBlock($comment);
+        $this->short_description = $short;
+        $this->long_description = new DocBlock\Description($long, $this);
+        return $this;
+    }
    /**
     * Returns the opening line or also known as short description.
     *
@@ -241,7 +279,7 @@ class DocBlock implements \Reflector
    /**
     * Returns the full description or also known as long description.
     *
-     * @return \phpDocumentor\Reflection\DocBlock\LongDescription
+     * @return DocBlock\Description
     */
    public function getLongDescription()
    {
@@ -271,7 +309,7 @@ class DocBlock implements \Reflector
    /**
     * Returns the tags for this DocBlock.
     *
-     * @return \phpDocumentor\Reflection\DocBlock\Tag[]
+     * @return Tag[]
     */
    public function getTags()
    {
@@ -284,13 +322,13 @@ class DocBlock implements \Reflector
     *
     * @param string $name String to search by.
     *
-     * @return \phpDocumentor\Reflection\DocBlock_Tag[]
+     * @return Tag[]
     */
    public function getTagsByName($name)
    {
        $result = array();

-        /** @var \phpDocumentor\Reflection\DocBlock\Tag $tag */
+        /** @var Tag $tag */
        foreach ($this->getTags() as $tag) {
            if ($tag->getName() != $name) {
                continue;
@@ -311,7 +349,7 @@ class DocBlock implements \Reflector
     */
    public function hasTag($name)
    {
-        /** @var \phpDocumentor\Reflection\DocBlock\Tag $tag */
+        /** @var Tag $tag */
        foreach ($this->getTags() as $tag) {
            if ($tag->getName() == $name) {
                return true;
@@ -321,6 +359,33 @@ class DocBlock implements \Reflector
        return false;
    }

+    /**
+     * Appends a tag at the end of the list of tags.
+     *
+     * @param Tag $tag The tag to add.
+     *
+     * @return Tag The newly added tag.
+     *
+     * @throws \LogicException When the tag belongs to a different DocBlock.
+     */
+    public function appendTag(Tag $tag)
+    {
+        if (null === $tag->getDocBlock()) {
+            $tag->setDocBlock($this);
+        }
+
+        if ($tag->getDocBlock() === $this) {
+            $this->tags[] = $tag;
+        } else {
+            throw new \LogicException(
+                'This tag belongs to a different DocBlock object.'
+            );
+        }
+
+        return $tag;
+    }
+
+
    /**
     * Builds a string representation of this object.
     *
@@ -29,26 +29,22 @@ class Description implements \Reflector
    /** @var array The contents, as an array of strings and Tag objects. */
    protected $parsedContents = null;

-    /** @var \phpDocumentor\Reflection\DocBlock\Tags[] */
-    protected $tags = array();
-
    /** @var DocBlock The DocBlock which this description belongs to. */
    protected $docblock = null;

    /**
     * Populates the fields of a description.
     *
-     * @param string   $content  The DocBlock contents without asterisks.
+     * @param string   $content  The description's conetnts.
     * @param DocBlock $docblock The DocBlock which this description belongs to.
     */
    public function __construct($content, DocBlock $docblock = null)
    {
-        $this->contents = trim($content);
-        $this->docblock = $docblock;
+        $this->setContent($content)->setDocBlock($docblock);
    }

    /**
-     * Returns the text of this description.
+     * Gets the text of this description.
     *
     * @return string
     */
@@ -57,6 +53,21 @@ class Description implements \Reflector
        return $this->contents;
    }

+    /**
+     * Sets the text of this description.
+     * 
+     * @param string $content The new text of this description.
+     * 
+     * @return $this
+     */
+    public function setContent($content)
+    {
+        $this->contents = trim($content);
+        
+        $this->parsedContents = null;
+        return $this;
+    }
+
    /**
     * Returns the parsed text of this description.
     *
@@ -101,7 +112,9 @@ class Description implements \Reflector
                null,
                PREG_SPLIT_DELIM_CAPTURE
            );
-            for ($i=1, $l = count($this->parsedContents); $i<$l; $i += 2) {
+
+            $count = count($this->parsedContents);
+            for ($i=1; $i<$count; $i += 2) {
                $this->parsedContents[$i] = Tag::createInstance(
                    $this->parsedContents[$i],
                    $this->docblock
@@ -111,7 +124,7 @@ class Description implements \Reflector
            //In order to allow "literal" inline tags, the otherwise invalid
            //sequence "{@}" is changed to "@", and "{}" is changed to "}".
            //See unit tests for examples.
-            for ($i=0, $l = count($this->parsedContents); $i<$l; $i += 2) {
+            for ($i=0; $i<$count; $i += 2) {
                $this->parsedContents[$i] = str_replace(
                    array('{@}', '{}'),
                    array('@', '}'),
@@ -156,6 +169,31 @@ class Description implements \Reflector
        return trim($result);
    }

+    /**
+     * Gets the docblock this tag belongs to.
+     * 
+     * @return DocBlock The docblock this description belongs to.
+     */
+    public function getDocBlock()
+    {
+        return $this->docblock;
+    }
+
+    /**
+     * Sets the docblock this tag belongs to.
+     * 
+     * @param DocBlock $docblock The new docblock this description belongs to.
+     *     Setting NULL removes any association.
+     * 
+     * @return $this
+     */
+    public function setDocBlock(DocBlock $docblock = null)
+    {
+        $this->docblock = $docblock;
+
+        return $this;
+    }
+
    /**
     * Builds a string representation of this object.
     *
@@ -171,14 +209,12 @@ class Description implements \Reflector
    }

    /**
-     * Returns the exported information (we should use the export static method
-     * BUT this throws an exception at this point).
+     * Returns the long description as a string.
     *
     * @return string
-     * @codeCoverageIgnore Not yet implemented
     */
    public function __toString()
    {
-        return 'Not yet implemented';
+        return $this->getContents();
    }
 }
@@ -22,17 +22,16 @@ namespace phpDocumentor\Reflection\DocBlock;
 class Location
 {
    /** @var int Line where the DocBlock text starts. */
-    protected $line_number = 0;
+    protected $lineNumber = 0;

    /** @var int Column where the DocBlock text starts. */
-    protected $column_number = 0;
+    protected $columnNumber = 0;
    
    public function __construct(
-        $line_number = 0,
-        $column_number = 0
+        $lineNumber = 0,
+        $columnNumber = 0
    ) {
-        $this->line_number = (int)$line_number;
-        $this->column_number = (int)$column_number;
+        $this->setLineNumber($lineNumber)->setColumnNumber($columnNumber);
    }

    /**
@@ -40,7 +39,19 @@ class Location
     */
    public function getLineNumber()
    {
-        return $this->line_number;
+        return $this->lineNumber;
+    }
+
+    /**
+     * 
+     * @param type $lineNumber
+     * @return $this
+     */
+    public function setLineNumber($lineNumber)
+    {
+        $this->lineNumber = (int)$lineNumber;
+
+        return $this;
    }

    /**
@@ -48,6 +59,18 @@ class Location
     */
    public function getColumnNumber()
    {
-        return $this->column_number;
+        return $this->columnNumber;
+    }
+
+    /**
+     * 
+     * @param int $columnNumber
+     * @return $this
+     */
+    public function setColumnNumber($columnNumber)
+    {
+        $this->columnNumber = (int)$columnNumber;
+
+        return $this;
    }
 }
@@ -0,0 +1,198 @@
+<?php
+/**
+ * phpDocumentor
+ *
+ * PHP Version 5.3
+ *
+ * @author    Barry vd. Heuvel <[email protected]>
+ * @copyright 2013 Mike van Riel / Naenius (http://www.naenius.com)
+ * @license   http://www.opensource.org/licenses/mit-license.php MIT
+ * @link      http://phpdoc.org
+ */
+
+namespace phpDocumentor\Reflection\DocBlock;
+
+use phpDocumentor\Reflection\DocBlock;
+
+/**
+ * Serializes a DocBlock instance.
+ *
+ * @author  Barry vd. Heuvel <[email protected]>
+ * @license http://www.opensource.org/licenses/mit-license.php MIT
+ * @link    http://phpdoc.org
+ */
+class Serializer
+{
+
+    /** @var string The string to indent the comment with. */
+    protected $indentString = ' ';
+
+    /** @var int The number of times the indent string is repeated. */
+    protected $indent = 0;
+
+    /** @var bool Whether to indent the first line. */
+    protected $isFirstLineIndented = true;
+
+    /** @var int|null The max length of a line. */
+    protected $lineLength = null;
+
+    /**
+     * Create a Serializer instance.
+     *
+     * @param int      $indent          The number of times the indent string is
+     *     repeated.
+     * @param string   $indentString    The string to indent the comment with.
+     * @param bool     $indentFirstLine Whether to indent the first line.
+     * @param int|null $lineLength      The max length of a line or NULL to
+     *     disable line wrapping.
+     */
+    public function __construct(
+        $indent = 0,
+        $indentString = ' ',
+        $indentFirstLine = true,
+        $lineLength = null
+    ) {
+        $this->setIndentationString($indentString);
+        $this->setIndent($indent);
+        $this->setIsFirstLineIndented($indentFirstLine);
+        $this->setLineLength($lineLength);
+    }
+
+    /**
+     * Sets the string to indent comments with.
+     * 
+     * @param string $indentationString The string to indent comments with.
+     * 
+     * @return $this This serializer object.
+     */
+    public function setIndentationString($indentString)
+    {
+        $this->indentString = (string)$indentString;
+        return $this;
+    }
+
+    /**
+     * Gets the string to indent comments with.
+     * 
+     * @return string The indent string.
+     */
+    public function getIndentationString()
+    {
+        return $this->indentString;
+    }
+
+    /**
+     * Sets the number of indents.
+     * 
+     * @param int $indent The number of times the indent string is repeated.
+     * 
+     * @return $this This serializer object.
+     */
+    public function setIndent($indent)
+    {
+        $this->indent = (int)$indent;
+        return $this;
+    }
+
+    /**
+     * Gets the number of indents.
+     * 
+     * @return int The number of times the indent string is repeated.
+     */
+    public function getIndent()
+    {
+        return $this->indent;
+    }
+
+    /**
+     * Sets whether or not the first line should be indented.
+     * 
+     * Sets whether or not the first line (the one with the "/**") should be
+     * indented.
+     * 
+     * @param bool $indentFirstLine The new value for this setting.
+     * 
+     * @return $this This serializer object.
+     */
+    public function setIsFirstLineIndented($indentFirstLine)
+    {
+        $this->isFirstLineIndented = (bool)$indentFirstLine;
+        return $this;
+    }
+
+    /**
+     * Gets whether or not the first line should be indented.
+     * 
+     * @return bool Whether or not the first line should be indented.
+     */
+    public function isFirstLineIndented()
+    {
+        return $this->isFirstLineIndented;
+    }
+
+    /**
+     * Sets the line length.
+     * 
+     * Sets the length of each line in the serialization. Content will be
+     * wrapped within this limit.
+     * 
+     * @param int|null $lineLength The length of each line. NULL to disable line
+     *     wrapping altogether.
+     * 
+     * @return $this This serializer object.
+     */
+    public function setLineLength($lineLength)
+    {
+        $this->lineLength = null === $lineLength ? null : (int)$lineLength;
+        return $this;
+    }
+
+    /**
+     * Gets the line length.
+     * 
+     * @return int|null The length of each line or NULL if line wrapping is
+     *     disabled.
+     */
+    public function getLineLength()
+    {
+        return $this->lineLength;
+    }
+
+    /**
+     * Generate a DocBlock comment.
+     *
+     * @param DocBlock The DocBlock to serialize.
+     * 
+     * @return string The serialized doc block.
+     */
+    public function getDocComment(DocBlock $docblock)
+    {
+        $indent = str_repeat($this->indentString, $this->indent);
+        $firstIndent = $this->isFirstLineIndented ? $indent : '';
+
+        $text = $docblock->getText();
+        if ($this->lineLength) {
+            //3 === strlen(' * ')
+            $wrapLength = $this->lineLength - strlen($indent) - 3;
+            $text = wordwrap($text, $wrapLength);
+        }
+        $text = str_replace("\n", "\n{$indent} * ", $text);
+
+        $comment = "{$firstIndent}/**\n{$indent} * {$text}\n{$indent} *\n";
+
+        /** @var Tag $tag */
+        foreach ($docblock->getTags() as $tag) {
+            $tagText = (string) $tag;
+            if ($this->lineLength) {
+                $tagText = wordwrap($tagText, $wrapLength);
+            }
+            $tagText = str_replace("\n", "\n{$indent} * ", $tagText);
+
+            $comment .= "{$indent} * {$tagText}\n";
+        }
+
+        $comment .= $indent . ' */';
+
+        return $comment;
+    }
+}
@@ -23,16 +23,27 @@ use phpDocumentor\Reflection\DocBlock;
 */
 class Tag implements \Reflector
 {
+    /**
+     * PCRE regular expression matching a tag name.
+     */
+    const REGEX_TAGNAME = '[\w\-\_\\\\]+';
+
    /** @var string Name of the tag */
    protected $tag = '';

-    /** @var string Content of the tag */
+    /**
+     * @var string|null Content of the tag.
+     *     When set to NULL, it means it needs to be regenerated.
+     */
    protected $content = '';

    /** @var string Description of the content of this tag */
    protected $description = '';

-    /** @var array The description, as an array of strings and Tag objects. */
+    /**
+     * @var array|null The description, as an array of strings and Tag objects.
+     *     When set to NULL, it means it needs to be regenerated.
+     */
    protected $parsedDescription = null;

    /** @var Location Location of the tag. */
@@ -104,7 +115,7 @@ class Tag implements \Reflector
        Location $location = null
    ) {
        if (!preg_match(
-            '/^@([\w\-\_\\\\]+)(?:\s*([^\s].*)|$)?/us',
+            '/^@(' . self::REGEX_TAGNAME . ')(?:\s*([^\s].*)|$)?/us',
            $tag_line,
            $matches
        )) {
@@ -173,28 +184,28 @@ class Tag implements \Reflector
    /**
     * Parses a tag and populates the member variables.
     *
-     * @param string   $type     Name of the tag.
+     * @param string   $name     Name of the tag.
     * @param string   $content  The contents of the given tag.
     * @param DocBlock $docblock The DocBlock which this tag belongs to.
     * @param Location $location Location of the tag.
     */
    public function __construct(
-        $type,
+        $name,
        $content,
        DocBlock $docblock = null,
        Location $location = null
    ) {
-        $this->tag         = $type;
-        $this->content     = $content;
-        $this->description = trim($content);
-        $this->docblock    = $docblock;
-        $this->location    = $location;
+        $this
+            ->setName($name)
+            ->setContent($content)
+            ->setDocBlock($docblock)
+            ->setLocation($location);
    }

    /**
-     * Returns the name of this tag.
+     * Gets the name of this tag.
     *
-     * @return string
+     * @return string The name of this tag.
     */
    public function getName()
    {
@@ -202,17 +213,57 @@ class Tag implements \Reflector
    }

    /**
-     * Returns the content of this tag.
+     * Sets the name of this tag.
+     * 
+     * @param string $name The new name of this tag.
+     * 
+     * @return $this
+     * @throws \InvalidArgumentException When an invalid tag name is provided.
+     */
+    public function setName($name)
+    {
+        if (!preg_match('/^' . self::REGEX_TAGNAME . '$/u', $name)) {
+            throw new \InvalidArgumentException(
+                'Invalid tag name supplied: ' . $name
+            );
+        }
+
+        $this->tag = $name;
+
+        return $this;
+    }
+
+    /**
+     * Gets the content of this tag.
     *
     * @return string
     */
    public function getContent()
    {
+        if (null === $this->content) {
+            $this->content = $this->description;
+        }
+
        return $this->content;
    }

    /**
-     * Returns the description component of this tag.
+     * Sets the content of this tag.
+     * 
+     * @param string $content The new content of this tag.
+     * 
+     * @return $this
+     */
+    public function setContent($content)
+    {
+        $this->setDescription($content);
+        $this->content = $content;
+
+        return $this;
+    }
+
+    /**
+     * Gets the description component of this tag.
     *
     * @return string
     */
@@ -222,7 +273,23 @@ class Tag implements \Reflector
    }

    /**
-     * Returns the parsed text of this description.
+     * Sets the description component of this tag.
+     * 
+     * @param string $description The new description component of this tag.
+     * 
+     * @return $this
+     */
+    public function setDescription($description)
+    {
+        $this->content = null;
+        $this->parsedDescription = null;
+        $this->description = trim($description);
+
+        return $this;
+    }
+
+    /**
+     * Gets the parsed text of this description.
     * 
     * @return array An array of strings and tag objects, in the order they
     *     occur within the description.
@@ -237,14 +304,53 @@ class Tag implements \Reflector
    }

    /**
-     * Get the location of the tag.
+     * Gets the docblock this tag belongs to.
+     * 
+     * @return DocBlock The docblock this tag belongs to.
+     */
+    public function getDocBlock()
+    {
+        return $this->docblock;
+    }
+
+    /**
+     * Sets the docblock this tag belongs to.
+     * 
+     * @param DocBlock $docblock The new docblock this tag belongs to. Setting
+     *     NULL removes any association.
+     * 
+     * @return $this
+     */
+    public function setDocBlock(DocBlock $docblock = null)
+    {
+        $this->docblock = $docblock;
+
+        return $this;
+    }
+
+    /**
+     * Gets the location of the tag.
     *
-     * @return Location Tag's location.
+     * @return Location The tag's location.
     */
    public function getLocation()
    {
        return $this->location;
    }
+    
+    /**
+     * Sets the location of the tag.
+     * 
+     * @param Location $location The new location of the tag.
+     * 
+     * @return $this
+     */
+    public function setLocation(Location $location = null)
+    {
+        $this->location = $location;
+
+        return $this;
+    }

    /**
     * Builds a string representation of this object.
@@ -260,14 +366,12 @@ class Tag implements \Reflector
    }

    /**
-     * Returns the exported information (we should use the export static method
-     * BUT this throws an exception at this point).
+     * Returns the tag as a serialized string
     *
     * @return string
-     * @codeCoverageIgnore Not yet implemented
     */
    public function __toString()
    {
-        return 'Not yet implemented';
+        return "@{$this->getName()} {$this->getContent()}";
    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -24,37 +23,54 @@ use phpDocumentor\Reflection\DocBlock\Tag;
 */
 class AuthorTag extends Tag
 {
-    /** @var string The name of the author */
-    protected $name = '';
-
-    /** @var string The email of the author */
-    protected $email = '';
+    /**
+     * PCRE regular expression matching any valid value for the name component.
+     */
+    const REGEX_AUTHOR_NAME = '[^\<]*';

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'author').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * PCRE regular expression matching any valid value for the email component.
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        parent::__construct($type, $content, $docblock, $location);
+    const REGEX_AUTHOR_EMAIL = '[^\>]*';
+
+    /** @var string The name of the author */
+    protected $authorName = '';
+
+    /** @var string The email of the author */
+    protected $authorEmail = '';
+    
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content = $this->authorName;
+            if ('' != $this->authorEmail) {
+                $this->content .= "<{$this->authorEmail}>";
+            }
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        parent::setContent($content);
        if (preg_match(
-            '/^([^\<]*)(\<([^\>]*)\>)?$/',
+            '/^(' . self::REGEX_AUTHOR_NAME .
+            ')(\<(' . self::REGEX_AUTHOR_EMAIL .
+            ')\>)?$/u',
            $this->description,
            $matches
        )) {
-            $this->name = trim($matches[1]);
+            $this->authorName = trim($matches[1]);
            if (isset($matches[3])) {
-                $this->email = trim($matches[3]);
+                $this->authorEmail = trim($matches[3]);
            }
        }
+
+        return $this;
    }

    /**
@@ -64,7 +80,25 @@ class AuthorTag extends Tag
     */
    public function getAuthorName()
    {
-        return $this->name;
+        return $this->authorName;
+    }
+    
+    /**
+     * Sets the author's name.
+     * 
+     * @param string $authorName The new author name.
+     *     An invalid value will set an empty string.
+     * 
+     * @return $this
+     */
+    public function setAuthorName($authorName)
+    {
+        $this->content = null;
+        $this->authorName
+            = preg_match('/^' . self::REGEX_AUTHOR_NAME . '$/u', $authorName)
+            ? $authorName : '';
+
+        return $this;
    }

    /**
@@ -74,6 +108,24 @@ class AuthorTag extends Tag
     */
    public function getAuthorEmail()
    {
-        return $this->email;
+        return $this->authorEmail;
+    }
+    
+    /**
+     * Sets the author's email.
+     * 
+     * @param string $authorEmail The new author email.
+     *     An invalid value will set an empty string.
+     * 
+     * @return $this
+     */
+    public function setAuthorEmail($authorEmail)
+    {
+        $this->authorEmail
+            = preg_match('/^' . self::REGEX_AUTHOR_EMAIL . '$/u', $authorEmail)
+            ? $authorEmail : '';
+
+        $this->content = null;
+        return $this;
    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -24,26 +23,53 @@ use phpDocumentor\Reflection\DocBlock\Tag;
 */
 class ExampleTag extends SourceTag
 {
-    /** @var string Path to a file to use as an example. Can also be an URI. */
+    /** 
+     * @var string Path to a file to use as an example.
+     *     May also be an absolute URI.
+     */
    protected $filePath = '';

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'example').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * @var bool Whether the file path component represents an URI.
+     *     This determines how the file portion appears at {@link getContent()}.
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        Tag::__construct($type, $content, $docblock, $location);
+    protected $isURI = false;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $filePath = '';
+            if ($this->isURI) {
+                if (false === strpos($this->filePath, ':')) {
+                    $filePath = str_replace(
+                        '%2F',
+                        '/',
+                        rawurlencode($this->filePath)
+                    );
+                } else {
+                    $filePath = $this->filePath;
+                }
+            } else {
+                $filePath = '"' . $this->filePath . '"';
+            }
+
+            $this->content = $filePath . ' ' . $this->getContent();
+        }
+
+        return $this->content;
+    }
+    /**
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        Tag::setContent($content);
        if (preg_match(
            '/^
+                # File component
                (?:
                    # File path in quotes
                    \"([^\"]+)\"
@@ -58,34 +84,73 @@ class ExampleTag extends SourceTag
            $matches
        )) {
            if ('' !== $matches[1]) {
-                //Quoted file path.
-                $this->filePath = trim($matches[1]);
-            } elseif (false === strpos($matches[2], ':')) {
-                //Relative URL or a file path with no spaces in it.
-                $this->filePath = rawurldecode(
-                    str_replace(array('/', '\\'), '%2F', $matches[2])
-                );
+                $this->setFilePath($matches[1]);
            } else {
-                //Absolute URL or URI.
-                $this->filePath = $matches[2];
+                $this->setFileURI($matches[2]);
            }
-            
+
            if (isset($matches[3])) {
-                parent::__construct($type, $matches[3]);
-                $this->content = $content;
+                parent::setContent($matches[3]);
            } else {
-                $this->description = '';
+                $this->setDescription('');
            }
+            $this->content = $content;
        }
+
+        return $this;
    }

    /**
     * Returns the file path.
     *
-     * @return string Path to a file to use as an example. Can also be an URI.
+     * @return string Path to a file to use as an example.
+     *     May also be an absolute URI.
     */
    public function getFilePath()
    {
        return $this->filePath;
    }
+    
+    /**
+     * Sets the file path.
+     * 
+     * @param string $filePath The new file path to use for the example.
+     * 
+     * @return $this
+     */
+    public function setFilePath($filePath)
+    {
+        $this->isURI = false;
+        $this->filePath = trim($filePath);
+
+        $this->content = null;
+        return $this;
+    }
+    
+    /**
+     * Sets the file path as an URI.
+     * 
+     * This function is equivalent to {@link setFilePath()}, except that it
+     * convers an URI to a file path before that.
+     * 
+     * There is no getFileURI(), as {@link getFilePath()} is compatible.
+     * 
+     * @param type $uri The new file URI to use as an example.
+     */
+    public function setFileURI($uri)
+    {
+        $this->isURI = true;
+        if (false === strpos($uri, ':')) {
+            //Relative URL
+            $this->filePath = rawurldecode(
+                str_replace(array('/', '\\'), '%2F', $uri)
+            );
+        } else {
+            //Absolute URL or URI.
+            $this->filePath = $uri;
+        }
+
+        $this->content = null;
+        return $this;
+    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -28,30 +27,35 @@ class LinkTag extends Tag
    protected $link = '';

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'link').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        parent::__construct($type, $content, $docblock, $location);
-        $content = preg_split('/\s+/u', $this->description, 2);
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content = "{$this->link} {$this->description}";
+        }

-        // any output is considered a type
-        $this->link = $content[0];
-
-        $this->description = isset($content[1]) ? $content[1] : $content[0];
+        return $this->content;
    }

    /**
-    * Returns the link
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        parent::setContent($content);
+        $parts = preg_split('/\s+/Su', $this->description, 2);
+
+        $this->link = $parts[0];
+
+        $this->setDescription(isset($parts[1]) ? $parts[1] : $parts[0]);
+
+        $this->content = $content;
+        return $this;
+    }
+
+    /**
+    * Gets the link
    *
    * @return string
    */
@@ -65,10 +69,13 @@ class LinkTag extends Tag
    *
    * @param string $link The link
    *
-    * @return void
+    * @return $this
    */
    public function setLink($link)
    {
        $this->link = $link;
+
+        $this->content = null;
+        return $this;
    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -30,34 +29,51 @@ class MethodTag extends ReturnTag

    /** @var string */
    protected $arguments = '';
+    
+    /** @var bool */
+    protected $isStatic = false;

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'method').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        Tag::__construct($type, $content, $docblock, $location);
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content = '';
+            if ($this->isStatic) {
+                $this->content .= 'static ';
+            }
+            $this->content .= $this->type .
+                " {$this->method_name}({$this->arguments}) " .
+                $this->description;
+        }

-        $matches = array();
+        return $this->content;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        Tag::setContent($content);
        // 1. none or more whitespace
-        // 2. optionally a word with underscores followed by whitespace : as
+        // 2. optionally the keyword "static" followed by whitespace
+        // 3. optionally a word with underscores followed by whitespace : as
        //    type for the return value
-        // 3. then optionally a word with underscores followed by () and
+        // 4. then optionally a word with underscores followed by () and
        //    whitespace : as method name as used by phpDocumentor
-        // 4. then a word with underscores, followed by ( and any character
+        // 5. then a word with underscores, followed by ( and any character
        //    until a ) and whitespace : as method name with signature
-        // 5. any remaining text : as description
+        // 6. any remaining text : as description
        if (preg_match(
            '/^
+                # Static keyword
+                # Declates a static method ONLY if type is also present
+                (?:
+                    (static)
+                    \s+
+                )?
                # Return type
                (?:
                    ([\w\|_\\\\]+)
@@ -80,18 +96,30 @@ class MethodTag extends ReturnTag
        )) {
            list(
                ,
+                $static,
                $this->type,
                $this->method_name,
                $this->arguments,
                $this->description
            ) = $matches;
-            if (!$this->type) {
-                $this->type = 'void';
+            if ($static) {
+                if (!$this->type) {
+                    $this->type = 'static';
+                } else {
+                    $this->isStatic = true;
+                }
+            } else {
+                if (!$this->type) {
+                    $this->type = 'void';
+                }
            }
+            $this->parsedDescription = null;
        } else {
            echo date('c') . ' ERR (3): @method contained invalid contents: '
                . $this->content . PHP_EOL;
        }
+
+        return $this;
    }

    /**
@@ -99,11 +127,14 @@ class MethodTag extends ReturnTag
     *
     * @param string $method_name The name of the method.
     *
-     * @return void
+     * @return $this
     */
    public function setMethodName($method_name)
    {
        $this->method_name = $method_name;
+
+        $this->content = null;
+        return $this;
    }

    /**
@@ -126,6 +157,9 @@ class MethodTag extends ReturnTag
    public function setArguments($arguments)
    {
        $this->arguments = $arguments;
+
+        $this->content = null;
+        return $this;
    }

    /**
@@ -149,4 +183,30 @@ class MethodTag extends ReturnTag

        return $arguments;
    }
+    
+    /**
+     * Checks whether the method tag describes a static method or not.
+     * 
+     * @return bool TRUE if the method declaration is for a static method, FALSE
+     *     otherwise.
+     */
+    public function isStatic()
+    {
+        return $this->isStatic;
+    }
+    
+    /**
+     * Sets a new value for whether the method is static or not.
+     * 
+     * @param bool $isStatic The new value to set.
+     * 
+     * @return $this
+     */
+    public function setIsStatic($isStatic)
+    {
+        $this->isStatic = $isStatic;
+
+        $this->content = null;
+        return $this;
+    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -27,49 +26,54 @@ class ParamTag extends ReturnTag
    /**
     * @var string
     */
-    protected $variableName = null;
+    protected $variableName = '';

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'param').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        Tag::__construct($type, $content, $docblock, $location);
-        $content = preg_split(
-            '/(\s+)/u',
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content
+                = "{$this->type} {$this->variableName} {$this->description}";
+        }
+        return $this->content;
+    }
+    /**
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        Tag::setContent($content);
+        $parts = preg_split(
+            '/(\s+)/Su',
            $this->description,
            3,
            PREG_SPLIT_DELIM_CAPTURE
        );

        // if the first item that is encountered is not a variable; it is a type
-        if (isset($content[0])
-            && (strlen($content[0]) > 0)
-            && ($content[0][0] !== '$')
+        if (isset($parts[0])
+            && (strlen($parts[0]) > 0)
+            && ($parts[0][0] !== '$')
        ) {
-            $this->type = array_shift($content);
-            array_shift($content);
+            $this->type = array_shift($parts);
+            array_shift($parts);
        }

        // if the next item starts with a $ it must be the variable name
-        if (isset($content[0])
-            && (strlen($content[0]) > 0)
-            && ($content[0][0] == '$')
+        if (isset($parts[0])
+            && (strlen($parts[0]) > 0)
+            && ($parts[0][0] == '$')
        ) {
-            $this->variableName = array_shift($content);
-            array_shift($content);
+            $this->variableName = array_shift($parts);
+            array_shift($parts);
        }

-        $this->description = implode('', $content);
+        $this->setDescription(implode('', $parts));
+
+        $this->content = $content;
+        return $this;
    }

    /**
@@ -87,10 +91,13 @@ class ParamTag extends ReturnTag
     *
     * @param string $name The new name for this variable.
     *
-     * @return void
+     * @return $this
     */
    public function setVariableName($name)
    {
        $this->variableName = $name;
+
+        $this->content = null;
+        return $this;
    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Type\Collection;

@@ -32,26 +31,34 @@ class ReturnTag extends Tag
    protected $types = null;

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'return').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        parent::__construct($type, $content, $docblock, $location);
-        $content = preg_split('/\s+/u', $this->description, 2);
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content = "{$this->type} {$this->description}";
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        parent::setContent($content);
+
+        $parts = preg_split('/\s+/Su', $this->description, 2);

        // any output is considered a type
-        $this->type = $content[0];
+        $this->type = $parts[0];
+        $this->types = null;

-        $this->description = isset($content[1]) ? $content[1] : '';
+        $this->setDescription(isset($parts[1]) ? $parts[1] : '');
+
+        $this->content = $content;
+        return $this;
    }

    /**
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -28,30 +27,35 @@ class SeeTag extends Tag
    protected $refers = null;

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'see').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        parent::__construct($type, $content, $docblock, $location);
-        $content = preg_split('/\s+/u', $this->description, 2);
-
-        // any output is considered a type
-        $this->refers = $content[0];
-
-        $this->description = isset($content[1]) ? $content[1] : '';
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content = "{$this->refers} {$this->description}";
+        }
+        return $this->content;
    }

    /**
-     * Returns the type of the variable.
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        parent::setContent($content);
+        $parts = preg_split('/\s+/Su', $this->description, 2);
+
+        // any output is considered a type
+        $this->refers = $parts[0];
+
+        $this->setDescription(isset($parts[1]) ? $parts[1] : '');
+
+        $this->content = $content;
+        return $this;
+    }
+
+    /**
+     * Gets the structural element this tag refers to.
     *
     * @return string
     */
@@ -59,4 +63,19 @@ class SeeTag extends Tag
    {
        return $this->refers;
    }
+
+    /**
+     * Sets the structural element this tag refers to.
+     * 
+     * @param string $refers The new type this tag refers to.
+     * 
+     * @return $this
+     */
+    public function setReference($refers)
+    {
+        $this->refers = $refers;
+
+        $this->content = null;
+        return $this;
+    }
 }
@@ -36,20 +36,24 @@ class SourceTag extends Tag
    protected $lineCount = null;

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'source').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        parent::__construct($type, $content, $docblock, $location);
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content
+                = "{$this->startingLine} {$this->lineCount} {$this->description}";
+        }
+
+        return $this->content;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function setContent($content)
+    {
+        parent::setContent($content);
        if (preg_match(
            '/^
                # Starting line
@@ -70,12 +74,15 @@ class SourceTag extends Tag
            if (isset($matches[2]) && '' !== $matches[2]) {
                $this->lineCount = (int)$matches[2];
            }
-            $this->description = $matches[3];
+            $this->setDescription($matches[3]);
+            $this->content = $content;
        }
+
+        return $this;
    }

    /**
-     * Returns the starting line.
+     * Gets the starting line.
     *
     * @return int The starting line, relative to the structural element's
     *     location.
@@ -85,6 +92,22 @@ class SourceTag extends Tag
        return $this->startingLine;
    }

+    /**
+     * Sets the starting line.
+     * 
+     * @param int $startingLine The new starting line, relative to the
+     *     structural element's location.
+     * 
+     * @return $this
+     */
+    public function setStartingLine($startingLine)
+    {
+        $this->startingLine = $startingLine;
+
+        $this->content = null;
+        return $this;
+    }
+
    /**
     * Returns the number of lines.
     *
@@ -95,4 +118,20 @@ class SourceTag extends Tag
    {
        return $this->lineCount;
    }
+
+    /**
+     * Sets the number of lines.
+     * 
+     * @param int|null $lineCount The new number of lines, relative to the
+     *     starting line. NULL means "to the end".
+     * 
+     * @return $this
+     */
+    public function setLineCount($lineCount)
+    {
+        $this->lineCount = $lineCount;
+
+        $this->content = null;
+        return $this;
+    }
 }
@@ -12,9 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Tag;
-
 /**
 * Reflection class for a @var tag in a Docblock.
 *
@@ -24,38 +21,4 @@ use phpDocumentor\Reflection\DocBlock\Tag;
 */
 class VarTag extends ParamTag
 {
-    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'var').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
-     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        Tag::__construct($type, $content, $docblock, $location);
-        $content = preg_split('/\s+/u', $this->description);
-
-        if (count($content) == 0) {
-            return;
-        }
-
-        // var always starts with the variable name
-        $this->type = array_shift($content);
-
-        // if the next item starts with a $ it must be the variable name
-        if ((count($content) > 0)
-            && (strlen($content[0]) > 0)
-            && ($content[0][0] == '$')
-        ) {
-            $this->variableName = array_shift($content);
-        }
-
-        $this->description = implode(' ', $content);
-    }
 }
@@ -12,7 +12,6 @@

 namespace phpDocumentor\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock;
 use phpDocumentor\Reflection\DocBlock\Tag;

 /**
@@ -24,39 +23,45 @@ use phpDocumentor\Reflection\DocBlock\Tag;
 */
 class VersionTag extends Tag
 {
+    /**
+     * PCRE regular expression matching a version vector.
+     * Assumes the "x" modifier.
+     */
+    const REGEX_VECTOR = '(?:
+        # Normal release vectors.
+        \d\S*
+        |
+        # VCS version vectors. Per PHPCS, they are expected to
+        # follow the form of the VCS name, followed by ":", followed
+        # by the version vector itself.
+        # By convention, popular VCSes like CVS, SVN and GIT use "$"
+        # around the actual version vector.
+        [^\s\:]+\:\s*\$[^\$]+\$
+    )';
+
    /** @var string The version vector. */
    protected $version = '';
+    
+    public function getContent()
+    {
+        if (null === $this->content) {
+            $this->content = "{$this->version} {$this->description}";
+        }
+
+        return $this->content;
+    }

    /**
-     * Parses a tag and populates the member variables.
-     *
-     * @param string   $type     Tag identifier for this tag (should be 'version').
-     * @param string   $content  Contents for this tag.
-     * @param DocBlock $docblock The DocBlock which this tag belongs to.
-     * @param Location $location Location of the tag.
+     * {@inheritdoc}
     */
-    public function __construct(
-        $type,
-        $content,
-        DocBlock $docblock = null,
-        Location $location = null
-    ) {
-        parent::__construct($type, $content, $docblock, $location);
+    public function setContent($content)
+    {
+        parent::setContent($content);

        if (preg_match(
            '/^
                # The version vector
-                ((?:
-                    # Normal release vectors.
-                    \d\S*
-                    |
-                    # VCS version vectors. Per PHPCS, they are expected to
-                    # follow the form of the VCS name, followed by ":", followed
-                    # by the version vector itself.
-                    # By convention, popular VCSes like CVS, SVN and GIT use "$"
-                    # around the actual version vector.
-                    [^\s\:]+\:\s*\$[^\$]+\$
-                ))
+                (' . self::REGEX_VECTOR . ')
                \s*
                # The description
                (.+)?
@@ -65,12 +70,15 @@ class VersionTag extends Tag
            $matches
        )) {
            $this->version = $matches[1];
-            $this->description = isset($matches[2]) ? $matches[2] : '';
+            $this->setDescription(isset($matches[2]) ? $matches[2] : '');
+            $this->content = $content;
        }
+
+        return $this;
    }

    /**
-     * Returns the version section of the tag.
+     * Gets the version section of the tag.
     *
     * @return string The version section of the tag.
     */
@@ -78,4 +86,23 @@ class VersionTag extends Tag
    {
        return $this->version;
    }
+    
+    /**
+     * Sets the version section of the tag.
+     * 
+     * @param string $version The new version section of the tag.
+     *     An invalid value will set an empty string.
+     * 
+     * @return $this
+     */
+    public function setVersion($version)
+    {
+        $this->version
+            = preg_match('/^' . self::REGEX_VECTOR . '$/ux', $version)
+            ? $version
+            : '';
+
+        $this->content = null;
+        return $this;
+    }
 }
@@ -34,9 +34,9 @@ class Collection extends \ArrayObject
    const OPERATOR_NAMESPACE = '\\';

    /** @var string[] List of recognized keywords */
-    protected $keywords = array(
+    protected static $keywords = array(
        'string', 'int', 'integer', 'bool', 'boolean', 'float', 'double',
-        'object', 'mixed', 'array', 'resource', 'void', 'null',
+        'object', 'mixed', 'array', 'resource', 'void', 'null', 'scalar',
        'callback', 'callable', 'false', 'true', 'self', '$this', 'static'
    );

@@ -152,7 +152,7 @@ class Collection extends \ArrayObject
        }

        if ($this->isTypeAnArray($type)) {
-            return $this->expand(substr($type, 0, -2)).self::OPERATOR_ARRAY;
+            return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;
        }

        if ($this->isRelativeType($type) && !$this->isTypeAKeyword($type)) {
@@ -186,7 +186,7 @@ class Collection extends \ArrayObject
     */
    protected function isTypeAnArray($type)
    {
-        return (substr($type, -2) == self::OPERATOR_ARRAY);
+        return substr($type, -2) === self::OPERATOR_ARRAY;
    }

    /**
@@ -199,7 +199,7 @@ class Collection extends \ArrayObject
     */
    protected function isTypeAKeyword($type)
    {
-        return in_array(strtolower($type), $this->keywords);
+        return in_array(strtolower($type), static::$keywords, true);
    }

    /**
@@ -33,8 +33,7 @@ class ExampleTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exLineCount
     * @param string $exFilepath
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ExampleTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ExampleTag::getFilePath
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ExampleTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -32,8 +32,7 @@ class LinkTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exDescription
     * @param string $exLink
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\LinkTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\LinkTag::getLink
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\LinkTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -34,10 +34,7 @@ class MethodTagTest extends \PHPUnit_Framework_TestCase
     * @param string $description     The short description mentioned in the
     *     signature.
     * 
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\MethodTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\MethodTag::getMethodName
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\MethodTag::getArguments
-     * 
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\MethodTag
     * @dataProvider getTestSignatures
     *
     * @return void
@@ -47,6 +44,7 @@ class MethodTagTest extends \PHPUnit_Framework_TestCase
        $valid,
        $expected_name,
        $expected_return,
+        $expected_isStatic,
        $paramCount,
        $description
    ) {
@@ -67,6 +65,7 @@ class MethodTagTest extends \PHPUnit_Framework_TestCase
        $this->assertEquals($expected_name, $tag->getMethodName());
        $this->assertEquals($expected_return, $tag->getType());
        $this->assertEquals($description, $tag->getDescription());
+        $this->assertEquals($expected_isStatic, $tag->isStatic());
        $this->assertCount($paramCount, $tag->getArguments());
    }

@@ -75,56 +74,72 @@ class MethodTagTest extends \PHPUnit_Framework_TestCase
        return array(
            array(
                'foo',
-                false, 'foo', '', 0, ''
+                false, 'foo', '', false, 0, ''
            ),
            array(
                'foo()',
-                true, 'foo', 'void', 0, ''
+                true, 'foo', 'void', false, 0, ''
            ),
            array(
                'foo() description',
-                true, 'foo', 'void', 0, 'description'
+                true, 'foo', 'void', false, 0, 'description'
            ),
            array(
                'int foo()',
-                true, 'foo', 'int', 0, ''
+                true, 'foo', 'int', false, 0, ''
            ),
            array(
                'int foo() description',
-                true, 'foo', 'int', 0, 'description'
+                true, 'foo', 'int', false, 0, 'description'
            ),
            array(
                'int foo($a, $b)',
-                true, 'foo', 'int', 2, ''
+                true, 'foo', 'int', false, 2, ''
            ),
            array(
                'int foo() foo(int $a, int $b)',
-                true, 'foo', 'int', 2, ''
+                true, 'foo', 'int', false, 2, ''
            ),
            array(
                'int foo(int $a, int $b)',
-                true, 'foo', 'int', 2, ''
+                true, 'foo', 'int', false, 2, ''
            ),
            array(
                'null|int foo(int $a, int $b)',
-                true, 'foo', 'null|int', 2, ''
+                true, 'foo', 'null|int', false, 2, ''
            ),
            array(
                'int foo(null|int $a, int $b)',
-                true, 'foo', 'int', 2, ''
+                true, 'foo', 'int', false, 2, ''
            ),
            array(
                '\Exception foo() foo(Exception $a, Exception $b)',
-                true, 'foo', '\Exception', 2, ''
+                true, 'foo', '\Exception', false, 2, ''
            ),
            array(
                'int foo() foo(Exception $a, Exception $b) description',
-                true, 'foo', 'int', 2, 'description'
+                true, 'foo', 'int', false, 2, 'description'
            ),
            array(
                'int foo() foo(\Exception $a, \Exception $b) description',
-                true, 'foo', 'int', 2, 'description'
+                true, 'foo', 'int', false, 2, 'description'
            ),
+            array(
+                'void()',
+                true, 'void', 'void', false, 0, ''
+            ),
+            array(
+                'static foo()',
+                true, 'foo', 'static', false, 0, ''
+            ),
+            array(
+                'static void foo()',
+                true, 'foo', 'void', true, 0, ''
+            ),
+            array(
+                'static static foo()',
+                true, 'foo', 'static', true, 0, ''
+            )
        );
    }
 }
@@ -33,9 +33,7 @@ class ParamTagTest extends \PHPUnit_Framework_TestCase
     * @param string $extractedVarName
     * @param string $extractedDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ParamTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ParamTag::getVariableName
-     *
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ParamTag
     * @dataProvider provideDataForConstructor
     *
     * @return void
@@ -33,7 +33,6 @@ class ReturnTagTest extends \PHPUnit_Framework_TestCase
     * @param string $extractedDescription
     *
     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ReturnTag
-     *
     * @dataProvider provideDataForConstructor
     *
     * @return void
@@ -31,8 +31,7 @@ class SeeTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exContent
     * @param string $exReference
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SeeTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SeeTag::getReference
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SeeTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -32,9 +32,7 @@ class SourceTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exStartingLine
     * @param string $exLineCount
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SourceTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SourceTag::getStartingLine
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SourceTag::getLineCount
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SourceTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -33,7 +33,6 @@ class ThrowsTagTest extends \PHPUnit_Framework_TestCase
     * @param string $extractedDescription
     *
     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag
-     *
     * @dataProvider provideDataForConstructor
     *
     * @return void
@@ -32,7 +32,7 @@ class VarTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exVariable
     * @param string $exDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VarTag::__construct
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VarTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -32,8 +32,7 @@ class VersionTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exDescription
     * @param string $exVersion
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VersionTag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VersionTag::getVersion
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VersionTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -272,9 +272,7 @@ TAG_HANDLER
     * @param string $content
     * @param string $exDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::getDescription
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::getContent
+     * @covers \phpDocumentor\Reflection\DocBlock\Tag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -309,11 +307,6 @@ TAG_HANDLER
                'unknown',
                '',
                '',
-            ),
-            array(
-                '',
-                'unknown',
-                'unknown',
            )
        );
    }
@@ -34,9 +34,9 @@ class DocBlockTest extends \PHPUnit_Framework_TestCase
    {
        $fixture = <<<DOCBLOCK
 /**
- * This is a short description.
+ * This is a short description
 *
- * This is a long description.
+ * This is a long description
 *
 * @see \MyClass
 * @return void
@@ -48,11 +48,11 @@ DOCBLOCK;
            new Location(2)
        );
        $this->assertEquals(
-            'This is a short description.',
+            'This is a short description',
            $object->getShortDescription()
        );
        $this->assertEquals(
-            'This is a long description.',
+            'This is a long description',
            $object->getLongDescription()->getContents()
        );
        $this->assertCount(2, $object->getTags());
@@ -142,7 +142,8 @@ DOCBLOCK;
    {
        $fixture = <<<DOCBLOCK
 /**
- * This is a short description. This is a long description.
+ * This is a short description.
+ * This is a long description.
 * This is a continuation of the long description.
 */
 DOCBLOCK;
Author	SHA1	Message	Date
Barry vd. Heuvel	280c4a1d44	Markdown is not required, so move to suggest Markdown is only used once and a check is in place to see if the markdown classes exists. So perhaps it is better to move this to suggest instead of require, so the people who don't need it, don't have to download it.	2013-08-08 18:25:04 +02:00
Vasil Rangelov	66ae84e9d7	Merge pull request #24 from tommygnr/travis-5.5 Enable travis builds on php5.5	2013-08-07 04:04:22 -07:00
Tom Corrigan	3023fb2220	Enable travis builds on php5.5	2013-08-07 13:08:11 +10:00
Mike van Riel	a9b6edf3ce	Merge pull request #23 from tommygnr/patch-1 Add a branch alias	2013-08-01 12:16:50 -07:00
Tom Corrigan	f3d1a28bf7	Add a branch alias This will enable improved version constraints in phpdocumentor/reflection	2013-08-02 02:40:14 +10:00
Vasil Rangelov	6d705c1a0f	Merge pull request #22 from barryvdh/tostring Add __toString() methods for Description and Tag	2013-05-27 10:54:22 -07:00
Barry vd. Heuvel	ab0bcb8d31	Add __toString() methods for Description and Tag And let the Serializer make use of the (string) $tag	2013-05-27 18:16:15 +02:00
Vasil Rangelov	ac6e37af97	Added "{}" around all double quoted variables, for readability's sake; Performance improvement in Serializer - wrap length is calculated once during the text portion only. Tags reuse the result. Also no "prefix" adding in tags - the name is simply added before wrapping.	2013-05-27 02:04:23 +03:00
Vasil Rangelov	4a7affe15b	Minor doc fix at Serializer.php.	2013-05-27 01:31:58 +03:00
Vasil Rangelov	b7797b4e1a	Added getters for Serializer options; Swapped the indent and indent string options at Serializer's constructor; Renamed Serializer::setIndentFirstLine() to setIsFirstLineIndented() in accordance with the getter (PHPMD fix); Line length is now ACTUALLY line length, i.e. it takes the indentation into account, and is applied to tags as well; Fixed ReturnTag::setContent() to set "types" to NULL; A lot of doc and CS fixes at Serializer.php.	2013-05-27 01:27:07 +03:00
Vasil Rangelov	8b529636bf	Merge pull request #20 from barryvdh/master Export docblock comment	2013-05-26 13:55:34 -07:00
Barry vd. Heuvel	2e9fd6a2e8	Revert setType Doesn't really belong to this PR	2013-05-26 22:36:53 +02:00
Barry vd. Heuvel	cbb14bab1e	Move serializer to seperate class	2013-05-26 22:36:31 +02:00
Barry vd. Heuvel	d57128e65c	Export DocBlock & full description Add get/set for entire description, and create a docblock comment, based on the description/tags	2013-05-26 21:17:09 +02:00
Barry vd. Heuvel	d9c0928243	Set return type	2013-05-26 21:16:30 +02:00
Vasil Rangelov	63c9de4e8b	Added support for static method declarations at MethodTag and according unit tests. Fixed MethodTag::getContent() to actually return the content as opposed to $this;	2013-05-16 22:17:15 +03:00
Vasil Rangelov	76619d4a16	Adjusted Unit tests and docs to match the latest dot separation.	2013-04-16 19:25:40 +03:00
Vasil Rangelov	47d3f86c53	Fixed the dot separation to match the latest PSR (see phpDocumentor/phpDocumentor2#797)	2013-04-16 17:22:15 +03:00
Mike van Riel	cfb104b8c8	Merge pull request #17 from joncave/cotnent-typo Fix typo in "cotnent"	2013-02-01 10:47:35 -08:00
Jon Cave	5c51ccf185	Fix typo in "cotnent"	2013-02-01 18:08:30 +00:00
Vasil Rangelov	5d93f42598	Added "scalar" as a recognized keyword (phpDocumentor/phpDocumentor2#694 ); Changed the list of keywords to be static (for the purpose of reducing memory consumption); Updated composer.lock with the latest dependencies (PHPUnit in particular).	2012-12-02 22:26:45 +02:00
Vasil Rangelov	eb83d810de	Added a Travis status image to README.md; Also, fixed a typo.	2012-11-30 22:43:34 +02:00
Vasil Rangelov	6f0fc03c49	Added setters at Location and Description; Added DocBlock::appendTag(); Minor reorganization at the tag setters;	2012-11-30 22:37:41 +02:00
Vasil Rangelov	b09525332f	Refactored all tags to have setters for all of their components; Removed the special handling for VarTag (it's now equivalent to ParamTag); Minor doc, CS and coverage fixes.	2012-11-30 19:26:19 +02:00
Vasil Rangelov	c2796044a6	Adjusted composer files for consistency with PhpDocumentor.	2012-11-29 20:12:53 +02:00