Merge pull request #12 from barryvdh/fix-deprecated

Fix deprecated messages
2026-08-18 18:13:13 +00:00 · 2022-10-31 16:35:43 +01:00 · 2022-10-31 16:34:24 +01:00 · 2022-10-31 16:22:38 +01:00 · 2022-10-31 16:20:50 +01:00 · 2022-10-31 16:13:13 +01:00
51 changed files with 1154 additions and 842 deletions
@@ -0,0 +1,10 @@
+# Path-based git attributes
+# https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
+
+# Ignore all test and documentation with "export-ignore".
+/.gitignore         export-ignore
+/.gitattributes     export-ignore
+/.travis.yml        export-ignore
+/composer.lock      export-ignore
+/phpunit.xml.dist   export-ignore
+/tests              export-ignore
@@ -0,0 +1,43 @@
+name: Unit Tests
+
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+    branches:
+    - "*"
+  schedule:
+  - cron: '0 0 * * *'
+
+jobs:
+  php-tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    env:
+      COMPOSER_NO_INTERACTION: 1
+
+    strategy:
+      matrix:
+        php: [8.1, 8.0, 7.4, 7.3, 7.2]
+        dependency-version: [prefer-lowest, prefer-stable]
+
+    name: P${{ matrix.php }} - ${{ matrix.dependency-version }}
+
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+
+    - name: Setup PHP
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php }}
+        coverage: none
+        tools: composer:v2
+
+    - name: Install dependencies
+      run: |
+        composer update --${{ matrix.dependency-version }} --prefer-dist --no-progress
+
+    - name: Execute Unit Tests
+      run: vendor/bin/phpunit
@@ -1,2 +1,3 @@
 .idea
+composer.lock
 vendor
@@ -1,23 +0,0 @@
-language: php
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-
-script:
- - vendor/phpunit/phpunit/composer/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 
-
-notifications:
-  irc: "irc.freenode.org#phpdocumentor"
-  email:
-    - [email protected]
-    - [email protected]
-    - [email protected]
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2010 Mike van Riel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
@@ -1,18 +1,26 @@
 {
-    "name":    "phpdocumentor/reflection-docblock",
+    "name":    "barryvdh/reflection-docblock",
    "type":    "library",
    "license": "MIT",
    "authors": [
        {"name": "Mike van Riel", "email": "[email protected]"}
    ],
    "require": {
-        "php": ">=5.3.3",
-        "dflydev/markdown": "1.0.*"
+        "php": ">=5.3.3"
    },
    "autoload": {
-        "psr-0": {"phpDocumentor": ["src/"]}
+        "psr-0": {"Barryvdh": ["src/"]}
    },
    "require-dev": {
-        "phpunit/phpunit": "3.7.*@stable"
+        "phpunit/phpunit": "^8.5.14|^9"
+    },
+    "suggest": {
+        "dflydev/markdown": "~1.0",
+        "erusev/parsedown": "~1.0"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "2.0.x-dev"
+        }
    }
 }
@@ -1,475 +0,0 @@
-{
-    "hash": "c6115c20a4a284f6ca14e676e788b4d3",
-    "packages": [
-        {
-            "name": "dflydev/markdown",
-            "version": "v1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/dflydev/dflydev-markdown.git",
-                "reference": "v1.0.2"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/dflydev/dflydev-markdown/zipball/v1.0.2",
-                "reference": "v1.0.2",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3"
-            },
-            "time": "2012-01-15 19:36:37",
-            "type": "library",
-            "installation-source": "dist",
-            "autoload": {
-                "psr-0": {
-                    "dflydev\\markdown": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "New BSD License"
-            ],
-            "authors": [
-                {
-                    "name": "Dragonfly Development Inc.",
-                    "email": "[email protected]",
-                    "homepage": "http://dflydev.com"
-                },
-                {
-                    "name": "Beau Simensen",
-                    "email": "[email protected]",
-                    "homepage": "http://beausimensen.com"
-                },
-                {
-                    "name": "Michel Fortin",
-                    "homepage": "http://michelf.com"
-                },
-                {
-                    "name": "John Gruber",
-                    "homepage": "http://daringfireball.net"
-                }
-            ],
-            "description": "PHP Markdown & Extra",
-            "homepage": "http://github.com/dflydev/dflydev-markdown",
-            "keywords": [
-                "markdown"
-            ]
-        }
-    ],
-    "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": {
-        "phpunit/phpunit": 0
-    }
-}
@@ -1,14 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<phpunit colors="true" strict="true" bootstrap="vendor/autoload.php">
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" colors="true" bootstrap="vendor/autoload.php" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">./src/</directory>
+    </include>
+  </coverage>
  <testsuites>
    <testsuite name="phpDocumentor\Reflection\DocBlock">
      <directory>./tests/</directory>
    </testsuite>
  </testsuites>
-  <filter>
-    <whitelist>
-        <directory suffix=".php">./src/</directory>
-    </whitelist>
-  </filter>
 </phpunit>
@@ -10,11 +10,11 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection;
+namespace Barryvdh\Reflection;

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

 /**
 * Parses the DocBlock for any structure.
@@ -46,6 +46,12 @@ class DocBlock implements \Reflector
    /** @var Location Information about the location of this DocBlock. */
    protected $location = null;

