Merge pull request #179 from phpDocumentor/cleanup

Cleanup

.github/workflows/push.yml

@@ -0,0 +1,196 @@
+on: push
+name: Qa workflow
+jobs:
+  setup:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@master
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Restore/cache tools folder
+        uses: actions/cache@v1
+        with:
+          path: tools
+          key: all-tools-${{ github.sha }}
+          restore-keys: |
+            all-tools-${{ github.sha }}-
+            all-tools-
+      - name: composer
+        uses: docker://composer
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: install --no-interaction --prefer-dist --optimize-autoloader
+      - name: composer-require-checker
+        uses: docker://phpga/composer-require-checker-ga
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: check --config-file ./composer-require-config.json composer.json
+      - name: Install phive
+        run: make install-phive
+      - name: Install PHAR dependencies
+        run: tools/phive.phar --no-progress install --copy --trust-gpg-keys 4AA394086372C20A,D2CCAC42F6295E7D,E82B2FB314E9906E,8E730BA25823D8B5 --force-accept-unsigned
+
+  phpunit-with-coverage:
+    runs-on: ubuntu-latest
+    name: Unit tests
+    needs: setup
+    steps:
+      - uses: actions/checkout@master
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Restore/cache tools folder
+        uses: actions/cache@v1
+        with:
+          path: tools
+          key: all-tools-${{ github.sha }}
+          restore-keys: |
+            all-tools-${{ github.sha }}-
+            all-tools-
+      - name: Setup PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: 7.2
+          extension-csv: mbstring, intl, iconv, libxml, dom, json, simplexml, zlib
+          ini-values-csv: memory_limit=2G, display_errors=On, error_reporting=-1
+          coverage: xdebug
+          pecl: false
+      - name: Run PHPUnit
+        run: php tools/phpunit
+
+  phpunit:
+    runs-on: ${{ matrix.operating-system }}
+    strategy:
+      matrix:
+        operating-system:
+          - ubuntu-latest
+          - windows-latest
+          - macOS-latest
+        php-versions: ['7.2', '7.3', '7.4']
+    name: Unit tests for PHP version ${{ matrix.php-versions }} on ${{ matrix.operating-system }}
+    needs:
+      - setup
+      - phpunit-with-coverage
+    steps:
+      - uses: actions/checkout@master
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Restore/cache tools folder
+        uses: actions/cache@v1
+        with:
+          path: tools
+          key: all-tools-${{ github.sha }}
+          restore-keys: |
+            all-tools-${{ github.sha }}-
+            all-tools-
+      - name: Setup PHP
+        uses: shivammathur/setup-php@master
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extension-csv: mbstring, intl, iconv, libxml, dom, json, simplexml, zlib
+          ini-values-csv: memory_limit=2G, display_errors=On, error_reporting=-1
+          pecl: false
+      - name: Run PHPUnit
+        continue-on-error: true
+        run: php tools/phpunit
+
+  codestyle:
+    runs-on: ubuntu-latest
+    needs: [setup, phpunit]
+    steps:
+      - uses: actions/checkout@master
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Restore/cache tools folder
+        uses: actions/cache@v1
+        with:
+          path: tools
+          key: all-tools-${{ github.sha }}
+          restore-keys: |
+            all-tools-${{ github.sha }}-
+            all-tools-
+      - name: Code style check
+        uses: docker://phpdoc/phpcs-ga:latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: -d memory_limit=1024M
+
+  phpstan:
+    runs-on: ubuntu-latest
+    needs: [setup, phpunit]
+    steps:
+      - uses: actions/checkout@master
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Restore/cache tools folder
+        uses: actions/cache@v1
+        with:
+          path: tools
+          key: all-tools-${{ github.sha }}
+          restore-keys: |
+            all-tools-${{ github.sha }}-
+            all-tools-
+      - name: PHPStan
+        uses: docker://phpdoc/phpstan-ga:latest
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          args: analyse src --level max --configuration phpstan.neon
+
+  psalm:
+    runs-on: ubuntu-latest
+    needs: [setup, phpunit]
+    steps:
+      - uses: actions/checkout@master
+      - name: Restore/cache vendor folder
+        uses: actions/cache@v1
+        with:
+          path: vendor
+          key: all-build-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            all-build-${{ hashFiles('**/composer.lock') }}
+            all-build-
+      - name: Restore/cache tools folder
+        uses: actions/cache@v1
+        with:
+          path: tools
+          key: all-tools-${{ github.sha }}
+          restore-keys: |
+            all-tools-${{ github.sha }}-
+            all-tools-
+      - name: Psalm
+        uses: docker://mickaelandrieu/psalm-ga
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.travis.yml

@@ -1,49 +0,0 @@
-language: php
-php: [ 7.1, 7.2, 7.3, nightly ]
-sudo: false
-
-env:
-
-matrix:
-  fast_finish: true
-  allow_failures:
-    - php: nightly
-
-install:
-  - travis_retry composer install --no-interaction --prefer-dist --optimize-autoloader
-  - travis_retry composer global require phpunit/phpunit ^6 # cannot use phpunit.phar or require-dev, because this package is a phpunit dep
-  - travis_retry wget --no-verbose https://phar.io/releases/phive.phar
-
-script:
-  - /home/travis/.composer/vendor/bin/phpunit --no-coverage
-
-jobs:
-  include:
-    - stage: coverage
-      php: 7.1
-      script:
-        - /home/travis/.composer/vendor/bin/phpunit
-      after_script:
-        - travis_retry php phive.phar --no-progress install --trust-gpg-keys E82B2FB314E9906E php-coveralls/php-coveralls && ./tools/php-coveralls --verbose
-        - travis_retry wget --no-verbose https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml
-
-    - stage: lint
-      php: 7.1
-      before_script:
-        - travis_retry php phive.phar --no-progress install --trust-gpg-keys 8E730BA25823D8B5 phpstan
-      script:
-        - ./tools/phpstan analyse src --level max --configuration phpstan.neon
-        - composer create-project symplify/easy-coding-standard temp/ecs ^3 && temp/ecs/bin/ecs check src tests
-
-cache:
-  directories:
-  - $HOME/.composer/cache/files
-  - $HOME/.phive
-
-notifications:
-  irc: "irc.freenode.org#phpdocumentor"
-  slack:
-    secure: "fjumM0h+4w3EYM4dpgqvpiCug7m4sSIC5+HATgwga/Nrc6IjlbWvGOv3JPgD3kQUhi18VmZfUYPmCv916SIbMnv8JWcrSaJXnPCgmxidvYkuzQDIw1HDJbVppGnkmwQA/qjIrM3sIEMfnu/arLRJQLI363aStZzGPxwIa4PDKcg="
-  email:
-  - [email protected]
-  - [email protected]

Makefile

@@ -0,0 +1,32 @@
+.PHONY: install-phive
+install-phive:
+	mkdir tools; \
+	wget -O tools/phive.phar https://phar.io/releases/phive.phar; \
+	wget -O tools/phive.phar.asc https://phar.io/releases/phive.phar.asc; \
+	gpg --keyserver pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79; \
+	gpg --verify tools/phive.phar.asc tools/phive.phar; \
+	chmod +x tools/phive.phar
+
+.PHONY: setup
+setup: install-phive
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phar-ga:latest php tools/phive.phar install --force-accept-unsigned
+
+.PHONY: phpcs
+phpcs:
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpcs-ga:latest -d memory_limit=1024M
+
+.PHONY: phpstan
+phpstan:
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project phpdoc/phpstan-ga:latest analyse src --no-progress --level max --configuration phpstan.neon
+
+.PHONY: psaml
+psalm:
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project mickaelandrieu/psalm-ga
+
+.PHONY: test
+test:
+	docker run -it --rm -v${PWD}:/opt/project -w /opt/project php:7.2 tools/phpunit
+
+.PHONY: pre-commit-test
+pre-commit-test: test phpcs phpstan psalm
+

appveyor.yml

@@ -1,54 +0,0 @@
-build: false
-clone_folder: c:\reflectiondocblock
-max_jobs: 3
-platform: x86
-pull_requests:
-  do_not_increment_build_number: true
-version: '{build}.{branch}'
-skip_tags: true
-branches:
-  only:
-    - master
-
-environment:
-  matrix:
-    - php_ver_target: 7.1
-    - php_ver_target: 7.2
-matrix:
-  fast_finish: false
-
-cache:
-  - c:\php -> appveyor.yml
-  - '%LOCALAPPDATA%\Composer\files'
-
-init:
-  - SET PATH=C:\Program Files\OpenSSL;c:\tools\php;%PATH%
-  - SET COMPOSER_NO_INTERACTION=1
-  - SET PHP=1
-  - SET ANSICON=121x90 (121x90)
-
-
-install:
-  - IF EXIST c:\tools\php (SET PHP=0)
-  - ps: appveyor-retry cinst --params '""/InstallDir:C:\tools\php""' --ignore-checksums -y php --version ((choco search php --exact --all-versions -r | select-string -pattern $env:php_ver_target | sort { [version]($_ -split '\|' | select -last 1) } -Descending | Select-Object -first 1) -replace '[php|]','')
-  - cd c:\tools\php
-  - IF %PHP%==1 copy /Y php.ini-development php.ini
-  - IF %PHP%==1 echo max_execution_time=1200 >> php.ini
-  - IF %PHP%==1 echo date.timezone="UTC" >> php.ini
-  - IF %PHP%==1 echo extension_dir=ext >> php.ini
-  - IF %PHP%==1 echo extension=php_curl.dll >> php.ini
-  - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini
-  - IF %PHP%==1 echo extension=php_mbstring.dll >> php.ini
-  - IF %PHP%==1 echo extension=php_fileinfo.dll >> php.ini
-  - IF %PHP%==1 echo zend.assertions=1 >> php.ini
-  - IF %PHP%==1 echo assert.exception=On >> php.ini
-  - IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
-  - appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
-  - cd c:\reflectiondocblock
-  - composer install --no-interaction --prefer-dist --no-progress
-  - composer global require phpunit/phpunit ^6
-  - composer global config bin-dir --absolute
-
-test_script:
-  - cd c:\reflectiondocblock
-  - c:\Users\appveyor\AppData\Roaming\Composer\vendor\bin\phpunit --no-coverage

composer-require-config.json

@@ -0,0 +1,15 @@
+{
+  "symbol-whitelist" : [
+    "null", "true", "false",
+    "static", "self", "parent",
+    "array", "string", "int", "float", "bool", "iterable", "callable", "void", "object", "XSLTProcessor"
+  ],
+  "php-core-extensions" : [
+    "Core",
+    "pcre",
+    "Reflection",
+    "tokenizer",
+    "SPL",
+    "standard"
+  ]
+}

composer.json

@@ -7,13 +7,18 @@
         {
             "name": "Mike van Riel",
             "email": "[email protected]"
+        },
+        {
+            "name": "Jaap van Otterdijk",
+            "email": "[email protected]"
         }
     ],
-    "minimum-stability": "alpha",
     "require": {
-        "php": ">=7.1",
+        "php": "^7.2",
-        "phpdocumentor/type-resolver": "^0",
+        "phpdocumentor/type-resolver": "^1.0",
-        "webmozart/assert": "^1"
+        "webmozart/assert": "^1",
+        "phpdocumentor/reflection-common": "^2.0",
+        "ext-filter": "^7.1"
     },
     "require-dev": {
         "mockery/mockery": "^1",

composer.lock

@@ -1,30 +1,30 @@
 {
     "_readme": [
         "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "cb7ecdcb52e627755275cf273bcdd249",
+    "content-hash": "2f0301d81fbb8c707a619b4e2bdb3a9c",
     "packages": [
         {
             "name": "phpdocumentor/reflection-common",
-            "version": "2.0.0-alpha3",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "eedd98e8bc9cfd924f056b4b5847066d4a250d2f"
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/eedd98e8bc9cfd924f056b4b5847066d4a250d2f",
+                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a",
-                "reference": "eedd98e8bc9cfd924f056b4b5847066d4a250d2f",
+                "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^6"
+                "phpunit/phpunit": "~6"
             },
             "type": "library",
             "extra": {
@@ -34,9 +34,7 @@
             },
             "autoload": {
                 "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
+                    "phpDocumentor\\Reflection\\": "src/"
-                        "src"
-                    ]
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -58,34 +56,35 @@
                 "reflection",
                 "static analysis"
             ],
-            "time": "2018-06-13T21:44:20+00:00"
+            "time": "2018-08-07T13:53:10+00:00"
         },
         {
             "name": "phpdocumentor/type-resolver",
-            "version": "0.6.2",
+            "version": "1.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "e81ce9e82df06b49b2d0e0a2393a08955aeda05b"
+                "reference": "4dfca962ce4d6c11ae17efcc65621cc4b22004c7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/e81ce9e82df06b49b2d0e0a2393a08955aeda05b",
+                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/4dfca962ce4d6c11ae17efcc65621cc4b22004c7",
-                "reference": "e81ce9e82df06b49b2d0e0a2393a08955aeda05b",
+                "reference": "4dfca962ce4d6c11ae17efcc65621cc4b22004c7",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.1",
+                "php": "^7.1",
-                "phpdocumentor/reflection-common": "^2"
+                "phpdocumentor/reflection-common": "^2.0"
             },
             "require-dev": {
-                "mockery/mockery": "^1.0",
+                "ext-tokenizer": "^7.1",
-                "phpunit/phpunit": "^6.5"
+                "mockery/mockery": "~1",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "0.x-dev"
+                    "dev-master": "1.x-dev"
                 }
             },
             "autoload": {
@@ -93,7 +92,11 @@
                     "phpDocumentor\\Reflection\\": "src"
                 }
             },
-            "notification-url": "https://packagist.org/downloads/",
+            "autoload-dev": {
+                "psr-4": {
+                    "phpDocumentor\\Reflection\\": "tests/unit"
+                }
+            },
             "license": [
                 "MIT"
             ],
@@ -103,35 +106,96 @@
                     "email": "[email protected]"
                 }
             ],
-            "time": "2018-06-14T12:29:58+00:00"
+            "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names",
+            "support": {
+                "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.0.0",
+                "issues": "https://github.com/phpDocumentor/TypeResolver/issues"
+            },
+            "time": "2019-07-08T19:35:58+00:00"
         },
         {
-            "name": "webmozart/assert",
+            "name": "symfony/polyfill-ctype",
-            "version": "1.3.0",
+            "version": "v1.11.0",
             "source": {
                 "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
+                "reference": "82ebae02209c21113908c229e9883c419720738a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
+                "reference": "82ebae02209c21113908c229e9883c419720738a",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": ">=5.3.3"
             },
-            "require-dev": {
+            "suggest": {
-                "phpunit/phpunit": "^4.6",
+                "ext-ctype": "For best performance"
-                "sebastian/version": "^1.0.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.3-dev"
+                    "dev-master": "1.11-dev"
                 }
             },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                },
+                "files": [
+                    "bootstrap.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                },
+                {
+                    "name": "Gert de Pagter",
+                    "email": "[email protected]"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "time": "2019-02-06T07:57:58+00:00"
+        },
+        {
+            "name": "webmozart/assert",
+            "version": "1.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/webmozart/assert.git",
+                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925",
+                "reference": "573381c0a64f155a0d9a23f4b0c797194805b925",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.3 || ^7.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "vimeo/psalm": "<3.6.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^4.8.36 || ^7.5.13"
+            },
+            "type": "library",
             "autoload": {
                 "psr-4": {
                     "Webmozart\\Assert\\": "src/"
@@ -153,33 +217,35 @@
                 "check",
                 "validate"
             ],
-            "time": "2018-01-29T19:49:41+00:00"
+            "time": "2019-11-24T13:36:37+00:00"
         }
     ],
     "packages-dev": [
         {
             "name": "doctrine/instantiator",
-            "version": "1.1.0",
+            "version": "1.2.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
+                "reference": "a2c590166b2133a4633738648b6b064edae0814a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
+                "reference": "a2c590166b2133a4633738648b6b064edae0814a",
                 "shasum": ""
             },
             "require": {
                 "php": "^7.1"
             },
             "require-dev": {
-                "athletic/athletic": "~0.1.8",
+                "doctrine/coding-standard": "^6.0",
                 "ext-pdo": "*",
                 "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
+                "phpbench/phpbench": "^0.13",
-                "squizlabs/php_codesniffer": "^3.0.2"
+                "phpstan/phpstan-phpunit": "^0.11",
+                "phpstan/phpstan-shim": "^0.11",
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
@@ -204,12 +270,12 @@
                 }
             ],
             "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
             "keywords": [
                 "constructor",
                 "instantiate"
             ],
-            "time": "2017-07-22T11:58:36+00:00"
+            "time": "2019-03-17T17:37:11+00:00"
         },
         {
             "name": "hamcrest/hamcrest-php",
@@ -261,16 +327,16 @@
         },
         {
             "name": "mockery/mockery",
-            "version": "1.1.0",
+            "version": "1.2.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/mockery/mockery.git",
-                "reference": "99e29d3596b16dabe4982548527d5ddf90232e99"
+                "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/mockery/mockery/zipball/99e29d3596b16dabe4982548527d5ddf90232e99",
+                "url": "https://api.github.com/repos/mockery/mockery/zipball/0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2",
-                "reference": "99e29d3596b16dabe4982548527d5ddf90232e99",
+                "reference": "0eb0b48c3f07b3b89f5169ce005b7d05b18cf1d2",
                 "shasum": ""
             },
             "require": {
@@ -279,8 +345,7 @@
                 "php": ">=5.6.0"
             },
             "require-dev": {
-                "phpdocumentor/phpdocumentor": "^2.9",
+                "phpunit/phpunit": "~5.7.10|~6.5|~7.0|~8.0"
-                "phpunit/phpunit": "~5.7.10|~6.5"
             },
             "type": "library",
             "extra": {
@@ -323,16 +388,17 @@
                 "test double",
                 "testing"
             ],
-            "time": "2018-05-08T08:54:48+00:00"
+            "time": "2019-02-13T09:37:52+00:00"
         }
     ],
     "aliases": [],
-    "minimum-stability": "alpha",
+    "minimum-stability": "stable",
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=7.1"
+        "php": "^7.2",
+        "ext-filter": "^7.1"
     },
     "platform-dev": []
 }

easy-coding-standard.neon

@@ -1,26 +0,0 @@
-includes:
-    - temp/ecs/config/clean-code.neon
-    - temp/ecs/config/psr2.neon
-    - temp/ecs/config/common.neon
-
-parameters:
-    exclude_checkers:
-        # from temp/ecs/config/common.neon
-        - PhpCsFixer\Fixer\ClassNotation\OrderedClassElementsFixer
-        - PhpCsFixer\Fixer\PhpUnit\PhpUnitStrictFixer
-        - PhpCsFixer\Fixer\ControlStructure\YodaStyleFixer
-        # from temp/ecs/config/spaces.neon
-        - PhpCsFixer\Fixer\Operator\NotOperatorWithSuccessorSpaceFixer
-
-    skip:
-        SlevomatCodingStandard\Sniffs\Classes\UnusedPrivateElementsSniff:
-            # WIP code
-            - src/DocBlock/StandardTagFactory.php
-        PHP_CodeSniffer\Standards\Generic\Sniffs\CodeAnalysis\EmptyStatementSniff:
-            # WIP code
-            - src/DocBlock/StandardTagFactory.php
-        PHP_CodeSniffer\Standards\Squiz\Sniffs\Classes\ValidClassNameSniff:
-            - src/DocBlock/Tags/Return_.php
-            - src/DocBlock/Tags/Var_.php
-        PHP_CodeSniffer\Standards\Generic\Sniffs\NamingConventions\CamelCapsFunctionNameSniff:
-            - */tests/**

phive.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phpstan" version="^0.9.1" installed="0.9.1" location="./tools/phpstan"/>
+  <phar name="phpunit" version="^8.4.3" installed="8.4.3" location="./tools/phpunit" copy="true"/>
-  <phar name="phpunit" version="^6.5.5" installed="6.5.5" location="./tools/phpunit"/>
+  <phar name="phpstan" version="^0.9.1" installed="0.10.2" location="./tools/phpstan" copy="true"/>
 </phive>

phpcs.xml.dist

@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<ruleset name="phpDocumentor">
+ <description>The coding standard for phpDocumentor.</description>
+
+    <file>src</file>
+    <file>tests/unit</file>
+    <exclude-pattern>*/tests/unit/Types/ContextFactoryTest.php</exclude-pattern>
+    <arg value="p"/>
+    <rule ref="PSR2">
+        <include-pattern>*\.php</include-pattern>
+    </rule>
+
+    <rule ref="Doctrine">
+        <exclude name="SlevomatCodingStandard.TypeHints.UselessConstantTypeHint.UselessDocComment" />
+    </rule>
+
+    <rule ref="Squiz.Classes.ValidClassName.NotCamelCaps">
+        <exclude-pattern>*/src/*_.php</exclude-pattern>
+    </rule>
+
+    <rule ref="SlevomatCodingStandard.Classes.SuperfluousAbstractClassNaming.SuperfluousPrefix">
+        <exclude-pattern>*/src/*/Abstract*.php</exclude-pattern>
+    </rule>
+
+    <rule ref="Generic.Formatting.SpaceAfterNot">
+        <properties>
+            <property name="spacing" value="0" />
+        </properties>
+    </rule>
+</ruleset>

phpstan.neon

@@ -1,10 +1,8 @@
+includes:
+    - /composer/vendor/phpstan/phpstan-mockery/extension.neon
+    - /composer/vendor/phpstan/phpstan-webmozart-assert/extension.neon
+
 parameters:
     ignoreErrors:
         # false positive
-        - '#Call to an undefined method object::getDocComment\(\)#'
+        - '#Method phpDocumentor\Reflection\DocBlock\Tags\Method::filterArguments() should return array<array> but returns array<array|string>#'
-        - '#Cannot call method render\(\) on phpDocumentor\\Reflection\\DocBlock\\Description\|string#'
-        - '#Calling method create\(\) on possibly null value of type phpDocumentor\\Reflection\\DocBlock\\DescriptionFactory\|null#'
-        - '#Calling method resolve\(\) on possibly null value of type phpDocumentor\\Reflection\\(TypeResolver|FqsenResolver)\|null#'
-
-        # nested parents
-        - '#Calling method render\(\) on possibly null value of type phpDocumentor\\Reflection\\DocBlock\\Description\|string\|null#'

phpunit.xml.dist

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/8.0/phpunit.xsd"
         colors="true"
-        checkForUnintentionallyCoveredCode="true"
         beStrictAboutOutputDuringTests="true"
         forceCoversAnnotation="true"
         verbose="true"
@@ -20,17 +21,10 @@
     <whitelist>
         <directory suffix=".php">./src/</directory>
     </whitelist>
-    <blacklist>
-      <directory>./vendor/</directory>
-    </blacklist>
   </filter>
   <logging>
     <log type="coverage-html"
-         title="phpDocumentor Reflection DocBlock"
          target="build/coverage"
-         charset="UTF-8"
-         yui="true"
-         highlight="false"
          lowUpperBound="35"
          highLowerBound="70"/>
   </logging>

psalm.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0"?>
+<psalm
+    totallyTyped="false"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="https://getpsalm.org/schema/config"
+    xsi:schemaLocation="https://getpsalm.org/schema/config file:///composer/vendor/vimeo/psalm/config.xsd"
+>
+    <projectFiles>
+        <directory name="src" />
+        <ignoreFiles>
+            <directory name="vendor" />
+        </ignoreFiles>
+    </projectFiles>
+
+    <issueHandlers>
+        <LessSpecificReturnType errorLevel="info" />
+    </issueHandlers>
+</psalm>

src/DocBlock.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

src/DocBlock/Description.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -15,6 +15,7 @@ namespace phpDocumentor\Reflection\DocBlock;
 
 use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
+use function vsprintf;
 
 /**
  * Object representing to description for a DocBlock.

src/DocBlock/DescriptionFactory.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,14 +8,25 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock;
 
 use phpDocumentor\Reflection\Types\Context as TypeContext;
+use Webmozart\Assert\Assert;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use function count;
+use function explode;
+use function implode;
+use function ltrim;
+use function min;
+use function preg_split;
+use function str_replace;
+use function strlen;
+use function strpos;
+use function substr;
+use function trim;
 
 /**
  * Creates a new Description object given a body of text.
@@ -50,15 +63,33 @@ class DescriptionFactory
      */
     public function create(string $contents, ?TypeContext $context = null) : Description
     {
-        [$text, $tags] = $this->parse($this->lex($contents), $context);
+        $tokens   = $this->lex($contents);
+        $count    = count($tokens);
+        $tagCount = 0;
+        $tags     = [];
 
-        return new Description($text, $tags);
+        for ($i = 1; $i < $count; $i += 2) {
+            $tag = $this->tagFactory->create($tokens[$i], $context);
+            if ($tag !== null) {
+                $tags[] = $tag;
+            }
+            $tokens[$i] = '%' . ++$tagCount . '$s';
+        }
+
+        //In order to allow "literal" inline tags, the otherwise invalid
+        //sequence "{@}" is changed to "@", and "{}" is changed to "}".
+        //"%" is escaped to "%%" because of vsprintf.
+        //See unit tests for examples.
+        for ($i = 0; $i < $count; $i += 2) {
+            $tokens[$i] = str_replace(['{@}', '{}', '%'], ['@', '}', '%%'], $tokens[$i]);
+        }
+
+        return new Description(implode('', $tokens), $tags);
     }
 
     /**
      * Strips the contents from superfluous whitespace and splits the description into a series of tokens.
      *
-     *
      * @return string[] A series of tokens of which the description text is composed.
      */
     private function lex(string $contents) : array
@@ -70,7 +101,7 @@ class DescriptionFactory
             return [$contents];
         }
 
-        return preg_split(
+        $parts =  preg_split(
             '/\{
                 # "{@}" is not a valid inline tag. This ensures that we do not treat it as one, but treat it literally.
                 (?!@\})
@@ -99,35 +130,8 @@ class DescriptionFactory
             0,
             PREG_SPLIT_DELIM_CAPTURE
         );
-    }
+        Assert::isArray($parts);
-
+        return $parts;
-    /**
-     * Parses the stream of tokens in to a new set of tokens containing Tags.
-     *
-     * @param string[] $tokens
-     *
-     * @return string[]|Tag[]
-     */
-    private function parse($tokens, ?TypeContext $context = null): array
-    {
-        $count = count($tokens);
-        $tagCount = 0;
-        $tags = [];
-
-        for ($i = 1; $i < $count; $i += 2) {
-            $tags[] = $this->tagFactory->create($tokens[$i], $context);
-            $tokens[$i] = '%' . ++$tagCount . '$s';
-        }
-
-        //In order to allow "literal" inline tags, the otherwise invalid
-        //sequence "{@}" is changed to "@", and "{}" is changed to "}".
-        //"%" is escaped to "%%" because of vsprintf.
-        //See unit tests for examples.
-        for ($i = 0; $i < $count; $i += 2) {
-            $tokens[$i] = str_replace(['{@}', '{}', '%'], ['@', '}', '%%'], $tokens[$i]);
-        }
-
-        return [implode('', $tokens), $tags];
     }
 
     /**

src/DocBlock/ExampleFinder.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,14 +8,21 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock;
 
 use phpDocumentor\Reflection\DocBlock\Tags\Example;
+use const DIRECTORY_SEPARATOR;
+use function array_slice;
+use function file;
+use function getcwd;
+use function implode;
+use function is_readable;
+use function rtrim;
+use function sprintf;
+use function trim;
 
 /**
  * Class used to find an example file's location based on a given ExampleDescriptor.
@@ -35,7 +44,7 @@ class ExampleFinder
 
         $file = $this->getExampleFileContents($filename);
         if (!$file) {
-            return "** File not found : {$filename} **";
+            return sprintf('** File not found : %s **', $filename);
         }
 
         return implode('', array_slice($file, $example->getStartingLine() - 1, $example->getLineCount()));
@@ -72,7 +81,7 @@ class ExampleFinder
      *
      * @return string[]
      */
-    public function getExampleDirectories()
+    public function getExampleDirectories() : array
     {
         return $this->exampleDirectories;
     }
@@ -87,8 +96,10 @@ class ExampleFinder
      * 2. Checks the source folder for the given filename
      * 3. Checks the 'examples' folder in the current working directory for examples
      * 4. Checks the path relative to the current working directory for the given filename
+     *
+     * @return string[] all lines of the example file
      */
-    private function getExampleFileContents(string $filename): ?string
+    private function getExampleFileContents(string $filename) : ?array
     {
         $normalizedPath = null;
 
@@ -110,7 +121,8 @@ class ExampleFinder
             }
         }
 
-        return $normalizedPath && is_readable($normalizedPath) ? file($normalizedPath) : null;
+        $lines = $normalizedPath && is_readable($normalizedPath) ? file($normalizedPath) : false;
+        return $lines !== false ? $lines : null;
     }
 
     /**

src/DocBlock/Serializer.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,14 +8,19 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock;
 
 use phpDocumentor\Reflection\DocBlock;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter;
+use function sprintf;
+use function str_repeat;
+use function str_replace;
+use function strlen;
+use function wordwrap;
 
 /**
  * Converts a DocBlock back from an object to a complete DocComment including Asterisks.
@@ -32,7 +39,7 @@ class Serializer
     /** @var int|null The max length of a line. */
     protected $lineLength;
 
-    /** @var DocBlock\Tags\Formatter A custom tag formatter. */
+    /** @var Formatter A custom tag formatter. */
     protected $tagFormatter;
 
     /**
@@ -42,15 +49,20 @@ class Serializer
      * @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 DocBlock\Tags\Formatter $tagFormatter A custom tag formatter, defaults to PassthroughFormatter.
+     * @param Formatter $tagFormatter    A custom tag formatter, defaults to PassthroughFormatter.
      */
-    public function __construct(int $indent = 0, string $indentString = ' ', bool $indentFirstLine = true, ?int $lineLength = null, ?DocBlock\Tags\Formatter $tagFormatter = null)
+    public function __construct(
-    {
+        int $indent = 0,
+        string $indentString = ' ',
+        bool $indentFirstLine = true,
+        ?int $lineLength = null,
+        ?Formatter $tagFormatter = null
+    ) {
         $this->indent              = $indent;
         $this->indentString        = $indentString;
         $this->isFirstLineIndented = $indentFirstLine;
         $this->lineLength          = $lineLength;
-        $this->tagFormatter = $tagFormatter ?: new DocBlock\Tags\Formatter\PassthroughFormatter();
+        $this->tagFormatter        = $tagFormatter ?: new PassthroughFormatter();
     }
 
     /**
@@ -75,35 +87,41 @@ class Serializer
             )
         );
 
-        $comment = "{$firstIndent}/**\n";
+        $comment = $firstIndent . "/**\n";
         if ($text) {
-            $comment .= "{$indent} * {$text}\n";
+            $comment .= $indent . ' * ' . $text . "\n";
-            $comment .= "{$indent} *\n";
+            $comment .= $indent . " *\n";
         }
 
         $comment = $this->addTagBlock($docblock, $wrapLength, $indent, $comment);
-        $comment .= $indent . ' */';
+        return $comment . $indent . ' */';
-
-        return $comment;
     }
 
     /**
      * @return mixed
      */
-    private function removeTrailingSpaces($indent, $text)
+    private function removeTrailingSpaces(string $indent, string $text)
     {
-        return str_replace("\n{$indent} * \n", "\n{$indent} *\n", $text);
+        return str_replace(
+            sprintf("\n%s * \n", $indent),
+            sprintf("\n%s *\n", $indent),
+            $text
+        );
     }
 
     /**
      * @return mixed
      */
-    private function addAsterisksForEachLine($indent, $text)
+    private function addAsterisksForEachLine(string $indent, string $text)
     {
-        return str_replace("\n", "\n{$indent} * ", $text);
+        return str_replace(
+            "\n",
+            sprintf("\n%s * ", $indent),
+            $text
+        );
     }
 
-    private function getSummaryAndDescriptionTextBlock(DocBlock $docblock, $wrapLength): string
+    private function getSummaryAndDescriptionTextBlock(DocBlock $docblock, ?int $wrapLength) : string
     {
         $text = $docblock->getSummary() . ((string) $docblock->getDescription() ? "\n\n" . $docblock->getDescription()
                 : '');
@@ -115,7 +133,7 @@ class Serializer
         return $text;
     }
 
-    private function addTagBlock(DocBlock $docblock, $wrapLength, $indent, $comment): string
+    private function addTagBlock(DocBlock $docblock, ?int $wrapLength, string $indent, string $comment) : string
     {
         foreach ($docblock->getTags() as $tag) {
             $tagText = $this->tagFormatter->format($tag);
@@ -123,9 +141,13 @@ class Serializer
                 $tagText = wordwrap($tagText, $wrapLength);
             }
 
-            $tagText = str_replace("\n", "\n{$indent} * ", $tagText);
+            $tagText = str_replace(
+                "\n",
+                sprintf("\n%s * ", $indent),
+                $tagText
+            );
 
-            $comment .= "{$indent} * {$tagText}\n";
+            $comment .= sprintf("%s * %s\n", $indent, $tagText);
         }
 
         return $comment;