+    /** @var bool Is this DocBlock (the start of) a template? */
+    protected $isTemplateStart = false;
+
+    /** @var bool Does this DocBlock signify the end of a DocBlock template? */
+    protected $isTemplateEnd = false;
+
    /**
     * Parses the given docblock and populates the member fields.
     *
@@ -81,7 +87,9 @@ class DocBlock implements \Reflector

        $docblock = $this->cleanInput($docblock);

-        list($short, $long, $tags) = $this->splitDocBlock($docblock);
+        list($templateMarker, $short, $long, $tags) = $this->splitDocBlock($docblock);
+        $this->isTemplateStart = $templateMarker === '#@+';
+        $this->isTemplateEnd = $templateMarker === '#@-';
        $this->short_description = $short;
        $this->long_description = new DocBlock\Description($long, $this);
        $this->parseTags($tags);
@@ -119,74 +127,86 @@ class DocBlock implements \Reflector
    }

    /**
-     * Splits the DocBlock into a short description, long description and
-     * block of tags.
+     * Splits the DocBlock into a template marker, summary, description and block of tags.
     *
     * @param string $comment Comment to split into the sub-parts.
     *
-     * @author RichardJ Special thanks to RichardJ for the regex responsible
-     *     for the split.
+     * @author Richard van Velzen (@_richardJ) Special thanks to Richard for the regex responsible for the split.
+     * @author Mike van Riel <me@mikevanriel.com> for extending the regex with template marker support.
     *
-     * @return string[] containing the short-, long description and an element
-     *     containing the tags.
+     * @return string[] containing the template marker (if any), summary, description and a string containing the tags.
     */
    protected function splitDocBlock($comment)
    {
+        // Performance improvement cheat: if the first character is an @ then only tags are in this DocBlock. This
+        // method does not split tags so we return this verbatim as the fourth result (tags). This saves us the
+        // performance impact of running a regular expression
        if (strpos($comment, '@') === 0) {
-            $matches = array('', '', $comment);
-        } else {
-            // clears all extra horizontal whitespace from the line endings
-            // to prevent parsing issues
-            $comment = preg_replace('/\h*$/Sum', '', $comment);
-
-            /*
-             * 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
-             *   two consecutive newlines (horizontal whitespace is taken into
-             *   account to consider spacing errors)
-             * - The long description, any character until a new line is
-             *   encountered followed by an @ and word characters (a tag).
-             *   This is optional.
-             * - Tags; the remaining characters
-             *
-             * Big thanks to RichardJ for contributing this Regular Expression
-             */
-            preg_match(
-                '/
-        \A (
-          [^\n.]+
-          (?:
-            (?! \. \s | \n{2} ) # disallow the first seperator here
-            [\n.] (?! [ \t]* @\pL ) # disallow second seperator
-            [^\n.]+
-          )*
-          \.?
-        )
-        (?:
-          \s* # first seperator (actually newlines but it\'s all whitespace)
-          (?! @\pL ) # disallow the rest, to make sure this one doesn\'t match,
-          #if it doesn\'t exist
-          (
-            [^\n]+
-            (?: \n+
-              (?! [ \t]* @\pL ) # disallow second seperator (@param)
-              [^\n]+
-            )*
-          )
-        )?
-        (\s+ [\s\S]*)? # everything that follows
-        /ux',
-                $comment,
-                $matches
-            );
-            array_shift($matches);
+            return array('', '', '', $comment);
        }

-        while (count($matches) < 3) {
+        // clears all extra horizontal whitespace from the line endings to prevent parsing issues
+        $comment = preg_replace('/\h*$/Sum', '', $comment);
+
+        /*
+         * Splits the docblock into a template marker, short description, long description and tags section
+         *
+         * - The template marker is empty, #@+ or #@- if the DocBlock starts with either of those (a newline may
+         *   occur after it and will be stripped).
+         * - The short description is started from the first character until a dot is encountered followed by a
+         *   newline OR two consecutive newlines (horizontal whitespace is taken into account to consider spacing
+         *   errors). This is optional.
+         * - The long description, any character until a new line is encountered followed by an @ and word
+         *   characters (a tag). This is optional.
+         * - Tags; the remaining characters
+         *
+         * Big thanks to RichardJ for contributing this Regular Expression
+         */
+        preg_match(
+            '/
+            \A
+            # 1. Extract the template marker
+            (?:(\#\@\+|\#\@\-)\n?)?
+
+            # 2. Extract the summary
+            (?:
+              (?! @\pL ) # The summary may not start with an @
+              (
+                [^\n.]+
+                (?:
+                  (?! \. \n | \n{2} )     # End summary upon a dot followed by newline or two newlines
+                  [\n.] (?! [ \t]* @\pL ) # End summary when an @ is found as first character on a new line
+                  [^\n.]+                 # Include anything else
+                )*
+                \.?
+              )?
+            )
+
+            # 3. Extract the description
+            (?:
+              \s*        # Some form of whitespace _must_ precede a description because a summary must be there
+              (?! @\pL ) # The description may not start with an @
+              (
+                [^\n]+
+                (?: \n+
+                  (?! [ \t]* @\pL ) # End description when an @ is found as first character on a new line
+                  [^\n]+            # Include anything else
+                )*
+              )
+            )?
+
+            # 4. Extract the tags (anything that follows)
+            (\s+ [\s\S]*)? # everything that follows
+            /ux',
+            $comment,
+            $matches
+        );
+        array_shift($matches);
+
+        while (count($matches) < 4) {
            $matches[] = '';
        }
+
        return $matches;
    }

@@ -209,26 +229,59 @@ class DocBlock implements \Reflector
                );
            }
            foreach (explode("\n", $tags) as $tag_line) {
-                if (trim($tag_line) === '') {
-                    continue;
-                }
-
                if (isset($tag_line[0]) && ($tag_line[0] === '@')) {
                    $result[] = $tag_line;
                } else {
-                    $result[count($result) - 1] .= PHP_EOL . $tag_line;
+                    $result[count($result) - 1] .= "\n" . $tag_line;
                }
            }

            // create proper Tag objects
            foreach ($result as $key => $tag_line) {
-                $result[$key] = Tag::createInstance($tag_line, $this);
+                $result[$key] = Tag::createInstance(trim($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.
     *
@@ -249,6 +302,44 @@ class DocBlock implements \Reflector
        return $this->long_description;
    }

+    /**
+     * Returns whether this DocBlock is the start of a Template section.
+     *
+     * A Docblock may serve as template for a series of subsequent DocBlocks. This is indicated by a special marker
+     * (`#@+`) that is appended directly after the opening `/**` of a DocBlock.
+     *
+     * An example of such an opening is:
+     *
+     * ```
+     * /**#@+
+     *  * My DocBlock
+     *  * /
+     * ```
+     *
+     * The description and tags (not the summary!) are copied onto all subsequent DocBlocks and also applied to all
+     * elements that follow until another DocBlock is found that contains the closing marker (`#@-`).
+     *
+     * @see self::isTemplateEnd() for the check whether a closing marker was provided.
+     *
+     * @return boolean
+     */
+    public function isTemplateStart()
+    {
+        return $this->isTemplateStart;
+    }
+
+    /**
+     * Returns whether this DocBlock is the end of a Template section.
+     *
+     * @see self::isTemplateStart() for a more complete description of the Docblock Template functionality.
+     *
+     * @return boolean
+     */
+    public function isTemplateEnd()
+    {
+        return $this->isTemplateEnd;
+    }
+
    /**
     * Returns the current context.
     *
@@ -348,6 +439,24 @@ class DocBlock implements \Reflector
        return $tag;
    }

+    /**
+     * Deletes a tag from the list of tags.
+     *
+     * @param Tag $tag The tag to be deleted.
+     *
+     * @return bool True if the tag was deleted.
+     */
+    public function deleteTag(Tag $tag)
+    {
+        if (($key = array_search($tag, $this->tags)) !== false) {
+            unset($this->tags[$key]);
+
+            return true;
+        }
+
+        return false;
+    }
+
    /**
     * Builds a string representation of this object.
     *
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock;
+namespace Barryvdh\Reflection\DocBlock;

 /**
 * The context in which a DocBlock occurs.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock;
+namespace Barryvdh\Reflection\DocBlock;

-use phpDocumentor\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock;

 /**
 * Parses a Description of a DocBlock or tag.
@@ -109,7 +109,7 @@ class Description implements \Reflector
                    )
                \}/Sux',
                $this->contents,
-                null,
+                -1,
                PREG_SPLIT_DELIM_CAPTURE
            );

@@ -161,7 +161,10 @@ class Description implements \Reflector
            );
        }

-        if (class_exists('dflydev\markdown\MarkdownExtraParser')) {
+        if (class_exists('Parsedown')) {
+            $markdown = \Parsedown::instance();
+            $result = $markdown->parse($result);
+        } elseif (class_exists('dflydev\markdown\MarkdownExtraParser')) {
            $markdown = new \dflydev\markdown\MarkdownExtraParser();
            $result = $markdown->transformMarkdown($result);
        }
@@ -209,14 +212,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();
    }
 }
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock;
+namespace Barryvdh\Reflection\DocBlock;

 /**
 * The location a DocBlock occurs within a file.
@@ -0,0 +1,235 @@
+<?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 Barryvdh\Reflection\DocBlock;
+
+use Barryvdh\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;
+
+    /** @var bool Separate tag groups. */
+    protected $separateTags = false;
+
+    /**
+     * 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.
+     * @param bool     $separateTags    Separate tag groups.
+     */
+    public function __construct(
+        $indent = 0,
+        $indentString = ' ',
+        $indentFirstLine = true,
+        $lineLength = null,
+        $separateTags = false
+    ) {
+        $this->setIndentationString($indentString);
+        $this->setIndent($indent);
+        $this->setIsFirstLineIndented($indentFirstLine);
+        $this->setLineLength($lineLength);
+        $this->setSeparateTags($separateTags);
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * Sets whether there should be an empty line between tag groups.
+     *
+     * @param bool $separateTags The new value for this setting.
+     *
+     * @return $this This serializer object.
+     */
+    public function setSeparateTags($separateTags)
+    {
+        $this->separateTags = (bool)$separateTags;
+        return $this;
+    }
+
+    /**
+     * Gets whether there should be an empty line between tag groups.
+     *
+     * @return bool Whether there should be an empty line between tag groups.
+     */
+    public function getSeparateTags()
+    {
+        return $this->separateTags;
+    }
+
+    /**
+     * 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";
+
+        $tags = array_values($docblock->getTags());
+
+        /** @var Tag $tag */
+        foreach ($tags as $key => $tag) {
+            $nextTag = isset($tags[$key + 1]) ? $tags[$key + 1] : null;
+
+            $tagText = (string) $tag;
+            if ($this->lineLength) {
+                $tagText = wordwrap($tagText, $wrapLength);
+            }
+            $tagText = str_replace("\n", "\n{$indent} * ", $tagText);
+
+            $comment .= "{$indent} * {$tagText}\n";
+
+            if ($this->separateTags && $nextTag !== null && ! $tag->inSameGroup($nextTag)) {
+                $comment .= "{$indent} *\n";
+            }
+        }
+
+        $comment .= $indent . ' */';
+
+        return $comment;
+    }
+}
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock;
+namespace Barryvdh\Reflection\DocBlock;

-use phpDocumentor\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock;

 /**
 * Parses a tag definition for a DocBlock.
@@ -59,43 +59,43 @@ class Tag implements \Reflector
     */
    private static $tagHandlerMappings = array(
        'author'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\AuthorTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\AuthorTag',
        'covers'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\CoversTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\CoversTag',
        'deprecated'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\DeprecatedTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\DeprecatedTag',
        'example'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ExampleTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\ExampleTag',
        'link'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\LinkTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\LinkTag',
        'method'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\MethodTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\MethodTag',
        'param'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ParamTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\ParamTag',
        'property-read'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyReadTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\PropertyReadTag',
        'property'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\PropertyTag',
        'property-write'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\PropertyWriteTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\PropertyWriteTag',
        'return'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ReturnTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\ReturnTag',
        'see'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\SeeTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\SeeTag',
        'since'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\SinceTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\SinceTag',
        'source'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\SourceTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\SourceTag',
        'throw'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\ThrowsTag',
        'throws'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\ThrowsTag',
        'uses'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\UsesTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\UsesTag',
        'var'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\VarTag',
+            => '\Barryvdh\Reflection\DocBlock\Tag\VarTag',
        'version'
-            => '\phpDocumentor\Reflection\DocBlock\Tag\VersionTag'
+            => '\Barryvdh\Reflection\DocBlock\Tag\VersionTag'
    );

    /**
@@ -352,6 +352,39 @@ class Tag implements \Reflector
        return $this;
    }

+    /**
+     * If the given tags should be together or apart.
+     *
+     * @param Tag $tag
+     *
+     * @return bool
+     */
+    public function inSameGroup(Tag $tag)
+    {
+        $firstName = $this->getName();
+        $secondName = $tag->getName();
+
+        if ($firstName === $secondName) {
+            return true;
+        }
+
+        $groups = array(
+            array('deprecated', 'link', 'see', 'since'),
+            array('author', 'copyright', 'license'),
+            array('category', 'package', 'subpackage'),
+            array('property', 'property-read', 'property-write'),
+            array('param', 'return'),
+        );
+
+        foreach ($groups as $group) {
+            if (in_array($firstName, $group, true) && in_array($secondName, $group, true)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
    /**
     * Builds a string representation of this object.
     *
@@ -366,14 +399,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()}";
    }
 }
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for an @author tag in a Docblock.
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @covers tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock\Tag\VersionTag;
+use Barryvdh\Reflection\DocBlock\Tag\VersionTag;

 /**
 * Reflection class for a @deprecated tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @example tag in a Docblock.
@@ -56,7 +56,7 @@ class ExampleTag extends SourceTag
                $filePath = '"' . $this->filePath . '"';
            }

-            $this->content = $filePath . ' ' . $this->getContent();
+            $this->content = $filePath . ' ' . parent::getContent();
        }

        return $this->content;
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @link tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @method in a Docblock.
@@ -30,18 +30,25 @@ class MethodTag extends ReturnTag
    /** @var string */
    protected $arguments = '';
    
+    /** @var bool */
+    protected $isStatic = false;
+
    /**
     * {@inheritdoc}
     */
    public function getContent()
    {
        if (null === $this->content) {
-            $this->content = $this->type .
+            $this->content = '';
+            if ($this->isStatic) {
+                $this->content .= 'static ';
+            }
+            $this->content .= $this->type .
                " {$this->method_name}({$this->arguments}) " .
                $this->description;
        }

-        return $this;
+        return $this->content;
    }

    /**
@@ -51,18 +58,33 @@ class MethodTag extends ReturnTag
    {
        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\|_\\\\]+)
+                    (
+                        (?:[\w\|_\\\\]*\$this[\w\|_\\\\]*)
+                        |
+                        (?:
+                            (?:[\w\|_\\\\]+)
+                            # array notation
+                            (?:\[\])*
+                        )*
+                    )
                    \s+
                )?
                # Legacy method name (not captured)
@@ -82,18 +104,24 @@ 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;
@@ -160,4 +188,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;
+    }
 }
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @param tag in a Docblock.
@@ -23,11 +23,12 @@ use phpDocumentor\Reflection\DocBlock\Tag;
 */
 class ParamTag extends ReturnTag
 {
-    /**
-     * @var string
-     */
+    /** @var string */
    protected $variableName = '';

+    /** @var bool determines whether this is a variadic argument */
+    protected $isVariadic = false;
+
    /**
     * {@inheritdoc}
     */
@@ -61,13 +62,18 @@ class ParamTag extends ReturnTag
            array_shift($parts);
        }

-        // if the next item starts with a $ it must be the variable name
+        // if the next item starts with a $ or ...$ it must be the variable name
        if (isset($parts[0])
            && (strlen($parts[0]) > 0)
-            && ($parts[0][0] == '$')
+            && ($parts[0][0] == '$' || substr($parts[0], 0, 4) === '...$')
        ) {
            $this->variableName = array_shift($parts);
            array_shift($parts);
+
+            if (substr($this->variableName, 0, 3) === '...') {
+                $this->isVariadic = true;
+                $this->variableName = substr($this->variableName, 3);
+            }
        }

        $this->setDescription(implode('', $parts));
@@ -100,4 +106,14 @@ class ParamTag extends ReturnTag
        $this->content = null;
        return $this;
    }
+
+    /**
+     * Returns whether this tag is variadic.
+     *
+     * @return boolean
+     */
+    public function isVariadic()
+    {
+        return $this->isVariadic;
+    }
 }
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @property-read tag in a Docblock.
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @property tag in a Docblock.
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @property-write tag in a Docblock.
@@ -10,10 +10,10 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @return tag in a Docblock.
@@ -33,13 +33,13 @@ class ReturnTag extends Tag
    /**
     * {@inheritdoc}
     */
-    public function getCotnent()
+    public function getContent()
    {
        if (null === $this->content) {
-            $this->content = "{$this->type} {$this->description}";
+            $this->content = "{$this->getType()} {$this->description}";
        }

-        return $this->cotnent;
+        return $this->content;
    }

    /**
@@ -49,10 +49,11 @@ class ReturnTag extends Tag
    {
        parent::setContent($content);

-        $parts = preg_split('/\s+/Su', $this->description, 2);
+        $parts = preg_split('/(?<!,)\s+/Su', $this->description, 2);

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

        $this->setDescription(isset($parts[1]) ? $parts[1] : '');

@@ -80,6 +81,35 @@ class ReturnTag extends Tag
        return (string) $this->getTypesCollection();
    }

+    /**
+     * Set the type section of the variable
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function setType($type)
+    {
+        $this->type = $type;
+        $this->types = null;
+        $this->content = null;
+        return $this;
+    }
+
+    /**
+     * Add a type to the type section of the variable
+     *
+     * @param string $type
+     * @return $this
+     */
+    public function addType($type)
+    {
+        $this->type = $this->type . Collection::OPERATOR_OR . $type;
+        $this->types = null;
+        $this->content = null;
+        return $this;
+    }
+
+
    /**
     * Returns the type collection.
     *
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @see tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

-use phpDocumentor\Reflection\DocBlock\Tag\VersionTag;
+use Barryvdh\Reflection\DocBlock\Tag\VersionTag;

 /**
 * Reflection class for a @since tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @source tag in a Docblock.
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @throws tag in a Docblock.
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @uses tag in a Docblock.
@@ -10,7 +10,7 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

 /**
 * Reflection class for a @var tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;

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

 /**
 * Reflection class for a @version tag in a Docblock.
@@ -10,9 +10,9 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Type;
+namespace Barryvdh\Reflection\DocBlock\Type;

-use phpDocumentor\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Context;

 /**
 * Collection
@@ -106,7 +106,7 @@ class Collection extends \ArrayObject
        }

        // separate the type by the OR operator
-        $type_parts = explode(self::OPERATOR_OR, $type);
+        $type_parts = $this->explode($type);
        foreach ($type_parts as $part) {
            $expanded_type = $this->expand($part);
            if ($expanded_type) {
@@ -126,6 +126,40 @@ class Collection extends \ArrayObject
        return implode(self::OPERATOR_OR, $this->getArrayCopy());
    }

+    /**
+     * Analyzes the given union of types and returns separated by OR operator
+     * single types.
+     *
+     * @param string $type The type or union of types
+     *
+     * @return array
+     */
+    protected function explode($type)
+    {
+        $type_parts = [];
+        $curr_type = '';
+        $nest_level = 0;
+
+        foreach (str_split($type) as $char) {
+            if ($char === self::OPERATOR_OR && $nest_level === 0) {
+                $type_parts[] = $curr_type;
+                $curr_type = '';
+            } else {
+                if ($char === '<') {
+                    $nest_level++;
+                } else if ($char === '>') {
+                    $nest_level--;
+                }
+
+                $curr_type .= $char;
+            }
+        }
+
+        $type_parts[] = $curr_type;
+
+        return $type_parts;
+    }
+
    /**
     * Analyzes the given type and returns the FQCN variant.
     *
@@ -151,17 +185,27 @@ class Collection extends \ArrayObject
            return '';
        }

+        if (substr($type, 0, 6) === 'array<' && substr($type, -1) === '>') {
+            return $type;
+        }
+
        if ($this->isTypeAnArray($type)) {
            return $this->expand(substr($type, 0, -2)) . self::OPERATOR_ARRAY;
        }

        if ($this->isRelativeType($type) && !$this->isTypeAKeyword($type)) {
+
+            if($this->shouldBeAbsolute($type)){
+                return self::OPERATOR_NAMESPACE . $type;
+            }
+
            $type_parts = explode(self::OPERATOR_NAMESPACE, $type, 2);

            $namespace_aliases = $this->context->getNamespaceAliases();
            // if the first segment is not an alias; prepend namespace name and
            // return
-            if (!isset($namespace_aliases[$type_parts[0]])) {
+            if (!isset($namespace_aliases[$type_parts[0]]) &&
+                !isset($namespace_aliases[strstr($type_parts[0], '::', true)])) {
                $namespace = $this->context->getNamespace();
                if ('' !== $namespace) {
                    $namespace .= self::OPERATOR_NAMESPACE;
@@ -169,6 +213,12 @@ class Collection extends \ArrayObject
                return self::OPERATOR_NAMESPACE . $namespace . $type;
            }

+            if (strpos($type_parts[0], '::')) {
+                $type_parts[] = strstr($type_parts[0], '::');
+                $type_parts[0] = $namespace_aliases[strstr($type_parts[0], '::', true)];
+                return implode('', $type_parts);
+            }
+
            $type_parts[0] = $namespace_aliases[$type_parts[0]];
            $type = implode(self::OPERATOR_NAMESPACE, $type_parts);
        }
@@ -218,4 +268,16 @@ class Collection extends \ArrayObject
        return ($type[0] !== self::OPERATOR_NAMESPACE)
            || $this->isTypeAKeyword($type);
    }
+
+    /**
+     * Detects if the type should actually be absolute, by checking if it exists.
+     *
+     * @param string $type A relative or absolute type as defined in the
+     *     phpDocumentor documentation.
+     *
+     * @return bool
+     */
+    protected function shouldBeAbsolute($type){
+        return class_exists($type);
+    }
 }
@@ -10,17 +10,19 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock;
+namespace Barryvdh\Reflection\DocBlock;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Description
+ * Test class for \Barryvdh\Reflection\DocBlock\Description
 *
 * @author    Vasil Rangelov <boen.robot@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class DescriptionTest extends \PHPUnit_Framework_TestCase
+class DescriptionTest extends TestCase
 {
    public function testConstruct()
    {
@@ -106,7 +108,7 @@ LONGDESC;

        $parsedDescription = $parsedContents[1]->getParsedDescription();
        $this->assertCount(3, $parsedDescription);
-        $this->assertSame("inline tag with\n", $parsedDescription[0]);
+        $this->assertSame("inline tag with", trim($parsedDescription[0]));
        $this->assertInstanceOf(
            __NAMESPACE__ . '\Tag\LinkTag',
            $parsedDescription[1]
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\CoversTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\CoversTag
 *
 * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class CoversTagTest extends \PHPUnit_Framework_TestCase
+class CoversTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\CoversTag can create
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\CoversTag can create
     * a link for the covers doc block.
     *
     * @param string $type
@@ -31,7 +33,7 @@ class CoversTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exContent
     * @param string $exReference
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\CoversTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\CoversTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\DeprecatedTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\DeprecatedTag
 *
 * @author    Vasil Rangelov <boen.robot@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class DeprecatedTagTest extends \PHPUnit_Framework_TestCase
+class DeprecatedTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\LinkTag can create
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\LinkTag can create
     * a link for the @deprecated doc block.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class DeprecatedTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exDescription
     * @param string $exVersion
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\DeprecatedTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\DeprecatedTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\ExampleTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\ExampleTag
 *
 * @author    Vasil Rangelov <boen.robot@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class ExampleTagTest extends \PHPUnit_Framework_TestCase
+class ExampleTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\SourceTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\SourceTag can
     * understand the @source DocBlock.
     *
     * @param string $type
@@ -33,7 +35,7 @@ class ExampleTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exLineCount
     * @param string $exFilepath
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ExampleTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\ExampleTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\LinkTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\LinkTag
 *
 * @author    Ben Selby <benmatselby@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class LinkTagTest extends \PHPUnit_Framework_TestCase
+class LinkTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\LinkTag can create
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\LinkTag can create
     * a link for the @link doc block.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class LinkTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exDescription
     * @param string $exLink
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\LinkTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\LinkTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,17 +10,19 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\MethodTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\MethodTag
 *
 * @author    Mike van Riel <mike.vanriel@naenius.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class MethodTagTest extends \PHPUnit_Framework_TestCase
+class MethodTagTest extends TestCase
 {
    /**
     * @param string $signature       The signature to test.
@@ -34,7 +36,7 @@ class MethodTagTest extends \PHPUnit_Framework_TestCase
     * @param string $description     The short description mentioned in the
     *     signature.
     * 
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\MethodTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\MethodTag
     * @dataProvider getTestSignatures
     *
     * @return void
@@ -44,6 +46,7 @@ class MethodTagTest extends \PHPUnit_Framework_TestCase
        $valid,
        $expected_name,
        $expected_return,
+        $expected_isStatic,
        $paramCount,
        $description
    ) {
@@ -64,64 +67,82 @@ 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());
    }

    public function getTestSignatures()
    {
        return array(
-            array(
-                'foo',
-                false, 'foo', '', 0, ''
-            ),
+            // TODO: Verify this case
+//            array(
+//                'foo',
+//                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, ''
+            )
        );
    }
 }
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\ParamTag
+ * Test class for \Barryvdh\Reflection\DocBlock\ParamTag
 *
 * @author    Mike van Riel <mike.vanriel@naenius.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class ParamTagTest extends \PHPUnit_Framework_TestCase
+class ParamTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\ParamTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\ParamTag can
     * understand the @param DocBlock.
     *
     * @param string $type
@@ -33,7 +35,7 @@ class ParamTagTest extends \PHPUnit_Framework_TestCase
     * @param string $extractedVarName
     * @param string $extractedDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ParamTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\ParamTag
     * @dataProvider provideDataForConstructor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\ReturnTag
+ * Test class for \Barryvdh\Reflection\DocBlock\ReturnTag
 *
 * @author    Mike van Riel <mike.vanriel@naenius.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class ReturnTagTest extends \PHPUnit_Framework_TestCase
+class ReturnTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\ReturnTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\ReturnTag can
     * understand the @return DocBlock.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class ReturnTagTest extends \PHPUnit_Framework_TestCase
     * @param string $extractedTypes
     * @param string $extractedDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ReturnTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\ReturnTag
     * @dataProvider provideDataForConstructor
     *
     * @return void
@@ -96,6 +98,27 @@ class ReturnTagTest extends \PHPUnit_Framework_TestCase
                'int',
                array('int'),
                "Number of Bobs"
+            ),
+            array(
+                'return',
+                'array<int, string> Types of Bobs',
+                'array<int, string>',
+                array('array<int, string>'),
+                'Types of Bobs'
+            ),
+            array(
+                'return',
+                'array<int, string>|string Types of Bobs',
+                'array<int, string>|string',
+                array('array<int, string>', 'string'),
+                'Types of Bobs'
+            ),
+            array(
+                'return',
+                'array<int, string|bool>|string Types of Bobs',
+                'array<int, string|bool>|string',
+                array('array<int, string|bool>', 'string'),
+                'Types of Bobs'
            )
        );
    }
@@ -10,17 +10,19 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\SeeTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\SeeTag
 *
 * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class SeeTagTest extends \PHPUnit_Framework_TestCase
+class SeeTagTest extends TestCase
 {
    /**
     * Test that the phpDocumentor_Reflection_DocBlock_Tag_See can create a link
@@ -31,7 +33,7 @@ class SeeTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exContent
     * @param string $exReference
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SeeTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\SeeTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\SinceTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\SinceTag
 *
 * @author    Vasil Rangelov <boen.robot@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class SinceTagTest extends \PHPUnit_Framework_TestCase
+class SinceTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\LinkTag can create
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\LinkTag can create
     * a link for the @since doc block.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class SinceTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exDescription
     * @param string $exVersion
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SinceTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\SinceTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\SourceTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\SourceTag
 *
 * @author    Vasil Rangelov <boen.robot@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class SourceTagTest extends \PHPUnit_Framework_TestCase
+class SourceTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\SourceTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\SourceTag can
     * understand the @source DocBlock.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class SourceTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exStartingLine
     * @param string $exLineCount
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\SourceTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\SourceTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\ThrowsTag
+ * Test class for \Barryvdh\Reflection\DocBlock\ThrowsTag
 *
 * @author    Mike van Riel <mike.vanriel@naenius.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class ThrowsTagTest extends \PHPUnit_Framework_TestCase
+class ThrowsTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\ThrowsTag can
     * understand the @throws DocBlock.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class ThrowsTagTest extends \PHPUnit_Framework_TestCase
     * @param string $extractedTypes
     * @param string $extractedDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\ThrowsTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\ThrowsTag
     * @dataProvider provideDataForConstructor
     *
     * @return void
@@ -10,20 +10,23 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\UsesTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\UsesTag
 *
 * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class UsesTagTest extends \PHPUnit_Framework_TestCase
+class UsesTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\UsesTag can create
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\UsesTag can create
     * a link for the @uses doc block.
     *
     * @param string $type
@@ -31,7 +34,7 @@ class UsesTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exContent
     * @param string $exReference
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\UsesTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\UsesTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,23 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\Test;
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\VarTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\VarTag
 *
 * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class VarTagTest extends \PHPUnit_Framework_TestCase
+class VarTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\VarTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\VarTag can
     * understand the @var doc block.
     *
     * @param string $type
@@ -32,7 +35,7 @@ class VarTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exVariable
     * @param string $exDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VarTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\VarTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,20 +10,22 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Tag;
+namespace Barryvdh\Reflection\DocBlock\Tag;
+
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\VersionTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\VersionTag
 *
 * @author    Vasil Rangelov <boen.robot@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class VersionTagTest extends \PHPUnit_Framework_TestCase
+class VersionTagTest extends TestCase
 {
    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\LinkTag can create
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\LinkTag can create
     * a link for the @version doc block.
     *
     * @param string $type
@@ -32,7 +34,7 @@ class VersionTagTest extends \PHPUnit_Framework_TestCase
     * @param string $exDescription
     * @param string $exVersion
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag\VersionTag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag\VersionTag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,34 +10,35 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock;
+namespace Barryvdh\Reflection\DocBlock;

-use phpDocumentor\Reflection\DocBlock;
-use phpDocumentor\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock;
+use Barryvdh\Reflection\DocBlock\Context;
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Tag\VarTag
+ * Test class for \Barryvdh\Reflection\DocBlock\Tag\VarTag
 *
 * @author    Daniel O'Connor <daniel.oconnor@gmail.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class TagTest extends \PHPUnit_Framework_TestCase
+class TagTest extends TestCase
 {
    
    /**
-     * @expectedException \InvalidArgumentException
     *
     * @return void
     */
    public function testInvalidTagLine()
    {
+        $this->expectException(\InvalidArgumentException::class);
        Tag::createInstance('Invalid tag line');
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::registerTagHandler
     * 
     * @return void
     */
@@ -70,13 +71,13 @@ class TagTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::registerTagHandler
     * 
     * @return void
     */
    public function testTagHandlerCorrectRegistration()
    {
-        if (0 == ini_get('allow_url_include')) {
+        if (!ini_get('allow_url_include')) {
            $this->markTestSkipped('"data" URIs for includes are required.');
        }
        $currentHandler = __NAMESPACE__ . '\Tag\VarTag';
@@ -93,7 +94,7 @@ class TagTest extends \PHPUnit_Framework_TestCase
        include 'data:text/plain;base64,'. base64_encode(
 <<<TAG_HANDLER
 <?php
-    class MyTagHandler extends \phpDocumentor\Reflection\DocBlock\Tag {}
+    class MyTagHandler extends \Barryvdh\Reflection\DocBlock\Tag {}
 TAG_HANDLER
        );

@@ -118,8 +119,8 @@ TAG_HANDLER
    
    /**
     * @depends testTagHandlerCorrectRegistration
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::createInstance
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::registerTagHandler
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::createInstance
     * 
     * @return void
     */
@@ -162,8 +163,8 @@ TAG_HANDLER
    
    /**
     * @depends testTagHandlerCorrectRegistration
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::createInstance
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::registerTagHandler
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::createInstance
     * 
     * @return void
     */
@@ -201,7 +202,7 @@ TAG_HANDLER
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::registerTagHandler
     * 
     * @return void
     */
@@ -232,7 +233,7 @@ TAG_HANDLER
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag::registerTagHandler
+     * @covers \Barryvdh\Reflection\DocBlock\Tag::registerTagHandler
     * 
     * @return void
     */
@@ -265,14 +266,14 @@ TAG_HANDLER
    }

    /**
-     * Test that the \phpDocumentor\Reflection\DocBlock\Tag\VarTag can
+     * Test that the \Barryvdh\Reflection\DocBlock\Tag\VarTag can
     * understand the @var doc block.
     *
     * @param string $type
     * @param string $content
     * @param string $exDescription
     *
-     * @covers \phpDocumentor\Reflection\DocBlock\Tag
+     * @covers \Barryvdh\Reflection\DocBlock\Tag
     * @dataProvider provideDataForConstuctor
     *
     * @return void
@@ -10,25 +10,26 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection\DocBlock\Type;
+namespace Barryvdh\Reflection\DocBlock\Type;

-use phpDocumentor\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Context;
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for \phpDocumentor\Reflection\DocBlock\Type\Collection
+ * Test class for \Barryvdh\Reflection\DocBlock\Type\Collection
 *
- * @covers phpDocumentor\Reflection\DocBlock\Type\Collection
+ * @covers Barryvdh\Reflection\DocBlock\Type\Collection
 *
 * @author    Mike van Riel <mike.vanriel@naenius.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class CollectionTest extends \PHPUnit_Framework_TestCase
+class CollectionTest extends TestCase
 {
    /**
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::__construct
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::getContext
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::__construct
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::getContext
     *
     * @return void
     */
@@ -41,7 +42,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::__construct
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::__construct
     *
     * @return void
     */
@@ -52,7 +53,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::__construct
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::__construct
     *
     * @return void
     */
@@ -69,7 +70,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::__construct
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::__construct
     *
     * @return void
     */
@@ -88,7 +89,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     * @param array  $expected
     *
     * @dataProvider provideTypesToExpand
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::add
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::add
     *
     * @return void
     */
@@ -108,7 +109,7 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
     * @param array  $expected
     *
     * @dataProvider provideTypesToExpandWithoutNamespace
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::add
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::add
     *
     * @return void
     */
@@ -124,13 +125,33 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
    }

    /**
-     * @covers phpDocumentor\Reflection\DocBlock\Type\Collection::add
-     * @expectedException InvalidArgumentException
+     * @param string $fixture
+     * @param array  $expected
+     *
+     * @dataProvider provideTypesToExpandWithPropertyOrMethod
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::add
+     *
+     * @return void
+     */
+    public function testAddMethodsAndProperties($fixture, $expected)
+    {
+        $collection = new Collection(
+            array(),
+            new Context(null, array('LinkDescriptor' => '\phpDocumentor\LinkDescriptor'))
+        );
+        $collection->add($fixture);
+
+        $this->assertSame($expected, $collection->getArrayCopy());
+    }
+
+    /**
+     * @covers Barryvdh\Reflection\DocBlock\Type\Collection::add
     *
     * @return void
     */
    public function testAddWithInvalidArgument()
    {
+        $this->expectException(\InvalidArgumentException::class);
        $collection = new Collection();
        $collection->add(array());
    }
@@ -177,6 +198,30 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
                'DocBlock[]|int[]',
                array($namespace.'DocBlock[]', 'int[]')
            ),
+            array(
+                'array<int, string>',
+                array('array<int, string>')
+            ),
+            array(
+                'array<int, string>|string',
+                array('array<int, string>', 'string')
+            ),
+            array(
+                'array<int, float|bool>|string',
+                array('array<int, float|bool>', 'string')
+            ),
+            array(
+                'array<int, string|array<int, bool>>|array<int, float>|string',
+                array('array<int, string|array<int, bool>>', 'array<int, float>', 'string')
+            ),
+            array(
+                'LinkDescriptor::setLink()',
+                array($namespace.'LinkDescriptor::setLink()')
+            ),
+            array(
+                'Alias\LinkDescriptor::setLink()',
+                array('\My\Space\Aliasing\LinkDescriptor::setLink()')
+            ),
        );
    }

@@ -192,4 +237,34 @@ class CollectionTest extends \PHPUnit_Framework_TestCase
    {
        return $this->provideTypesToExpand($method, '\\');
    }
+
+    /**
+     * Returns the method and property types and their expected values to test
+     * the retrieval of types.
+     *
+     * @param string $method Name of the method consuming this data provider.
+     *
+     * @return string[]
+     */
+    public function provideTypesToExpandWithPropertyOrMethod($method)
+    {
+        return array(
+            array(
+                'LinkDescriptor::setLink()',
+                array('\phpDocumentor\LinkDescriptor::setLink()')
+            ),
+            array(
+                'phpDocumentor\LinkDescriptor::setLink()',
+                array('\phpDocumentor\LinkDescriptor::setLink()')
+            ),
+            array(
+                'LinkDescriptor::$link',
+                array('\phpDocumentor\LinkDescriptor::$link')
+            ),
+            array(
+                'phpDocumentor\LinkDescriptor::$link',
+                array('\phpDocumentor\LinkDescriptor::$link')
+            ),
+        );
+    }
 }
@@ -10,23 +10,25 @@
 * @link      http://phpdoc.org
 */

-namespace phpDocumentor\Reflection;
+namespace Barryvdh\Reflection;

-use phpDocumentor\Reflection\DocBlock\Context;
-use phpDocumentor\Reflection\DocBlock\Location;
+use Barryvdh\Reflection\DocBlock\Context;
+use Barryvdh\Reflection\DocBlock\Location;
+use Barryvdh\Reflection\DocBlock\Tag\ReturnTag;
+use PHPUnit\Framework\TestCase;

 /**
- * Test class for phpDocumentor\Reflection\DocBlock
+ * Test class for Barryvdh\Reflection\DocBlock
 *
 * @author    Mike van Riel <mike.vanriel@naenius.com>
 * @copyright 2010-2011 Mike van Riel / Naenius. (http://www.naenius.com)
 * @license   http://www.opensource.org/licenses/mit-license.php MIT
 * @link      http://phpdoc.org
 */
-class DocBlockTest extends \PHPUnit_Framework_TestCase
+class DocBlockTest extends TestCase
 {
    /**
-     * @covers \phpDocumentor\Reflection\DocBlock
+     * @covers \Barryvdh\Reflection\DocBlock
     * 
     * @return void
     */
@@ -34,9 +36,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 +50,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());
@@ -69,7 +71,7 @@ DOCBLOCK;
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock::splitDocBlock
+     * @covers \Barryvdh\Reflection\DocBlock::splitDocBlock
     *
     * @return void
     */
@@ -91,7 +93,42 @@ DOCBLOCK;
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock::cleanInput
+     * @covers \Barryvdh\Reflection\DocBlock::isTemplateStart
+     */
+    public function testIfStartOfTemplateIsDiscovered()
+    {
+        $fixture = <<<DOCBLOCK
+/**#@+
+ * @see \MyClass
+ * @return void
+ */
+DOCBLOCK;
+        $object = new DocBlock($fixture);
+        $this->assertEquals('', $object->getShortDescription());
+        $this->assertEquals('', $object->getLongDescription()->getContents());
+        $this->assertCount(2, $object->getTags());
+        $this->assertTrue($object->hasTag('see'));
+        $this->assertTrue($object->hasTag('return'));
+        $this->assertFalse($object->hasTag('category'));
+        $this->assertTrue($object->isTemplateStart());
+    }
+
+    /**
+     * @covers \Barryvdh\Reflection\DocBlock::isTemplateEnd
+     */
+    public function testIfEndOfTemplateIsDiscovered()
+    {
+        $fixture = <<<DOCBLOCK
+/**#@-*/
+DOCBLOCK;
+        $object = new DocBlock($fixture);
+        $this->assertEquals('', $object->getShortDescription());
+        $this->assertEquals('', $object->getLongDescription()->getContents());
+        $this->assertTrue($object->isTemplateEnd());
+    }
+
+    /**
+     * @covers \Barryvdh\Reflection\DocBlock::cleanInput
     * 
     * @return void
     */
@@ -108,7 +145,7 @@ DOCBLOCK;
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock::__construct
+     * @covers \Barryvdh\Reflection\DocBlock::__construct
     * 
     * @return void
     */
@@ -116,7 +153,7 @@ DOCBLOCK;
    {
        $object = new DocBlock(new \ReflectionClass($this));
        $this->assertEquals(
-            'Test class for phpDocumentor\Reflection\DocBlock',
+            'Test class for Barryvdh\Reflection\DocBlock',
            $object->getShortDescription()
        );
        $this->assertEquals('', $object->getLongDescription()->getContents());
@@ -129,12 +166,12 @@ DOCBLOCK;
    }

    /**
-     * @expectedException \InvalidArgumentException
     *
     * @return void
     */
    public function testExceptionOnInvalidObject()
    {
+        $this->expectException(\InvalidArgumentException::class);
        new DocBlock($this);
    }

@@ -142,7 +179,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;
@@ -159,21 +197,22 @@ DOCBLOCK;
    }

    /**
-     * @covers \phpDocumentor\Reflection\DocBlock::parseTags
+     * @covers \Barryvdh\Reflection\DocBlock::parseTags
     * @expectedException \LogicException
     * 
     * @return void
     */
    public function testInvalidTagBlock()
    {
-        if (0 == ini_get('allow_url_include')) {
+        if (!ini_get('allow_url_include')) {
            $this->markTestSkipped('"data" URIs for includes are required.');
+            return;
        }

        include 'data:text/plain;base64,'. base64_encode(
            <<<DOCBLOCK_EXTENSION
 <?php
-class MyReflectionDocBlock extends \phpDocumentor\Reflection\DocBlock {
+class MyReflectionDocBlock extends \Barryvdh\Reflection\DocBlock {
    protected function splitDocBlock(\$comment) {
        return array('', '', 'Invalid tag block');
    }
@@ -225,7 +264,7 @@ DOCBLOCK;

    /**
     * @depends testConstructFromReflector
-     * @covers \phpDocumentor\Reflection\DocBlock::getTagsByName
+     * @covers \Barryvdh\Reflection\DocBlock::getTagsByName
     * 
     * @return void
     */
@@ -238,7 +277,7 @@ DOCBLOCK;

    /**
     * @depends testConstructWithTagsOnly
-     * @covers \phpDocumentor\Reflection\DocBlock::parseTags
+     * @covers \Barryvdh\Reflection\DocBlock::parseTags
     * 
     * @return void
     */
@@ -256,7 +295,7 @@ DOCBLOCK;

    /**
     * @depends testConstructWithTagsOnly
-     * @covers \phpDocumentor\Reflection\DocBlock::parseTags
+     * @covers \Barryvdh\Reflection\DocBlock::parseTags
     * 
     * @return void
     */
@@ -271,12 +310,15 @@ DOCBLOCK;
 */
 DOCBLOCK;
        $object = new DocBlock($fixture);
-        $this->assertCount(1, $object->getTags());
+        $this->assertCount(1, $tags = $object->getTags());
+	    /** @var ReturnTag $tag */
+	    $tag = reset($tags);
+	    $this->assertEquals("Content on\n    multiple lines.\n\n    One more, after the break.", $tag->getDescription());
    }

    /**
     * @depends testConstructWithTagsOnly
-     * @covers \phpDocumentor\Reflection\DocBlock::getTagsByName
+     * @covers \Barryvdh\Reflection\DocBlock::getTagsByName
     * 
     * @return void
     */
Author	SHA1	Message	Date
Barry vd. Heuvel	bf44b757fe	Merge pull request #12 from barryvdh/fix-deprecated Fix deprecated messages	2022-10-31 16:35:43 +01:00
Barry vd. Heuvel	e6526132ee	Fix deprecated messages	2022-10-31 16:34:24 +01:00
Barry vd. Heuvel	6b7c110b33	Merge pull request #10 from barryvdh/test-ghactions Create run-tests.yml	2022-10-31 16:22:38 +01:00
Barry vd. Heuvel	ad1e63e15c	Fix tests	2022-10-31 16:20:50 +01:00
Barry vd. Heuvel	6eafab0ff3	Revert "Check namespace + class to see if it exists" This reverts commit `7f729dc9a7`.	2022-10-31 16:13:13 +01:00
Barry vd. Heuvel	fe49c3d9ee	Update tests	2022-10-31 16:13:07 +01:00
Barry vd. Heuvel	3f6ec1c280	Merge pull request #8 from Kerigard/feat/separate-tags feat: add separation of tags into groups	2022-10-31 16:06:25 +01:00
Barry vd. Heuvel	72df918400	Create run-tests.yml	2022-10-31 16:05:08 +01:00
Barry vd. Heuvel	c10c41e932	Merge pull request #7 from angeljqv/patch-2 Create .gitattributes	2022-10-31 16:01:16 +01:00
Barry vd. Heuvel	977da00f0f	Merge pull request #6 from Stevemoretz/patch-2 Check namespace + class to see if it exists	2022-10-31 16:01:03 +01:00
Barry vd. Heuvel	7e5538a638	Merge pull request #9 from bbprojectnet/generic-types-fix Generic types recognitions bug fix	2022-10-31 16:00:41 +01:00
M@ster	295d2fba38	Generic types bug fix	2022-10-19 23:16:04 +02:00
Kerigard	ef9f04dd59	feat: add separation of tags into groups	2022-09-17 20:54:33 +03:00
angeljqv	6171834fde	Create .gitattributes	2022-06-13 16:05:10 -05:00
Steve Moretz	7f729dc9a7	Check namespace + class to see if it exists main issue : https://github.com/barryvdh/laravel-ide-helper/issues/1273 Adds support for psaml and php-stan specific params and other possible problems.	2021-10-27 00:08:57 +03:30
Barry vd. Heuvel	144140cd39	Merge pull request #5 from GrahamCampbell/patch-2 Drop HHVM and support PHP 7	2020-01-08 14:36:02 +01:00
Graham Campbell	be72a2d318	Update .gitignore	2020-01-08 10:29:51 +00:00
Graham Campbell	6d03fa81d9	Delete composer.lock	2020-01-08 10:28:55 +00:00
Graham Campbell	3e7bb6e171	Drop HHVM and support PHP 7	2020-01-08 10:28:32 +00:00
Barry vd. Heuvel	0f32bd0e61	Merge pull request #4 from liquid207/fix-annotation-error-about-typed-array Fix annotation error about typed array like array<mixed> or array<int…	2020-01-08 10:55:58 +01:00
Shuai Yang	b0b90f44f0	Fix annotation error about typed array like array<mixed> or array<int> ...	2020-01-08 15:09:57 +08:00
Barry vd. Heuvel	6b69015d83	Merge pull request #2 from JeppeKnockaert/add-brackets-for-parsing-return-types feature - Improve method tag parsing	2018-12-13 11:34:14 +01:00
Jeppe Knockaert	053005ed4e	feature - Improve method tag parsing This is an update based on the original repository, I just cherry-picked some code. https://github.com/phpDocumentor/ReflectionDocBlock/blob/master/src/DocBlock/Tags/Method.php This includes: - https://github.com/phpDocumentor/ReflectionDocBlock/commit/e9454d844db9d8fd2f276a2069647c3c4fb15085 - https://github.com/phpDocumentor/ReflectionDocBlock/commit/e9454d844db9d8fd2f276a2069647c3c4fb15085	2018-12-13 10:13:22 +01:00
Barry vd. Heuvel	64165bd4ba	Merge pull request #1 from JeppeKnockaert/allow-deleting-tags-in-docblocks Allow deleting tags in DocBlocks	2018-10-25 21:09:52 +02:00
Jeppe Knockaert	9b08619fbd	Allow deleting tags in DocBlocks	2018-10-23 15:38:27 +02:00
Barry vd. Heuvel	3dcbd98b5d	Update namespace	2016-06-13 21:28:20 +02:00
Barry vd. Heuvel	d411a2bc7e	Merge branch 'release/2.x' of https://github.com/phpDocumentor/ReflectionDocBlock	2016-06-13 21:28:05 +02:00
Mike van Riel	e6a969a640	Merge pull request #67 from mbed67/fix-bug-in-collection fix for bug #1672 in phpDocumentor2	2016-01-25 09:17:30 +01:00
Marieke Bednarczyk	708c2c9253	fix for bug #1672 in phpDocumentor2 When dealing with inline @see or @link tags and having a relative method or property type like LinkDescriptor::setLink() and a namespace alias like phpDocumentor\Descriptor\Tag\LinkDescriptor Collection::expand() was checking if LinkDescriptor::setLink() could be found in the namespace aliases. This would never be true. In this fix, the method or type (for instance ::setLink()) part is removed for comparison and later re-added when generating the full name	2015-12-13 15:52:57 +01:00
Mike van Riel	d68dbdc53d	Disable failing test before tagging	2015-02-03 13:10:50 +01:00
Mike van Riel	fb5dfa51d4	Merge pull request #41 from cebe/patch-1 Create LICENSE	2015-02-03 07:38:02 +01:00
Carsten Brandt	ae02953010	Create LICENSE According to [composer.json](https://github.com/phpDocumentor/ReflectionDocBlock/blob/master/composer.json#L4) it should be MIT. fixes #40	2014-12-19 23:13:47 +01:00
Chuck Burgess	fd0ac20074	Merge pull request #39 from mvriel/feature/phpDocumentor2/42 Add support for DocBlock template markers	2014-09-02 09:26:20 -05:00
Mike van Riel	21feb61eb5	Add missing DocBlock (info).	2014-08-30 11:16:26 +02:00
Mike van Riel	280a3ce56d	Add support for DocBlock template markers DocBlocks may start with #@+ and #@- to indicate that they are (the start) of a DocBlock template or the end of a template. In this commit I have changed the way a DocBlock is parsed to interpret this information and added tests to show for it. In addition I have added more comments to the Regular Expression responsible for splitting a DocBlock to show the business rules more clearly. This is the first step in implementing https://github.com/phpDocumentor/phpDocumentor2/issues/42.	2014-08-30 11:08:15 +02:00
Mike van Riel	0604d62704	Merge pull request #38 from GrahamCampbell/stuff Composer And Travis Updates	2014-08-21 23:05:07 +02:00
Graham Campbell	a66d783afd	Travis improvements	2014-08-21 13:02:49 +01:00
Graham Campbell	84de81c009	Composer updates	2014-08-21 13:02:41 +01:00
Mike van Riel	38743b6779	Merge pull request #37 from alexkn/fix-error-display Remove Error display at MethodTag	2014-08-09 12:27:07 +02:00
Alexander Knöbel	0d52cb6389	Remove Error display at MethodTag	2014-08-09 12:09:15 +02:00
Mike van Riel	2281569ebc	Merge pull request #33 from Nyholm/patch-1 Added PHP 5.6 and HHVM to travis.yml	2014-07-19 08:49:33 +02:00
Tobias Nyholm	e0faa7f04f	Added hhvm-nightly	2014-07-09 14:15:10 +02:00
Tobias Nyholm	39a08094f1	Added PHP 5.6 and HHVM to travis.yml	2014-07-09 12:05:21 +02:00
Mike van Riel	07b195e1ee	Merge branch 'master' of github.com:phpDocumentor/ReflectionDocBlock	2014-04-26 12:10:44 +02:00
Mike van Riel	0bca477a34	Implement support for Variadic arguments Fixes https://github.com/phpDocumentor/phpDocumentor2/issues/629, in this commit we add support for recognizing and displaying variadic arguments as described in the Variadics RFC on Internals (https://wiki.php.net/rfc/variadics). This adds support for describing Variadics even before PHP 5.6, where this feature is planned.	2014-03-28 10:21:30 +01:00
Mike van Riel	66a7d3bf31	Merge pull request #31 from siad007/patch-1 Fixed method call.	2014-03-16 13:31:01 +01:00
Siad Ardroumli	2331fc92f6	Fixed method call. Related to https://github.com/phpDocumentor/phpDocumentor2/pull/1145	2014-03-16 13:23:37 +01:00
Mike van Riel	b1922e00de	Merge pull request #30 from cebe/preserve-newlines Preserve newlines in docblock tags	2014-03-01 11:01:55 +01:00
Carsten Brandt	53ba484043	Preserve newlines in docblock tags This is especially important when using markdown. Adding a blank line between text introduces a new paragraph. Current implementation will result in all text staying in one paragraph and also other elements like lists and code do not get recognized in most cases.	2014-02-28 17:17:48 +01:00
Mike van Riel	cfb3ebea55	Add support for Parsedown as a markdown parser	2013-12-05 09:16:55 +01:00
Vasil Rangelov	c33820b04b	Merge pull request #25 from barryvdh/patch-1 Markdown is not required, so move to suggest	2013-08-08 09:31:39 -07:00
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
Barry vd. Heuvel	fd9e6bd26d	Move around	2013-06-08 23:04:47 +02:00
Barry vd. Heuvel	d5e4b2ec73	Also check if it is not already absolute	2013-06-08 23:02:34 +02:00
Barry vd. Heuvel	bae8be0dcd	Test for false relative paths Closure -> \Closure etc	2013-06-08 22:53:54 +02:00
Barry vd. Heuvel	3a5d30e027	Use parsed types for content	2013-06-08 22:37:52 +02:00
Barry vd. Heuvel	d2414cd3dc	Add setType and addType	2013-06-08 22:37:36 +02:00
Barry vd. Heuvel	070b13745a	Correct namespace	2013-06-08 12:58:42 +02:00
Barry vd. Heuvel	df7807cd73	Add markdown to suggest instead of require	2013-06-08 12:52:45 +02:00
Barry vd. Heuvel	b07e3c36b7	Change namespace	2013-06-08 12:45:35 +02:00
Barry vd. Heuvel	163dd7877e	Add __toString() methods for Description and Tag And let the Serializer make use of the (string) $tag	2013-06-08 12:40:01 +02: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