src/DocBlock/StandardTagFactory.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,18 +8,43 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock;
 
+use InvalidArgumentException;
+use phpDocumentor\Reflection\DocBlock\Tags\Author;
+use phpDocumentor\Reflection\DocBlock\Tags\Covers;
+use phpDocumentor\Reflection\DocBlock\Tags\Deprecated;
 use phpDocumentor\Reflection\DocBlock\Tags\Factory\StaticMethod;
 use phpDocumentor\Reflection\DocBlock\Tags\Generic;
+use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Method;
+use phpDocumentor\Reflection\DocBlock\Tags\Param;
+use phpDocumentor\Reflection\DocBlock\Tags\Property;
+use phpDocumentor\Reflection\DocBlock\Tags\PropertyRead;
+use phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite;
+use phpDocumentor\Reflection\DocBlock\Tags\Return_;
+use phpDocumentor\Reflection\DocBlock\Tags\See as SeeTag;
+use phpDocumentor\Reflection\DocBlock\Tags\Since;
+use phpDocumentor\Reflection\DocBlock\Tags\Source;
+use phpDocumentor\Reflection\DocBlock\Tags\Throws;
+use phpDocumentor\Reflection\DocBlock\Tags\Uses;
+use phpDocumentor\Reflection\DocBlock\Tags\Var_;
+use phpDocumentor\Reflection\DocBlock\Tags\Version;
 use phpDocumentor\Reflection\FqsenResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
+use ReflectionMethod;
+use ReflectionParameter;
 use Webmozart\Assert\Assert;
+use function array_merge;
+use function array_slice;
+use function call_user_func_array;
+use function count;
+use function get_class;
+use function preg_match;
+use function strpos;
 
 /**
  * Creates a Tag object given the contents of a tag.
@@ -42,38 +69,44 @@ final class StandardTagFactory implements TagFactory
     public const REGEX_TAGNAME = '[\w\-\_\\\\]+';
 
     /**
-     * @var string[] An array with a tag as a key, and an FQCN to a class that handles it as an array value.
+     * @var string[] An array with a tag as a key, and an
+     *      FQCN to a class that handles it as an array value.
      */
     private $tagHandlerMappings = [
-        'author' => '\phpDocumentor\Reflection\DocBlock\Tags\Author',
+        'author' => Author::class,
-        'covers' => '\phpDocumentor\Reflection\DocBlock\Tags\Covers',
+        'covers' => Covers::class,
-        'deprecated' => '\phpDocumentor\Reflection\DocBlock\Tags\Deprecated',
+        'deprecated' => Deprecated::class,
         // 'example'        => '\phpDocumentor\Reflection\DocBlock\Tags\Example',
-        'link' => '\phpDocumentor\Reflection\DocBlock\Tags\Link',
+        'link' => LinkTag::class,
-        'method' => '\phpDocumentor\Reflection\DocBlock\Tags\Method',
+        'method' => Method::class,
-        'param' => '\phpDocumentor\Reflection\DocBlock\Tags\Param',
+        'param' => Param::class,
-        'property-read' => '\phpDocumentor\Reflection\DocBlock\Tags\PropertyRead',
+        'property-read' => PropertyRead::class,
-        'property' => '\phpDocumentor\Reflection\DocBlock\Tags\Property',
+        'property' => Property::class,
-        'property-write' => '\phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite',
+        'property-write' => PropertyWrite::class,
-        'return' => '\phpDocumentor\Reflection\DocBlock\Tags\Return_',
+        'return' => Return_::class,
-        'see' => '\phpDocumentor\Reflection\DocBlock\Tags\See',
+        'see' => SeeTag::class,
-        'since' => '\phpDocumentor\Reflection\DocBlock\Tags\Since',
+        'since' => Since::class,
-        'source' => '\phpDocumentor\Reflection\DocBlock\Tags\Source',
+        'source' => Source::class,
-        'throw' => '\phpDocumentor\Reflection\DocBlock\Tags\Throws',
+        'throw' => Throws::class,
-        'throws' => '\phpDocumentor\Reflection\DocBlock\Tags\Throws',
+        'throws' => Throws::class,
-        'uses' => '\phpDocumentor\Reflection\DocBlock\Tags\Uses',
+        'uses' => Uses::class,
-        'var' => '\phpDocumentor\Reflection\DocBlock\Tags\Var_',
+        'var' => Var_::class,
-        'version' => '\phpDocumentor\Reflection\DocBlock\Tags\Version',
+        'version' => Version::class,
     ];
 
     /**
-     * @var \ReflectionParameter[][] a lazy-loading cache containing parameters for each tagHandler that has been used.
+     * @var string[] An array with a anotation s a key, and an
+     *      FQCN to a class that handles it as an array value.
+     */
+    private $annotationMappings = [];
+
+    /**
+     * @var ReflectionParameter[][] a lazy-loading cache containing parameters
+     *      for each tagHandler that has been used.
      */
     private $tagHandlerParameterCache = [];
 
-    /**
+    /** @var FqsenResolver */
-     * @var FqsenResolver
-     */
     private $fqsenResolver;
 
     /**
@@ -88,9 +121,9 @@ final class StandardTagFactory implements TagFactory
      * If no tag handlers are provided than the default list in the {@see self::$tagHandlerMappings} property
      * is used.
      *
-     * @param string[]      $tagHandlers
-     *
      * @see self::registerTagHandler() to add a new tag handler to the existing default list.
+     *
+     * @param string[] $tagHandlers
      */
     public function __construct(FqsenResolver $fqsenResolver, ?array $tagHandlers = null)
     {
@@ -113,8 +146,8 @@ final class StandardTagFactory implements TagFactory
 
         [$tagName, $tagBody] = $this->extractTagParts($tagLine);
 
-        if ($tagBody !== '' && $tagBody[0] === '[') {
+        if ($tagBody !== '' && strpos($tagBody, '[') === 0) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'The tag "' . $tagLine . '" does not seem to be wellformed, please check it for errors'
             );
         }
@@ -133,7 +166,7 @@ final class StandardTagFactory implements TagFactory
     /**
      * {@inheritDoc}
      */
-    public function addService($service, $alias = null): void
+    public function addService(object $service, ?string $alias = null) : void
     {
         $this->serviceLocator[$alias ?: get_class($service)] = $service;
     }
@@ -144,12 +177,12 @@ final class StandardTagFactory implements TagFactory
     public function registerTagHandler(string $tagName, string $handler) : void
     {
         Assert::stringNotEmpty($tagName);
-        Assert::stringNotEmpty($handler);
         Assert::classExists($handler);
+        /** @var object $handler stupid hack to make phpstan happy.  */
         Assert::implementsInterface($handler, StaticMethod::class);
 
         if (strpos($tagName, '\\') && $tagName[0] !== '\\') {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'A namespaced tag must have a leading backslash as it must be fully qualified'
             );
         }
@@ -160,14 +193,13 @@ final class StandardTagFactory implements TagFactory
     /**
      * Extracts all components for a tag.
      *
-     *
      * @return string[]
      */
     private function extractTagParts(string $tagLine) : array
     {
         $matches = [];
         if (!preg_match('/^@(' . self::REGEX_TAGNAME . ')(?:\s*([^\s].*)|$)/us', $tagLine, $matches)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'The tag "' . $tagLine . '" does not seem to be wellformed, please check it for errors'
             );
         }
@@ -192,8 +224,10 @@ final class StandardTagFactory implements TagFactory
         );
 
         try {
-            return call_user_func_array([$handlerClassName, 'create'], $arguments);
+            /** @var callable $callable */
-        } catch (\InvalidArgumentException $e) {
+            $callable = [$handlerClassName, 'create'];
+            return call_user_func_array($callable, $arguments);
+        } catch (InvalidArgumentException $e) {
             return null;
         }
     }
@@ -208,10 +242,10 @@ final class StandardTagFactory implements TagFactory
             $handlerClassName = $this->tagHandlerMappings[$tagName];
         } elseif ($this->isAnnotation($tagName)) {
             // TODO: Annotation support is planned for a later stage and as such is disabled for now
-            // $tagName = (string)$this->fqsenResolver->resolve($tagName, $context);
+            $tagName = (string) $this->fqsenResolver->resolve($tagName, $context);
-            // if (isset($this->annotationMappings[$tagName])) {
+            if (isset($this->annotationMappings[$tagName])) {
-            //     $handlerClassName = $this->annotationMappings[$tagName];
+                $handlerClassName = $this->annotationMappings[$tagName];
-            // }
+            }
         }
 
         return $handlerClassName;
@@ -220,17 +254,22 @@ final class StandardTagFactory implements TagFactory
     /**
      * Retrieves the arguments that need to be passed to the Factory Method with the given Parameters.
      *
-     * @param \ReflectionParameter[] $parameters
+     * @param ReflectionParameter[] $parameters
      * @param mixed[]               $locator
      *
      * @return mixed[] A series of values that can be passed to the Factory Method of the tag whose parameters
      *     is provided with this method.
      */
-    private function getArgumentsForParametersFromWiring($parameters, $locator): array
+    private function getArgumentsForParametersFromWiring(array $parameters, array $locator) : array
     {
         $arguments = [];
-        foreach ($parameters as $index => $parameter) {
+        foreach ($parameters as $parameter) {
-            $typeHint = $parameter->getClass() ? $parameter->getClass()->getName() : null;
+            $class    = $parameter->getClass();
+            $typeHint = null;
+            if ($class !== null) {
+                $typeHint = $class->getName();
+            }
+
             if (isset($locator[$typeHint])) {
                 $arguments[] = $locator[$typeHint];
                 continue;
@@ -252,13 +291,12 @@ final class StandardTagFactory implements TagFactory
      * Retrieves a series of ReflectionParameter objects for the static 'create' method of the given
      * tag handler class name.
      *
-     *
+     * @return ReflectionParameter[]
-     * @return \ReflectionParameter[]
      */
     private function fetchParametersForHandlerFactoryMethod(string $handlerClassName) : array
     {
         if (!isset($this->tagHandlerParameterCache[$handlerClassName])) {
-            $methodReflection = new \ReflectionMethod($handlerClassName, 'create');
+            $methodReflection                                  = new ReflectionMethod($handlerClassName, 'create');
             $this->tagHandlerParameterCache[$handlerClassName] = $methodReflection->getParameters();
         }
 
@@ -266,18 +304,24 @@ final class StandardTagFactory implements TagFactory
     }
 
     /**
-     * Returns a copy of this class' Service Locator with added dynamic parameters, such as the tag's name, body and
+     * Returns a copy of this class' Service Locator with added dynamic parameters,
-     * Context.
+     * such as the tag's name, body and Context.
      *
-     * @param TypeContext $context The Context (namespace and aliasses) that may be passed and is used to resolve FQSENs.
+     * @param TypeContext $context The Context (namespace and aliasses) that may be
-     * @param string      $tagName The name of the tag that may be passed onto the factory method of the Tag class.
+     *  passed and is used to resolve FQSENs.
-     * @param string      $tagBody The body of the tag that may be passed onto the factory method of the Tag class.
+     * @param string      $tagName The name of the tag that may be
+     *  passed onto the factory method of the Tag class.
+     * @param string      $tagBody The body of the tag that may be
+     *  passed onto the factory method of the Tag class.
      *
      * @return mixed[]
      */
-    private function getServiceLocatorWithDynamicParameters(TypeContext $context, string $tagName, string $tagBody): array
+    private function getServiceLocatorWithDynamicParameters(
-    {
+        TypeContext $context,
-        $locator = array_merge(
+        string $tagName,
+        string $tagBody
+    ) : array {
+        return array_merge(
             $this->serviceLocator,
             [
                 'name' => $tagName,
@@ -285,14 +329,11 @@ final class StandardTagFactory implements TagFactory
                 TypeContext::class => $context,
             ]
         );
-
-        return $locator;
     }
 
     /**
      * Returns whether the given tag belongs to an annotation.
      *
-     *
      * @todo this method should be populated once we implement Annotation notation support.
      */
     private function isAnnotation(string $tagContent) : bool

src/DocBlock/Tag.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

src/DocBlock/TagFactory.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,13 +8,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock;
 
+use InvalidArgumentException;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 
 interface TagFactory
@@ -39,6 +40,17 @@ interface TagFactory
      */
     public function addParameter(string $name, $value) : void;
 
+    /**
+     * Factory method responsible for instantiating the correct sub type.
+     *
+     * @param string $tagLine The text for this tag, including description.
+     *
+     * @return Tag A new tag object.
+     *
+     * @throws InvalidArgumentException If an invalid tag line was presented.
+     */
+    public function create(string $tagLine, ?TypeContext $context = null) : ?Tag;
+
     /**
      * Registers a service with the Service Locator using the FQCN of the class or the alias, if provided.
      *
@@ -47,39 +59,26 @@ interface TagFactory
      *
      * Because interfaces are regularly used as type-hints this method provides an alias parameter; if the FQCN of the
      * interface is passed as alias then every time that interface is requested the provided service will be returned.
-     *
-     * @param object $service
      */
-    public function addService($service): void;
+    public function addService(object $service) : void;
-
-    /**
-     * Factory method responsible for instantiating the correct sub type.
-     *
-     * @param string $tagLine The text for this tag, including description.
-     *
-     * @throws \InvalidArgumentException if an invalid tag line was presented.
-     *
-     * @return Tag A new tag object.
-     */
-    public function create(string $tagLine, ?TypeContext $context = null): ?Tag;
 
     /**
      * Registers a handler for tags.
      *
-     * If you want to use your own tags then you can use this method to instruct the TagFactory to register the name
+     * If you want to use your own tags then you can use this method to instruct the TagFactory
-     * of a tag with the FQCN of a 'Tag Handler'. The Tag handler should implement the {@see Tag} interface (and thus
+     * to register the name of a tag with the FQCN of a 'Tag Handler'. The Tag handler should implement
-     * the create method).
+     * the {@see Tag} interface (and thus the create method).
      *
-     * @param string $tagName Name of tag to register a handler for. When registering a namespaced tag, the full
+     * @param string $tagName Name of tag to register a handler for. When registering a namespaced tag,
-     *                        name, along with a prefixing slash MUST be provided.
+     *                        the full name, along with a prefixing slash MUST be provided.
      * @param string $handler FQCN of handler.
      *
-     * @throws \InvalidArgumentException if the tag name is not a string
+     * @throws InvalidArgumentException If the tag name is not a string.
-     * @throws \InvalidArgumentException if the tag name is namespaced (contains backslashes) but does not start with
+     * @throws InvalidArgumentException If the tag name is namespaced (contains backslashes) but
-     *     a backslash
+     *                                   does not start with a backslash.
-     * @throws \InvalidArgumentException if the handler is not a string
+     * @throws InvalidArgumentException If the handler is not a string.
-     * @throws \InvalidArgumentException if the handler is not an existing class
+     * @throws InvalidArgumentException If the handler is not an existing class.
-     * @throws \InvalidArgumentException if the handler does not implement the {@see Tag} interface
+     * @throws InvalidArgumentException If the handler does not implement the {@see Tag} interface.
      */
     public function registerTagHandler(string $tagName, string $handler) : void;
 }

src/DocBlock/Tags/Author.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,13 +8,18 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock\Tags;
 
+use InvalidArgumentException;
+use const FILTER_VALIDATE_EMAIL;
+use function filter_var;
+use function preg_match;
+use function strlen;
+use function trim;
+
 /**
  * Reflection class for an {@}author tag in a Docblock.
  */
@@ -33,7 +40,7 @@ final class Author extends BaseTag implements Factory\StaticMethod
     public function __construct(string $authorName, string $authorEmail)
     {
         if ($authorEmail && !filter_var($authorEmail, FILTER_VALIDATE_EMAIL)) {
-            throw new \InvalidArgumentException('The author tag does not have a valid e-mail address');
+            throw new InvalidArgumentException('The author tag does not have a valid e-mail address');
         }
 
         $this->authorName  = $authorName;

src/DocBlock/Tags/BaseTag.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -24,7 +24,7 @@ abstract class BaseTag implements DocBlock\Tag
     /** @var string Name of the tag */
     protected $name = '';
 
-    /** @var Description|string|null Description of the tag. */
+    /** @var Description|null Description of the tag. */
     protected $description;
 
     /**
@@ -37,7 +37,7 @@ abstract class BaseTag implements DocBlock\Tag
         return $this->name;
     }
 
-    public function getDescription()
+    public function getDescription() : ?Description
     {
         return $this->description;
     }

src/DocBlock/Tags/Covers.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -19,12 +19,14 @@ use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\FqsenResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_split;
 
 /**
  * Reflection class for a @covers tag in a Docblock.
  */
 final class Covers extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'covers';
 
     /** @var Fqsen */
@@ -49,8 +51,11 @@ final class Covers extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : self {
         Assert::notEmpty($body);
+        Assert::notNull($descriptionFactory);
+        Assert::notNull($resolver);
 
         $parts = preg_split('/\s+/Su', $body, 2);
+        Assert::isArray($parts);
 
         return new static(
             $resolver->resolve($parts[0], $context),

src/DocBlock/Tags/Deprecated.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -17,12 +17,14 @@ use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_match;
 
 /**
  * Reflection class for a {@}deprecated tag in a Docblock.
  */
 final class Deprecated extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'deprecated';
 
     /**
@@ -41,10 +43,10 @@ final class Deprecated extends BaseTag implements Factory\StaticMethod
         [^\s\:]+\:\s*\$[^\$]+\$
     )';
 
-    /** @var string The version vector. */
+    /** @var string|null The version vector. */
     private $version = '';
 
-    public function __construct($version = null, ?Description $description = null)
+    public function __construct(?string $version = null, ?Description $description = null)
     {
         Assert::nullOrStringNotEmpty($version);
 
@@ -68,10 +70,11 @@ final class Deprecated extends BaseTag implements Factory\StaticMethod
         if (!preg_match('/^(' . self::REGEX_VECTOR . ')\s*(.+)?$/sux', $body, $matches)) {
             return new static(
                 null,
-                null !== $descriptionFactory ? $descriptionFactory->create($body, $context) : null
+                $descriptionFactory !== null ? $descriptionFactory->create($body, $context) : null
             );
         }
 
+        Assert::notNull($descriptionFactory);
         return new static(
             $matches[1],
             $descriptionFactory->create($matches[2] ?? '', $context)
@@ -91,6 +94,6 @@ final class Deprecated extends BaseTag implements Factory\StaticMethod
      */
     public function __toString() : string
     {
-        return $this->version . ($this->description ? ' ' . $this->description->render() : '');
+        return ($this->version ?? '') . ($this->description ? ' ' . $this->description->render() : '');
     }
 }

src/DocBlock/Tags/Example.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -15,15 +15,19 @@ namespace phpDocumentor\Reflection\DocBlock\Tags;
 
 use phpDocumentor\Reflection\DocBlock\Tag;
 use Webmozart\Assert\Assert;
+use function array_key_exists;
+use function preg_match;
+use function rawurlencode;
+use function str_replace;
+use function strpos;
+use function trim;
 
 /**
  * Reflection class for a {@}example tag in a Docblock.
  */
-final class Example extends BaseTag
+final class Example implements Tag
 {
-    /**
+    /** @var string Path to a file to use as an example. May also be an absolute URI. */
-     * @var string Path to a file to use as an example. May also be an absolute URI.
-     */
     private $filePath;
 
     /**
@@ -32,17 +36,16 @@ final class Example extends BaseTag
      */
     private $isURI = false;
 
-    /**
+    /** @var int */
-     * @var int
-     */
     private $startingLine;
 
-    /**
+    /** @var int */
-     * @var int
-     */
     private $lineCount;
 
-    public function __construct(string $filePath, bool $isURI, int $startingLine, int $lineCount, $description)
+    /** @var string|null */
+    private $content;
+
+    public function __construct(string $filePath, bool $isURI, int $startingLine, int $lineCount, ?string $content)
     {
         Assert::notEmpty($filePath);
         Assert::greaterThanEq($startingLine, 0);
@@ -51,20 +54,16 @@ final class Example extends BaseTag
         $this->filePath     = $filePath;
         $this->startingLine = $startingLine;
         $this->lineCount    = $lineCount;
-        $this->name = 'example';
+        if ($content !== null) {
-        if ($description !== null) {
+            $this->content = trim((string) $content);
-            $this->description = trim((string) $description);
         }
 
         $this->isURI = $isURI;
     }
 
-    /**
+    public function getContent() : string
-     * {@inheritdoc}
-     */
-    public function getContent()
     {
-        if (null === $this->description) {
+        if ($this->content === null) {
             $filePath = '"' . $this->filePath . '"';
             if ($this->isURI) {
                 $filePath = $this->isUriRelative($this->filePath)
@@ -72,10 +71,15 @@ final class Example extends BaseTag
                     : $this->filePath;
             }
 
-            return trim($filePath . ' ' . parent::getDescription());
+            return trim($filePath);
         }
 
-        return $this->description;
+        return $this->content;
+    }
+
+    public function getDescription() : ?string
+    {
+        return $this->content;
     }
 
     /**
@@ -90,7 +94,7 @@ final class Example extends BaseTag
 
         $filePath = null;
         $fileUri  = null;
-        if ('' !== $matches[1]) {
+        if ($matches[1] !== '') {
             $filePath = $matches[1];
         } else {
             $fileUri = $matches[2];
@@ -117,7 +121,7 @@ final class Example extends BaseTag
         }
 
         return new static(
-            $filePath !== null ? $filePath : $fileUri,
+            $filePath ?? ($fileUri ?? ''),
             $fileUri !== null,
             $startingLine,
             $lineCount,
@@ -141,7 +145,7 @@ final class Example extends BaseTag
      */
     public function __toString() : string
     {
-        return $this->filePath . ($this->description ? ' ' . $this->description : '');
+        return $this->filePath . ($this->content ? ' ' . $this->content : '');
     }
 
     /**
@@ -149,7 +153,7 @@ final class Example extends BaseTag
      */
     private function isUriRelative(string $uri) : bool
     {
-        return false === strpos($uri, ':');
+        return strpos($uri, ':') === false;
     }
 
     public function getStartingLine() : int
@@ -161,4 +165,18 @@ final class Example extends BaseTag
     {
         return $this->lineCount;
     }
+
+    public function getName() : string
+    {
+        return 'example';
+    }
+
+    public function render(?Formatter $formatter = null) : string
+    {
+        if ($formatter === null) {
+            $formatter = new Formatter\PassthroughFormatter();
+        }
+
+        return $formatter->format($this);
+    }
 }

src/DocBlock/Tags/Factory/StaticMethod.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

src/DocBlock/Tags/Factory/Strategy.php

@@ -1,19 +0,0 @@
-<?php declare(strict_types=1);
-
-/**
- * This file is part of phpDocumentor.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
- * @link      http://phpdoc.org
- */
-
-namespace phpDocumentor\Reflection\DocBlock\Tags\Factory;
-
-interface Strategy
-{
-    public function create($body): void;
-}

src/DocBlock/Tags/Formatter.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

src/DocBlock/Tags/Formatter/AlignFormatter.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,9 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author    Jan Schneider <[email protected]>
- * @copyright 2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -16,6 +15,9 @@ namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 
 use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use function max;
+use function str_repeat;
+use function strlen;
 
 class AlignFormatter implements Formatter
 {
@@ -23,8 +25,6 @@ class AlignFormatter implements Formatter
     protected $maxLen = 0;
 
     /**
-     * Constructor.
-     *
      * @param Tag[] $tags All tags that should later be aligned with the formatter.
      */
     public function __construct(array $tags)
@@ -39,6 +39,11 @@ class AlignFormatter implements Formatter
      */
     public function format(Tag $tag) : string
     {
-        return '@' . $tag->getName() . str_repeat(' ', $this->maxLen - strlen($tag->getName()) + 1) . (string) $tag;
+        return '@' . $tag->getName() .
+            str_repeat(
+                ' ',
+                $this->maxLen - strlen($tag->getName()) + 1
+            ) .
+            $tag;
     }
 }

src/DocBlock/Tags/Formatter/PassthroughFormatter.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -15,6 +15,7 @@ namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 
 use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\Tags\Formatter;
+use function trim;
 
 class PassthroughFormatter implements Formatter
 {
@@ -23,6 +24,6 @@ class PassthroughFormatter implements Formatter
      */
     public function format(Tag $tag) : string
     {
-        return trim('@' . $tag->getName() . ' ' . (string) $tag);
+        return trim('@' . $tag->getName() . ' ' . $tag);
     }
 }

src/DocBlock/Tags/Generic.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,23 +8,23 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock\Tags;
 
+use InvalidArgumentException;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_match;
 
 /**
  * Parses a tag definition for a DocBlock.
  */
-class Generic extends BaseTag implements Factory\StaticMethod
+final class Generic extends BaseTag implements Factory\StaticMethod
 {
     /**
      * Parses a tag and populates the member variables.
@@ -41,7 +43,6 @@ class Generic extends BaseTag implements Factory\StaticMethod
     /**
      * Creates a new tag that represents any unknown tag type.
      *
-     *
      * @return static
      */
     public static function create(
@@ -53,7 +54,7 @@ class Generic extends BaseTag implements Factory\StaticMethod
         Assert::stringNotEmpty($name);
         Assert::notNull($descriptionFactory);
 
-        $description = $descriptionFactory && $body !== "" ? $descriptionFactory->create($body, $context) : null;
+        $description = $body !== '' ? $descriptionFactory->create($body, $context) : null;
 
         return new static($name, $description);
     }
@@ -72,7 +73,7 @@ class Generic extends BaseTag implements Factory\StaticMethod
     private function validateTagName(string $name) : void
     {
         if (!preg_match('/^' . StandardTagFactory::REGEX_TAGNAME . '$/u', $name)) {
-            throw new \InvalidArgumentException(
+            throw new InvalidArgumentException(
                 'The tag name "' . $name . '" is not wellformed. Tags may only consist of letters, underscores, '
                 . 'hyphens and backslashes.'
             );

src/DocBlock/Tags/Link.php

@@ -1,13 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
- * phpDocumentor
+ * This file is part of phpDocumentor.
  *
- * PHP Version 5.3
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @author    Ben Selby <[email protected]>
- * @copyright 2010-2018 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -17,16 +17,18 @@ use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_split;
 
 /**
  * Reflection class for a @link tag in a Docblock.
  */
 final class Link extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'link';
 
     /** @var string */
-    private $link = '';
+    private $link;
 
     /**
      * Initializes a link to a URL.
@@ -40,11 +42,15 @@ final class Link extends BaseTag implements Factory\StaticMethod
     /**
      * {@inheritdoc}
      */
-    public static function create(string $body, ?DescriptionFactory $descriptionFactory = null, ?TypeContext $context = null): self
+    public static function create(
-    {
+        string $body,
+        ?DescriptionFactory $descriptionFactory = null,
+        ?TypeContext $context = null
+    ) : self {
         Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/\s+/Su', $body, 2);
+        Assert::isArray($parts);
         $description = isset($parts[1]) ? $descriptionFactory->create($parts[1], $context) : null;
 
         return new static($parts[0], $description);

src/DocBlock/Tags/Method.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,13 +8,12 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock\Tags;
 
+use InvalidArgumentException;
 use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Type;
@@ -20,18 +21,29 @@ use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use phpDocumentor\Reflection\Types\Void_;
 use Webmozart\Assert\Assert;
+use function array_keys;
+use function explode;
+use function implode;
+use function is_string;
+use function preg_match;
+use function sort;
+use function strpos;
+use function substr;
+use function trim;
+use function var_export;
 
 /**
  * Reflection class for an {@}method in a Docblock.
  */
 final class Method extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'method';
 
     /** @var string */
     private $methodName = '';
 
-    /** @var string[] */
+    /** @var string[][] */
     private $arguments = [];
 
     /** @var bool */
@@ -40,15 +52,19 @@ final class Method extends BaseTag implements Factory\StaticMethod
     /** @var Type */
     private $returnType;
 
+    /**
+     * @param mixed[][] $arguments
+     *
+     * @psalm-param array<int, array<string, string|Type>|string> $arguments
+     */
     public function __construct(
-        $methodName,
+        string $methodName,
         array $arguments = [],
         ?Type $returnType = null,
-        $static = false,
+        bool $static = false,
         ?Description $description = null
     ) {
         Assert::stringNotEmpty($methodName);
-        Assert::boolean($static);
 
         if ($returnType === null) {
             $returnType = new Void_();
@@ -71,7 +87,8 @@ final class Method extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : ?self {
         Assert::stringNotEmpty($body);
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         // 1. none or more whitespace
         // 2. optionally the keyword "static" followed by whitespace
@@ -134,7 +151,7 @@ final class Method extends BaseTag implements Factory\StaticMethod
         $returnType  = $typeResolver->resolve($returnType, $context);
         $description = $descriptionFactory->create($description, $context);
 
-        if (is_string($arguments) && strlen($arguments) > 0) {
+        if ($arguments !== '') {
             $arguments = explode(',', $arguments);
             foreach ($arguments as &$argument) {
                 $argument = explode(' ', self::stripRestArg(trim($argument)), 2);
@@ -168,7 +185,7 @@ final class Method extends BaseTag implements Factory\StaticMethod
     }
 
     /**
-     * @return string[]
+     * @return string[][]
      */
     public function getArguments() : array
     {
@@ -204,9 +221,18 @@ final class Method extends BaseTag implements Factory\StaticMethod
             . ($this->description ? ' ' . $this->description->render() : ''));
     }
 
+    /**
+     * @param mixed[][]|string[] $arguments
+     *
+     * @return mixed[][]
+     *
+     * @psalm-param array<int, array<string, string|Type>|string> $arguments
+     * @psalm-return array<int, array<string, string|Type>> $arguments
+     */
     private function filterArguments(array $arguments = []) : array
     {
-        foreach ($arguments as &$argument) {
+        $result = [];
+        foreach ($arguments as $argument) {
             if (is_string($argument)) {
                 $argument = ['name' => $argument];
             }
@@ -218,13 +244,15 @@ final class Method extends BaseTag implements Factory\StaticMethod
             $keys = array_keys($argument);
             sort($keys);
             if ($keys !== ['name', 'type']) {
-                throw new \InvalidArgumentException(
+                throw new InvalidArgumentException(
                     'Arguments can only have the "name" and "type" fields, found: ' . var_export($keys, true)
                 );
             }
+
+            $result[] = $argument;
         }
 
-        return $arguments;
+        return $result;
     }
 
     private static function stripRestArg(string $argument) : string

src/DocBlock/Tags/Param.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,6 +19,12 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use function array_shift;
+use function implode;
+use function preg_split;
+use function strpos;
+use function substr;
 
 /**
  * Reflection class for the {@}param tag in a Docblock.
@@ -31,14 +37,18 @@ final class Param extends BaseTag implements Factory\StaticMethod
     /** @var Type|null */
     private $type;
 
-    /** @var string */
+    /** @var string|null */
-    private $variableName = '';
+    private $variableName;
 
     /** @var bool determines whether this is a variadic argument */
-    private $isVariadic = false;
+    private $isVariadic;
 
-    public function __construct(string $variableName, ?Type $type = null, bool $isVariadic = false, ?Description $description = null)
+    public function __construct(
-    {
+        ?string $variableName,
+        ?Type $type = null,
+        bool $isVariadic = false,
+        ?Description $description = null
+    ) {
         $this->variableName = $variableName;
         $this->type         = $type;
         $this->isVariadic   = $isVariadic;
@@ -55,30 +65,34 @@ final class Param extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : self {
         Assert::stringNotEmpty($body);
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/(\s+)/Su', $body, 3, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $type         = null;
         $variableName = '';
         $isVariadic   = false;
 
         // if the first item that is encountered is not a variable; it is a type
-        if (isset($parts[0]) && (strlen($parts[0]) > 0) && ($parts[0][0] !== '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && ($parts[0][0] !== '$')) {
             $type = $typeResolver->resolve(array_shift($parts), $context);
             array_shift($parts);
         }
 
         // 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] === '$' || substr($parts[0], 0, 4) === '...$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') &&
+            (strpos($parts[0], '$') === 0 || strpos($parts[0], '...$') === 0)
+        ) {
             $variableName = array_shift($parts);
             array_shift($parts);
 
-            if (substr($variableName, 0, 3) === '...') {
+            if ($variableName !== null && strpos($variableName, '...') === 0) {
                 $isVariadic   = true;
                 $variableName = substr($variableName, 3);
             }
 
-            if (substr($variableName, 0, 1) === '$') {
+            if ($variableName !== null && strpos($variableName, '$') === 0) {
                 $variableName = substr($variableName, 1);
             }
         }
@@ -91,7 +105,7 @@ final class Param extends BaseTag implements Factory\StaticMethod
     /**
      * Returns the variable's name.
      */
-    public function getVariableName(): string
+    public function getVariableName() : ?string
     {
         return $this->variableName;
     }
@@ -119,7 +133,7 @@ final class Param extends BaseTag implements Factory\StaticMethod
     {
         return ($this->type ? $this->type . ' ' : '')
             . ($this->isVariadic() ? '...' : '')
-        . '$' . $this->variableName
+            . ($this->variableName !== null ? '$' . $this->variableName : '')
             . ($this->description ? ' ' . $this->description : '');
     }
 }

src/DocBlock/Tags/Property.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,11 +19,17 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use function array_shift;
+use function implode;
+use function preg_split;
+use function strpos;
+use function substr;
 
 /**
  * Reflection class for a {@}property tag in a Docblock.
  */
-class Property extends BaseTag implements Factory\StaticMethod
+final class Property extends BaseTag implements Factory\StaticMethod
 {
     /** @var string */
     protected $name = 'property';
@@ -31,10 +37,10 @@ class Property extends BaseTag implements Factory\StaticMethod
     /** @var Type|null */
     private $type;
 
-    /** @var string */
+    /** @var string|null */
     protected $variableName = '';
 
-    public function __construct(string $variableName, ?Type $type = null, ?Description $description = null)
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
     {
         $this->variableName = $variableName;
         $this->type         = $type;
@@ -51,24 +57,26 @@ class Property extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : self {
         Assert::stringNotEmpty($body);
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/(\s+)/Su', $body, 3, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $type         = null;
         $variableName = '';
 
         // if the first item that is encountered is not a variable; it is a type
-        if (isset($parts[0]) && (strlen($parts[0]) > 0) && ($parts[0][0] !== '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && ($parts[0][0] !== '$')) {
             $type = $typeResolver->resolve(array_shift($parts), $context);
             array_shift($parts);
         }
 
         // 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] === '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && (strpos($parts[0], '$') === 0)) {
             $variableName = array_shift($parts);
             array_shift($parts);
 
-            if (substr($variableName, 0, 1) === '$') {
+            if ($variableName !== null && strpos($variableName, '$') === 0) {
                 $variableName = substr($variableName, 1);
             }
         }
@@ -81,7 +89,7 @@ class Property extends BaseTag implements Factory\StaticMethod
     /**
      * Returns the variable's name.
      */
-    public function getVariableName(): string
+    public function getVariableName() : ?string
     {
         return $this->variableName;
     }
@@ -100,7 +108,7 @@ class Property extends BaseTag implements Factory\StaticMethod
     public function __toString() : string
     {
         return ($this->type ? $this->type . ' ' : '')
-        . '$' . $this->variableName
+            . ($this->variableName ? '$' . $this->variableName : '')
             . ($this->description ? ' ' . $this->description : '');
     }
 }

src/DocBlock/Tags/PropertyRead.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,11 +19,17 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use function array_shift;
+use function implode;
+use function preg_split;
+use function strpos;
+use function substr;
 
 /**
  * Reflection class for a {@}property-read tag in a Docblock.
  */
-class PropertyRead extends BaseTag implements Factory\StaticMethod
+final class PropertyRead extends BaseTag implements Factory\StaticMethod
 {
     /** @var string */
     protected $name = 'property-read';
@@ -31,10 +37,10 @@ class PropertyRead extends BaseTag implements Factory\StaticMethod
     /** @var Type|null */
     private $type;
 
-    /** @var string */
+    /** @var string|null */
     protected $variableName = '';
 
-    public function __construct(string $variableName, ?Type $type = null, ?Description $description = null)
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
     {
         $this->variableName = $variableName;
         $this->type         = $type;
@@ -51,24 +57,26 @@ class PropertyRead extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : self {
         Assert::stringNotEmpty($body);
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/(\s+)/Su', $body, 3, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $type         = null;
         $variableName = '';
 
         // if the first item that is encountered is not a variable; it is a type
-        if (isset($parts[0]) && (strlen($parts[0]) > 0) && ($parts[0][0] !== '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && ($parts[0][0] !== '$')) {
             $type = $typeResolver->resolve(array_shift($parts), $context);
             array_shift($parts);
         }
 
         // 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] === '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && (strpos($parts[0], '$') === 0)) {
             $variableName = array_shift($parts);
             array_shift($parts);
 
-            if (substr($variableName, 0, 1) === '$') {
+            if ($variableName !== null && strpos($variableName, '$') === 0) {
                 $variableName = substr($variableName, 1);
             }
         }
@@ -81,7 +89,7 @@ class PropertyRead extends BaseTag implements Factory\StaticMethod
     /**
      * Returns the variable's name.
      */
-    public function getVariableName(): string
+    public function getVariableName() : ?string
     {
         return $this->variableName;
     }
@@ -100,7 +108,7 @@ class PropertyRead extends BaseTag implements Factory\StaticMethod
     public function __toString() : string
     {
         return ($this->type ? $this->type . ' ' : '')
-        . '$' . $this->variableName
+            . ($this->variableName ? '$' . $this->variableName : '')
             . ($this->description ? ' ' . $this->description : '');
     }
 }

src/DocBlock/Tags/PropertyWrite.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,11 +19,18 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use function array_shift;
+use function implode;
+use function preg_split;
+use function strlen;
+use function strpos;
+use function substr;
 
 /**
  * Reflection class for a {@}property-write tag in a Docblock.
  */
-class PropertyWrite extends BaseTag implements Factory\StaticMethod
+final class PropertyWrite extends BaseTag implements Factory\StaticMethod
 {
     /** @var string */
     protected $name = 'property-write';
@@ -31,10 +38,10 @@ class PropertyWrite extends BaseTag implements Factory\StaticMethod
     /** @var Type|null */
     private $type;
 
-    /** @var string */
+    /** @var string|null */
     protected $variableName = '';
 
-    public function __construct(string $variableName, ?Type $type = null, ?Description $description = null)
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
     {
         $this->variableName = $variableName;
         $this->type         = $type;
@@ -51,14 +58,16 @@ class PropertyWrite extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : self {
         Assert::stringNotEmpty($body);
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/(\s+)/Su', $body, 3, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
         $type         = null;
         $variableName = '';
 
         // if the first item that is encountered is not a variable; it is a type
-        if (isset($parts[0]) && (strlen($parts[0]) > 0) && ($parts[0][0] !== '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && ($parts[0][0] !== '$')) {
             $type = $typeResolver->resolve(array_shift($parts), $context);
             array_shift($parts);
         }
@@ -68,7 +77,7 @@ class PropertyWrite extends BaseTag implements Factory\StaticMethod
             $variableName = array_shift($parts);
             array_shift($parts);
 
-            if (substr($variableName, 0, 1) === '$') {
+            if ($variableName !== null && strpos($variableName, '$') === 0) {
                 $variableName = substr($variableName, 1);
             }
         }
@@ -81,7 +90,7 @@ class PropertyWrite extends BaseTag implements Factory\StaticMethod
     /**
      * Returns the variable's name.
      */
-    public function getVariableName(): string
+    public function getVariableName() : ?string
     {
         return $this->variableName;
     }
@@ -100,7 +109,7 @@ class PropertyWrite extends BaseTag implements Factory\StaticMethod
     public function __toString() : string
     {
         return ($this->type ? $this->type . ' ' : '')
-        . '$' . $this->variableName
+            . ($this->variableName ? '$' . $this->variableName : '')
             . ($this->description ? ' ' . $this->description : '');
     }
 }

src/DocBlock/Tags/Reference/Fqsen.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  *
- *  @copyright 2010-2018 Mike van Riel<[email protected]>
- *  @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -16,18 +16,13 @@ namespace phpDocumentor\Reflection\DocBlock\Tags\Reference;
 use phpDocumentor\Reflection\Fqsen as RealFqsen;
 
 /**
- * Fqsen reference used by {@see phpDocumentor\Reflection\DocBlock\Tags\See}
+ * Fqsen reference used by {@see \phpDocumentor\Reflection\DocBlock\Tags\See}
  */
 final class Fqsen implements Reference
 {
-    /**
+    /** @var RealFqsen */
-     * @var RealFqsen
-     */
     private $fqsen;
 
-    /**
-     * Fqsen constructor.
-     */
     public function __construct(RealFqsen $fqsen)
     {
         $this->fqsen = $fqsen;

src/DocBlock/Tags/Reference/Reference.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,15 +8,13 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  *
- *  @copyright 2010-2018 Mike van Riel<[email protected]>
- *  @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock\Tags\Reference;
 
 /**
- * Interface for references in {@see phpDocumentor\Reflection\DocBlock\Tags\See}
+ * Interface for references in {@see \phpDocumentor\Reflection\DocBlock\Tags\See}
  */
 interface Reference
 {

src/DocBlock/Tags/Reference/Url.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  *
- *  @copyright 2010-2018 Mike van Riel<[email protected]>
- *  @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -16,18 +16,13 @@ namespace phpDocumentor\Reflection\DocBlock\Tags\Reference;
 use Webmozart\Assert\Assert;
 
 /**
- * Url reference used by {@see phpDocumentor\Reflection\DocBlock\Tags\See}
+ * Url reference used by {@see \phpDocumentor\Reflection\DocBlock\Tags\See}
  */
 final class Url implements Reference
 {
-    /**
+    /** @var string */
-     * @var string
-     */
     private $uri;
 
-    /**
-     * Url constructor.
-     */
     public function __construct(string $uri)
     {
         Assert::stringNotEmpty($uri);

src/DocBlock/Tags/Return_.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,12 +19,14 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_split;
 
 /**
  * Reflection class for a {@}return tag in a Docblock.
  */
 final class Return_ extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'return';
 
     /** @var Type */
@@ -45,9 +47,11 @@ final class Return_ extends BaseTag implements Factory\StaticMethod
         ?DescriptionFactory $descriptionFactory = null,
         ?TypeContext $context = null
     ) : self {
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/\s+/Su', $body, 2);
+        Assert::isArray($parts);
 
         $type        = $typeResolver->resolve($parts[0] ?? '', $context);
         $description = $descriptionFactory->create($parts[1] ?? '', $context);
@@ -65,6 +69,6 @@ final class Return_ extends BaseTag implements Factory\StaticMethod
 
     public function __toString() : string
     {
-        return $this->type . ' ' . $this->description;
+        return $this->type . ' ' . (string) $this->description;
     }
 }

src/DocBlock/Tags/See.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -21,12 +21,15 @@ use phpDocumentor\Reflection\DocBlock\Tags\Reference\Url;
 use phpDocumentor\Reflection\FqsenResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_match;
+use function preg_split;
 
 /**
  * Reflection class for an {@}see tag in a Docblock.
  */
-class See extends BaseTag implements Factory\StaticMethod
+final class See extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'see';
 
     /** @var Reference */
@@ -46,13 +49,15 @@ class See extends BaseTag implements Factory\StaticMethod
      */
     public static function create(
         string $body,
-        ?FqsenResolver $resolver = null,
+        ?FqsenResolver $typeResolver = null,
         ?DescriptionFactory $descriptionFactory = null,
         ?TypeContext $context = null
     ) : self {
-        Assert::allNotNull([$resolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/\s+/Su', $body, 2);
+        Assert::isArray($parts);
         $description = isset($parts[1]) ? $descriptionFactory->create($parts[1], $context) : null;
 
         // https://tools.ietf.org/html/rfc2396#section-3
@@ -60,7 +65,7 @@ class See extends BaseTag implements Factory\StaticMethod
             return new static(new Url($parts[0]), $description);
         }
 
-        return new static(new FqsenRef($resolver->resolve($parts[0], $context)), $description);
+        return new static(new FqsenRef($typeResolver->resolve($parts[0], $context)), $description);
     }
 
     /**

src/DocBlock/Tags/Since.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -17,12 +17,14 @@ use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_match;
 
 /**
  * Reflection class for a {@}since tag in a Docblock.
  */
 final class Since extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'since';
 
     /**
@@ -41,10 +43,10 @@ final class Since extends BaseTag implements Factory\StaticMethod
         [^\s\:]+\:\s*\$[^\$]+\$
     )';
 
-    /** @var string The version vector. */
+    /** @var string|null The version vector. */
     private $version = '';
 
-    public function __construct($version = null, ?Description $description = null)
+    public function __construct(?string $version = null, ?Description $description = null)
     {
         Assert::nullOrStringNotEmpty($version);
 
@@ -66,6 +68,7 @@ final class Since extends BaseTag implements Factory\StaticMethod
             return null;
         }
 
+        Assert::notNull($descriptionFactory);
         return new static(
             $matches[1],
             $descriptionFactory->create($matches[2] ?? '', $context)
@@ -85,6 +88,6 @@ final class Since extends BaseTag implements Factory\StaticMethod
      */
     public function __toString() : string
     {
-        return $this->version . ($this->description ? ' ' . $this->description->render() : '');
+        return (string) $this->version . ($this->description ? ' ' . (string) $this->description : '');
     }
 }

src/DocBlock/Tags/Source.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -17,6 +17,7 @@ use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_match;
 
 /**
  * Reflection class for a {@}source tag in a Docblock.
@@ -32,6 +33,10 @@ final class Source extends BaseTag implements Factory\StaticMethod
     /** @var int|null The number of lines, relative to the starting line. NULL means "to the end". */
     private $lineCount;
 
+    /**
+     * @param int|string      $startingLine should be a to int convertible value
+     * @param int|string|null $lineCount    should be a to int convertible value
+     */
     public function __construct($startingLine, $lineCount = null, ?Description $description = null)
     {
         Assert::integerish($startingLine);
@@ -67,7 +72,7 @@ final class Source extends BaseTag implements Factory\StaticMethod
             $description = $matches[3];
         }
 
-        return new static($startingLine, $lineCount, $descriptionFactory->create($description, $context));
+        return new static($startingLine, $lineCount, $descriptionFactory->create($description??'', $context));
     }
 
     /**
@@ -96,6 +101,6 @@ final class Source extends BaseTag implements Factory\StaticMethod
     {
         return $this->startingLine
             . ($this->lineCount !== null ? ' ' . $this->lineCount : '')
-        . ($this->description ? ' ' . $this->description->render() : '');
+            . ($this->description ? ' ' . (string) $this->description : '');
     }
 }

src/DocBlock/Tags/Throws.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,12 +19,14 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_split;
 
 /**
  * Reflection class for a {@}throws tag in a Docblock.
  */
 final class Throws extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'throws';
 
     /** @var Type */
@@ -45,9 +47,11 @@ final class Throws extends BaseTag implements Factory\StaticMethod
         ?DescriptionFactory $descriptionFactory = null,
         ?TypeContext $context = null
     ) : self {
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/\s+/Su', $body, 2);
+        Assert::isArray($parts);
 
         $type        = $typeResolver->resolve($parts[0] ?? '', $context);
         $description = $descriptionFactory->create($parts[1] ?? '', $context);
@@ -65,6 +69,6 @@ final class Throws extends BaseTag implements Factory\StaticMethod
 
     public function __toString() : string
     {
-        return $this->type . ' ' . $this->description;
+        return (string) $this->type . ' ' . (string) $this->description;
     }
 }

src/DocBlock/Tags/Uses.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -19,12 +19,14 @@ use phpDocumentor\Reflection\Fqsen;
 use phpDocumentor\Reflection\FqsenResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_split;
 
 /**
  * Reflection class for a {@}uses tag in a Docblock.
  */
 final class Uses extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'uses';
 
     /** @var Fqsen */
@@ -48,9 +50,12 @@ final class Uses extends BaseTag implements Factory\StaticMethod
         ?DescriptionFactory $descriptionFactory = null,
         ?TypeContext $context = null
     ) : self {
-        Assert::allNotNull([$resolver, $descriptionFactory]);
+        Assert::notNull($resolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/\s+/Su', $body, 2);
+        Assert::isArray($parts);
+        Assert::allString($parts);
 
         return new static(
             $resolver->resolve($parts[0], $context),
@@ -71,6 +76,6 @@ final class Uses extends BaseTag implements Factory\StaticMethod
      */
     public function __toString() : string
     {
-        return $this->refers . ' ' . $this->description->render();
+        return $this->refers . ' ' . (string) $this->description;
     }
 }

src/DocBlock/Tags/Var_.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,11 +19,17 @@ use phpDocumentor\Reflection\Type;
 use phpDocumentor\Reflection\TypeResolver;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use const PREG_SPLIT_DELIM_CAPTURE;
+use function array_shift;
+use function implode;
+use function preg_split;
+use function strpos;
+use function substr;
 
 /**
  * Reflection class for a {@}var tag in a Docblock.
  */
-class Var_ extends BaseTag implements Factory\StaticMethod
+final class Var_ extends BaseTag implements Factory\StaticMethod
 {
     /** @var string */
     protected $name = 'var';
@@ -31,10 +37,10 @@ class Var_ extends BaseTag implements Factory\StaticMethod
     /** @var Type|null */
     private $type;
 
-    /** @var string */
+    /** @var string|null */
     protected $variableName = '';
 
-    public function __construct(string $variableName, ?Type $type = null, ?Description $description = null)
+    public function __construct(?string $variableName, ?Type $type = null, ?Description $description = null)
     {
         $this->variableName = $variableName;
         $this->type         = $type;
@@ -51,24 +57,27 @@ class Var_ extends BaseTag implements Factory\StaticMethod
         ?TypeContext $context = null
     ) : self {
         Assert::stringNotEmpty($body);
-        Assert::allNotNull([$typeResolver, $descriptionFactory]);
+        Assert::notNull($typeResolver);
+        Assert::notNull($descriptionFactory);
 
         $parts = preg_split('/(\s+)/Su', $body, 3, PREG_SPLIT_DELIM_CAPTURE);
+        Assert::isArray($parts);
+        Assert::allString($parts);
         $type         = null;
         $variableName = '';
 
         // if the first item that is encountered is not a variable; it is a type
-        if (isset($parts[0]) && (strlen($parts[0]) > 0) && ($parts[0][0] !== '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && ($parts[0][0] !== '$')) {
             $type = $typeResolver->resolve(array_shift($parts), $context);
             array_shift($parts);
         }
 
         // 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] === '$')) {
+        if (isset($parts[0]) && ($parts[0] !== '') && (strpos($parts[0], '$') === 0)) {
             $variableName = array_shift($parts);
             array_shift($parts);
 
-            if (substr($variableName, 0, 1) === '$') {
+            if ($variableName !== null && strpos($variableName, '$') === 0) {
                 $variableName = substr($variableName, 1);
             }
         }
@@ -81,7 +90,7 @@ class Var_ extends BaseTag implements Factory\StaticMethod
     /**
      * Returns the variable's name.
      */
-    public function getVariableName(): string
+    public function getVariableName() : ?string
     {
         return $this->variableName;
     }
@@ -100,7 +109,7 @@ class Var_ extends BaseTag implements Factory\StaticMethod
     public function __toString() : string
     {
         return ($this->type ? $this->type . ' ' : '')
-            . (empty($this->variableName) ? null : ('$' . $this->variableName))
+            . (empty($this->variableName) ? '' : ('$' . $this->variableName))
             . ($this->description ? ' ' . $this->description : '');
     }
 }

src/DocBlock/Tags/Version.php

@@ -1,13 +1,13 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
- * phpDocumentor
+ * This file is part of phpDocumentor.
  *
- * PHP Version 5.3
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * @author    Vasil Rangelov <[email protected]>
- * @copyright 2010-2018 Mike van Riel / Naenius (http://www.naenius.com)
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -17,12 +17,14 @@ use phpDocumentor\Reflection\DocBlock\Description;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\Types\Context as TypeContext;
 use Webmozart\Assert\Assert;
+use function preg_match;
 
 /**
  * Reflection class for a {@}version tag in a Docblock.
  */
 final class Version extends BaseTag implements Factory\StaticMethod
 {
+    /** @var string */
     protected $name = 'version';
 
     /**
@@ -41,10 +43,10 @@ final class Version extends BaseTag implements Factory\StaticMethod
         [^\s\:]+\:\s*\$[^\$]+\$
     )';
 
-    /** @var string The version vector. */
+    /** @var string|null The version vector. */
     private $version = '';
 
-    public function __construct($version = null, ?Description $description = null)
+    public function __construct(?string $version = null, ?Description $description = null)
     {
         Assert::nullOrStringNotEmpty($version);
 
@@ -66,9 +68,14 @@ final class Version extends BaseTag implements Factory\StaticMethod
             return null;
         }
 
+        $description = null;
+        if ($descriptionFactory !== null) {
+            $description = $descriptionFactory->create($matches[2] ?? '', $context);
+        }
+
         return new static(
             $matches[1],
-            $descriptionFactory->create($matches[2] ?? '', $context)
+            $description
         );
     }
 
@@ -85,6 +92,7 @@ final class Version extends BaseTag implements Factory\StaticMethod
      */
     public function __toString() : string
     {
-        return $this->version . ($this->description ? ' ' . $this->description->render() : '');
+        return ((string) $this->version) .
+            ($this->description instanceof Description ? ' ' . $this->description->render() : '');
     }
 }

src/DocBlockFactory.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,18 +8,29 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection;
 
+use InvalidArgumentException;
+use LogicException;
 use phpDocumentor\Reflection\DocBlock\DescriptionFactory;
 use phpDocumentor\Reflection\DocBlock\StandardTagFactory;
 use phpDocumentor\Reflection\DocBlock\Tag;
 use phpDocumentor\Reflection\DocBlock\TagFactory;
 use Webmozart\Assert\Assert;
+use function array_shift;
+use function count;
+use function explode;
+use function is_object;
+use function method_exists;
+use function preg_match;
+use function preg_replace;
+use function str_replace;
+use function strpos;
+use function substr;
+use function trim;
 
 final class DocBlockFactory implements DocBlockFactoryInterface
 {
@@ -67,7 +80,7 @@ final class DocBlockFactory implements DocBlockFactoryInterface
         if (is_object($docblock)) {
             if (!method_exists($docblock, 'getDocComment')) {
                 $exceptionMessage = 'Invalid object passed; the given object must support the getDocComment method';
-                throw new \InvalidArgumentException($exceptionMessage);
+                throw new InvalidArgumentException($exceptionMessage);
             }
 
             $docblock = $docblock->getDocComment();
@@ -80,14 +93,13 @@ final class DocBlockFactory implements DocBlockFactoryInterface
         }
 
         $parts = $this->splitDocBlock($this->stripDocComment($docblock));
+
         [$templateMarker, $summary, $description, $tags] = $parts;
 
         return new DocBlock(
             $summary,
             $description ? $this->descriptionFactory->create($description, $context) : null,
-            array_filter($this->parseTagBlock($tags, $context), function ($tag) {
+            $this->parseTagBlock($tags, $context),
-                return $tag instanceof Tag;
-            }),
             $context,
             $location,
             $templateMarker === '#@+',
@@ -95,7 +107,7 @@ final class DocBlockFactory implements DocBlockFactoryInterface
         );
     }
 
-    public function registerTagHandler($tagName, $handler): void
+    public function registerTagHandler(string $tagName, string $handler) : void
     {
         $this->tagFactory->registerTagHandler($tagName, $handler);
     }
@@ -107,7 +119,9 @@ final class DocBlockFactory implements DocBlockFactoryInterface
      */
     private function stripDocComment(string $comment) : string
     {
-        $comment = trim(preg_replace('#[ \t]*(?:\/\*\*|\*\/|\*)?[ \t]{0,1}(.*)?#u', '$1', $comment));
+        /** @var string $comment */
+        $comment = preg_replace('#[ \t]*(?:\/\*\*|\*\/|\*)?[ \t]{0,1}(.*)?#u', '$1', $comment);
+        $comment = trim($comment);
 
         // reg ex above is not able to remove */ from a single line docblock
         if (substr($comment, -2) === '*/') {
@@ -117,15 +131,17 @@ final class DocBlockFactory implements DocBlockFactoryInterface
         return str_replace(["\r\n", "\r"], "\n", $comment);
     }
 
+    // phpcs:disable SlevomatCodingStandard.Commenting.ForbiddenAnnotations.AnnotationForbidden
     /**
      * Splits the DocBlock into a template marker, summary, description and block of tags.
      *
      * @param string $comment Comment to split into the sub-parts.
      *
-     * @author Richard van Velzen (@_richardJ) Special thanks to Richard for the regex responsible for the split.
+     * @return string[] containing the template marker (if any), summary, description and a string containing the tags.
+     *
      * @author Mike van Riel <[email protected]> for extending the regex with template marker support.
      *
-     * @return string[] containing the template marker (if any), summary, description and a string containing the tags.
+     * @author Richard van Velzen (@_richardJ) Special thanks to Richard for the regex responsible for the split.
      */
     private function splitDocBlock(string $comment) : array
     {
@@ -137,6 +153,7 @@ final class DocBlockFactory implements DocBlockFactoryInterface
         }
 
         // clears all extra horizontal whitespace from the line endings to prevent parsing issues
+        /** @var string $comment */
         $comment = preg_replace('/\h*$/Sum', '', $comment);
 
         /*
@@ -207,18 +224,24 @@ final class DocBlockFactory implements DocBlockFactoryInterface
      * @param string        $tags    Tag block to parse.
      * @param Types\Context $context Context of the parsed Tag
      *
-     * @return DocBlock\Tag[]|string[]|null[]
+     * @return DocBlock\Tag[]
      */
     private function parseTagBlock(string $tags, Types\Context $context) : array
     {
         $tags = $this->filterTagBlock($tags);
-        if (!$tags) {
+        if ($tags === null) {
             return [];
         }
 
-        $result = $this->splitTagBlockIntoTagLines($tags);
+        $result = [];
-        foreach ($result as $key => $tagLine) {
+        $lines  = $this->splitTagBlockIntoTagLines($tags);
-            $result[$key] = $this->tagFactory->create(trim($tagLine), $context);
+        foreach ($lines as $key => $tagLine) {
+            $tag = $this->tagFactory->create(trim($tagLine), $context);
+            if (!($tag instanceof Tag)) {
+                continue;
+            }
+
+            $result[$key] = $tag;
         }
 
         return $result;
@@ -241,18 +264,18 @@ final class DocBlockFactory implements DocBlockFactoryInterface
         return $result;
     }
 
-    private function filterTagBlock($tags): ?string
+    private function filterTagBlock(string $tags) : ?string
     {
         $tags = trim($tags);
         if (!$tags) {
             return null;
         }
 
-        if ('@' !== $tags[0]) {
+        if ($tags[0] !== '@') {
             // @codeCoverageIgnoreStart
             // Can't simulate this; this only happens if there is an error with the parsing of the DocBlock that
             // we didn't foresee.
-            throw new \LogicException('A tag block started with text instead of an at-sign(@): ' . $tags);
+            throw new LogicException('A tag block started with text instead of an at-sign(@): ' . $tags);
             // @codeCoverageIgnoreEnd
         }
 

src/DocBlockFactoryInterface.php

@@ -1,7 +1,10 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace phpDocumentor\Reflection;
 
+// phpcs:ignore SlevomatCodingStandard.Classes.SuperfluousInterfaceNaming.SuperfluousSuffix
 interface DocBlockFactoryInterface
 {
     /**

tests/integration/DocblocksWithAnnotationsTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  *  For the full copyright and license information, please view the LICENSE
  *  file that was distributed with this source code.
  *
- *  @copyright 2010-2018 Mike van Riel<[email protected]>
- *  @license   http://www.opensource.org/licenses/mit-license.php MIT
  *  @link      http://phpdoc.org
  */
 

tests/integration/InterpretingDocBlocksTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

tests/integration/ReconstitutingADocBlockTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

tests/integration/UsingTagsTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 

tests/unit/DocBlock/DescriptionFactoryTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,15 +8,13 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
 namespace phpDocumentor\Reflection\DocBlock;
 
 use Mockery as m;
-use phpDocumentor\Reflection\DocBlock\Tags\Link;
+use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
 use phpDocumentor\Reflection\Types\Context;
 use PHPUnit\Framework\TestCase;
 
@@ -33,12 +33,13 @@ class DescriptionFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses         phpDocumentor\Reflection\DocBlock\Description
      * @dataProvider provideSimpleExampleDescriptions
      */
-    public function testDescriptionCanParseASimpleString($contents): void
+    public function testDescriptionCanParseASimpleString(string $contents) : void
     {
         $tagFactory = m::mock(TagFactory::class);
         $tagFactory->shouldReceive('create')->never();
@@ -50,12 +51,13 @@ class DescriptionFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses         phpDocumentor\Reflection\DocBlock\Description
      * @dataProvider provideEscapeSequences
      */
-    public function testEscapeSequences($contents, $expected): void
+    public function testEscapeSequences(string $contents, string $expected) : void
     {
         $tagFactory = m::mock(TagFactory::class);
         $tagFactory->shouldReceive('create')->never();
@@ -67,13 +69,14 @@ class DescriptionFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Link
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     * @uses \phpDocumentor\Reflection\Types\Context
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\Link
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
-     * @uses   phpDocumentor\Reflection\Types\Context
      */
     public function testDescriptionCanParseAStringWithInlineTag() : void
     {
@@ -83,7 +86,7 @@ class DescriptionFactoryTest extends TestCase
         $tagFactory->shouldReceive('create')
             ->once()
             ->with('@link http://phpdoc.org/ description', $context)
-            ->andReturn(new Link('http://phpdoc.org/', new Description('description')));
+            ->andReturn(new LinkTag('http://phpdoc.org/', new Description('description')));
 
         $factory     = new DescriptionFactory($tagFactory);
         $description = $factory->create($contents, $context);
@@ -92,13 +95,14 @@ class DescriptionFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Link
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     * @uses \phpDocumentor\Reflection\Types\Context
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\Link
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
-     * @uses   phpDocumentor\Reflection\Types\Context
      */
     public function testDescriptionCanParseAStringStartingWithInlineTag() : void
     {
@@ -108,7 +112,7 @@ class DescriptionFactoryTest extends TestCase
         $tagFactory->shouldReceive('create')
             ->once()
             ->with('@link http://phpdoc.org/ This', $context)
-            ->andReturn(new Link('http://phpdoc.org/', new Description('This')));
+            ->andReturn(new LinkTag('http://phpdoc.org/', new Description('This')));
 
         $factory     = new DescriptionFactory($tagFactory);
         $description = $factory->create($contents, $context);
@@ -117,9 +121,10 @@ class DescriptionFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
      */
     public function testIfSuperfluousStartingSpacesAreRemoved() : void
     {
@@ -162,7 +167,7 @@ DESCRIPTION;
      *
      * @return string[][]
      */
-    public function provideSimpleExampleDescriptions()
+    public function provideSimpleExampleDescriptions() : array
     {
         return [
             ['This is text for a description.'],
@@ -172,7 +177,10 @@ DESCRIPTION;
         ];
     }
 
-    public function provideEscapeSequences()
+    /**
+     * @return string[][]
+     */
+    public function provideEscapeSequences() : array
     {
         return [
             ['This is text for a description with a {@}.', 'This is text for a description with a @.'],

tests/unit/DocBlock/DescriptionTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -32,11 +32,12 @@ class DescriptionTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::render
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     *
+     * @covers ::__construct
+     * @covers ::render
      */
     public function testDescriptionCanRenderUsingABodyWithPlaceholdersAndTags() : void
     {
@@ -56,12 +57,13 @@ class DescriptionTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::render
-     * @covers ::__toString
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     *
+     * @covers ::__construct
+     * @covers ::render
+     * @covers ::__toString
      */
     public function testDescriptionCanBeCastToString() : void
     {
@@ -75,9 +77,10 @@ class DescriptionTest extends TestCase
     }
 
     /**
-     * @covers ::getTags
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
+     * @covers ::getTags
      */
     public function testDescriptionTagsGetter() : void
     {
@@ -102,12 +105,13 @@ class DescriptionTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::render
-     * @covers ::__toString
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     *
+     * @covers ::__construct
+     * @covers ::render
+     * @covers ::__toString
      */
     public function testDescriptionMultipleTagsCanBeCastToString() : void
     {
@@ -122,7 +126,8 @@ class DescriptionTest extends TestCase
         ];
 
         $fixture  = new Description($body, $tags);
-        $expected = '@JoinTable(name="table", joinColumns={@JoinColumn (name="column_id", referencedColumnName="id")}, inverseJoinColumns={@JoinColumn (name="column_id_2", referencedColumnName="id")})';
+        $expected = '@JoinTable(name="table", joinColumns={@JoinColumn (name="column_id", referencedColumnName="id")}, '
+        . 'inverseJoinColumns={@JoinColumn (name="column_id_2", referencedColumnName="id")})';
         $this->assertSame($expected, (string) $fixture);
     }
 }

tests/unit/DocBlock/ExampleFinderTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace phpDocumentor\Reflection\DocBlock;
 
@@ -7,7 +9,7 @@ use phpDocumentor\Reflection\DocBlock\Tags\Example;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @coversDefaultClass phpDocumentor\Reflection\DocBlock\ExampleFinder
+ * @coversDefaultClass \phpDocumentor\Reflection\DocBlock\ExampleFinder
  * @covers ::<private>
  */
 class ExampleFinderTest extends TestCase
@@ -29,14 +31,15 @@ class ExampleFinderTest extends TestCase
     }
 
     /**
-     * @covers ::find
-     * @covers ::getSourceDirectory
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Example
      * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
+     * @covers ::find
+     * @covers ::getSourceDirectory
      */
     public function testFileNotFound() : void
     {
-        $example = new Example('./example.php', false, 1, 0, new Description('Test'));
+        $example = new Example('./example.php', false, 1, 0, 'Test');
         $this->assertSame('** File not found : ./example.php **', $this->fixture->find($example));
     }
 }

tests/unit/DocBlock/SerializerTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -32,13 +32,14 @@ class SerializerTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     * @uses \phpDocumentor\Reflection\DocBlock
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     *
      * @covers ::__construct
      * @covers ::getDocComment
-     * @uses phpDocumentor\Reflection\DocBlock\Description
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
-     * @uses phpDocumentor\Reflection\DocBlock
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testReconstructsADocCommentFromADocBlock() : void
     {
@@ -66,13 +67,14 @@ DOCCOMMENT;
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     * @uses \phpDocumentor\Reflection\DocBlock
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     *
      * @covers ::__construct
      * @covers ::getDocComment
-     * @uses phpDocumentor\Reflection\DocBlock\Description
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
-     * @uses phpDocumentor\Reflection\DocBlock
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testAddPrefixToDocBlock() : void
     {
@@ -100,13 +102,14 @@ DOCCOMMENT;
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     * @uses \phpDocumentor\Reflection\DocBlock
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     *
      * @covers ::__construct
      * @covers ::getDocComment
-     * @uses phpDocumentor\Reflection\DocBlock\Description
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
-     * @uses phpDocumentor\Reflection\DocBlock
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testAddPrefixToDocBlockExceptFirstLine() : void
     {
@@ -134,13 +137,14 @@ DOCCOMMENT;
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     * @uses \phpDocumentor\Reflection\DocBlock
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     *
      * @covers ::__construct
      * @covers ::getDocComment
-     * @uses phpDocumentor\Reflection\DocBlock\Description
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
-     * @uses phpDocumentor\Reflection\DocBlock
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
      */
     public function testWordwrapsAroundTheGivenAmountOfCharacters() : void
     {
@@ -177,7 +181,7 @@ DOCCOMMENT;
      * @covers ::__construct
      * @covers ::getDocComment
      */
-    public function testNoExtraSpacesAfterTagRemoval()
+    public function testNoExtraSpacesAfterTagRemoval() : void
     {
         $expected = <<<'DOCCOMMENT'
 /**

tests/unit/DocBlock/StandardTagFactoryTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -27,7 +27,7 @@ use phpDocumentor\Reflection\Types\Context;
 use PHPUnit\Framework\TestCase;
 
 /**
- * @coversDefaultClass phpDocumentor\Reflection\DocBlock\StandardTagFactory
+ * @coversDefaultClass \phpDocumentor\Reflection\DocBlock\StandardTagFactory
  * @covers ::<private>
  */
 class StandardTagFactoryTest extends TestCase
@@ -41,12 +41,13 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Generic
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
-     * @uses phpDocumentor\Reflection\DocBlock\Description
      */
     public function testCreatingAGenericTag() : void
     {
@@ -74,11 +75,12 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Author
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Author
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testCreatingASpecificTag() : void
     {
@@ -93,13 +95,14 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\See
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
+     *
+     * @covers ::__construct
+     * @covers ::create
      */
     public function testAnEmptyContextIsCreatedIfNoneIsProvided() : void
     {
@@ -123,11 +126,12 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Author
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Author
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testPassingYourOwnSetOfTagHandlers() : void
     {
@@ -142,22 +146,26 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     *
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      */
     public function testExceptionIsThrownIfProvidedTagIsNotWellformed() : void
     {
         $this->expectException('InvalidArgumentException');
-        $this->expectExceptionMessage('The tag "@user[myuser" does not seem to be wellformed, please check it for errors');
+        $this->expectExceptionMessage(
+            'The tag "@user[myuser" does not seem to be wellformed, please check it for errors'
+        );
         $tagFactory = new StandardTagFactory(m::mock(FqsenResolver::class));
         $tagFactory->create('@user[myuser');
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     *
      * @covers ::__construct
      * @covers ::addParameter
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      */
     public function testAddParameterToServiceLocator() : void
     {
@@ -173,8 +181,9 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     *
      * @covers ::addService
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      */
     public function testAddServiceToServiceLocator() : void
     {
@@ -192,8 +201,9 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     *
      * @covers ::addService
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
      */
     public function testInjectConcreteServiceForInterfaceToServiceLocator() : void
     {
@@ -212,11 +222,12 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::create
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Author
+     *
      * @covers ::registerTagHandler
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::create
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Author
      */
     public function testRegisteringAHandlerForANewTag() : void
     {
@@ -231,22 +242,25 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     *
      * @covers ::registerTagHandler
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      */
     public function testHandlerRegistrationFailsIfProvidedTagNameIsNamespaceButNotFullyQualified() : void
     {
         $this->expectException('InvalidArgumentException');
         $resolver   = m::mock(FqsenResolver::class);
         $tagFactory = new StandardTagFactory($resolver);
+        // phpcs:ignore SlevomatCodingStandard.Namespaces.ReferenceUsedNamesOnly.ReferenceViaFullyQualifiedName
         $tagFactory->registerTagHandler(\Name\Spaced\Tag::class, Author::class);
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     *
      * @covers ::registerTagHandler
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      */
     public function testHandlerRegistrationFailsIfProvidedHandlerIsEmpty() : void
     {
@@ -257,9 +271,10 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     *
      * @covers ::registerTagHandler
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      */
     public function testHandlerRegistrationFailsIfProvidedHandlerIsNotAnExistingClassName() : void
     {
@@ -270,9 +285,10 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     *
      * @covers ::registerTagHandler
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
      */
     public function testHandlerRegistrationFailsIfProvidedHandlerDoesNotImplementTheTagInterface() : void
     {
@@ -283,14 +299,15 @@ class StandardTagFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
+     * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
+     * @uses \phpDocumentor\Reflection\Docblock\Description
+     * @uses \phpDocumentor\Reflection\Docblock\Tags\Return_
+     * @uses \phpDocumentor\Reflection\Docblock\Tags\BaseTag
+     *
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::__construct
-     * @uses phpDocumentor\Reflection\DocBlock\StandardTagFactory::addService
-     * @uses phpDocumentor\Reflection\Docblock\Description
-     * @uses phpDocumentor\Reflection\Docblock\Tags\Return_
-     * @uses phpDocumentor\Reflection\Docblock\Tags\BaseTag
      */
-    public function testReturntagIsMappedCorrectly(): void
+    public function testReturnTagIsMappedCorrectly() : void
     {
         $context = new Context('');
 

tests/unit/DocBlock/Tags/AuthorTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -32,6 +32,7 @@ class AuthorTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Author::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -45,6 +46,7 @@ class AuthorTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Author::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Author::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -57,6 +59,7 @@ class AuthorTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Author::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -127,8 +130,9 @@ class AuthorTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Author::<public>
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -140,8 +144,9 @@ class AuthorTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Author::<public>
+     *
+     * @covers ::create
      */
     public function testFactoryMethodReturnsNullIfItCouldNotReadBody() : void
     {

tests/unit/DocBlock/Tags/CoversTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class CoversTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Covers::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class CoversTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Covers::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -65,6 +67,7 @@ class CoversTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Covers::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -91,9 +94,10 @@ class CoversTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -105,9 +109,10 @@ class CoversTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -117,13 +122,14 @@ class CoversTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Covers::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\FqsenResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {

tests/unit/DocBlock/Tags/DeprecatedTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -36,6 +36,7 @@ class DeprecatedTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -50,6 +51,7 @@ class DeprecatedTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -63,6 +65,7 @@ class DeprecatedTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -89,9 +92,10 @@ class DeprecatedTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -103,9 +107,10 @@ class DeprecatedTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -115,11 +120,12 @@ class DeprecatedTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -139,11 +145,12 @@ class DeprecatedTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethodCreatesEmptyDeprecatedTag() : void
     {
@@ -158,8 +165,9 @@ class DeprecatedTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Deprecated::__construct
+     *
+     * @covers ::create
      */
     public function testFactoryMethodReturnsNullIfBodyDoesNotMatchRegex() : void
     {

tests/unit/DocBlock/Tags/ExampleTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 namespace DocBlock\Tags;
 
@@ -20,10 +22,11 @@ class ExampleTest extends TestCase
     }
 
     /**
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::create
      * @covers ::__construct
      * @covers ::getContent
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testExampleWithoutContent() : void
     {
@@ -34,11 +37,12 @@ class ExampleTest extends TestCase
     }
 
     /**
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::create
      * @covers ::__construct
      * @covers ::getFilePath
      * @covers ::getDescription
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testWithDescription() : void
     {
@@ -48,11 +52,12 @@ class ExampleTest extends TestCase
     }
 
     /**
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::create
      * @covers ::__construct
      * @covers ::getFilePath
      * @covers ::getStartingLine
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testStartlineIsParsed() : void
     {
@@ -62,12 +67,13 @@ class ExampleTest extends TestCase
     }
 
     /**
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::create
      * @covers ::__construct
      * @covers ::getFilePath
      * @covers ::getStartingLine
      * @covers ::getDescription
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testAllowOmitingLineCount() : void
     {
@@ -78,12 +84,13 @@ class ExampleTest extends TestCase
     }
 
     /**
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::create
      * @covers ::__construct
      * @covers ::getFilePath
      * @covers ::getStartingLine
      * @covers ::getLineCount
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testLengthIsParsed() : void
     {
@@ -94,13 +101,14 @@ class ExampleTest extends TestCase
     }
 
     /**
+     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
+     *
      * @covers ::create
      * @covers ::__construct
      * @covers ::getFilePath
      * @covers ::getStartingLine
      * @covers ::getLineCount
      * @covers ::getDescription
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      */
     public function testFullExample() : void
     {

tests/unit/DocBlock/Tags/Formatter/AlignFormatterTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,9 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @author    Jan Schneider <[email protected]>
- * @copyright 2018 Mike van Riel<[email protected]>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -16,7 +15,7 @@ namespace phpDocumentor\Reflection\DocBlock\Tags\Formatter;
 
 use Mockery as m;
 use phpDocumentor\Reflection\DocBlock\Description;
-use phpDocumentor\Reflection\DocBlock\Tags\Link;
+use phpDocumentor\Reflection\DocBlock\Tags\Link as LinkTag;
 use phpDocumentor\Reflection\DocBlock\Tags\Param;
 use phpDocumentor\Reflection\DocBlock\Tags\Version;
 use phpDocumentor\Reflection\Types\String_;
@@ -36,21 +35,22 @@ class AlignFormatterTest extends TestCase
     }
 
     /**
-     * @covers ::format
-     * @covers \phpDocumentor\Reflection\DocBlock\Tags\Formatter\AlignFormatter::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Link
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Param
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Version
      * @uses   \phpDocumentor\Reflection\Types\String_
+     *
+     * @covers ::format
+     * @covers \phpDocumentor\Reflection\DocBlock\Tags\Formatter\AlignFormatter::__construct
      */
     public function testFormatterCallsToStringAndReturnsAStandardRepresentation() : void
     {
         $tags    = [
             new Param('foobar', new String_()),
             new Version('1.2.0'),
-            new Link('http://www.example.com', new Description('Examples')),
+            new LinkTag('http://www.example.com', new Description('Examples')),
         ];
         $fixture = new AlignFormatter($tags);
 

tests/unit/DocBlock/Tags/Formatter/PassthroughFormatterTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link http://phpdoc.org
  */
 
@@ -32,10 +32,11 @@ class PassthroughFormatterTest extends TestCase
     }
 
     /**
-     * @covers ::format
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     *
+     * @covers ::format
      */
     public function testFormatterCallsToStringAndReturnsAStandardRepresentation() : void
     {
@@ -50,10 +51,11 @@ class PassthroughFormatterTest extends TestCase
     }
 
     /**
-     * @covers ::format
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\BaseTag
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic
+     *
+     * @covers ::format
      */
     public function testFormatterToStringWitoutDescription() : void
     {

tests/unit/DocBlock/Tags/GenericTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @generic      http://phpdoc.org
  */
 
@@ -36,6 +36,7 @@ class GenericTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Generic::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -51,6 +52,7 @@ class GenericTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingDefaultFormatter() : void
@@ -63,6 +65,7 @@ class GenericTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Generic::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -76,9 +79,10 @@ class GenericTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -90,10 +94,11 @@ class GenericTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -103,11 +108,12 @@ class GenericTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Generic::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {

tests/unit/DocBlock/Tags/LinkTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -36,6 +36,7 @@ class LinkTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Link::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -50,6 +51,7 @@ class LinkTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Link::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -63,6 +65,7 @@ class LinkTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Link::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -89,9 +92,10 @@ class LinkTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -103,9 +107,10 @@ class LinkTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -115,11 +120,12 @@ class LinkTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Link::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -139,11 +145,12 @@ class LinkTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Link::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethodCreatesEmptyLinkTag() : void
     {

tests/unit/DocBlock/Tags/MethodTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -44,6 +44,7 @@ class MethodTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -59,6 +60,7 @@ class MethodTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -68,7 +70,14 @@ class MethodTest extends TestCase
             ['name' => 'argument1', 'type' => new String_()],
             ['name' => 'argument2', 'type' => new Object_()],
         ];
-        $fixture = new Method('myMethod', $arguments, new Void_(), true, new Description('My Description'));
+
+        $fixture = new Method(
+            'myMethod',
+            $arguments,
+            new Void_(),
+            true,
+            new Description('My Description')
+        );
 
         $this->assertSame(
             '@method static void myMethod(string $argument1, object $argument2) My Description',
@@ -79,6 +88,7 @@ class MethodTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -152,10 +162,11 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::getArguments
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
+     * @covers ::create
      */
     public function testRestArgumentIsParsedAsRegularArg() : void
     {
@@ -221,9 +232,10 @@ class MethodTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -235,10 +247,11 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Method::isStatic
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -255,13 +268,14 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -292,11 +306,12 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testReturnTypeThis() : void
     {
@@ -321,7 +336,10 @@ class MethodTest extends TestCase
         $this->assertInstanceOf(This::class, $fixture->getReturnType());
     }
 
-    public function collectionReturnTypesProvider()
+    /**
+     * @return string[][]
+     */
+    public function collectionReturnTypesProvider() : array
     {
         return [
             ['int[]', Array_::class, Integer::class, Compound::class],
@@ -332,16 +350,17 @@ class MethodTest extends TestCase
     }
 
     /**
+     * @uses         \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
+     * @uses         \phpDocumentor\Reflection\DocBlock\Description
+     * @uses         \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses         \phpDocumentor\Reflection\TypeResolver
+     * @uses         \phpDocumentor\Reflection\Types\Array_
+     * @uses         \phpDocumentor\Reflection\Types\Compound
+     * @uses         \phpDocumentor\Reflection\Types\Integer
+     * @uses         \phpDocumentor\Reflection\Types\Object_
+     *
      * @dataProvider collectionReturnTypesProvider
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
-     * @uses phpDocumentor\Reflection\DocBlock\Description
-     * @uses phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @uses phpDocumentor\Reflection\TypeResolver
-     * @uses phpDocumentor\Reflection\Types\Array_
-     * @uses phpDocumentor\Reflection\Types\Compound
-     * @uses phpDocumentor\Reflection\Types\Integer
-     * @uses phpDocumentor\Reflection\Types\Object_
      */
     public function testCollectionReturnTypes(
         string $returnType,
@@ -357,11 +376,13 @@ class MethodTest extends TestCase
         $returnType = $fixture->getReturnType();
         $this->assertInstanceOf($expectedType, $returnType);
 
-        if ($returnType instanceof Array_) {
+        if (!($returnType instanceof Array_)) {
+            return;
+        }
+
         $this->assertInstanceOf($expectedValueType, $returnType->getValueType());
         $this->assertInstanceOf($expectedKeyType, $returnType->getKeyType());
     }
-    }
 
     /**
      * @covers ::create
@@ -399,15 +420,6 @@ class MethodTest extends TestCase
         Method::create('body', new TypeResolver());
     }
 
-    /**
-     * @covers ::__construct
-     */
-    public function testCreationFailsIfBodyIsNotString(): void
-    {
-        $this->expectException('InvalidArgumentException');
-        new Method([]);
-    }
-
     /**
      * @covers ::__construct
      */
@@ -417,15 +429,6 @@ class MethodTest extends TestCase
         new Method('');
     }
 
-    /**
-     * @covers ::__construct
-     */
-    public function testCreationFailsIfStaticIsNotBoolean(): void
-    {
-        $this->expectException('InvalidArgumentException');
-        new Method('body', [], null, []);
-    }
-
     /**
      * @covers ::__construct
      */
@@ -436,13 +439,14 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testCreateMethodParenthesisMissing() : void
     {
@@ -469,7 +473,6 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\TypeResolver
@@ -477,6 +480,8 @@ class MethodTest extends TestCase
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\Types\Context
      * @uses \phpDocumentor\Reflection\Types\Void_
+     *
+     * @covers ::create
      */
     public function testCreateWithoutReturnType() : void
     {
@@ -503,7 +508,6 @@ class MethodTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Method::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\TypeResolver
@@ -514,6 +518,8 @@ class MethodTest extends TestCase
      * @uses \phpDocumentor\Reflection\Types\Compound
      * @uses \phpDocumentor\Reflection\Types\Integer
      * @uses \phpDocumentor\Reflection\Types\Object_
+     *
+     * @covers ::create
      */
     public function testCreateWithMixedReturnTypes() : void
     {

tests/unit/DocBlock/Tags/ParamTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class ParamTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Param::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -53,6 +54,7 @@ class ParamTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Param::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -73,6 +75,7 @@ class ParamTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Param::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -125,9 +128,10 @@ class ParamTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -139,11 +143,12 @@ class ParamTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     * @uses   \phpDocumentor\Reflection\Types\String_
+     *
      * @covers ::__construct
      * @covers ::isVariadic
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
-     * @uses   \phpDocumentor\Reflection\Types\String_
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -153,11 +158,12 @@ class ParamTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Param::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -178,10 +184,11 @@ class ParamTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Param::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
@@ -200,8 +207,9 @@ class ParamTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {

tests/unit/DocBlock/Tags/PropertyReadTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class PropertyReadTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class PropertyReadTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -69,6 +71,7 @@ class PropertyReadTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -108,9 +111,10 @@ class PropertyReadTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -122,10 +126,11 @@ class PropertyReadTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\Types\String_
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -135,11 +140,12 @@ class PropertyReadTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -164,10 +170,11 @@ class PropertyReadTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\PropertyRead::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
@@ -186,8 +193,9 @@ class PropertyReadTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {

tests/unit/DocBlock/Tags/PropertyTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class PropertyTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Property::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class PropertyTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Property::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -69,6 +71,7 @@ class PropertyTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Property::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -108,9 +111,10 @@ class PropertyTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -122,10 +126,11 @@ class PropertyTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\Types\String_
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -135,11 +140,12 @@ class PropertyTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Property::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -159,10 +165,11 @@ class PropertyTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Property::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
@@ -181,8 +188,9 @@ class PropertyTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {

tests/unit/DocBlock/Tags/PropertyWriteTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class PropertyWriteTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class PropertyWriteTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -69,6 +71,7 @@ class PropertyWriteTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -108,9 +111,10 @@ class PropertyWriteTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -122,10 +126,11 @@ class PropertyWriteTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\Types\String_
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -135,11 +140,12 @@ class PropertyWriteTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -164,10 +170,11 @@ class PropertyWriteTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\PropertyWrite::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
@@ -186,8 +193,9 @@ class PropertyWriteTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {

tests/unit/DocBlock/Tags/ReturnTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class ReturnTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Return_::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class ReturnTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Return_::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -65,6 +67,7 @@ class ReturnTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Return_::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -91,9 +94,10 @@ class ReturnTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -105,9 +109,10 @@ class ReturnTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -117,13 +122,14 @@ class ReturnTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Return_::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\String_
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {

tests/unit/DocBlock/Tags/SeeTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -42,6 +42,7 @@ class SeeTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
      * @uses   \phpDocumentor\Reflection\Fqsen
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -57,6 +58,7 @@ class SeeTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -72,6 +74,7 @@ class SeeTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
      * @uses   \phpDocumentor\Reflection\Fqsen
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -87,6 +90,7 @@ class SeeTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
      * @uses   \phpDocumentor\Reflection\Fqsen
+     *
      * @covers ::__construct
      * @covers ::getReference
      */
@@ -100,11 +104,12 @@ class SeeTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
      * @uses   \phpDocumentor\Reflection\Fqsen
+     *
+     * @covers ::__construct
+     * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
      */
     public function testHasDescription() : void
     {
@@ -116,11 +121,12 @@ class SeeTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
      * @uses   \phpDocumentor\Reflection\Fqsen
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -130,7 +136,6 @@ class SeeTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\See::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\FqsenResolver
@@ -138,6 +143,8 @@ class SeeTest extends TestCase
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Reference\Fqsen
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -161,13 +168,14 @@ class SeeTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\See::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\FqsenResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Reference\Url
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethodWithUrl() : void
     {

tests/unit/DocBlock/Tags/SinceTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -36,6 +36,7 @@ class SinceTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Since::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -50,6 +51,7 @@ class SinceTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Since::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -63,6 +65,7 @@ class SinceTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Since::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -89,9 +92,10 @@ class SinceTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -103,9 +107,10 @@ class SinceTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -115,11 +120,12 @@ class SinceTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Since::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -139,11 +145,12 @@ class SinceTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Since::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethodCreatesEmptySinceTag() : void
     {

tests/unit/DocBlock/Tags/SourceTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -36,6 +36,7 @@ class SourceTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Source::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -50,6 +51,7 @@ class SourceTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Source::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -67,6 +69,7 @@ class SourceTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Source::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -106,9 +109,10 @@ class SourceTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -120,10 +124,11 @@ class SourceTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\Types\String_
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -133,11 +138,12 @@ class SourceTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Source::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -156,10 +162,11 @@ class SourceTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Source::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
@@ -169,8 +176,9 @@ class SourceTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {

tests/unit/DocBlock/Tags/ThrowsTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class ThrowsTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Throws::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class ThrowsTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Throws::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -65,6 +67,7 @@ class ThrowsTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Throws::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -91,9 +94,10 @@ class ThrowsTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -105,9 +109,10 @@ class ThrowsTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -117,13 +122,14 @@ class ThrowsTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Throws::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\String_
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {

tests/unit/DocBlock/Tags/UsesTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class UsesTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Uses::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -52,6 +53,7 @@ class UsesTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Uses::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -65,6 +67,7 @@ class UsesTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Uses::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -91,9 +94,10 @@ class UsesTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -105,9 +109,10 @@ class UsesTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -117,13 +122,14 @@ class UsesTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Uses::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\FqsenResolver
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Fqsen
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {

tests/unit/DocBlock/Tags/VarTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -38,6 +38,7 @@ class VarTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Var_::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -49,6 +50,7 @@ class VarTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Var_::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfVariableNameIsOmmitedIfEmpty() : void
@@ -63,6 +65,7 @@ class VarTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Var_::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -80,6 +83,7 @@ class VarTest extends TestCase
 
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Var_::__construct
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -119,9 +123,10 @@ class VarTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -133,10 +138,11 @@ class VarTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
      * @uses   \phpDocumentor\Reflection\Types\String_
+     *
+     * @covers ::__construct
+     * @covers ::__toString
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -146,11 +152,12 @@ class VarTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Var_::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -170,10 +177,11 @@ class VarTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Var_::<public>
      * @uses \phpDocumentor\Reflection\TypeResolver
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfEmptyBodyIsGiven() : void
     {
@@ -192,8 +200,9 @@ class VarTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\TypeResolver
+     *
+     * @covers ::create
      */
     public function testFactoryMethodFailsIfDescriptionFactoryIsNull() : void
     {

tests/unit/DocBlock/Tags/VersionTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -36,6 +36,7 @@ class VersionTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Version::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
     public function testIfCorrectTagNameIsReturned() : void
@@ -50,6 +51,7 @@ class VersionTest extends TestCase
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Version::__toString
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Formatter\PassthroughFormatter
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getName
      */
@@ -63,6 +65,7 @@ class VersionTest extends TestCase
     /**
      * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Version::__construct
      * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::render
      */
     public function testIfTagCanBeRenderedUsingSpecificFormatter() : void
@@ -89,9 +92,10 @@ class VersionTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers \phpDocumentor\Reflection\DocBlock\Tags\BaseTag::getDescription
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testHasDescription() : void
     {
@@ -103,9 +107,10 @@ class VersionTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::__toString
-     * @uses   \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testStringRepresentationIsReturned() : void
     {
@@ -115,11 +120,12 @@ class VersionTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Version::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethod() : void
     {
@@ -139,11 +145,12 @@ class VersionTest extends TestCase
     }
 
     /**
-     * @covers ::create
      * @uses \phpDocumentor\Reflection\DocBlock\Tags\Version::<public>
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::create
      */
     public function testFactoryMethodCreatesEmptyVersionTag() : void
     {

tests/unit/DocBlockFactoryTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -21,12 +21,14 @@ use phpDocumentor\Reflection\DocBlock\TagFactory;
 use phpDocumentor\Reflection\DocBlock\Tags\Param;
 use phpDocumentor\Reflection\Types\Context;
 use PHPUnit\Framework\TestCase;
+use ReflectionClass;
 
 /**
- * @coversDefaultClass phpDocumentor\Reflection\DocBlockFactory
- * @covers             ::<private>
  * @uses               \Webmozart\Assert\Assert
- * @uses               phpDocumentor\Reflection\DocBlock
+ * @uses               \phpDocumentor\Reflection\DocBlock
+ *
+ * @coversDefaultClass \phpDocumentor\Reflection\DocBlockFactory
+ * @covers             ::<private>
  */
 class DocBlockFactoryTest extends TestCase
 {
@@ -39,10 +41,11 @@ class DocBlockFactoryTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::createInstance
      * @uses \phpDocumentor\Reflection\DocBlock\StandardTagFactory
      * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
+     * @covers ::__construct
+     * @covers ::createInstance
      */
     public function testCreateFactoryUsingFactoryMethod() : void
     {
@@ -52,16 +55,17 @@ class DocBlockFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
      */
     public function testCreateDocBlockFromReflection() : void
     {
         $fixture = new DocBlockFactory(m::mock(DescriptionFactory::class), m::mock(TagFactory::class));
 
         $docBlock       = '/** This is a DocBlock */';
-        $classReflector = m::mock(\ReflectionClass::class);
+        $classReflector = m::mock(ReflectionClass::class);
         $classReflector->shouldReceive('getDocComment')->andReturn($docBlock);
         $docblock = $fixture->create($classReflector);
 
@@ -74,9 +78,10 @@ class DocBlockFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
      */
     public function testCreateDocBlockFromStringWithDocComment() : void
     {
@@ -93,9 +98,10 @@ class DocBlockFactoryTest extends TestCase
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::create
      * @covers ::__construct
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
      */
     public function testCreateDocBlockFromStringWithoutDocComment() : void
     {
@@ -112,13 +118,15 @@ class DocBlockFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses         phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     *
-     * @uses         phpDocumentor\Reflection\DocBlock\Description
      * @dataProvider provideSummaryAndDescriptions
      */
-    public function testSummaryAndDescriptionAreSeparated($given, $summary, $description): void
+    public function testSummaryAndDescriptionAreSeparated(string $given, string $summary, string $description) : void
     {
         $tagFactory = m::mock(TagFactory::class);
         $fixture    = new DocBlockFactory(new DescriptionFactory($tagFactory), $tagFactory);
@@ -130,10 +138,11 @@ class DocBlockFactoryTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @uses phpDocumentor\Reflection\DocBlock\Description
      */
     public function testDescriptionsRetainFormatting() : void
     {
@@ -163,10 +172,11 @@ DESCRIPTION;
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     * @uses phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @uses phpDocumentor\Reflection\DocBlock\Description
      */
     public function testTagsAreInterpretedUsingFactory() : void
     {
@@ -195,7 +205,10 @@ DOCBLOCK;
         $this->assertEquals([$tag], $docblock->getTags());
     }
 
-    public function provideSummaryAndDescriptions()
+    /**
+     * @return string[]
+     */
+    public function provideSummaryAndDescriptions() : array
     {
         return [
             ['This is a DocBlock', 'This is a DocBlock', ''],
@@ -247,13 +260,13 @@ DOCBLOCK
     }
 
     /**
+     * @uses   \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses   \phpDocumentor\Reflection\DocBlock\Description
+     * @uses   \phpDocumentor\Reflection\Types\Context
+     * @uses   \phpDocumentor\Reflection\DocBlock\Tags\Param
+     *
      * @covers ::__construct
      * @covers ::create
-     *
-     * @uses   phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @uses   phpDocumentor\Reflection\DocBlock\Description
-     * @uses   phpDocumentor\Reflection\Types\Context
-     * @uses   phpDocumentor\Reflection\DocBlock\Tags\Param
      */
     public function testTagsWithContextNamespace() : void
     {
@@ -268,11 +281,11 @@ DOCBLOCK
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\DescriptionFactory
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::create
-     *
-     * @uses phpDocumentor\Reflection\DocBlock\DescriptionFactory
-     * @uses phpDocumentor\Reflection\DocBlock\Description
      */
     public function testTagsAreFilteredForNullValues() : void
     {

tests/unit/DocBlockTest.php

@@ -1,4 +1,6 @@
-<?php declare(strict_types=1);
+<?php
+
+declare(strict_types=1);
 
 /**
  * This file is part of phpDocumentor.
@@ -6,8 +8,6 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @copyright 2010-2018 Mike van Riel<mike@phpdoc.org>
- * @license   http://www.opensource.org/licenses/mit-license.php MIT
  * @link      http://phpdoc.org
  */
 
@@ -19,9 +19,10 @@ use phpDocumentor\Reflection\Types\Context;
 use PHPUnit\Framework\TestCase;
 
 /**
+ * @uses \Webmozart\Assert\Assert
+ *
  * @coversDefaultClass phpDocumentor\Reflection\DocBlock
  * @covers ::<private>
- * @uses \Webmozart\Assert\Assert
  */
 class DocBlockTest extends TestCase
 {
@@ -34,10 +35,10 @@ class DocBlockTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::getSummary
-     *
-     * @uses \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testDocBlockCanHaveASummary() : void
     {
@@ -49,10 +50,10 @@ class DocBlockTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::getSummary
-     *
-     * @uses \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testDocBlockCanHaveEllipsisInSummary() : void
     {
@@ -64,10 +65,10 @@ class DocBlockTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::getDescription
-     *
-     * @uses \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testDocBlockCanHaveADescription() : void
     {
@@ -79,11 +80,11 @@ class DocBlockTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::getTags
-     *
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tag
+     *
+     * @covers ::__construct
+     * @covers ::getTags
      */
     public function testDocBlockCanHaveTags() : void
     {
@@ -97,27 +98,26 @@ class DocBlockTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::getTags
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tag
+     *
+     * @covers ::__construct
+     * @covers ::getTags
      */
     public function testDocBlockAllowsOnlyTags() : void
     {
         $this->expectException('InvalidArgumentException');
-        $tags = [
+        $tags    = [null];
-            null,
-        ];
         $fixture = new DocBlock('', null, $tags);
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::getTagsByName
-     *
      * @uses \phpDocumentor\Reflection\DocBlock::getTags
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tag
+     *
+     * @covers ::__construct
+     * @covers ::getTagsByName
      */
     public function testFindTagsInDocBlockByName() : void
     {
@@ -137,12 +137,12 @@ class DocBlockTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::hasTag
-     *
      * @uses \phpDocumentor\Reflection\DocBlock::getTags
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\DocBlock\Tag
+     *
+     * @covers ::__construct
+     * @covers ::hasTag
      */
     public function testCheckIfThereAreTagsWithAGivenName() : void
     {
@@ -162,11 +162,11 @@ class DocBlockTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::getContext
-     *
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Types\Context
+     *
+     * @covers ::__construct
+     * @covers ::getContext
      */
     public function testDocBlockKnowsInWhichNamespaceItIsAndWhichAliasesThereAre() : void
     {
@@ -178,11 +178,11 @@ class DocBlockTest extends TestCase
     }
 
     /**
-     * @covers ::__construct
-     * @covers ::getLocation
-     *
      * @uses \phpDocumentor\Reflection\DocBlock\Description
      * @uses \phpDocumentor\Reflection\Location
+     *
+     * @covers ::__construct
+     * @covers ::getLocation
      */
     public function testDocBlockKnowsAtWhichLineItIs() : void
     {
@@ -194,10 +194,10 @@ class DocBlockTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::isTemplateStart
-     *
-     * @uses \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testDocBlockKnowsIfItIsTheStartOfADocBlockTemplate() : void
     {
@@ -207,10 +207,10 @@ class DocBlockTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Description
+     *
      * @covers ::__construct
      * @covers ::isTemplateEnd
-     *
-     * @uses \phpDocumentor\Reflection\DocBlock\Description
      */
     public function testDocBlockKnowsIfItIsTheEndOfADocBlockTemplate() : void
     {
@@ -220,10 +220,10 @@ class DocBlockTest extends TestCase
     }
 
     /**
+     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Deprecated
+     *
      * @covers ::__construct
      * @covers ::removeTag
-     *
-     * @uses \phpDocumentor\Reflection\DocBlock\Tags\Deprecated
      */
     public function testRemoveTag() : void
     {