diff -Nru phpdox-0.11.2/build.xml phpdox-0.12.0/build.xml
--- phpdox-0.11.2/build.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/build.xml	2019-03-13 09:34:17.000000000 +0000
@@ -132,7 +132,7 @@
 
 
     <target name="release" description="Make a release based on latest tag">
-    
+
         <exec executable="bash" outputproperty="version">
             <arg value="-c"/>
             <arg value="${basedir}/build/phar/phpdox*.phar --version | awk 'BEGIN { ORS = &quot;&quot;; } {print $2}'"/>
@@ -150,6 +150,22 @@
 
     </target>
 
+    <target name="getphive" description="Get phive on travis-ci">
+        <exec executable="wget" taskname="wget">
+            <arg value="https://phar.io/releases/phive.phar"/>
+        </exec>
+        <exec executable="wget" taskname="wget">
+            <arg value="https://phar.io/releases/phive.phar.asc"/>
+        </exec>
+        <exec executable="gpg" taskname="gpg-get-key">
+            <arg line="--keyserver hkps.pool.sks-keyservers.net --recv-keys 0x9D8A98B29B2D5D79" />
+        </exec>
+        <exec executable="gpg" taskname="gpg-verify">
+            <arg line="--verify phive.phar.asc phive.phar" />
+        </exec>
+        <chmod file="phive.phar" perm="+x" />
+        <delete file="phive.phar.asc" />
+    </target>
 
     <target name="build" depends="clean,phpab,phpunit"/>
 </project>
diff -Nru phpdox-0.11.2/CHANGELOG.md phpdox-0.12.0/CHANGELOG.md
--- phpdox-0.11.2/CHANGELOG.md	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/CHANGELOG.md	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,22 @@
 # Changelog of phpDox
 
+## phpDox 0.12.0 (13 Mar 2019)
+
+Note: This release requires PHP 7.1+
+
+### Changed
+* Upgraded dependencies: Now using PHP-Parser ^4.2, PHP-Timer ^2.0
+* Changed all sources to follow PHP 7 syntax
+* Updated php core classes and interfaces data
+
+### Fixed
+* [#271](https://github.com/theseer/phpdox/issues/271): Fix TokenFile not Found Error on Windows
+
+### Merged
+* [#352](https://github.com/theseer/phpdox/pull/352): Fix bad exit status 255 generated by uncaught TypeError
+* [#335](https://github.com/theseer/phpdox/pull/335): Make this compatible with PHPUnit 7.2
+
+
 ## phpDox 0.11.2 (22 May 2018)
 
 Note: 0.11.x is the last series of releases that supports running under PHP 5.x 
@@ -23,7 +40,7 @@
 
 ### Merged
 * [#310](https://github.com/theseer/phpdox/pull/310): Make the build reproducible
-* [#319](https://github.com/theseer/phpdox/pull/319):Fixed: #315 count(): Parameter must be an array or an object that implements Countable
+* [#319](https://github.com/theseer/phpdox/pull/319): Fixed: #315 count(): Parameter must be an array or an object that implements Countable
 
 ### Fixed
 * [#320](https://github.com/theseer/phpdox/issues/320): Multiline annotation for class constants fails to add subsequent lines
diff -Nru phpdox-0.11.2/composer.json phpdox-0.12.0/composer.json
--- phpdox-0.11.2/composer.json	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/composer.json	2019-03-13 09:34:17.000000000 +0000
@@ -13,7 +13,7 @@
     "issues" : "https://github.com/theseer/phpdox/issues"
   },
   "require" : {
-    "php" : ">=5.5",
+    "php" : ">=7.1",
     "ext-tokenizer" : "*",
     "ext-dom" : "*",
     "ext-xsl" : "*",
@@ -23,8 +23,8 @@
     "theseer/fdomdocument": "^1.6",
     "theseer/directoryscanner" : "^1.3.0",
     "theseer/fxsl" : "^1.1",
-    "phpunit/php-timer" : "^1.0",
-    "nikic/php-parser" : "^3.1"
+    "phpunit/php-timer" : "^2.0",
+    "nikic/php-parser" : "^4.2"
   },
   "autoload": {
     "classmap": [
diff -Nru phpdox-0.11.2/composer.lock phpdox-0.12.0/composer.lock
--- phpdox-0.11.2/composer.lock	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/composer.lock	2019-03-13 09:34:17.000000000 +0000
@@ -1,31 +1,31 @@
 {
     "_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": "f9634ce6203e7fde86726f70226969bf",
+    "content-hash": "aea8a10f3958526173e493c4a923e322",
     "packages": [
         {
             "name": "nikic/php-parser",
-            "version": "v3.1.3",
+            "version": "v4.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "579f4ce846734a1cf55d6a531d00ca07a43e3cda"
+                "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/579f4ce846734a1cf55d6a531d00ca07a43e3cda",
-                "reference": "579f4ce846734a1cf55d6a531d00ca07a43e3cda",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/5221f49a608808c1e4d436df32884cbc1b821ac0",
+                "reference": "5221f49a608808c1e4d436df32884cbc1b821ac0",
                 "shasum": ""
             },
             "require": {
                 "ext-tokenizer": "*",
-                "php": ">=5.5"
+                "php": ">=7.0"
             },
             "require-dev": {
-                "phpunit/phpunit": "~4.0|~5.0"
+                "phpunit/phpunit": "^6.5 || ^7.0"
             },
             "bin": [
                 "bin/php-parse"
@@ -33,7 +33,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "3.0-dev"
+                    "dev-master": "4.2-dev"
                 }
             },
             "autoload": {
@@ -55,32 +55,32 @@
                 "parser",
                 "php"
             ],
-            "time": "2017-12-26T14:43:21+00:00"
+            "time": "2019-02-16T20:54:15+00:00"
         },
         {
             "name": "phpunit/php-timer",
-            "version": "1.0.9",
+            "version": "2.1.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f"
+                "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
-                "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b389aebe1b8b0578430bda0c7c95a829608e059",
+                "reference": "8b389aebe1b8b0578430bda0c7c95a829608e059",
                 "shasum": ""
             },
             "require": {
-                "php": "^5.3.3 || ^7.0"
+                "php": "^7.1"
             },
             "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0"
+                "phpunit/phpunit": "^7.0"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "1.0-dev"
+                    "dev-master": "2.1-dev"
                 }
             },
             "autoload": {
@@ -95,7 +95,7 @@
             "authors": [
                 {
                     "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
+                    "email": "sebastian@phpunit.de",
                     "role": "lead"
                 }
             ],
@@ -104,7 +104,7 @@
             "keywords": [
                 "timer"
             ],
-            "time": "2017-02-26T11:10:40+00:00"
+            "time": "2019-02-20T10:12:59+00:00"
         },
         {
             "name": "theseer/directoryscanner",
@@ -241,7 +241,7 @@
     "prefer-stable": true,
     "prefer-lowest": false,
     "platform": {
-        "php": ">=5.5",
+        "php": ">=7.1",
         "ext-tokenizer": "*",
         "ext-dom": "*",
         "ext-xsl": "*",
diff -Nru phpdox-0.11.2/debian/changelog phpdox-0.12.0/debian/changelog
--- phpdox-0.11.2/debian/changelog	2018-07-12 05:50:07.000000000 +0000
+++ phpdox-0.12.0/debian/changelog	2019-08-10 01:53:10.000000000 +0000
@@ -1,14 +1,34 @@
-phpdox (0.11.2-1build4) cosmic; urgency=medium
+phpdox (0.12.0-2) unstable; urgency=medium
 
-  * Rebuild against new phpunit7 bootstrapped stack.
+  * Upload to unstable in sync with php-parser
+  * Use secure URI in debian/watch.
+  * Update standards version, no changes needed.
+  * Set upstream metadata fields: Contact, Name.
+  * Compatibility with recent PHPUnit (8)
+  * Use fonts-liberation instead of embedded font
+
+ -- David Prévot <taffit@debian.org>  Fri, 09 Aug 2019 15:53:10 -1000
+
+phpdox (0.12.0-1) experimental; urgency=medium
+
+  Upload to experimental during the freeze
+
+  [ Arne Blankerts ]
+  * Bump copyright
+  * Bundle OFL Font "SourceSansPro", cleanup CSS
+  * Release 0.12.0
+
+  [ David Prévot ]
+  * More generic version handling
+  * Update copyright
+  * Drop get-orig-source target
+  * Use https in Format
+  * Use debhelper-compat 12
+  * Depend on recent php-parser
+  * Declare SOURCE_DATE_EPOCH as an integer
+  * Update Standards-Version to 4.3.0
 
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 12 Jul 2018 07:50:07 +0200
-
-phpdox (0.11.2-1build3) cosmic; urgency=medium
-
-  * Rebuild against new phpunit7 bootstrap.
-
- -- Gianfranco Costamagna <locutusofborg@debian.org>  Thu, 12 Jul 2018 00:01:37 +0200
+ -- David Prévot <taffit@debian.org>  Sun, 17 Mar 2019 15:59:01 -1000
 
 phpdox (0.11.2-1) unstable; urgency=medium
 
diff -Nru phpdox-0.11.2/debian/clean phpdox-0.12.0/debian/clean
--- phpdox-0.11.2/debian/clean	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/debian/clean	2019-08-10 01:53:10.000000000 +0000
@@ -0,0 +1 @@
+.phpunit.result.cache
diff -Nru phpdox-0.11.2/debian/compat phpdox-0.12.0/debian/compat
--- phpdox-0.11.2/debian/compat	2017-08-04 15:17:21.000000000 +0000
+++ phpdox-0.12.0/debian/compat	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-9
diff -Nru phpdox-0.11.2/debian/control phpdox-0.12.0/debian/control
--- phpdox-0.11.2/debian/control	2018-05-10 00:44:20.000000000 +0000
+++ phpdox-0.12.0/debian/control	2019-08-10 01:53:10.000000000 +0000
@@ -5,28 +5,28 @@
 Uploaders: David Prévot <taffit@debian.org>,
            Prach Pongpanich <prachpub@gmail.com>
 Build-Depends: ant,
-               debhelper (>= 9),
+               debhelper-compat (= 12),
                help2man,
                php-codesniffer,
                php-directory-scanner,
                php-fdomdocument,
                php-fxsl,
                php-mbstring,
-               php-parser,
+               php-parser (>= 4),
                php-timer (>= 2),
                phpcpd,
                phploc,
                phpmd,
                phpunit,
                pkg-php-tools (>= 1.29~)
-Standards-Version: 4.1.4
+Standards-Version: 4.4.0
 Homepage: http://phpdox.de/
 Vcs-Browser: https://salsa.debian.org/php-team/pear/phpdox
 Vcs-Git: https://salsa.debian.org/php-team/pear/phpdox.git
 
 Package: phpdox
 Architecture: all
-Depends: ${misc:Depends}, ${phpcomposer:Debian-require}
+Depends: fonts-liberation, ${misc:Depends}, ${phpcomposer:Debian-require}
 Suggests: ${phpcomposer:Debian-suggest}
 Replaces: ${phpcomposer:Debian-replace}
 Breaks: ${phpcomposer:Debian-conflict}, ${phpcomposer:Debian-replace}
diff -Nru phpdox-0.11.2/debian/copyright phpdox-0.12.0/debian/copyright
--- phpdox-0.11.2/debian/copyright	2018-05-10 00:43:52.000000000 +0000
+++ phpdox-0.12.0/debian/copyright	2019-08-10 01:53:10.000000000 +0000
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: phpDox
 Upstream-Contact: Arne Blankerts <arne@blankerts.include>
 Source: https://github.com/theseer/phpdox
 
 Files: *
-Copyright: 2009-2018, Arne Blankerts <arne@blankerts.include>
+Copyright: 2009-2019, Arne Blankerts <arne@blankerts.include>
            Reiner Zufall <reiner@zufall.net>
 License: BSD-3-clause
 
@@ -12,6 +12,10 @@
 Copyright: 2008, fCMS Development Team
 License: fpl-1.1
 
+Files: templates/html/static/css/SourceSansPro-Regular.ttf
+Copyright: 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/)
+License: OFL-1.1
+
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -93,3 +97,95 @@
  the freepoint public license, please contact contact@fcms.de
  .
  Read more about this license at http://fcms.de/en/site/license/
+
+License: OFL-1.1
+ Copyright 2010, 2012 Adobe Systems Incorporated (http://www.adobe.com/),
+ with Reserved Font Name ‘Source’. All Rights Reserved. Source is
+ a trademark of Adobe Systems Incorporated in the United States and/or
+ other countries.
+ .
+ ––––––––––––––––––––––––––––––––––––––––––––––––––––
+ SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+ ––––––––––––––––––––––––––––––––––––––––––––––––––––
+ .
+ PREAMBLE
+ The goals of the Open Font License (OFL) are to stimulate worldwide
+ development of collaborative font projects, to support the font
+ creation efforts of academic and linguistic communities, and to provide
+ a free and open framework in which fonts may be shared and improved in
+ partnership with others.
+ .
+ The OFL allows the licensed fonts to be used, studied, modified and
+ redistributed freely as long as they are not sold by themselves. The
+ fonts, including any derivative works, can be bundled, embedded,
+ redistributed and/or sold with any software provided that any reserved
+ names are not used by derivative works. The fonts and derivatives,
+ however, cannot be released under any other type of license. The
+ requirement for fonts to remain under this license does not apply to
+ any document created using the fonts or their derivatives.
+ .
+ DEFINITIONS
+ “Font Software” refers to the set of files released by the Copyright
+ Holder(s) under this license and clearly marked as such. This may
+ include source files, build scripts and documentation.
+ .
+ “Reserved Font Name” refers to any names specified as such after the
+ copyright statement(s).
+ .
+ “Original Version” refers to the collection of Font Software components
+ as distributed by the Copyright Holder(s).
+ .
+ “Modified Version” refers to any derivative made by adding to,
+ deleting, or substituting—in part or in whole—any of the components of
+ the Original Version, by changing formats or by porting the Font
+ Software to a new environment.
+ .
+ “Author” refers to any designer, engineer, programmer, technical writer
+ or other person who contributed to the Font Software.
+ .
+ PERMISSION & CONDITIONS
+ Permission is hereby granted, free of charge, to any person obtaining a
+ copy of the Font Software, to use, study, copy, merge, embed, modify,
+ redistribute, and sell modified and unmodified copies of the Font
+ Software, subject to the following conditions:
+ .
+ 1) Neither the Font Software nor any of its individual components, in
+ Original or Modified Versions, may be sold by itself.
+ .
+ 2) Original or Modified Versions of the Font Software may be bundled,
+ redistributed and/or sold with any software, provided that each copy
+ contains the above copyright notice and this license. These can be
+ included either as stand-alone text files, human-readable headers or in
+ the appropriate machine-readable metadata fields within text or binary
+ files as long as those fields can be easily viewed by the user.
+ .
+ 3) No Modified Version of the Font Software may use the Reserved Font
+ Name(s) unless explicit written permission is granted by the
+ corresponding Copyright Holder. This restriction only applies to the
+ primary font name as presented to the users.
+ .
+ 4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+ Software shall not be used to promote, endorse or advertise any
+ Modified Version, except to acknowledge the contribution(s) of the
+ Copyright Holder(s) and the Author(s) or with their explicit written
+ permission.
+ .
+ 5) The Font Software, modified or unmodified, in part or in whole, must
+ be distributed entirely under this license, and must not be distributed
+ under any other license. The requirement for fonts to remain under this
+ license does not apply to any document created using the Font Software.
+ .
+ TERMINATION
+ This license becomes null and void if any of the above conditions are
+ not met.
+ .
+ DISCLAIMER
+ THE FONT SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+ OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+ COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+ OTHER DEALINGS IN THE FONT SOFTWARE.
diff -Nru phpdox-0.11.2/debian/links phpdox-0.12.0/debian/links
--- phpdox-0.11.2/debian/links	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/debian/links	2019-08-10 01:53:10.000000000 +0000
@@ -0,0 +1 @@
+usr/share/fonts/truetype/liberation/LiberationSans-Regular.ttf	usr/share/php/TheSeer/phpDox/templates/html/static/css/SourceSansPro-Regular.ttf
diff -Nru phpdox-0.11.2/debian/patches/0001-Load-dependencies-from-autoload.php.patch phpdox-0.12.0/debian/patches/0001-Load-dependencies-from-autoload.php.patch
--- phpdox-0.11.2/debian/patches/0001-Load-dependencies-from-autoload.php.patch	2018-05-10 00:43:54.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0001-Load-dependencies-from-autoload.php.patch	2019-08-10 01:53:10.000000000 +0000
@@ -8,7 +8,7 @@
  1 file changed, 7 insertions(+)
 
 diff --git a/src/autoload.php b/src/autoload.php
-index d559291..bd5fa82 100644
+index e547ffb..f88472b 100644
 --- a/src/autoload.php
 +++ b/src/autoload.php
 @@ -1,4 +1,11 @@
@@ -17,8 +17,8 @@
 +require_once 'TheSeer/fDOMDocument/autoload.php';
 +require_once 'TheSeer/DirectoryScanner/autoload.php';
 +require_once 'TheSeer/fXSL/autoload.php';
-+require_once 'PHP/Timer.php';
-+require_once 'PhpParser/bootstrap.php';
++require_once 'SebastianBergmann/Timer/autoload.php';
++require_once 'PhpParser/autoload.php';
 +
  // @codingStandardsIgnoreFile
  // @codeCoverageIgnoreStart
diff -Nru phpdox-0.11.2/debian/patches/0002-Adapt-to-actual-autoload.php.patch phpdox-0.12.0/debian/patches/0002-Adapt-to-actual-autoload.php.patch
--- phpdox-0.11.2/debian/patches/0002-Adapt-to-actual-autoload.php.patch	2018-05-10 00:43:54.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0002-Adapt-to-actual-autoload.php.patch	2019-08-10 01:53:10.000000000 +0000
@@ -8,7 +8,7 @@
  1 file changed, 2 insertions(+), 19 deletions(-)
 
 diff --git a/phpdox b/phpdox
-index 0e76af5..ba49b93 100755
+index 63a7b0c..b5694c6 100755
 --- a/phpdox
 +++ b/phpdox
 @@ -1,4 +1,4 @@
@@ -16,7 +16,7 @@
 +#!/usr/bin/php
  <?php
  /*
-  * Copyright (c) 2010-2017 Arne Blankerts <arne@blankerts.de>
+  * Copyright (c) 2010-2019 Arne Blankerts <arne@blankerts.de>
 @@ -40,24 +40,7 @@
   *
   */
diff -Nru phpdox-0.11.2/debian/patches/0003-Adpapt-to-actual-templates-path.patch phpdox-0.12.0/debian/patches/0003-Adpapt-to-actual-templates-path.patch
--- phpdox-0.11.2/debian/patches/0003-Adpapt-to-actual-templates-path.patch	2018-05-10 00:43:54.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0003-Adpapt-to-actual-templates-path.patch	2019-08-10 01:53:10.000000000 +0000
@@ -8,15 +8,15 @@
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/generator/engine/html/HtmlConfig.php b/src/generator/engine/html/HtmlConfig.php
-index 6c5cc7e..a368080 100644
+index efd0431..cb3cfce 100644
 --- a/src/generator/engine/html/HtmlConfig.php
 +++ b/src/generator/engine/html/HtmlConfig.php
-@@ -39,7 +39,7 @@ namespace TheSeer\phpDox\Generator\Engine {
-     class HtmlConfig extends \TheSeer\phpDox\BuildConfig {
+@@ -3,7 +3,7 @@ namespace TheSeer\phpDox\Generator\Engine;
+ 
+ class HtmlConfig extends \TheSeer\phpDox\BuildConfig {
+     public function getTemplateDirectory() {
+-        $default = $this->getGeneratorConfig()->getProjectConfig()->getHomeDirectory()->getPathname();
++        $default = '/usr/share/php/TheSeer/phpDox';
+         $default .= '/templates/html';
+         $node = $this->ctx->queryOne('cfg:template');
  
-         public function getTemplateDirectory() {
--            $default = $this->getGeneratorConfig()->getProjectConfig()->getHomeDirectory()->getPathname();
-+            $default = '/usr/share/php/TheSeer/phpDox';
-             $default .= '/templates/html';
-             $node = $this->ctx->queryOne('cfg:template');
-             if (!$node) {
diff -Nru phpdox-0.11.2/debian/patches/0004-Adapt-upstream-build-system-to-Debian-expectations.patch phpdox-0.12.0/debian/patches/0004-Adapt-upstream-build-system-to-Debian-expectations.patch
--- phpdox-0.11.2/debian/patches/0004-Adapt-upstream-build-system-to-Debian-expectations.patch	2018-05-10 00:43:54.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0004-Adapt-upstream-build-system-to-Debian-expectations.patch	2019-08-10 01:53:10.000000000 +0000
@@ -5,11 +5,11 @@
 Forwarded: not-needed
 ---
  build.xml           | 17 ++++++++++-------
- tests/bootstrap.php |  1 -
- 2 files changed, 10 insertions(+), 8 deletions(-)
+ tests/bootstrap.php |  2 --
+ 2 files changed, 10 insertions(+), 9 deletions(-)
 
 diff --git a/build.xml b/build.xml
-index 1b2097a..c666daf 100644
+index 9fa1aa4..cb7ffc1 100644
 --- a/build.xml
 +++ b/build.xml
 @@ -2,12 +2,15 @@
@@ -67,19 +67,20 @@
              <arg line="--count-tests --log-xml ${basedir}/build/logs/phploc.xml ${source} tests"/>
          </exec>
      </target>
-@@ -151,5 +154,5 @@
+@@ -167,5 +170,5 @@
+         <delete file="phive.phar.asc" />
      </target>
  
- 
 -    <target name="build" depends="clean,phpab,phpunit"/>
 +    <target name="test" depends="phpunit,phpmd,phpcpd,phploc,phpcs"/>
  </project>
 diff --git a/tests/bootstrap.php b/tests/bootstrap.php
-index d2587ef..6d8a24a 100644
+index a6e12e2..410e4b1 100644
 --- a/tests/bootstrap.php
 +++ b/tests/bootstrap.php
-@@ -37,4 +37,3 @@
-  */
+@@ -1,5 +1,3 @@
+ <?php declare(strict_types = 1);
  
  require __DIR__ . '/../src/autoload.php';
+-
 -require __DIR__ . '/../vendor/autoload.php';
diff -Nru phpdox-0.11.2/debian/patches/0005-Declare-SOURCE_DATE_EPOCH-as-an-integer.patch phpdox-0.12.0/debian/patches/0005-Declare-SOURCE_DATE_EPOCH-as-an-integer.patch
--- phpdox-0.11.2/debian/patches/0005-Declare-SOURCE_DATE_EPOCH-as-an-integer.patch	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0005-Declare-SOURCE_DATE_EPOCH-as-an-integer.patch	2019-08-10 01:53:10.000000000 +0000
@@ -0,0 +1,22 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Sun, 17 Mar 2019 17:13:47 -1000
+Subject: Declare SOURCE_DATE_EPOCH as an integer
+
+Forwarded: https://github.com/theseer/phpdox/pull/355
+---
+ src/shared/Version.php | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/shared/Version.php b/src/shared/Version.php
+index a5f0619..ca4deb1 100644
+--- a/src/shared/Version.php
++++ b/src/shared/Version.php
+@@ -29,7 +29,7 @@ class Version {
+     }
+ 
+     public function getInfoString() {
+-        return 'phpDox ' . $this->getVersion() . ' - Copyright (C) 2010 - ' . \date('Y', \getenv('SOURCE_DATE_EPOCH') ?: \time()) . ' by Arne Blankerts and Contributors';
++        return 'phpDox ' . $this->getVersion() . ' - Copyright (C) 2010 - ' . \date('Y', (int)\getenv('SOURCE_DATE_EPOCH') ?: \time()) . ' by Arne Blankerts and Contributors';
+     }
+ 
+     public function getGeneratedByString() {
diff -Nru phpdox-0.11.2/debian/patches/0005-Use-php-timer-2.patch phpdox-0.12.0/debian/patches/0005-Use-php-timer-2.patch
--- phpdox-0.11.2/debian/patches/0005-Use-php-timer-2.patch	2018-05-10 00:43:54.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0005-Use-php-timer-2.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
-From: =?utf-8?q?David_Pr=C3=A9vot?= <david@tilapin.org>
-Date: Thu, 8 Mar 2018 09:14:16 -1000
-Subject: Use php-timer (>= 2)
-
-Bug: https://github.com/theseer/phpdox/pull/326
----
- composer.json                      | 2 +-
- src/autoload.php                   | 2 +-
- src/logger/ShellProgressLogger.php | 4 +++-
- 3 files changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/composer.json b/composer.json
-index 512a198..a9f3973 100644
---- a/composer.json
-+++ b/composer.json
-@@ -23,7 +23,7 @@
-     "theseer/fdomdocument": "^1.6",
-     "theseer/directoryscanner" : "^1.3.0",
-     "theseer/fxsl" : "^1.1",
--    "phpunit/php-timer" : "^1.0",
-+    "phpunit/php-timer" : "^2.0",
-     "nikic/php-parser" : "^3.1"
-   },
-   "autoload": {
-diff --git a/src/autoload.php b/src/autoload.php
-index bd5fa82..4072c6a 100644
---- a/src/autoload.php
-+++ b/src/autoload.php
-@@ -3,7 +3,7 @@
- require_once 'TheSeer/fDOMDocument/autoload.php';
- require_once 'TheSeer/DirectoryScanner/autoload.php';
- require_once 'TheSeer/fXSL/autoload.php';
--require_once 'PHP/Timer.php';
-+require_once 'SebastianBergmann/Timer/autoload.php';
- require_once 'PhpParser/bootstrap.php';
- 
- // @codingStandardsIgnoreFile
-diff --git a/src/logger/ShellProgressLogger.php b/src/logger/ShellProgressLogger.php
-index 1100e04..c771896 100644
---- a/src/logger/ShellProgressLogger.php
-+++ b/src/logger/ShellProgressLogger.php
-@@ -37,6 +37,8 @@
-  */
- namespace TheSeer\phpDox {
- 
-+use SebastianBergmann\Timer\Timer;
-+
-     /**
-      * Shell output based logger
-      */
-@@ -128,7 +130,7 @@ namespace TheSeer\phpDox {
-          */
-         public function buildSummary() {
-             echo "\n\n";
--            echo \PHP_Timer::resourceUsage();
-+            echo Timer::resourceUsage();
-             echo "\n\n";
-         }
- 
diff -Nru phpdox-0.11.2/debian/patches/0006-Compatibility-with-recent-PHPUnit-8.patch phpdox-0.12.0/debian/patches/0006-Compatibility-with-recent-PHPUnit-8.patch
--- phpdox-0.11.2/debian/patches/0006-Compatibility-with-recent-PHPUnit-8.patch	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/debian/patches/0006-Compatibility-with-recent-PHPUnit-8.patch	2019-08-10 01:53:10.000000000 +0000
@@ -0,0 +1,35 @@
+From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
+Date: Fri, 9 Aug 2019 16:18:56 -1000
+Subject: Compatibility with recent PHPUnit (8)
+
+---
+ tests/Unit/DirectoryCleanerTest.php    | 2 +-
+ tests/Unit/config/GlobalConfigTest.php | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/Unit/DirectoryCleanerTest.php b/tests/Unit/DirectoryCleanerTest.php
+index 719ea47..1c96f60 100644
+--- a/tests/Unit/DirectoryCleanerTest.php
++++ b/tests/Unit/DirectoryCleanerTest.php
+@@ -13,7 +13,7 @@ class DirectoryCleanerTest extends \PHPUnit\Framework\TestCase {
+ 
+     /**
+      * @expectedException \TheSeer\phpDox\DirectoryCleanerException
+-     * @expectedExceptionCode \TheSeer\phpDox\DirectoryCleanerException::SecurityLimitation
++     * @expectedException \TheSeer\phpDox\DirectoryCleanerException::SecurityLimitation
+      */
+     public function testTryingToDeleteAShortPathThrowsException(): void {
+         $this->cleaner->process(new FileInfo('/tmp'));
+diff --git a/tests/Unit/config/GlobalConfigTest.php b/tests/Unit/config/GlobalConfigTest.php
+index 2103449..a7d640b 100644
+--- a/tests/Unit/config/GlobalConfigTest.php
++++ b/tests/Unit/config/GlobalConfigTest.php
+@@ -42,7 +42,7 @@ class GlobalConfigTest extends \PHPUnit\Framework\TestCase {
+ 
+     /**
+      * @expectedException \TheSeer\phpDox\ConfigException
+-     * @expectedExceptionCode \TheSeer\phpDox\ConfigException::InvalidDataStructure
++     * @expectedException \TheSeer\phpDox\ConfigException::InvalidDataStructure
+      */
+     public function testTryingToLoadInvalidConfigThrowsException(): void {
+         $this->init('broken');
diff -Nru phpdox-0.11.2/debian/patches/series phpdox-0.12.0/debian/patches/series
--- phpdox-0.11.2/debian/patches/series	2018-05-10 00:43:54.000000000 +0000
+++ phpdox-0.12.0/debian/patches/series	2019-08-10 01:53:10.000000000 +0000
@@ -2,4 +2,5 @@
 0002-Adapt-to-actual-autoload.php.patch
 0003-Adpapt-to-actual-templates-path.patch
 0004-Adapt-upstream-build-system-to-Debian-expectations.patch
-0005-Use-php-timer-2.patch
+0005-Declare-SOURCE_DATE_EPOCH-as-an-integer.patch
+0006-Compatibility-with-recent-PHPUnit-8.patch
diff -Nru phpdox-0.11.2/debian/rules phpdox-0.12.0/debian/rules
--- phpdox-0.11.2/debian/rules	2018-01-23 08:17:07.000000000 +0000
+++ phpdox-0.12.0/debian/rules	2019-08-10 01:46:40.000000000 +0000
@@ -17,6 +17,3 @@
 		../../bin/phpdox \
 		> $(CURDIR)/debian/tmp/phpdox.1
 	dh_installman
-
-get-orig-source:
-	uscan --rename --verbose --force
diff -Nru phpdox-0.11.2/debian/tests/control phpdox-0.12.0/debian/tests/control
--- phpdox-0.11.2/debian/tests/control	2017-08-04 15:17:21.000000000 +0000
+++ phpdox-0.12.0/debian/tests/control	2019-08-10 01:53:10.000000000 +0000
@@ -1,2 +1,2 @@
 Test-Command: phpunit --bootstrap /usr/share/php/TheSeer/phpDox/autoload.php
-Depends: @, phpunit
+Depends: phpunit, @
diff -Nru phpdox-0.11.2/debian/upstream/metadata phpdox-0.12.0/debian/upstream/metadata
--- phpdox-0.11.2/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/debian/upstream/metadata	2019-08-10 01:53:10.000000000 +0000
@@ -0,0 +1,2 @@
+Name: phpDox
+Contact: Arne Blankerts <arne@blankerts.include>
diff -Nru phpdox-0.11.2/debian/watch phpdox-0.12.0/debian/watch
--- phpdox-0.11.2/debian/watch	2017-08-04 15:17:21.000000000 +0000
+++ phpdox-0.12.0/debian/watch	2019-08-10 01:53:10.000000000 +0000
@@ -1,5 +1,5 @@
 version=3
 # The PEAR package just embeds a PHAR
-# http://pear.netpirates.net/ http://pear.netpirates.net/get/phpDox-([\d\.]+).tgz
-options=uversionmangle=s/A/~alpha/i;s/B/~beta/i;s/RC/~rc/i \
+# https://pear.netpirates.net/ https://pear.netpirates.net/get/phpDox-([\d\.]+).tgz
+options=uversionmangle=s/-?([^\d.]+)/~$1/;tr/A-Z/a-z/;s/dev/~dev/ \
 https://github.com/theseer/phpdox/releases .*/archive/(.*).tar.gz
diff -Nru phpdox-0.11.2/dependencies/php/classes/ArgumentCountError.xml phpdox-0.12.0/dependencies/php/classes/ArgumentCountError.xml
--- phpdox-0.11.2/dependencies/php/classes/ArgumentCountError.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ArgumentCountError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ArgumentCountError" namespace="" name="ArgumentCountError">
+  <extends name="TypeError" full="TypeError"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ArithmeticError.xml phpdox-0.12.0/dependencies/php/classes/ArithmeticError.xml
--- phpdox-0.11.2/dependencies/php/classes/ArithmeticError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ArithmeticError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="ArithmeticError" namespace="" name="ArithmeticError">
   <extends name="Error" full="Error"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ArrayIterator.xml phpdox-0.12.0/dependencies/php/classes/ArrayIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/ArrayIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ArrayIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="ArrayIterator" namespace="" name="ArrayIterator">
   <implements name="ArrayAccess" full="ArrayAccess"/>
+  <constant name="" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Append an element"/>
@@ -42,7 +52,7 @@
   </method>
   <method name="getFlags" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get flags"/>
+      <description compact="Get behavior flags"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -79,31 +89,31 @@
   <method name="offsetExists" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Check if offset exists"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get value for an offset"/>
       <return type="mixed"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetSet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set value for an offset"/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
-    <parameter name="newval" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="newval" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetUnset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Unset value for an offset"/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="rewind" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -133,17 +143,17 @@
   </method>
   <method name="uasort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="User defined sort"/>
+      <description compact="Sort with a user-defined comparison function and maintain index association">This method sorts the elements such that indices maintain their correlation with the values they are associated with, using a user-defined comparison function.</description>
       <return type="void"/>
     </docblock>
-    <parameter name="cmp_function" optional="false" byreference="false" type="string"/>
+    <parameter name="cmp_function" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="uksort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="User defined sort"/>
+      <description compact="Sort by keys using a user-defined comparison function">This method sorts the elements by keys using a user-supplied comparison function.</description>
       <return type="void"/>
     </docblock>
-    <parameter name="cmp_function" optional="false" byreference="false" type="string"/>
+    <parameter name="cmp_function" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="unserialize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ArrayObject.xml phpdox-0.12.0/dependencies/php/classes/ArrayObject.xml
--- phpdox-0.11.2/dependencies/php/classes/ArrayObject.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ArrayObject.xml	2019-03-13 09:34:17.000000000 +0000
@@ -41,20 +41,20 @@
   </method>
   <method name="exchangeArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Exchange the array for another one."/>
+      <description compact="Exchange the array for another one"/>
       <return type="array"/>
     </docblock>
     <parameter name="input" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="getArrayCopy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a copy of the ArrayObject."/>
+      <description compact="Creates a copy of the ArrayObject"/>
       <return type="array"/>
     </docblock>
   </method>
   <method name="getFlags" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the behavior flags."/>
+      <description compact="Gets the behavior flags"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -66,7 +66,7 @@
   </method>
   <method name="getIteratorClass" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the iterator classname for the ArrayObject."/>
+      <description compact="Gets the iterator classname for the ArrayObject"/>
       <return type="string"/>
     </docblock>
   </method>
@@ -125,14 +125,14 @@
   </method>
   <method name="setFlags" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the behavior flags."/>
+      <description compact="Sets the behavior flags"/>
       <return type="void"/>
     </docblock>
     <parameter name="flags" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setIteratorClass" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the iterator classname for the ArrayObject."/>
+      <description compact="Sets the iterator classname for the ArrayObject"/>
       <return type="void"/>
     </docblock>
     <parameter name="iterator_class" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/AssertionError.xml phpdox-0.12.0/dependencies/php/classes/AssertionError.xml
--- phpdox-0.11.2/dependencies/php/classes/AssertionError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/AssertionError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="AssertionError" namespace="" name="AssertionError">
   <extends name="Error" full="Error"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CachingIterator.xml phpdox-0.12.0/dependencies/php/classes/CachingIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/CachingIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CachingIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -33,7 +33,7 @@
   </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Construct a new CachingIterator object for the iterator."/>
+      <description compact="Construct a new CachingIterator object for the iterator"/>
       <return type="void"/>
     </docblock>
     <parameter name="iterator" optional="false" byreference="false" type="object" class="Iterator"/>
@@ -92,7 +92,7 @@
       <description compact="The offsetExists purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -106,8 +106,8 @@
       <description compact="The offsetSet purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
-    <parameter name="newval" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="newval" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetUnset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoContext.xml phpdox-0.12.0/dependencies/php/classes/CairoContext.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoContext.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoContext.xml	2019-03-13 09:34:17.000000000 +0000
@@ -274,48 +274,48 @@
       <description compact="The inFill purpose">Object oriented style (method):</description>
       <return type="bool"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="inStroke" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The inStroke purpose">Object oriented style (method):</description>
       <return type="bool"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="lineTo" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The lineTo purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="mask" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The mask purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="pattern" optional="false" byreference="false" type="string"/>
+    <parameter name="pattern" optional="false" byreference="false" type="object" class="CairoPattern"/>
   </method>
   <method name="maskSurface" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The maskSurface purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="surface" optional="false" byreference="false" type="string"/>
-    <parameter name="x" optional="true" byreference="false" type="string"/>
-    <parameter name="y" optional="true" byreference="false" type="string"/>
+    <parameter name="surface" optional="false" byreference="false" type="object" class="CairoSurface"/>
+    <parameter name="x" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="moveTo" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The moveTo purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="newPath" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -340,7 +340,7 @@
       <description compact="The paintWithAlpha purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="alpha" optional="false" byreference="false" type="string"/>
+    <parameter name="alpha" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="pathExtents" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -371,45 +371,45 @@
       <description compact="The pushGroupWithContent purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="content" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="false" byreference="false" type="int"/>
   </method>
   <method name="rectangle" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The rectangle purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="relCurveTo" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The relCurveTo purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x1" optional="false" byreference="false" type="string"/>
-    <parameter name="y1" optional="false" byreference="false" type="string"/>
-    <parameter name="x2" optional="false" byreference="false" type="string"/>
-    <parameter name="y2" optional="false" byreference="false" type="string"/>
-    <parameter name="x3" optional="false" byreference="false" type="string"/>
-    <parameter name="y3" optional="false" byreference="false" type="string"/>
+    <parameter name="x1" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y1" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="x2" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y2" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="x3" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y3" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="relLineTo" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The relLineTo purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="relMoveTo" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The relMoveTo purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="resetClip" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -428,7 +428,7 @@
       <description compact="The rotate purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="angle" optional="false" byreference="false" type="string"/>
+    <parameter name="angle" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="save" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -441,8 +441,8 @@
       <description compact="The scale purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="selectFontFace" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -450,30 +450,30 @@
       <return type="void"/>
     </docblock>
     <parameter name="family" optional="false" byreference="false" type="string"/>
-    <parameter name="slant" optional="true" byreference="false" type="string"/>
-    <parameter name="weight" optional="true" byreference="false" type="string"/>
+    <parameter name="slant" optional="true" byreference="false" type="int"/>
+    <parameter name="weight" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setAntialias" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setAntialias purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="antialias" optional="true" byreference="false" type="string"/>
+    <parameter name="antialias" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setDash" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setDash purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="dashes" optional="false" byreference="false" type="string"/>
-    <parameter name="offset" optional="true" byreference="false" type="string"/>
+    <parameter name="dashes" optional="false" byreference="false" type="object" class="array"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="setFillRule" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setFillRule purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="setting" optional="false" byreference="false" type="string"/>
+    <parameter name="setting" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setFontFace" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -487,112 +487,112 @@
       <description compact="The setFontMatrix purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="setFontOptions" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setFontOptions purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="fontoptions" optional="false" byreference="false" type="string"/>
+    <parameter name="fontoptions" optional="false" byreference="false" type="object" class="CairoFontOptions"/>
   </method>
   <method name="setFontSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setFontSize purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="size" optional="false" byreference="false" type="string"/>
+    <parameter name="size" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setLineCap" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setLineCap purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="setting" optional="false" byreference="false" type="string"/>
+    <parameter name="setting" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setLineJoin" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setLineJoin purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="setting" optional="false" byreference="false" type="string"/>
+    <parameter name="setting" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setLineWidth" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setLineWidth purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setMatrix" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setMatrix purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="setMiterLimit" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setMiterLimit purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="limit" optional="false" byreference="false" type="string"/>
+    <parameter name="limit" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setOperator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setOperator purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="setting" optional="false" byreference="false" type="string"/>
+    <parameter name="setting" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setScaledFont" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setScaledFont purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="scaledfont" optional="false" byreference="false" type="string"/>
+    <parameter name="scaledfont" optional="false" byreference="false" type="object" class="CairoScaledFont"/>
   </method>
   <method name="setSource" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setSource purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="pattern" optional="false" byreference="false" type="string"/>
+    <parameter name="pattern" optional="false" byreference="false" type="object" class="CairoPattern"/>
   </method>
   <method name="setSourceRGB" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setSourceRGB purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setSourceRGBA" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setSourceRGBA purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
-    <parameter name="alpha" optional="false" byreference="false" type="string"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="alpha" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setSourceSurface" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setSourceSurface purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="surface" optional="false" byreference="false" type="string"/>
-    <parameter name="x" optional="true" byreference="false" type="string"/>
-    <parameter name="y" optional="true" byreference="false" type="string"/>
+    <parameter name="surface" optional="false" byreference="false" type="object" class="CairoSurface"/>
+    <parameter name="x" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="setTolerance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setTolerance purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="tolerance" optional="false" byreference="false" type="string"/>
+    <parameter name="tolerance" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="showPage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -650,30 +650,30 @@
       <description compact="The transform purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="translate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The translate purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="userToDevice" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The userToDevice purpose">Object oriented style (method):</description>
       <return type="array"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="userToDeviceDistance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The userToDeviceDistance purpose">Object oriented style (method):</description>
       <return type="array"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoFontFace.xml phpdox-0.12.0/dependencies/php/classes/CairoFontFace.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoFontFace.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoFontFace.xml	2019-03-13 09:34:17.000000000 +0000
@@ -8,7 +8,7 @@
   </constructor>
   <method name="getType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Retrieves the font face type"/>
+      <description compact="Retrieves the font face type">Object oriented style (method):</description>
       <return type="int"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoFontOptions.xml phpdox-0.12.0/dependencies/php/classes/CairoFontOptions.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoFontOptions.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoFontOptions.xml	2019-03-13 09:34:17.000000000 +0000
@@ -11,7 +11,7 @@
       <description compact="The equal purpose"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="other" optional="false" byreference="false" type="string"/>
+    <parameter name="other" optional="false" byreference="false" type="object" class="CairoFontOptions"/>
   </method>
   <method name="getAntialias" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -48,35 +48,35 @@
       <description compact="The merge purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="other" optional="false" byreference="false" type="string"/>
+    <parameter name="other" optional="false" byreference="false" type="object" class="CairoFontOptions"/>
   </method>
   <method name="setAntialias" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setAntialias purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="antialias" optional="false" byreference="false" type="string"/>
+    <parameter name="antialias" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setHintMetrics" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setHintMetrics purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="hint_metrics" optional="false" byreference="false" type="string"/>
+    <parameter name="hint_metrics" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setHintStyle" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setHintStyle purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="hint_style" optional="false" byreference="false" type="string"/>
+    <parameter name="hint_style" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setSubpixelOrder" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setSubpixelOrder purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="subpixel_order" optional="false" byreference="false" type="string"/>
+    <parameter name="subpixel_order" optional="false" byreference="false" type="int"/>
   </method>
   <method name="status" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoGradientPattern.xml phpdox-0.12.0/dependencies/php/classes/CairoGradientPattern.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoGradientPattern.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoGradientPattern.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,21 +6,21 @@
       <description compact="The addColorStopRgb purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="addColorStopRgba" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The addColorStopRgba purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
-    <parameter name="alpha" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="alpha" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="getColorStopCount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -33,7 +33,7 @@
       <description compact="The getColorStopRgba purpose"/>
       <return type="array"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getExtend" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -71,7 +71,7 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="status" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoImageSurface.xml phpdox-0.12.0/dependencies/php/classes/CairoImageSurface.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoImageSurface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoImageSurface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -19,7 +19,6 @@
     <parameter name="format" optional="false" byreference="false" type="int"/>
     <parameter name="width" optional="false" byreference="false" type="int"/>
     <parameter name="height" optional="false" byreference="false" type="int"/>
-    <parameter name="stride" optional="true" byreference="false" type="int"/>
   </method>
   <method name="createFromPng" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -127,26 +126,26 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setDeviceOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setFallbackResolution" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="showPage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoLinearGradient.xml phpdox-0.12.0/dependencies/php/classes/CairoLinearGradient.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoLinearGradient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoLinearGradient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -22,21 +22,21 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="addColorStopRgba" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
-    <parameter name="alpha" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="alpha" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="getColorStopCount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -49,7 +49,7 @@
       <description compact=""/>
       <return type="array"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getExtend" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoMatrix.xml phpdox-0.12.0/dependencies/php/classes/CairoMatrix.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoMatrix.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoMatrix.xml	2019-03-13 09:34:17.000000000 +0000
@@ -60,8 +60,7 @@
       <description compact="The rotate purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="sx" optional="false" byreference="false" type="string"/>
-    <parameter name="sy" optional="false" byreference="false" type="string"/>
+    <parameter name="radians" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="scale" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -76,23 +75,23 @@
       <description compact="The transformDistance purpose"/>
       <return type="array"/>
     </docblock>
-    <parameter name="dx" optional="false" byreference="false" type="string"/>
-    <parameter name="dy" optional="false" byreference="false" type="string"/>
+    <parameter name="dx" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="dy" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="transformPoint" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The transformPoint purpose"/>
       <return type="array"/>
     </docblock>
-    <parameter name="dx" optional="false" byreference="false" type="string"/>
-    <parameter name="dy" optional="false" byreference="false" type="string"/>
+    <parameter name="dx" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="dy" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="translate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The translate purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="tx" optional="false" byreference="false" type="string"/>
-    <parameter name="ty" optional="false" byreference="false" type="string"/>
+    <parameter name="tx" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="ty" optional="false" byreference="false" type="object" class="float"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoPattern.xml phpdox-0.12.0/dependencies/php/classes/CairoPattern.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoPattern.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoPattern.xml	2019-03-13 09:34:17.000000000 +0000
@@ -23,7 +23,7 @@
       <description compact="The setMatrix purpose">Object oriented style (method):</description>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="status" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoPdfSurface.xml phpdox-0.12.0/dependencies/php/classes/CairoPdfSurface.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoPdfSurface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoPdfSurface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,8 +15,8 @@
       <description compact="The setSize purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -87,26 +87,26 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setDeviceOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setFallbackResolution" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="showPage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoPsSurface.xml phpdox-0.12.0/dependencies/php/classes/CairoPsSurface.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoPsSurface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoPsSurface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -53,22 +53,22 @@
       <description compact="The restrictToLevel purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="level" optional="false" byreference="false" type="string"/>
+    <parameter name="level" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setEps" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setEps purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="level" optional="false" byreference="false" type="string"/>
+    <parameter name="level" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setSize purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -139,26 +139,26 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setDeviceOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setFallbackResolution" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="showPage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoRadialGradient.xml phpdox-0.12.0/dependencies/php/classes/CairoRadialGradient.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoRadialGradient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoRadialGradient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -24,21 +24,21 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="addColorStopRgba" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
-    <parameter name="red" optional="false" byreference="false" type="string"/>
-    <parameter name="green" optional="false" byreference="false" type="string"/>
-    <parameter name="blue" optional="false" byreference="false" type="string"/>
-    <parameter name="alpha" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="red" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="green" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="blue" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="alpha" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="getColorStopCount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -51,7 +51,7 @@
       <description compact=""/>
       <return type="array"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getExtend" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoScaledFont.xml phpdox-0.12.0/dependencies/php/classes/CairoScaledFont.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoScaledFont.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoScaledFont.xml	2019-03-13 09:34:17.000000000 +0000
@@ -57,7 +57,7 @@
       <description compact="The glyphExtents purpose"/>
       <return type="array"/>
     </docblock>
-    <parameter name="glyphs" optional="false" byreference="false" type="string"/>
+    <parameter name="glyphs" optional="false" byreference="false" type="object" class="array"/>
   </method>
   <method name="status" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoSolidPattern.xml phpdox-0.12.0/dependencies/php/classes/CairoSolidPattern.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoSolidPattern.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoSolidPattern.xml	2019-03-13 09:34:17.000000000 +0000
@@ -40,7 +40,7 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="status" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoSurfacePattern.xml phpdox-0.12.0/dependencies/php/classes/CairoSurfacePattern.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoSurfacePattern.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoSurfacePattern.xml	2019-03-13 09:34:17.000000000 +0000
@@ -38,7 +38,7 @@
       <description compact="The setFilter purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="filter" optional="false" byreference="false" type="string"/>
+    <parameter name="filter" optional="false" byreference="false" type="int"/>
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -63,7 +63,7 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="matrix" optional="false" byreference="false" type="object" class="CairoMatrix"/>
   </method>
   <method name="status" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoSurface.xml phpdox-0.12.0/dependencies/php/classes/CairoSurface.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoSurface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoSurface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -69,26 +69,26 @@
       <description compact="The markDirtyRectangle purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setDeviceOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setDeviceOffset purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setFallbackResolution" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The setFallbackResolution purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="showPage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CairoSvgSurface.xml phpdox-0.12.0/dependencies/php/classes/CairoSvgSurface.xml
--- phpdox-0.11.2/dependencies/php/classes/CairoSvgSurface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CairoSvgSurface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -21,7 +21,7 @@
       <description compact="The restrictToVersion purpose"/>
       <return type="void"/>
     </docblock>
-    <parameter name="version" optional="false" byreference="false" type="string"/>
+    <parameter name="version" optional="false" byreference="false" type="int"/>
   </method>
   <method name="versionToString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -99,26 +99,26 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
-    <parameter name="width" optional="false" byreference="false" type="string"/>
-    <parameter name="height" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setDeviceOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setFallbackResolution" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="x" optional="false" byreference="false" type="string"/>
-    <parameter name="y" optional="false" byreference="false" type="string"/>
+    <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="showPage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CallbackFilterIterator.xml phpdox-0.12.0/dependencies/php/classes/CallbackFilterIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/CallbackFilterIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CallbackFilterIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -12,7 +12,7 @@
   <method name="accept" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Calls the callback with the current value, the current key and the inner iterator as arguments">This method calls the callback with the current value, current key and the inner iterator.</description>
-      <return type="string"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="accept" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/Closure.xml phpdox-0.12.0/dependencies/php/classes/Closure.xml
--- phpdox-0.11.2/dependencies/php/classes/Closure.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Closure.xml	2019-03-13 09:34:17.000000000 +0000
@@ -33,7 +33,7 @@
   </method>
   <method name="fromCallable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Converts a callable into a closure."/>
+      <description compact="Converts a callable into a closure"/>
       <return type="Closure"/>
     </docblock>
     <parameter name="callable" optional="false" byreference="false" type="object" class="callable"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_CQL.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_CQL.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_CQL.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_CQL.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\CQL" namespace="CommonMark" name="CQL">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="CQL Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="query" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="__invoke" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="CQL Execution"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="root" optional="false" byreference="false" type="object" class="\CommonMark\Node"/>
+    <parameter name="handler" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Interfaces_IVisitor.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Interfaces_IVisitor.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Interfaces_IVisitor.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Interfaces_IVisitor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Interfaces\IVisitor" namespace="CommonMark\Interfaces" name="IVisitor">
+  <constant name="Done" value="">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="Enter" value="">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="Leave" value="">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <method name="enter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Visitation"/>
+      <return type="?int|IVisitable"/>
+    </docblock>
+    <parameter name="visitable" optional="false" byreference="false" type="object" class="IVisitable"/>
+  </method>
+  <method name="leave" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Visitation"/>
+      <return type="?int|IVisitable"/>
+    </docblock>
+    <parameter name="visitable" optional="false" byreference="false" type="object" class="IVisitable"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_BlockQuote.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_BlockQuote.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_BlockQuote.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_BlockQuote.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\BlockQuote" namespace="CommonMark\Node" name="BlockQuote">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_BulletList.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_BulletList.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_BulletList.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_BulletList.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\BulletList" namespace="CommonMark\Node" name="BulletList">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="tight" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="bool"/>
+    </docblock>
+  </member>
+  <member name="delimiter" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="BulletList Construction"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="BulletList Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tight" optional="false" byreference="false" type="int"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="BulletList Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tight" optional="false" byreference="false" type="int"/>
+    <parameter name="delimiter" optional="false" byreference="false" type="int"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_CodeBlock.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_CodeBlock.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_CodeBlock.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_CodeBlock.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\CodeBlock" namespace="CommonMark\Node" name="CodeBlock">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="literal" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <member name="fence" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="literal" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="CodeBlock Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fence" optional="false" byreference="false" type="string"/>
+    <parameter name="literal" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Code.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Code.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Code.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Code.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Code" namespace="CommonMark\Node" name="Code">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="literal" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="literal" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_CustomBlock.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_CustomBlock.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_CustomBlock.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_CustomBlock.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\CustomBlock" namespace="CommonMark\Node" name="CustomBlock">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="onEnter" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <member name="onLeave" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_CustomInline.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_CustomInline.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_CustomInline.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_CustomInline.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\CustomInline" namespace="CommonMark\Node" name="CustomInline">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="onEnter" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <member name="onLeave" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Document.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Document.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Document.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Document.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Document" namespace="CommonMark\Node" name="Document">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Heading.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Heading.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Heading.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Heading.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Heading" namespace="CommonMark\Node" name="Heading">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="level" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Heading Construction"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Heading Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="level" optional="false" byreference="false" type="int"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_HTMLBlock.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_HTMLBlock.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_HTMLBlock.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_HTMLBlock.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\HTMLBlock" namespace="CommonMark\Node" name="HTMLBlock">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="literal" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="literal" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_HTMLInline.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_HTMLInline.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_HTMLInline.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_HTMLInline.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\HTMLInline" namespace="CommonMark\Node" name="HTMLInline">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="literal" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="literal" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Image.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Image.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Image.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Image.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Image" namespace="CommonMark\Node" name="Image">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="url" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <member name="title" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Image Construction"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Image Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="url" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Image Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="url" optional="false" byreference="false" type="string"/>
+    <parameter name="title" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Item.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Item.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Item.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Item.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Item" namespace="CommonMark\Node" name="Item">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_LineBreak.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_LineBreak.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_LineBreak.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_LineBreak.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\LineBreak" namespace="CommonMark\Node" name="LineBreak">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Link.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Link.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Link.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Link.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Link" namespace="CommonMark\Node" name="Link">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="url" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <member name="title" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Link Construction"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Link Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="url" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Link Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="url" optional="false" byreference="false" type="string"/>
+    <parameter name="title" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_OrderedList.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_OrderedList.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_OrderedList.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_OrderedList.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\OrderedList" namespace="CommonMark\Node" name="OrderedList">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="tight" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="bool"/>
+    </docblock>
+  </member>
+  <member name="delimiter" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="start" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="OrderedList Construction"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="OrderedList Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tight" optional="false" byreference="false" type="int"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="OrderedList Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tight" optional="false" byreference="false" type="int"/>
+    <parameter name="delimiter" optional="false" byreference="false" type="int"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="OrderedList Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tight" optional="false" byreference="false" type="int"/>
+    <parameter name="delimiter" optional="false" byreference="false" type="int"/>
+    <parameter name="start" optional="false" byreference="false" type="int"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Paragraph.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Paragraph.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Paragraph.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Paragraph.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Paragraph" namespace="CommonMark\Node" name="Paragraph">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_SoftBreak.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_SoftBreak.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_SoftBreak.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_SoftBreak.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\SoftBreak" namespace="CommonMark\Node" name="SoftBreak">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Text_Emphasis.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Text_Emphasis.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Text_Emphasis.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Text_Emphasis.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Text\Emphasis" namespace="CommonMark\Node\Text" name="Emphasis">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Text_Strong.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Text_Strong.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Text_Strong.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Text_Strong.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Text\Strong" namespace="CommonMark\Node\Text" name="Strong">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Text.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Text.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_Text.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_Text.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\Text" namespace="CommonMark\Node" name="Text">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="literal" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?string"/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Text Construction"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Text Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="literal" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_ThematicBreak.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_ThematicBreak.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node_ThematicBreak.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node_ThematicBreak.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node\ThematicBreak" namespace="CommonMark\Node" name="ThematicBreak">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Node.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Node.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Node.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Node.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Node" namespace="CommonMark" name="Node">
+  <implements name="CommonMark\Interfaces\IVisitable" full="CommonMark\Interfaces\IVisitable"/>
+  <member name="parent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="previous" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="next" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="?Node"/>
+    </docblock>
+  </member>
+  <member name="startLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endLine" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="startColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="endColumn" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AST Manipulation"/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="prependChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AST Manipulation"/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="child" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertAfter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AST Manipulation"/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AST Manipulation"/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="sibling" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AST Manipulation"/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+    <parameter name="target" optional="false" byreference="false" type="object" class="CommonMark\Node"/>
+  </method>
+  <method name="unlink" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AST Manipulation"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Visitation"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CommonMark_Parser.xml phpdox-0.12.0/dependencies/php/classes/CommonMark_Parser.xml
--- phpdox-0.11.2/dependencies/php/classes/CommonMark_Parser.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CommonMark_Parser.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CommonMark\Parser" namespace="CommonMark" name="Parser">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Parsing"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="options" optional="true" byreference="false" type="int"/>
+  </constructor>
+  <method name="parse" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Parsing"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="buffer" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="finish" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Parsing"/>
+      <return type="CommonMark\Node"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/CompileError.xml phpdox-0.12.0/dependencies/php/classes/CompileError.xml
--- phpdox-0.11.2/dependencies/php/classes/CompileError.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/CompileError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="CompileError" namespace="" name="CompileError">
+  <extends name="Error" full="Error"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Componere_Abstract_Definition.xml phpdox-0.12.0/dependencies/php/classes/Componere_Abstract_Definition.xml
--- phpdox-0.11.2/dependencies/php/classes/Componere_Abstract_Definition.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Componere_Abstract_Definition.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Componere\Abstract\Definition" namespace="Componere\Abstract" name="Definition">
+  <method name="addInterface" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add Interface"/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="interface" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="addMethod" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add Method"/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="method" optional="false" byreference="false" type="object" class="\Componere\Method"/>
+  </method>
+  <method name="addTrait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add Trait"/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="trait" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getReflector" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reflection"/>
+      <return type="\ReflectionClass"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Componere_Definition.xml phpdox-0.12.0/dependencies/php/classes/Componere_Definition.xml
--- phpdox-0.11.2/dependencies/php/classes/Componere_Definition.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Componere_Definition.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Componere\Definition" namespace="Componere" name="Definition">
+  <extends name="Componere\Definition" full="Componere\Definition"/>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Definition Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Definition Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="parent" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Definition Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="interfaces" optional="false" byreference="false" type="object" class="array"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Definition Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="parent" optional="false" byreference="false" type="string"/>
+    <parameter name="interfaces" optional="false" byreference="false" type="object" class="array"/>
+  </constructor>
+  <method name="addConstant" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add Constant"/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="object" class="\Componere\Value"/>
+  </method>
+  <method name="addProperty" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add Property"/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="object" class="\Componere\Value"/>
+  </method>
+  <method name="register" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Registration"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="isRegistered" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="State Detection"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="getClosure" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get Closure"/>
+      <return type="\Closure"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getClosures" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get Closures"/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="addInterface" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="interface" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="addMethod" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="method" optional="false" byreference="false" type="object" class="\Componere\Method"/>
+  </method>
+  <method name="addTrait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="trait" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getReflector" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="\ReflectionClass"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Componere_Method.xml phpdox-0.12.0/dependencies/php/classes/Componere_Method.xml
--- phpdox-0.11.2/dependencies/php/classes/Componere_Method.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Componere_Method.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Componere\Method" namespace="Componere" name="Method">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Method Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="closure" optional="false" byreference="false" type="object" class="\Closure"/>
+  </constructor>
+  <method name="setPrivate" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Modification"/>
+      <return type="Method"/>
+    </docblock>
+  </method>
+  <method name="setProtected" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Modification"/>
+      <return type="Method"/>
+    </docblock>
+  </method>
+  <method name="setStatic" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Modification"/>
+      <return type="Method"/>
+    </docblock>
+  </method>
+  <method name="getReflector" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reflection"/>
+      <return type="\ReflectionMethod"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Componere_Patch.xml phpdox-0.12.0/dependencies/php/classes/Componere_Patch.xml
--- phpdox-0.11.2/dependencies/php/classes/Componere_Patch.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Componere_Patch.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Componere\Patch" namespace="Componere" name="Patch">
+  <extends name="Componere\Patch" full="Componere\Patch"/>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Patch Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="instance" optional="false" byreference="false" type="object" class="object"/>
+  </constructor>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Patch Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="instance" optional="false" byreference="false" type="object" class="object"/>
+    <parameter name="interfaces" optional="false" byreference="false" type="object" class="array"/>
+  </constructor>
+  <method name="apply" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Application"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="revert" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reversal"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="isApplied" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="State Detection"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="derive" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Patch Derivation"/>
+      <return type="Patch"/>
+    </docblock>
+    <parameter name="instance" optional="false" byreference="false" type="object" class="object"/>
+  </method>
+  <method name="getClosure" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get Closure"/>
+      <return type="\Closure"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getClosures" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get Closures"/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="addInterface" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="interface" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="addMethod" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="method" optional="false" byreference="false" type="object" class="\Componere\Method"/>
+  </method>
+  <method name="addTrait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Definition"/>
+    </docblock>
+    <parameter name="trait" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getReflector" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="\ReflectionClass"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Componere_Value.xml phpdox-0.12.0/dependencies/php/classes/Componere_Value.xml
--- phpdox-0.11.2/dependencies/php/classes/Componere_Value.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Componere_Value.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Componere\Value" namespace="Componere" name="Value">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Value Construction"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="default" optional="true" byreference="false" type=""/>
+  </constructor>
+  <method name="setPrivate" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Modification"/>
+      <return type="Value"/>
+    </docblock>
+  </method>
+  <method name="setProtected" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Modification"/>
+      <return type="Value"/>
+    </docblock>
+  </method>
+  <method name="setStatic" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Modification"/>
+      <return type="Value"/>
+    </docblock>
+  </method>
+  <method name="isPrivate" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Detection"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isProtected" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Detection"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isStatic" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Accessibility Detection"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="hasDefault" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Value Interaction"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Cond.xml phpdox-0.12.0/dependencies/php/classes/Cond.xml
--- phpdox-0.11.2/dependencies/php/classes/Cond.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Cond.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,37 +3,37 @@
   <method name="broadcast" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Broadcast a Condition"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="condition" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="condition" optional="false" byreference="false" type="int"/>
   </method>
   <method name="create" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Create a Condition"/>
-      <return type="long"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Destroy a Condition"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="condition" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="condition" optional="false" byreference="false" type="int"/>
   </method>
   <method name="signal" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Signal a Condition"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="condition" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="condition" optional="false" byreference="false" type="int"/>
   </method>
   <method name="wait" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Wait for Condition"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="condition" optional="false" byreference="false" type="object" class="long"/>
-    <parameter name="mutex" optional="false" byreference="false" type="object" class="long"/>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="long"/>
+    <parameter name="condition" optional="false" byreference="false" type="int"/>
+    <parameter name="mutex" optional="false" byreference="false" type="int"/>
+    <parameter name="timeout" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Counter.xml phpdox-0.12.0/dependencies/php/classes/Counter.xml
--- phpdox-0.11.2/dependencies/php/classes/Counter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Counter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,49 +2,49 @@
 <class xmlns="http://xml.phpdox.net/src" full="Counter" namespace="" name="Counter">
   <constructor name="__construct" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Creates an instance of a Counter which maintains a single numeric value.&#10;     "/>
+      <description compact="&#10;      Creates an instance of a Counter which maintains a single numeric value&#10;     "/>
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="initial_value" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="flags" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="initial_value" optional="true" byreference="false" type="int"/>
+    <parameter name="flags" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="getValue" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Get the current value of a counter.&#10;     "/>
-      <return type="integer"/>
+      <description compact="&#10;      Get the current value of a counter&#10;     "/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="bumpValue" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Change the current value of a counter.&#10;     "/>
+      <description compact="&#10;      Change the current value of a counter&#10;     "/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="resetValue" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Reset the current value of a counter.&#10;     "/>
+      <description compact="&#10;      Reset the current value of a counter&#10;     "/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="getMeta" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Return a piece of metainformation about a counter.&#10;     "/>
+      <description compact="&#10;      Return a piece of metainformation about a counter&#10;     "/>
       <return type="mixed"/>
     </docblock>
-    <parameter name="attribute" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="attribute" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getNamed" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Retrieve an existing named counter.&#10;     "/>
+      <description compact="&#10;      Retrieve an existing named counter&#10;     "/>
       <return type="Counter"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setCounterClass" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="&#10;      Set the class returned by Counter::getNamed.&#10;     "/>
+      <description compact="&#10;      Set the class returned by Counter::getNamed&#10;     "/>
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DatePeriod.xml phpdox-0.12.0/dependencies/php/classes/DatePeriod.xml
--- phpdox-0.11.2/dependencies/php/classes/DatePeriod.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DatePeriod.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,6 +6,48 @@
       <var type="integer"/>
     </docblock>
   </constant>
+  <member name="recurrences" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The number of recurrences."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="include_start_date" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Whether to include the start date in the set of recurring dates or not."/>
+      <var type="boolean"/>
+    </docblock>
+  </member>
+  <member name="start" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The start date of the period."/>
+      <var type="DateTimeInterface"/>
+    </docblock>
+  </member>
+  <member name="current" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="During iteration this will contain the current date within the period."/>
+      <var type="DateTimeInterface"/>
+    </docblock>
+  </member>
+  <member name="end" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The end date of the period."/>
+      <var type="DateTimeInterface"/>
+    </docblock>
+  </member>
+  <member name="interval" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="An ISO 8601 repeating interval specification."/>
+      <var type="DateInterval"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Creates a new DatePeriod object"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DateTimeImmutable.xml phpdox-0.12.0/dependencies/php/classes/DateTimeImmutable.xml
--- phpdox-0.11.2/dependencies/php/classes/DateTimeImmutable.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DateTimeImmutable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,66 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="DateTimeImmutable" namespace="" name="DateTimeImmutable">
   <implements name="DateTimeInterface" full="DateTimeInterface"/>
+  <constant name="ATOM" value="&quot;Y-m-d\TH:i:sP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="COOKIE" value="&quot;l, d-M-Y H:i:s T&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="ISO8601" value="&quot;Y-m-d\TH:i:sO&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC822" value="&quot;D, d M y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC850" value="&quot;l, d-M-y H:i:s T&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC1036" value="&quot;D, d M y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC1123" value="&quot;D, d M Y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC2822" value="&quot;D, d M Y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC3339" value="&quot;Y-m-d\TH:i:sP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC3339_EXTENDED" value="&quot;Y-m-d\TH:i:s.vP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RSS" value="&quot;D, d M Y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="W3C" value="&quot;Y-m-d\TH:i:sP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns new DateTimeImmutable object">Object oriented style</description>
@@ -78,10 +138,11 @@
     <parameter name="hour" optional="false" byreference="false" type="int"/>
     <parameter name="minute" optional="false" byreference="false" type="int"/>
     <parameter name="second" optional="true" byreference="false" type="int"/>
+    <parameter name="microseconds" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setTimestamp" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the date and time based on an Unix timestamp"/>
+      <description compact="Sets the date and time based on a Unix timestamp"/>
       <return type="DateTimeImmutable"/>
     </docblock>
     <parameter name="unixtimestamp" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DateTime.xml phpdox-0.12.0/dependencies/php/classes/DateTime.xml
--- phpdox-0.11.2/dependencies/php/classes/DateTime.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DateTime.xml	2019-03-13 09:34:17.000000000 +0000
@@ -46,6 +46,11 @@
       <var type="string"/>
     </docblock>
   </constant>
+  <constant name="RFC3339_EXTENDED" value="&quot;Y-m-d\TH:i:s.vP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
   <constant name="RSS" value="&quot;D, d M Y H:i:s O&quot;">
     <docblock>
       <var type="string"/>
@@ -126,6 +131,7 @@
     <parameter name="hour" optional="false" byreference="false" type="int"/>
     <parameter name="minute" optional="false" byreference="false" type="int"/>
     <parameter name="second" optional="true" byreference="false" type="int"/>
+    <parameter name="microseconds" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setTimestamp" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DirectoryIterator.xml phpdox-0.12.0/dependencies/php/classes/DirectoryIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/DirectoryIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DirectoryIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -10,7 +10,7 @@
   </constructor>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Return the current DirectoryIterator item."/>
+      <description compact="Return the current DirectoryIterator item"/>
       <return type="DirectoryIterator"/>
     </docblock>
   </method>
@@ -22,7 +22,7 @@
   </method>
   <method name="getBasename" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get base name of current DirectoryIterator item."/>
+      <description compact="Get base name of current DirectoryIterator item"/>
       <return type="string"/>
     </docblock>
     <parameter name="suffix" optional="true" byreference="false" type="string"/>
@@ -41,7 +41,7 @@
   </method>
   <method name="getFilename" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Return file name of current DirectoryIterator item."/>
+      <description compact="Return file name of current DirectoryIterator item"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DivisionByZeroError.xml phpdox-0.12.0/dependencies/php/classes/DivisionByZeroError.xml
--- phpdox-0.11.2/dependencies/php/classes/DivisionByZeroError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DivisionByZeroError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="DivisionByZeroError" namespace="" name="DivisionByZeroError">
   <extends name="ArithmeticError" full="ArithmeticError"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMAttr.xml phpdox-0.12.0/dependencies/php/classes/DOMAttr.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMAttr.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMAttr.xml	2019-03-13 09:34:17.000000000 +0000
@@ -36,6 +36,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Creates a new DOMAttr object"/>
@@ -139,7 +251,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMCdataSection.xml phpdox-0.12.0/dependencies/php/classes/DOMCdataSection.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMCdataSection.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMCdataSection.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,139 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="DOMCdataSection" namespace="" name="DOMCdataSection">
   <extends name="DOMText" full="DOMText"/>
+  <member name="wholeText" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Holds all the text of logically-adjacent (not separated by Element, Comment or Processing Instruction) Text nodes."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="data" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The contents of the node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="length" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The length of the contents."/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Constructs a new DOMCdataSection object"/>
@@ -8,6 +141,12 @@
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </constructor>
+  <method name="isElementContentWhitespace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isWhitespaceInElementContent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -21,4 +160,168 @@
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
+  <method name="appendData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="deleteData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="count" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="insertData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="replaceData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="count" optional="false" byreference="false" type="int"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="substringData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="count" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DOMNode"/>
+    </docblock>
+    <parameter name="newnode" optional="false" byreference="false" type="object" class="DOMNode"/>
+  </method>
+  <method name="C14N" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="exclusive" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="with_comments" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="xpath" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="ns_prefixes" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="C14NFile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="uri" optional="false" byreference="false" type="string"/>
+    <parameter name="exclusive" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="with_comments" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="xpath" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="ns_prefixes" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="cloneNode" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DOMNode"/>
+    </docblock>
+    <parameter name="deep" optional="true" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="getLineNo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getNodePath" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="hasAttributes" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="hasChildNodes" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="insertBefore" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DOMNode"/>
+    </docblock>
+    <parameter name="newnode" optional="false" byreference="false" type="object" class="DOMNode"/>
+    <parameter name="refnode" optional="true" byreference="false" type="object" class="DOMNode"/>
+  </method>
+  <method name="isDefaultNamespace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="namespaceURI" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="isSameNode" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="node" optional="false" byreference="false" type="object" class="DOMNode"/>
+  </method>
+  <method name="isSupported" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="feature" optional="false" byreference="false" type="string"/>
+    <parameter name="version" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="prefix" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="lookupPrefix" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="namespaceURI" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="normalize" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="removeChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DOMNode"/>
+    </docblock>
+    <parameter name="oldnode" optional="false" byreference="false" type="object" class="DOMNode"/>
+  </method>
+  <method name="replaceChild" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DOMNode"/>
+    </docblock>
+    <parameter name="newnode" optional="false" byreference="false" type="object" class="DOMNode"/>
+    <parameter name="oldnode" optional="false" byreference="false" type="object" class="DOMNode"/>
+  </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMCharacterData.xml phpdox-0.12.0/dependencies/php/classes/DOMCharacterData.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMCharacterData.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMCharacterData.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,14 +15,126 @@
       <var type="int"/>
     </docblock>
   </member>
-  <method name="appendData" abstract="false" static="false" final="false">
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <method name="appendData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Append the string to the end of the character data of the node&#10;  "/>
       <return type="void"/>
     </docblock>
     <parameter name="data" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="deleteData" abstract="false" static="false" final="false">
+  <method name="deleteData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Remove a range of characters from the node&#10;  "/>
       <return type="void"/>
@@ -30,7 +142,7 @@
     <parameter name="offset" optional="false" byreference="false" type="int"/>
     <parameter name="count" optional="false" byreference="false" type="int"/>
   </method>
-  <method name="insertData" abstract="false" static="false" final="false">
+  <method name="insertData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Insert a string at the specified 16-bit unit offset&#10;  "/>
       <return type="void"/>
@@ -38,7 +150,7 @@
     <parameter name="offset" optional="false" byreference="false" type="int"/>
     <parameter name="data" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="replaceData" abstract="false" static="false" final="false">
+  <method name="replaceData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Replace a substring within the DOMCharacterData node&#10;  "/>
       <return type="void"/>
@@ -47,7 +159,7 @@
     <parameter name="count" optional="false" byreference="false" type="int"/>
     <parameter name="data" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="substringData" abstract="false" static="false" final="false">
+  <method name="substringData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Extracts a range of data from the node&#10;  "/>
       <return type="string"/>
@@ -144,7 +256,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMComment.xml phpdox-0.12.0/dependencies/php/classes/DOMComment.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMComment.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMComment.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,132 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="DOMComment" namespace="" name="DOMComment">
   <extends name="DOMCharacterData" full="DOMCharacterData"/>
+  <member name="data" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The contents of the node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="length" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The length of the contents."/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Creates a new DOMComment object&#10;  "/>
@@ -8,14 +134,14 @@
     </docblock>
     <parameter name="value" optional="true" byreference="false" type="string"/>
   </constructor>
-  <method name="appendData" abstract="false" static="false" final="false">
+  <method name="appendData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
     <parameter name="data" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="deleteData" abstract="false" static="false" final="false">
+  <method name="deleteData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
@@ -23,7 +149,7 @@
     <parameter name="offset" optional="false" byreference="false" type="int"/>
     <parameter name="count" optional="false" byreference="false" type="int"/>
   </method>
-  <method name="insertData" abstract="false" static="false" final="false">
+  <method name="insertData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
@@ -31,7 +157,7 @@
     <parameter name="offset" optional="false" byreference="false" type="int"/>
     <parameter name="data" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="replaceData" abstract="false" static="false" final="false">
+  <method name="replaceData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
@@ -40,7 +166,7 @@
     <parameter name="count" optional="false" byreference="false" type="int"/>
     <parameter name="data" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="substringData" abstract="false" static="false" final="false">
+  <method name="substringData" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
@@ -137,7 +263,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMDocumentFragment.xml phpdox-0.12.0/dependencies/php/classes/DOMDocumentFragment.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMDocumentFragment.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMDocumentFragment.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,118 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="DOMDocumentFragment" namespace="" name="DOMDocumentFragment">
   <extends name="DOMNode" full="DOMNode"/>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <method name="appendXML" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Append raw XML data">Appends raw XML data to a DOMDocumentFragment.</description>
@@ -97,7 +209,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMDocumentType.xml phpdox-0.12.0/dependencies/php/classes/DOMDocumentType.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMDocumentType.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMDocumentType.xml	2019-03-13 09:34:17.000000000 +0000
@@ -43,6 +43,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -132,7 +244,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMDocument.xml phpdox-0.12.0/dependencies/php/classes/DOMDocument.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMDocument.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMDocument.xml	2019-03-13 09:34:17.000000000 +0000
@@ -134,6 +134,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Creates a new DOMDocument object&#10;  "/>
@@ -454,7 +566,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMElement.xml phpdox-0.12.0/dependencies/php/classes/DOMElement.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMElement.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMElement.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,6 +15,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Creates a new DOMElement object&#10;  "/>
@@ -251,7 +363,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMEntityReference.xml phpdox-0.12.0/dependencies/php/classes/DOMEntityReference.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMEntityReference.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMEntityReference.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,118 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="DOMEntityReference" namespace="" name="DOMEntityReference">
   <extends name="DOMNode" full="DOMNode"/>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Creates a new DOMEntityReference object&#10;  "/>
@@ -97,7 +209,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMEntity.xml phpdox-0.12.0/dependencies/php/classes/DOMEntity.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMEntity.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMEntity.xml	2019-03-13 09:34:17.000000000 +0000
@@ -43,6 +43,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -132,7 +244,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMException.xml phpdox-0.12.0/dependencies/php/classes/DOMException.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -8,6 +8,34 @@
       <var type="int"/>
     </docblock>
   </member>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMNamedNodeMap.xml phpdox-0.12.0/dependencies/php/classes/DOMNamedNodeMap.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMNamedNodeMap.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMNamedNodeMap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -8,6 +8,12 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get number of nodes in the map"/>
+      <return type="int"/>
+    </docblock>
+  </method>
   <method name="getNamedItem" abstract="false" static="false" final="false">
     <docblock>
       <description compact="&#10;   Retrieves a node specified by name&#10;  "/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMNodeList.xml phpdox-0.12.0/dependencies/php/classes/DOMNodeList.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMNodeList.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMNodeList.xml	2019-03-13 09:34:17.000000000 +0000
@@ -8,10 +8,16 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get number of nodes in the list"/>
+      <return type="int"/>
+    </docblock>
+  </method>
   <method name="item" abstract="false" static="false" final="false">
     <docblock>
       <description compact="&#10;   Retrieves a node specified by index&#10;  ">Retrieves a node specified by index within the DOMNodeList object.</description>
-      <return type="DOMElement"/>
+      <return type="DOMNode"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMNode.xml phpdox-0.12.0/dependencies/php/classes/DOMNode.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMNode.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMNode.xml	2019-03-13 09:34:17.000000000 +0000
@@ -201,7 +201,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Gets the namespace URI of the node based on the prefix&#10;  "/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMNotation.xml phpdox-0.12.0/dependencies/php/classes/DOMNotation.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMNotation.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMNotation.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,6 +15,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -104,7 +216,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMProcessingInstruction.xml phpdox-0.12.0/dependencies/php/classes/DOMProcessingInstruction.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMProcessingInstruction.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMProcessingInstruction.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,6 +15,118 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Creates a new DOMProcessingInstruction object&#10;  "/>
@@ -112,7 +224,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/DOMText.xml phpdox-0.12.0/dependencies/php/classes/DOMText.xml
--- phpdox-0.11.2/dependencies/php/classes/DOMText.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/DOMText.xml	2019-03-13 09:34:17.000000000 +0000
@@ -8,6 +8,132 @@
       <var type="string"/>
     </docblock>
   </member>
+  <member name="data" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The contents of the node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="length" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The length of the contents."/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="nodeName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the most accurate name for the current node type"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeValue" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The value of this node, depending on its type. Contrary to the W3C specification, the node value of DOMElement nodes is equal to DOMNode::textContent instead of NULL."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="nodeType" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Gets the type of the node. One of the predefined XML_xxx_NODE constants"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="parentNode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The parent of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="childNodes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNodeList that contains all children of this node. If there are no children, this is an empty DOMNodeList."/>
+      <var type="DOMNodeList"/>
+    </docblock>
+  </member>
+  <member name="firstChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The first child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="lastChild" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The last child of this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="previousSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately preceding this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="nextSibling" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The node immediately following this node. If there is no such node, this returns NULL."/>
+      <var type="DOMNode"/>
+    </docblock>
+  </member>
+  <member name="attributes" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="A DOMNamedNodeMap containing the attributes of this node (if it is a DOMElement) or NULL otherwise."/>
+      <var type="DOMNamedNodeMap"/>
+    </docblock>
+  </member>
+  <member name="ownerDocument" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The DOMDocument object associated with this node."/>
+      <var type="DOMDocument"/>
+    </docblock>
+  </member>
+  <member name="namespaceURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace URI of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="prefix" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The namespace prefix of this node, or NULL if it is unspecified."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="localName" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Returns the local part of the qualified name of this node."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="baseURI" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The absolute base URI of this node or NULL if the implementation wasn't able to obtain an absolute URI."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="textContent" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="The text content of this node and its descendants."/>
+      <var type="string"/>
+    </docblock>
+  </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Creates a new DOMText object&#10;  "/>
@@ -15,6 +141,12 @@
     </docblock>
     <parameter name="value" optional="true" byreference="false" type="string"/>
   </constructor>
+  <method name="isElementContentWhitespace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns whether this text node contains whitespace in element content"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isWhitespaceInElementContent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Indicates whether this text node contains whitespace&#10;  "/>
@@ -28,6 +160,46 @@
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
+  <method name="appendData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="deleteData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="count" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="insertData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="replaceData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="count" optional="false" byreference="false" type="int"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="substringData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="count" optional="false" byreference="false" type="int"/>
+  </method>
   <method name="appendChild" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -117,7 +289,7 @@
     <parameter name="feature" optional="false" byreference="false" type="string"/>
     <parameter name="version" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="lookupNamespaceURI" abstract="false" static="false" visibility="public" final="false">
+  <method name="lookupNamespaceUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Deque.xml phpdox-0.12.0/dependencies/php/classes/Ds_Deque.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Deque.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Deque.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Deque" namespace="" name="Ds\Deque">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Deque" namespace="Ds" name="Deque">
   <implements name="Ds\Sequence" full="Ds\Sequence"/>
   <constant name="MIN_CAPACITY" value="8">
     <docblock>
@@ -8,73 +8,73 @@
   </constant>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="apply" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates all values by applying a callback function to each value."/>
+      <description compact="Updates all values by applying a callback function to each value"/>
       <return type="void"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values from the deque."/>
+      <description compact="Removes all values from the deque"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="contains" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines if the deque contains given values."/>
+      <description compact="Determines if the deque contains given values"/>
       <return type="bool"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the deque."/>
+      <description compact="Returns a shallow copy of the deque"/>
       <return type="Ds\Deque"/>
     </docblock>
   </method>
   <method name="filter" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Creates a new deque using a callable to&#10;    determine which values to include.&#10; "/>
+      <description compact="&#10;    Creates a new deque using a callable to&#10;    determine which values to include&#10; "/>
       <return type="Ds\Deque"/>
     </docblock>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="find" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Attempts to find a value's index.&#10;  "/>
+      <description compact="&#10;    Attempts to find a value's index&#10;  "/>
       <return type="mixed"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the first value in the deque."/>
+      <description compact="Returns the first value in the deque"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at a given index."/>
+      <description compact="Returns the value at a given index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="insert" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Inserts values at a given index."/>
+      <description compact="Inserts values at a given index"/>
       <return type="void"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -88,47 +88,47 @@
   </method>
   <method name="join" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Joins all values together as a string."/>
+      <description compact="Joins all values together as a string"/>
       <return type="string"/>
     </docblock>
     <parameter name="glue" optional="true" byreference="false" type="string"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the last value."/>
+      <description compact="Returns the last value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="map" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of applying a callback to each value."/>
+      <description compact="Returns the result of applying a callback to each value"/>
       <return type="Ds\Deque"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of adding all given values to the deque."/>
+      <description compact="Returns the result of adding all given values to the deque"/>
       <return type="Ds\Deque"/>
     </docblock>
     <parameter name="values" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the last value."/>
+      <description compact="Removes and returns the last value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="push" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the end of the deque."/>
+      <description compact="Adds values to the end of the deque"/>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="reduce" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Reduces the deque to a single value using a callback function."/>
+      <description compact="Reduces the deque to a single value using a callback function"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
@@ -136,33 +136,33 @@
   </method>
   <method name="remove" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns a value by index."/>
+      <description compact="Removes and returns a value by index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="reverse" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Reverses the deque in-place.&#10;  "/>
+      <description compact="&#10;    Reverses the deque in-place&#10;  "/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="reversed" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a reversed copy."/>
+      <description compact="Returns a reversed copy"/>
       <return type="Ds\Deque"/>
     </docblock>
   </method>
   <method name="rotate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Rotates the deque by a given number of rotations."/>
+      <description compact="Rotates the deque by a given number of rotations"/>
       <return type="void"/>
     </docblock>
     <parameter name="rotations" optional="false" byreference="false" type="int"/>
   </method>
   <method name="set" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates a value at a given index."/>
+      <description compact="Updates a value at a given index"/>
       <return type="void"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -170,13 +170,13 @@
   </method>
   <method name="shift" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the first value."/>
+      <description compact="Removes and returns the first value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="slice" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Returns a sub-deque of a given range.&#10;  "/>
+      <description compact="&#10;   Returns a sub-deque of a given range&#10;  "/>
       <return type="Ds\Deque"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -184,33 +184,33 @@
   </method>
   <method name="sort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Sorts the deque in-place.&#10; "/>
+      <description compact="&#10;    Sorts the deque in-place&#10; "/>
       <return type="void"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sorted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a sorted copy."/>
+      <description compact="Returns a sorted copy"/>
       <return type="Ds\Deque"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the sum of all values in the deque.">Returns the sum of all values in the deque.</description>
+      <description compact="Returns the sum of all values in the deque">Returns the sum of all values in the deque.</description>
       <return type="number"/>
     </docblock>
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the deque to an array.&#10;  ">Converts the deque to an array.</description>
+      <description compact="&#10;    Converts the deque to an array&#10;  ">Converts the deque to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
   <method name="unshift" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the front of the deque."/>
+      <description compact="Adds values to the front of the deque"/>
       <return type="void"/>
     </docblock>
     <parameter name="values" optional="true" byreference="false" type="object" class="mixed"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Map.xml phpdox-0.12.0/dependencies/php/classes/Ds_Map.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Map.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Map.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Map" namespace="" name="Ds\Map">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Map" namespace="Ds" name="Map">
   <implements name="Ds\Collection" full="Ds\Collection"/>
   <constant name="MIN_CAPACITY" value="16">
     <docblock>
@@ -8,59 +8,59 @@
   </constant>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="apply" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates all values by applying a callback function to each value."/>
+      <description compact="Updates all values by applying a callback function to each value"/>
       <return type="void"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the map."/>
+      <description compact="Returns a shallow copy of the map"/>
       <return type="Ds\Map"/>
     </docblock>
   </method>
   <method name="diff" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new map using keys that aren't in another map.">Returns the result of removing all keys from the current instance that are present in a given map.</description>
+      <description compact="Creates a new map using keys that aren't in another map">Returns the result of removing all keys from the current instance that are present in a given map.</description>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="map" optional="false" byreference="false" type="object" class="Ds\Map"/>
   </method>
   <method name="filter" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Creates a new map using a callable to determine which pairs to include.&#10;  "/>
+      <description compact="&#10;    Creates a new map using a callable to determine which pairs to include&#10;  "/>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the first pair in the map."/>
+      <description compact="Returns the first pair in the map"/>
       <return type="Ds\Pair"/>
     </docblock>
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value for a given key.">Returns the value for a given key, or an optional default value if the key could not be found.</description>
+      <description compact="Returns the value for a given key">Returns the value for a given key, or an optional default value if the key could not be found.</description>
       <return type="mixed"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="object" class="mixed"/>
@@ -68,21 +68,21 @@
   </method>
   <method name="hasKey" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines whether the map contains a given key."/>
+      <description compact="Determines whether the map contains a given key"/>
       <return type="bool"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="hasValue" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines whether the map contains a given value."/>
+      <description compact="Determines whether the map contains a given value"/>
       <return type="bool"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="intersect" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new map by intersecting keys with another map.">Creates a new map containing the pairs of the current instance whose keys are also present in the given map. In other words, returns a copy of the current instance with all keys removed that are not also in the other map.</description>
+      <description compact="Creates a new map by intersecting keys with another map">Creates a new map containing the pairs of the current instance whose keys are also present in the given map. In other words, returns a copy of the current instance with all keys removed that are not also in the other map.</description>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="map" optional="false" byreference="false" type="object" class="Ds\Map"/>
@@ -95,53 +95,53 @@
   </method>
   <method name="keys" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a set of the map's keys."/>
+      <description compact="Returns a set of the map's keys"/>
       <return type="Ds\Set"/>
     </docblock>
   </method>
   <method name="ksort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Sorts the map in-place by key.&#10; "/>
+      <description compact="&#10;    Sorts the map in-place by key&#10; "/>
       <return type="void"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="ksorted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a copy, sorted by key."/>
+      <description compact="Returns a copy, sorted by key"/>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the last pair of the map."/>
+      <description compact="Returns the last pair of the map"/>
       <return type="Ds\Pair"/>
     </docblock>
   </method>
   <method name="map" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of applying a callback to each value."/>
+      <description compact="Returns the result of applying a callback to each value"/>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of adding all given associations.">Returns the result of associating all keys of a given traversable object or array with their corresponding values, combined with the current instance.</description>
+      <description compact="Returns the result of adding all given associations">Returns the result of associating all keys of a given traversable object or array with their corresponding values, combined with the current instance.</description>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="values" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="pairs" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a sequence containing all the pairs of the map."/>
+      <description compact="Returns a sequence containing all the pairs of the map"/>
       <return type="Ds\Sequence"/>
     </docblock>
   </method>
   <method name="put" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Associates a key with a value.">Associates a key with a value, overwriting a previous association if one exists.</description>
+      <description compact="Associates a key with a value">Associates a key with a value, overwriting a previous association if one exists.</description>
       <return type="void"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="object" class="mixed"/>
@@ -149,14 +149,14 @@
   </method>
   <method name="putAll" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Associates all key-value pairs of a traversable object or array.">Associates all key-value pairs of a traversable object or array.</description>
+      <description compact="Associates all key-value pairs of a traversable object or array">Associates all key-value pairs of a traversable object or array.</description>
       <return type="void"/>
     </docblock>
     <parameter name="pairs" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="reduce" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Reduces the map to a single value using a callback function."/>
+      <description compact="Reduces the map to a single value using a callback function"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
@@ -164,7 +164,7 @@
   </method>
   <method name="remove" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns a value by key.">Removes and returns a value by key, or return an optional default value if the key could not be found.</description>
+      <description compact="Removes and returns a value by key">Removes and returns a value by key, or return an optional default value if the key could not be found.</description>
       <return type="mixed"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="object" class="mixed"/>
@@ -172,26 +172,26 @@
   </method>
   <method name="reverse" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Reverses the map in-place.&#10;  "/>
+      <description compact="&#10;    Reverses the map in-place&#10;  "/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="reversed" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a reversed copy."/>
+      <description compact="Returns a reversed copy"/>
       <return type="Ds\Map"/>
     </docblock>
   </method>
   <method name="skip" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the pair at a given positional index."/>
+      <description compact="Returns the pair at a given positional index"/>
       <return type="Ds\Pair"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="int"/>
   </method>
   <method name="slice" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Returns a subset of the map defined by a starting index and length.&#10;  "/>
+      <description compact="&#10;   Returns a subset of the map defined by a starting index and length&#10;  "/>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -199,46 +199,46 @@
   </method>
   <method name="sort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Sorts the map in-place by value.&#10; "/>
+      <description compact="&#10;    Sorts the map in-place by value&#10; "/>
       <return type="void"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sorted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a copy, sorted by value."/>
+      <description compact="Returns a copy, sorted by value"/>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the sum of all values in the map.">Returns the sum of all values in the map.</description>
+      <description compact="Returns the sum of all values in the map">Returns the sum of all values in the map.</description>
       <return type="number"/>
     </docblock>
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the map to an array.&#10;  ">Converts the map to an array.</description>
+      <description compact="&#10;    Converts the map to an array&#10;  ">Converts the map to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
   <method name="union" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new map using values from the current instance and another map.">Creates a new map that contains the pairs of the current instance as well as the pairs of another map.</description>
+      <description compact="Creates a new map using values from the current instance and another map">Creates a new map that contains the pairs of the current instance as well as the pairs of another map.</description>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="map" optional="false" byreference="false" type="object" class="Ds\Map"/>
   </method>
   <method name="values" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a sequence of the map's values."/>
+      <description compact="Returns a sequence of the map's values"/>
       <return type="Ds\Sequence"/>
     </docblock>
   </method>
   <method name="xor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new map using keys of either the current instance or of another map, but not of both.">Creates a new map containing keys of the current instance as well as another map, but not of both.</description>
+      <description compact="Creates a new map using keys of either the current instance or of another map, but not of both">Creates a new map containing keys of the current instance as well as another map, but not of both.</description>
       <return type="Ds\Map"/>
     </docblock>
     <parameter name="map" optional="false" byreference="false" type="object" class="Ds\Map"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Pair.xml phpdox-0.12.0/dependencies/php/classes/Ds_Pair.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Pair.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Pair.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Pair" namespace="" name="Ds\Pair">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Pair" namespace="Ds" name="Pair">
   <implements name="JsonSerializable" full="JsonSerializable"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new instance."/>
+      <description compact="Creates a new instance"/>
       <return type="void"/>
     </docblock>
     <parameter name="key" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="value" optional="true" byreference="false" type="object" class="mixed"/>
   </constructor>
+  <method name="clear" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Removes all values"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="copy" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns a shallow copy of the pair"/>
+      <return type="Ds\Pair"/>
+    </docblock>
+  </method>
+  <method name="isEmpty" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns whether the pair is empty"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="toArray" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="&#10;    Converts the pair to an array&#10;  ">Converts the pair to an array.</description>
+      <return type="array"/>
+    </docblock>
+  </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_PriorityQueue.xml phpdox-0.12.0/dependencies/php/classes/Ds_PriorityQueue.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_PriorityQueue.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_PriorityQueue.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\PriorityQueue" namespace="" name="Ds\PriorityQueue">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\PriorityQueue" namespace="Ds" name="PriorityQueue">
   <implements name="Ds\Collection" full="Ds\Collection"/>
   <constant name="MIN_CAPACITY" value="8">
     <docblock>
@@ -8,26 +8,26 @@
   </constant>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the queue."/>
+      <description compact="Returns a shallow copy of the queue"/>
       <return type="Ds\PriorityQueue"/>
     </docblock>
   </method>
@@ -39,19 +39,19 @@
   </method>
   <method name="peek" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at the front of the queue."/>
+      <description compact="Returns the value at the front of the queue"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the value with the highest priority.">Removes and returns the value at the front of the queue, ie. the value with the highest priority.</description>
+      <description compact="Removes and returns the value with the highest priority">Removes and returns the value at the front of the queue, ie. the value with the highest priority.</description>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="push" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Pushes values into the queue."/>
+      <description compact="Pushes values into the queue"/>
       <return type="void"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
@@ -59,7 +59,7 @@
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the queue to an array.&#10;  ">Converts the queue to an array.</description>
+      <description compact="&#10;    Converts the queue to an array&#10;  ">Converts the queue to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Queue.xml phpdox-0.12.0/dependencies/php/classes/Ds_Queue.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Queue.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Queue.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Queue" namespace="" name="Ds\Queue">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Queue" namespace="Ds" name="Queue">
   <implements name="Ds\Collection" full="Ds\Collection"/>
   <constant name="MIN_CAPACITY" value="8">
     <docblock>
@@ -8,26 +8,26 @@
   </constant>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity.">Ensures that enough memory is allocated for a required capacity. This removes the need to reallocate the internal as values are added.</description>
+      <description compact="Allocates enough memory for a required capacity">Ensures that enough memory is allocated for a required capacity. This removes the need to reallocate the internal as values are added.</description>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the queue."/>
+      <description compact="Returns a shallow copy of the queue"/>
       <return type="Ds\Queue"/>
     </docblock>
   </method>
@@ -39,26 +39,26 @@
   </method>
   <method name="peek" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at the front of the queue."/>
+      <description compact="Returns the value at the front of the queue"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the value at the front of the queue."/>
+      <description compact="Removes and returns the value at the front of the queue"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="push" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Pushes values into the queue."/>
+      <description compact="Pushes values into the queue"/>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the queue to an array.&#10;  ">Converts the queue to an array.</description>
+      <description compact="&#10;    Converts the queue to an array&#10;  ">Converts the queue to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Set.xml phpdox-0.12.0/dependencies/php/classes/Ds_Set.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Set.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Set.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Set" namespace="" name="Ds\Set">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Set" namespace="Ds" name="Set">
   <implements name="Ds\Collection" full="Ds\Collection"/>
   <constant name="MIN_CAPACITY" value="16">
     <docblock>
@@ -8,73 +8,73 @@
   </constant>
   <method name="add" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the set.">Adds all given values to the set that haven't already been added.</description>
+      <description compact="Adds values to the set">Adds all given values to the set that haven't already been added.</description>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="contains" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines if the set contains all values.">Determines if the set contains all values.</description>
+      <description compact="Determines if the set contains all values">Determines if the set contains all values.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the set."/>
+      <description compact="Returns a shallow copy of the set"/>
       <return type="Ds\Set"/>
     </docblock>
   </method>
   <method name="diff" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new set using values that aren't in another set.">Creates a new set using values that aren't in another set.</description>
+      <description compact="Creates a new set using values that aren't in another set">Creates a new set using values that aren't in another set.</description>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="set" optional="false" byreference="false" type="object" class="Ds\Set"/>
   </method>
   <method name="filter" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Creates a new set using a callable to&#10;    determine which values to include.&#10;  "/>
+      <description compact="&#10;    Creates a new set using a callable to&#10;    determine which values to include&#10;  "/>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the first value in the set."/>
+      <description compact="Returns the first value in the set"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at a given index."/>
+      <description compact="Returns the value at a given index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="intersect" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new set by intersecting values with another set.">Creates a new set using values common to both the current instance and another set. In other words, returns a copy of the current instance with all values removed that are not in the other set.</description>
+      <description compact="Creates a new set by intersecting values with another set">Creates a new set using values common to both the current instance and another set. In other words, returns a copy of the current instance with all values removed that are not in the other set.</description>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="set" optional="false" byreference="false" type="object" class="Ds\Set"/>
@@ -87,27 +87,27 @@
   </method>
   <method name="join" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Joins all values together as a string."/>
+      <description compact="Joins all values together as a string"/>
       <return type="string"/>
     </docblock>
     <parameter name="glue" optional="true" byreference="false" type="string"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the last value in the set."/>
+      <description compact="Returns the last value in the set"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of adding all given values to the set."/>
+      <description compact="Returns the result of adding all given values to the set"/>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="values" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="reduce" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Reduces the set to a single value using a callback function."/>
+      <description compact="Reduces the set to a single value using a callback function"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
@@ -115,26 +115,26 @@
   </method>
   <method name="remove" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all given values from the set."/>
+      <description compact="Removes all given values from the set"/>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="reverse" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Reverses the set in-place.&#10;  "/>
+      <description compact="&#10;    Reverses the set in-place&#10;  "/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="reversed" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a reversed copy."/>
+      <description compact="Returns a reversed copy"/>
       <return type="Ds\Set"/>
     </docblock>
   </method>
   <method name="slice" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Returns a sub-set of a given range.&#10;  "/>
+      <description compact="&#10;   Returns a sub-set of a given range&#10;  "/>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -142,40 +142,40 @@
   </method>
   <method name="sort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Sorts the set in-place.&#10; "/>
+      <description compact="&#10;    Sorts the set in-place&#10; "/>
       <return type="void"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sorted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a sorted copy."/>
+      <description compact="Returns a sorted copy"/>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the sum of all values in the set.">Returns the sum of all values in the set.</description>
+      <description compact="Returns the sum of all values in the set">Returns the sum of all values in the set.</description>
       <return type="number"/>
     </docblock>
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the set to an array.&#10;  ">Converts the set to an array.</description>
+      <description compact="&#10;    Converts the set to an array&#10;  ">Converts the set to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
   <method name="union" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new set using values from the current instance and another set.">Creates a new set that contains the values of the current instance as well as the values of another set.</description>
+      <description compact="Creates a new set using values from the current instance and another set">Creates a new set that contains the values of the current instance as well as the values of another set.</description>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="set" optional="false" byreference="false" type="object" class="Ds\Set"/>
   </method>
   <method name="xor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new set using values in either the current instance or in another set, but not in both.">Creates a new set containing values in the current instance as well as another set, but not in both.</description>
+      <description compact="Creates a new set using values in either the current instance or in another set, but not in both">Creates a new set containing values in the current instance as well as another set, but not in both.</description>
       <return type="Ds\Set"/>
     </docblock>
     <parameter name="set" optional="false" byreference="false" type="object" class="Ds\Set"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Stack.xml phpdox-0.12.0/dependencies/php/classes/Ds_Stack.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Stack.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Stack.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Stack" namespace="" name="Ds\Stack">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Stack" namespace="Ds" name="Stack">
   <implements name="Ds\Collection" full="Ds\Collection"/>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the stack."/>
+      <description compact="Returns a shallow copy of the stack"/>
       <return type="Ds\Stack"/>
     </docblock>
   </method>
@@ -34,26 +34,26 @@
   </method>
   <method name="peek" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at the top of the stack."/>
+      <description compact="Returns the value at the top of the stack"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the value at the top of the stack."/>
+      <description compact="Removes and returns the value at the top of the stack"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="push" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Pushes values onto the stack."/>
+      <description compact="Pushes values onto the stack"/>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the stack to an array.&#10;  ">Converts the stack to an array.</description>
+      <description compact="&#10;    Converts the stack to an array&#10;  ">Converts the stack to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ds_Vector.xml phpdox-0.12.0/dependencies/php/classes/Ds_Vector.xml
--- phpdox-0.11.2/dependencies/php/classes/Ds_Vector.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ds_Vector.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Ds\Vector" namespace="" name="Ds\Vector">
+<class xmlns="http://xml.phpdox.net/src" full="Ds\Vector" namespace="Ds" name="Vector">
   <implements name="Ds\Sequence" full="Ds\Sequence"/>
   <constant name="MIN_CAPACITY" value="10">
     <docblock>
@@ -8,73 +8,73 @@
   </constant>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="apply" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates all values by applying a callback function to each value."/>
+      <description compact="Updates all values by applying a callback function to each value"/>
       <return type="void"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="contains" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines if the vector contains given values."/>
+      <description compact="Determines if the vector contains given values"/>
       <return type="bool"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the vector."/>
+      <description compact="Returns a shallow copy of the vector"/>
       <return type="Ds\Vector"/>
     </docblock>
   </method>
   <method name="filter" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Creates a new vector using a callable to&#10;    determine which values to include.&#10; "/>
+      <description compact="&#10;    Creates a new vector using a callable to&#10;    determine which values to include&#10; "/>
       <return type="Ds\Vector"/>
     </docblock>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="find" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Attempts to find a value's index.&#10;  "/>
+      <description compact="&#10;    Attempts to find a value's index&#10;  "/>
       <return type="mixed"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the first value in the vector."/>
+      <description compact="Returns the first value in the vector"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at a given index."/>
+      <description compact="Returns the value at a given index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="insert" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Inserts values at a given index."/>
+      <description compact="Inserts values at a given index"/>
       <return type="void"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -88,47 +88,47 @@
   </method>
   <method name="join" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Joins all values together as a string."/>
+      <description compact="Joins all values together as a string"/>
       <return type="string"/>
     </docblock>
     <parameter name="glue" optional="true" byreference="false" type="string"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the last value."/>
+      <description compact="Returns the last value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="map" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of applying a callback to each value."/>
+      <description compact="Returns the result of applying a callback to each value"/>
       <return type="Ds\Vector"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of adding all given values to the vector."/>
+      <description compact="Returns the result of adding all given values to the vector"/>
       <return type="Ds\Vector"/>
     </docblock>
     <parameter name="values" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the last value."/>
+      <description compact="Removes and returns the last value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="push" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the end of the vector."/>
+      <description compact="Adds values to the end of the vector"/>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="reduce" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Reduces the vector to a single value using a callback function."/>
+      <description compact="Reduces the vector to a single value using a callback function"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
@@ -136,33 +136,33 @@
   </method>
   <method name="remove" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns a value by index."/>
+      <description compact="Removes and returns a value by index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="reverse" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Reverses the vector in-place.&#10;  "/>
+      <description compact="&#10;    Reverses the vector in-place&#10;  "/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="reversed" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a reversed copy."/>
+      <description compact="Returns a reversed copy"/>
       <return type="Ds\Vector"/>
     </docblock>
   </method>
   <method name="rotate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Rotates the vector by a given number of rotations."/>
+      <description compact="Rotates the vector by a given number of rotations"/>
       <return type="void"/>
     </docblock>
     <parameter name="rotations" optional="false" byreference="false" type="int"/>
   </method>
   <method name="set" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates a value at a given index."/>
+      <description compact="Updates a value at a given index"/>
       <return type="void"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -170,13 +170,13 @@
   </method>
   <method name="shift" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the first value."/>
+      <description compact="Removes and returns the first value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="slice" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Returns a sub-vector of a given range.&#10;  "/>
+      <description compact="&#10;   Returns a sub-vector of a given range&#10;  "/>
       <return type="Ds\Vector"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -184,33 +184,33 @@
   </method>
   <method name="sort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Sorts the vector in-place.&#10; "/>
+      <description compact="&#10;    Sorts the vector in-place&#10; "/>
       <return type="void"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sorted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a sorted copy."/>
+      <description compact="Returns a sorted copy"/>
       <return type="Ds\Vector"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the sum of all values in the vector.">Returns the sum of all values in the vector.</description>
+      <description compact="Returns the sum of all values in the vector">Returns the sum of all values in the vector.</description>
       <return type="number"/>
     </docblock>
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the vector to an array.&#10;  ">Converts the vector to an array.</description>
+      <description compact="&#10;    Converts the vector to an array&#10;  ">Converts the vector to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
   <method name="unshift" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the front of the vector."/>
+      <description compact="Adds values to the front of the vector"/>
       <return type="void"/>
     </docblock>
     <parameter name="values" optional="true" byreference="false" type="object" class="mixed"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EvEmbed.xml phpdox-0.12.0/dependencies/php/classes/EvEmbed.xml
--- phpdox-0.11.2/dependencies/php/classes/EvEmbed.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EvEmbed.xml	2019-03-13 09:34:17.000000000 +0000
@@ -36,7 +36,7 @@
   </method>
   <method name="sweep" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Make a single, non-blocking sweep over the embedded loop."/>
+      <description compact="Make a single, non-blocking sweep over the embedded loop"/>
       <return type="void"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EventBase.xml phpdox-0.12.0/dependencies/php/classes/EventBase.xml
--- phpdox-0.11.2/dependencies/php/classes/EventBase.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EventBase.xml	2019-03-13 09:34:17.000000000 +0000
@@ -48,7 +48,7 @@
       <description compact="Stop dispatching events"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="double"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="free" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -71,7 +71,7 @@
   <method name="getTimeOfDayCached" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the current event base time"/>
-      <return type="double"/>
+      <return type="float"/>
     </docblock>
   </method>
   <method name="gotExit" abstract="false" static="false" visibility="public" final="false">
@@ -102,7 +102,7 @@
   </method>
   <method name="reInit" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Re-initialize event base(after a fork)."/>
+      <description compact="Re-initialize event base(after a fork)"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EventBufferEvent.xml phpdox-0.12.0/dependencies/php/classes/EventBufferEvent.xml
--- phpdox-0.11.2/dependencies/php/classes/EventBufferEvent.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EventBufferEvent.xml	2019-03-13 09:34:17.000000000 +0000
@@ -138,14 +138,14 @@
   </method>
   <method name="disable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Disable events read, write, or both on a buffer event."/>
+      <description compact="Disable events read, write, or both on a buffer event"/>
       <return type="bool"/>
     </docblock>
     <parameter name="events" optional="false" byreference="false" type="int"/>
   </method>
   <method name="enable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Enable events read, write, or both on a buffer event."/>
+      <description compact="Enable events read, write, or both on a buffer event"/>
       <return type="bool"/>
     </docblock>
     <parameter name="events" optional="false" byreference="false" type="int"/>
@@ -247,31 +247,31 @@
   </method>
   <method name="sslGetCipherInfo" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a textual description of the cipher.">Retrieves description of the current cipher by means of the SSL_CIPHER_description SSL API function (see SSL_CIPHER_get_name(3) man page).</description>
+      <description compact="Returns a textual description of the cipher">Retrieves description of the current cipher by means of the SSL_CIPHER_description SSL API function (see SSL_CIPHER_get_name(3) man page).</description>
       <return type="string"/>
     </docblock>
   </method>
   <method name="sslGetCipherName" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current cipher name of the SSL connection.">Retrieves name of cipher used by current SSL connection.</description>
+      <description compact="Returns the current cipher name of the SSL connection">Retrieves name of cipher used by current SSL connection.</description>
       <return type="string"/>
     </docblock>
   </method>
   <method name="sslGetCipherVersion" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns version of cipher used by current SSL connection.">Retrieves version of cipher used by current SSL connection.</description>
+      <description compact="Returns version of cipher used by current SSL connection">Retrieves version of cipher used by current SSL connection.</description>
       <return type="string"/>
     </docblock>
   </method>
   <method name="sslGetProtocol" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the name of the protocol used for current SSL connection.">Returns the name of the protocol used for current SSL connection.</description>
+      <description compact="Returns the name of the protocol used for current SSL connection">Returns the name of the protocol used for current SSL connection.</description>
       <return type="string"/>
     </docblock>
   </method>
   <method name="sslRenegotiate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Tells a bufferevent to begin SSL renegotiation.">Tells a bufferevent to begin SSL renegotiation.</description>
+      <description compact="Tells a bufferevent to begin SSL renegotiation">Tells a bufferevent to begin SSL renegotiation.</description>
       <return type="void"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EventListener.xml phpdox-0.12.0/dependencies/php/classes/EventListener.xml
--- phpdox-0.11.2/dependencies/php/classes/EventListener.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EventListener.xml	2019-03-13 09:34:17.000000000 +0000
@@ -64,7 +64,7 @@
   </method>
   <method name="getSocketName" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Retreives the current address to which the&#10;  listener's socket is bound."/>
+      <description compact="Retreives the current address to which the&#10;  listener's socket is bound"/>
       <return type="bool"/>
     </docblock>
     <parameter name="address" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EventUtil.xml phpdox-0.12.0/dependencies/php/classes/EventUtil.xml
--- phpdox-0.11.2/dependencies/php/classes/EventUtil.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EventUtil.xml	2019-03-13 09:34:17.000000000 +0000
@@ -149,7 +149,7 @@
   </method>
   <method name="getSocketName" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Retreives the current address to which the&#10;  socket is bound."/>
+      <description compact="Retreives the current address to which the&#10;  socket is bound"/>
       <return type="bool"/>
     </docblock>
     <parameter name="socket" optional="false" byreference="false" type="object" class="mixed"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Event.xml phpdox-0.12.0/dependencies/php/classes/Event.xml
--- phpdox-0.11.2/dependencies/php/classes/Event.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Event.xml	2019-03-13 09:34:17.000000000 +0000
@@ -42,21 +42,21 @@
       <description compact="Makes event pending">Marks event pending. Non-pending event will never occur, and the event callback will never be called. In conjuction with Event::del an event could be re-scheduled by user at any time.</description>
       <return type="bool"/>
     </docblock>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="double"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="addSignal" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Makes signal event pending"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="double"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="addTimer" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Makes timer event pending"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="double"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -89,7 +89,7 @@
   </method>
   <method name="free" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Make event non-pending and free resources allocated for this&#10;  event.">Removes event from the list of events monitored by libevent, and free resources allocated for the event.</description>
+      <description compact="Make event non-pending and free resources allocated for this&#10;  event">Removes event from the list of events monitored by libevent, and free resources allocated for the event.</description>
       <return type="void"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EvLoop.xml phpdox-0.12.0/dependencies/php/classes/EvLoop.xml
--- phpdox-0.11.2/dependencies/php/classes/EvLoop.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EvLoop.xml	2019-03-13 09:34:17.000000000 +0000
@@ -50,7 +50,7 @@
   </member>
   <method name="backend" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns an integer describing the backend used by libev."/>
+      <description compact="Returns an integer describing the backend used by libev"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -81,22 +81,22 @@
     </docblock>
     <parameter name="flags" optional="true" byreference="false" type="int"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
-    <parameter name="io_interval" optional="true" byreference="false" type="object" class="double"/>
-    <parameter name="timeout_interval" optional="true" byreference="false" type="object" class="double"/>
+    <parameter name="io_interval" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="timeout_interval" optional="true" byreference="false" type="object" class="float"/>
   </constructor>
   <method name="defaultLoop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns or creates the default event loop."/>
+      <description compact="Returns or creates the default event loop"/>
       <return type="EvLoop"/>
     </docblock>
     <parameter name="flags" optional="true" byreference="false" type="int"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
-    <parameter name="io_interval" optional="true" byreference="false" type="object" class="double"/>
-    <parameter name="timeout_interval" optional="true" byreference="false" type="object" class="double"/>
+    <parameter name="io_interval" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="timeout_interval" optional="true" byreference="false" type="object" class="float"/>
   </method>
   <method name="embed" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Creates an instance of EvEmbed watcher associated&#10;  with the current EvLoop object."/>
+      <description compact="Creates an instance of EvEmbed watcher associated&#10;  with the current EvLoop object"/>
       <return type="EvEmbed"/>
     </docblock>
     <parameter name="other" optional="false" byreference="false" type="string"/>
@@ -148,12 +148,12 @@
   <method name="now" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the current &quot;event loop time&quot;"/>
-      <return type="double"/>
+      <return type="float"/>
     </docblock>
   </method>
   <method name="nowUpdate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Establishes the current time by querying the kernel, updating the time&#10;    returned by EvLoop::now in the progress."/>
+      <description compact="Establishes the current time by querying the kernel, updating the time&#10;    returned by EvLoop::now in the progress"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -162,8 +162,8 @@
       <description compact="Creates EvPeriodic watcher object associated with the current&#10;  event loop instance"/>
       <return type="EvPeriodic"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
@@ -206,7 +206,7 @@
       <return type="EvStat"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
@@ -229,8 +229,8 @@
       <description compact="Creates EvTimer watcher object associated with the current event&#10;  loop instance"/>
       <return type="EvTimer"/>
     </docblock>
-    <parameter name="after" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="repeat" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="after" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="repeat" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EvPeriodic.xml phpdox-0.12.0/dependencies/php/classes/EvPeriodic.xml
--- phpdox-0.11.2/dependencies/php/classes/EvPeriodic.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EvPeriodic.xml	2019-03-13 09:34:17.000000000 +0000
@@ -39,14 +39,14 @@
   </member>
   <method name="again" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Simply stops and restarts the periodic watcher again."/>
+      <description compact="Simply stops and restarts the periodic watcher again"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="at" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the absolute time that this&#10;  watcher is supposed to trigger next"/>
-      <return type="double"/>
+      <return type="float"/>
     </docblock>
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
@@ -54,7 +54,7 @@
       <description compact="Constructs EvPeriodic watcher object"/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="interval" optional="false" byreference="false" type="string"/>
     <parameter name="reschedule_cb" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
@@ -66,8 +66,8 @@
       <description compact="Create a stopped EvPeriodic watcher"/>
       <return type="EvPeriodic"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="reschedule_cb" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
@@ -78,8 +78,8 @@
       <description compact="Configures the watcher"/>
       <return type="void"/>
     </docblock>
-    <parameter name="offset" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EvSignal.xml phpdox-0.12.0/dependencies/php/classes/EvSignal.xml
--- phpdox-0.11.2/dependencies/php/classes/EvSignal.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EvSignal.xml	2019-03-13 09:34:17.000000000 +0000
@@ -33,7 +33,7 @@
   </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Constructs EvPeriodic watcher object"/>
+      <description compact="Constructs EvSignal watcher object"/>
       <return type="void"/>
     </docblock>
     <parameter name="signum" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EvStat.xml phpdox-0.12.0/dependencies/php/classes/EvStat.xml
--- phpdox-0.11.2/dependencies/php/classes/EvStat.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EvStat.xml	2019-03-13 09:34:17.000000000 +0000
@@ -49,7 +49,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
@@ -60,7 +60,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
@@ -77,7 +77,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
-    <parameter name="interval" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="interval" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="stat" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/EvTimer.xml phpdox-0.12.0/dependencies/php/classes/EvTimer.xml
--- phpdox-0.11.2/dependencies/php/classes/EvTimer.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/EvTimer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -48,8 +48,8 @@
       <description compact="Constructs an EvTimer watcher object"/>
       <return type="void"/>
     </docblock>
-    <parameter name="after" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="repeat" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="after" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="repeat" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
@@ -59,8 +59,8 @@
       <description compact="Creates EvTimer stopped watcher object"/>
       <return type="EvTimer"/>
     </docblock>
-    <parameter name="after" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="repeat" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="after" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="repeat" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
     <parameter name="data" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="true" byreference="false" type="int"/>
@@ -70,8 +70,8 @@
       <description compact="Configures the watcher"/>
       <return type="void"/>
     </docblock>
-    <parameter name="after" optional="false" byreference="false" type="object" class="double"/>
-    <parameter name="repeat" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="after" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="repeat" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Ev.xml phpdox-0.12.0/dependencies/php/classes/Ev.xml
--- phpdox-0.11.2/dependencies/php/classes/Ev.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Ev.xml	2019-03-13 09:34:17.000000000 +0000
@@ -172,7 +172,7 @@
   </constant>
   <method name="backend" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Returns an integer describing the backend used by libev."/>
+      <description compact="Returns an integer describing the backend used by libev"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -184,7 +184,7 @@
   </method>
   <method name="embeddableBackends" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Returns the set of backends that are embeddable in other event loops."/>
+      <description compact="Returns the set of backends that are embeddable in other event loops"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -204,25 +204,25 @@
   </method>
   <method name="iteration" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Return the number of times the default event loop has polled for new&#10;  events."/>
+      <description compact="Return the number of times the default event loop has polled for new&#10;  events"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="now" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Returns the time when the last iteration of the default event&#10;  loop has started."/>
-      <return type="double"/>
+      <description compact="Returns the time when the last iteration of the default event&#10;  loop has started"/>
+      <return type="float"/>
     </docblock>
   </method>
   <method name="nowUpdate" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Establishes the current time by querying the kernel, updating the time&#10;    returned by Ev::now in the progress.">Establishes the current time by querying the kernel, updating the time returned by Ev::now in the progress. This is a costly operation and is usually done automatically within Ev::run .</description>
+      <description compact="Establishes the current time by querying the kernel, updating the time&#10;    returned by Ev::now in the progress">Establishes the current time by querying the kernel, updating the time returned by Ev::now in the progress. This is a costly operation and is usually done automatically within Ev::run .</description>
       <return type="void"/>
     </docblock>
   </method>
   <method name="recommendedBackends" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Returns a bit mask of recommended backends for current&#10;  platform."/>
+      <description compact="Returns a bit mask of recommended backends for current&#10;  platform"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -241,10 +241,10 @@
   </method>
   <method name="sleep" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Block the process for the given number of seconds."/>
+      <description compact="Block the process for the given number of seconds"/>
       <return type="void"/>
     </docblock>
-    <parameter name="seconds" optional="false" byreference="false" type="object" class="double"/>
+    <parameter name="seconds" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="stop" abstract="false" static="false" visibility="public" final="true">
     <docblock>
@@ -255,7 +255,7 @@
   </method>
   <method name="supportedBackends" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Returns the set of backends supported by current libev&#10;  configuration."/>
+      <description compact="Returns the set of backends supported by current libev&#10;  configuration"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -267,8 +267,8 @@
   </method>
   <method name="time" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Returns the current time in fractional seconds since the epoch."/>
-      <return type="double"/>
+      <description compact="Returns the current time in fractional seconds since the epoch"/>
+      <return type="float"/>
     </docblock>
   </method>
   <method name="verify" abstract="false" static="false" visibility="public" final="true">
diff -Nru phpdox-0.11.2/dependencies/php/classes/FANNConnection.xml phpdox-0.12.0/dependencies/php/classes/FANNConnection.xml
--- phpdox-0.11.2/dependencies/php/classes/FANNConnection.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/FANNConnection.xml	2019-03-13 09:34:17.000000000 +0000
@@ -29,7 +29,7 @@
   </constructor>
   <method name="getFromNeuron" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the postions of starting neuron."/>
+      <description compact="Returns the postions of starting neuron"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -48,7 +48,7 @@
   <method name="setWeight" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Sets the connections weight">Sets the connection weight.</description>
-      <return type="bool"/>
+      <return type="void"/>
     </docblock>
     <parameter name="weight" optional="false" byreference="false" type="object" class="float"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/GearmanClient.xml phpdox-0.12.0/dependencies/php/classes/GearmanClient.xml
--- phpdox-0.11.2/dependencies/php/classes/GearmanClient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/GearmanClient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -204,7 +204,7 @@
   </method>
   <method name="error" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns an error string for the last error encountered."/>
+      <description compact="Returns an error string for the last error encountered"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/GearmanWorker.xml phpdox-0.12.0/dependencies/php/classes/GearmanWorker.xml
--- phpdox-0.11.2/dependencies/php/classes/GearmanWorker.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/GearmanWorker.xml	2019-03-13 09:34:17.000000000 +0000
@@ -92,7 +92,7 @@
   </method>
   <method name="setId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Give the worker an identifier so it can be tracked when asking gearmand for the list of available workers."/>
+      <description compact="Give the worker an identifier so it can be tracked when asking gearmand for the list of available workers"/>
       <return type="bool"/>
     </docblock>
     <parameter name="id" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Gender_Gender.xml phpdox-0.12.0/dependencies/php/classes/Gender_Gender.xml
--- phpdox-0.11.2/dependencies/php/classes/Gender_Gender.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Gender_Gender.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="Gender\Gender" namespace="" name="Gender\Gender">
+<class xmlns="http://xml.phpdox.net/src" full="Gender\Gender" namespace="Gender" name="Gender">
   <constant name="IS_FEMALE" value="70">
     <docblock>
       <var type="integer"/>
@@ -312,14 +312,14 @@
   </constant>
   <method name="connect" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Connect to an external name dictionary."/>
-      <return type="boolean"/>
+      <description compact="Connect to an external name dictionary"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="dsn" optional="false" byreference="false" type="string"/>
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Construct the Gender object."/>
+      <description compact="Construct the Gender object"/>
       <return type="void"/>
     </docblock>
     <parameter name="dsn" optional="true" byreference="false" type="string"/>
@@ -329,31 +329,31 @@
       <description compact="Get textual country representation"/>
       <return type="array"/>
     </docblock>
-    <parameter name="country" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="country" optional="false" byreference="false" type="int"/>
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get gender of a name."/>
-      <return type="integer"/>
+      <description compact="Get gender of a name"/>
+      <return type="int"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="country" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="country" optional="true" byreference="false" type="int"/>
   </method>
   <method name="isNick" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Check if the name0 is an alias of the name1."/>
+      <description compact="Check if the name0 is an alias of the name1"/>
       <return type="array"/>
     </docblock>
     <parameter name="name0" optional="false" byreference="false" type="string"/>
     <parameter name="name1" optional="false" byreference="false" type="string"/>
-    <parameter name="country" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="country" optional="true" byreference="false" type="int"/>
   </method>
   <method name="similarNames" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get similar names."/>
+      <description compact="Get similar names"/>
       <return type="array"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="country" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="country" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/GlobIterator.xml phpdox-0.12.0/dependencies/php/classes/GlobIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/GlobIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/GlobIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,67 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="GlobIterator" namespace="" name="GlobIterator">
   <implements name="SeekableIterator" full="SeekableIterator"/>
+  <constant name="CURRENT_AS_PATHNAME" value="32">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_FILEINFO" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_SELF" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_MODE_MASK" value="240">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_PATHNAME" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_FILENAME" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FOLLOW_SYMLINKS" value="512">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_MODE_MASK" value="3840">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="NEW_CURRENT_AND_KEY" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_DOTS" value="4096">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="UNIX_PATHS" value="8192">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a directory using glob"/>
       <return type="void"/>
     </docblock>
-    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="pattern" optional="false" byreference="false" type="string"/>
     <parameter name="flags" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/GmagickDraw.xml phpdox-0.12.0/dependencies/php/classes/GmagickDraw.xml
--- phpdox-0.11.2/dependencies/php/classes/GmagickDraw.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/GmagickDraw.xml	2019-03-13 09:34:17.000000000 +0000
@@ -177,7 +177,7 @@
   </method>
   <method name="setfillcolor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the fill color to be used for drawing filled objects. "/>
+      <description compact="Sets the fill color to be used for drawing filled objects"/>
       <return type="GmagickDraw"/>
     </docblock>
     <parameter name="color" optional="false" byreference="false" type="object" class="mixed"/>
@@ -191,14 +191,14 @@
   </method>
   <method name="setfont" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the fully-specified font to use when annotating with text. "/>
+      <description compact="Sets the fully-specified font to use when annotating with text"/>
       <return type="GmagickDraw"/>
     </docblock>
     <parameter name="font" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setfontsize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the font pointsize to use when annotating with text. "/>
+      <description compact="Sets the font pointsize to use when annotating with text"/>
       <return type="GmagickDraw"/>
     </docblock>
     <parameter name="pointsize" optional="false" byreference="false" type="object" class="float"/>
@@ -219,21 +219,21 @@
   </method>
   <method name="setstrokecolor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the color used for stroking object outlines. "/>
+      <description compact="Sets the color used for stroking object outlines"/>
       <return type="GmagickDraw"/>
     </docblock>
     <parameter name="color" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="setstrokeopacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Specifies the opacity of stroked object outlines."/>
+      <description compact="Specifies the opacity of stroked object outlines"/>
       <return type="GmagickDraw"/>
     </docblock>
     <parameter name="stroke_opacity" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setstrokewidth" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the width of the stroke used to draw object outlines. "/>
+      <description compact="Sets the width of the stroke used to draw object outlines"/>
       <return type="GmagickDraw"/>
     </docblock>
     <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Gmagick.xml phpdox-0.12.0/dependencies/php/classes/Gmagick.xml
--- phpdox-0.11.2/dependencies/php/classes/Gmagick.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Gmagick.xml	2019-03-13 09:34:17.000000000 +0000
@@ -351,7 +351,7 @@
   </method>
   <method name="getimageprofile" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the named image profile."/>
+      <description compact="Returns the named image profile"/>
       <return type="string"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
@@ -388,7 +388,7 @@
   </method>
   <method name="getimagetype" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the potential image type. "/>
+      <description compact="Gets the potential image type"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -412,25 +412,25 @@
   </method>
   <method name="getpackagename" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the GraphicsMagick package name."/>
+      <description compact="Returns the GraphicsMagick package name"/>
       <return type="string"/>
     </docblock>
   </method>
   <method name="getquantumdepth" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the Gmagick quantum depth as a string. "/>
+      <description compact="Returns the Gmagick quantum depth as a string"/>
       <return type="array"/>
     </docblock>
   </method>
   <method name="getreleasedate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the GraphicsMagick release date as a string. "/>
+      <description compact="Returns the GraphicsMagick release date as a string"/>
       <return type="string"/>
     </docblock>
   </method>
   <method name="getsamplingfactors" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the horizontal and vertical sampling factor. "/>
+      <description compact="Gets the horizontal and vertical sampling factor"/>
       <return type="array"/>
     </docblock>
   </method>
@@ -467,7 +467,7 @@
   </method>
   <method name="labelimage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds a label to an image. "/>
+      <description compact="Adds a label to an image"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="label" optional="false" byreference="false" type="string"/>
@@ -490,7 +490,7 @@
   </method>
   <method name="mapimage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Replaces the colors of an image with the closest color from a reference image."/>
+      <description compact="Replaces the colors of an image with the closest color from a reference image"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="gmagick" optional="false" byreference="false" type="object" class="gmagick"/>
@@ -610,7 +610,7 @@
   </method>
   <method name="queryformats" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns formats supported by Gmagick."/>
+      <description compact="Returns formats supported by Gmagick"/>
       <return type="array"/>
     </docblock>
     <parameter name="pattern" optional="true" byreference="false" type="string"/>
@@ -753,14 +753,14 @@
   </method>
   <method name="setimagebackgroundcolor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image background color. "/>
+      <description compact="Sets the image background color"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="color" optional="false" byreference="false" type="object" class="GmagickPixel"/>
   </method>
   <method name="setimageblueprimary" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image chromaticity blue primary point."/>
+      <description compact="Sets the image chromaticity blue primary point"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
@@ -768,7 +768,7 @@
   </method>
   <method name="setimagebordercolor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image border color."/>
+      <description compact="Sets the image border color"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="color" optional="false" byreference="false" type="object" class="GmagickPixel"/>
@@ -839,7 +839,7 @@
   </method>
   <method name="setimagegreenprimary" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image chromaticity green primary point. "/>
+      <description compact="Sets the image chromaticity green primary point"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
@@ -854,14 +854,14 @@
   </method>
   <method name="setimageinterlacescheme" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the interlace scheme of the image."/>
+      <description compact="Sets the interlace scheme of the image"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="interlace" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setimageiterations" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image iterations. "/>
+      <description compact="Sets the image iterations"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="iterations" optional="false" byreference="false" type="int"/>
@@ -876,7 +876,7 @@
   </method>
   <method name="setimageredprimary" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image chromaticity red primary point. "/>
+      <description compact="Sets the image chromaticity red primary point"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
@@ -913,14 +913,14 @@
   </method>
   <method name="setimageunits" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image units of resolution. "/>
+      <description compact="Sets the image units of resolution"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="resolution" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setimagewhitepoint" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image chromaticity white point. "/>
+      <description compact="Sets the image chromaticity white point"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="x" optional="false" byreference="false" type="object" class="float"/>
@@ -928,7 +928,7 @@
   </method>
   <method name="setsamplingfactors" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the image sampling factors. "/>
+      <description compact="Sets the image sampling factors"/>
       <return type="Gmagick"/>
     </docblock>
     <parameter name="factors" optional="false" byreference="false" type="object" class="array"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/HashContext.xml phpdox-0.12.0/dependencies/php/classes/HashContext.xml
--- phpdox-0.11.2/dependencies/php/classes/HashContext.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/HashContext.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="HashContext" namespace="" name="HashContext">
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact="Private constructor to disallow direct instantiation"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/HRTime_PerformanceCounter.xml phpdox-0.12.0/dependencies/php/classes/HRTime_PerformanceCounter.xml
--- phpdox-0.11.2/dependencies/php/classes/HRTime_PerformanceCounter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/HRTime_PerformanceCounter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="HRTime\PerformanceCounter" namespace="" name="HRTime\PerformanceCounter">
+<class xmlns="http://xml.phpdox.net/src" full="HRTime\PerformanceCounter" namespace="HRTime" name="PerformanceCounter">
   <method name="getFrequency" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Timer frequency in ticks per second"/>
@@ -17,6 +17,6 @@
       <description compact="Ticks elapsed since the given value"/>
       <return type="int"/>
     </docblock>
-    <parameter name="start" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="start" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/HRTime_StopWatch.xml phpdox-0.12.0/dependencies/php/classes/HRTime_StopWatch.xml
--- phpdox-0.11.2/dependencies/php/classes/HRTime_StopWatch.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/HRTime_StopWatch.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,35 +1,35 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="HRTime\StopWatch" namespace="" name="HRTime\StopWatch">
+<class xmlns="http://xml.phpdox.net/src" full="HRTime\StopWatch" namespace="HRTime" name="StopWatch">
   <extends name="HRTime\PerformanceCounter" full="HRTime\PerformanceCounter"/>
   <method name="getElapsedTicks" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get elapsed ticks for all intervals."/>
+      <description compact="Get elapsed ticks for all intervals"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="getElapsedTime" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get elapsed time for all intervals."/>
+      <description compact="Get elapsed time for all intervals"/>
       <return type="float"/>
     </docblock>
-    <parameter name="unit" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="unit" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getLastElapsedTicks" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get elapsed ticks for the last interval."/>
+      <description compact="Get elapsed ticks for the last interval"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="getLastElapsedTime" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get elapsed time for the last interval."/>
+      <description compact="Get elapsed time for the last interval"/>
       <return type="float"/>
     </docblock>
-    <parameter name="unit" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="unit" optional="true" byreference="false" type="int"/>
   </method>
   <method name="isRunning" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Whether the measurement is running."/>
+      <description compact="Whether the measurement is running"/>
       <return type="bool"/>
     </docblock>
   </method>
@@ -62,6 +62,6 @@
       <description compact=""/>
       <return type="int"/>
     </docblock>
-    <parameter name="start" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="start" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/HRTime_Unit.xml phpdox-0.12.0/dependencies/php/classes/HRTime_Unit.xml
--- phpdox-0.11.2/dependencies/php/classes/HRTime_Unit.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/HRTime_Unit.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="HRTime\Unit" namespace="" name="HRTime\Unit">
+<class xmlns="http://xml.phpdox.net/src" full="HRTime\Unit" namespace="HRTime" name="Unit">
   <constant name="SECOND" value="0">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ImagickDraw.xml phpdox-0.12.0/dependencies/php/classes/ImagickDraw.xml
--- phpdox-0.11.2/dependencies/php/classes/ImagickDraw.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ImagickDraw.xml	2019-03-13 09:34:17.000000000 +0000
@@ -593,7 +593,7 @@
   <method name="resetVectorGraphics" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="rotate" abstract="false" static="false" final="false">
@@ -731,10 +731,10 @@
   <method name="setResolution" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="x_resolution" optional="false" byreference="false" type="string"/>
-    <parameter name="y_resolution" optional="false" byreference="false" type="string"/>
+    <parameter name="x_resolution" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="y_resolution" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setStrokeAlpha" abstract="false" static="false" final="false">
     <docblock>
@@ -844,21 +844,21 @@
   <method name="setTextInterlineSpacing" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="spacing" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setTextInterwordSpacing" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="spacing" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="setTextKerning" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="kerning" optional="false" byreference="false" type="object" class="float"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ImagickKernel.xml phpdox-0.12.0/dependencies/php/classes/ImagickKernel.xml
--- phpdox-0.11.2/dependencies/php/classes/ImagickKernel.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ImagickKernel.xml	2019-03-13 09:34:17.000000000 +0000
@@ -12,13 +12,14 @@
       <description compact="Description"/>
       <return type="void"/>
     </docblock>
+    <parameter name="scale" optional="false" byreference="false" type="object" class="float"/>
   </method>
   <method name="fromBuiltin" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="ImagickKernel"/>
     </docblock>
-    <parameter name="kernelType" optional="false" byreference="false" type="string"/>
+    <parameter name="kernelType" optional="false" byreference="false" type="int"/>
     <parameter name="kernelString" optional="false" byreference="false" type="string"/>
   </method>
   <method name="fromMatrix" abstract="false" static="false" visibility="public" final="false">
@@ -40,6 +41,8 @@
       <description compact="Description"/>
       <return type="void"/>
     </docblock>
+    <parameter name="scale" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="normalizeFlag" optional="true" byreference="false" type="int"/>
   </method>
   <method name="separate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ImagickPixel.xml phpdox-0.12.0/dependencies/php/classes/ImagickPixel.xml
--- phpdox-0.11.2/dependencies/php/classes/ImagickPixel.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ImagickPixel.xml	2019-03-13 09:34:17.000000000 +0000
@@ -24,7 +24,7 @@
       <description compact="Returns the color"/>
       <return type="array"/>
     </docblock>
-    <parameter name="normalized" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="normalized" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getColorAsString" abstract="false" static="false" final="false">
     <docblock>
@@ -41,7 +41,7 @@
   <method name="getColorQuantum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="mixed"/>
+      <return type="array"/>
     </docblock>
   </method>
   <method name="getColorValue" abstract="false" static="false" final="false">
@@ -54,8 +54,9 @@
   <method name="getColorValueQuantum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="mixed"/>
+      <return type="number"/>
     </docblock>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getHSL" abstract="false" static="false" final="false">
     <docblock>
@@ -103,9 +104,9 @@
   <method name="setcolorcount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="colorCount" optional="false" byreference="false" type="string"/>
+    <parameter name="colorCount" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setColorValue" abstract="false" static="false" final="false">
     <docblock>
@@ -118,10 +119,10 @@
   <method name="setColorValueQuantum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="color" optional="false" byreference="false" type="int"/>
-    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="value" optional="false" byreference="false" type="object" class="number"/>
   </method>
   <method name="setHSL" abstract="false" static="false" final="false">
     <docblock>
@@ -135,7 +136,7 @@
   <method name="setIndex" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Imagick.xml phpdox-0.12.0/dependencies/php/classes/Imagick.xml
--- phpdox-0.11.2/dependencies/php/classes/Imagick.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Imagick.xml	2019-03-13 09:34:17.000000000 +0000
@@ -18,6 +18,7 @@
     <parameter name="columns" optional="false" byreference="false" type="int"/>
     <parameter name="rows" optional="false" byreference="false" type="int"/>
     <parameter name="bestfit" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="adaptiveSharpenImage" abstract="false" static="false" final="false">
     <docblock>
@@ -87,9 +88,9 @@
   <method name="autoLevelImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="string"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="averageImages" abstract="false" static="false" final="false">
     <docblock>
@@ -107,7 +108,7 @@
   <method name="blueShiftImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="factor" optional="true" byreference="false" type="object" class="float"/>
   </method>
@@ -132,11 +133,11 @@
   <method name="brightnessContrastImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="brightness" optional="false" byreference="false" type="string"/>
-    <parameter name="contrast" optional="false" byreference="false" type="string"/>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="string"/>
+    <parameter name="brightness" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="contrast" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="charcoalImage" abstract="false" static="false" final="false">
     <docblock>
@@ -159,9 +160,9 @@
   <method name="clampImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="string"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="clear" abstract="false" static="false" final="false">
     <docblock>
@@ -203,7 +204,7 @@
       <return type="bool"/>
     </docblock>
     <parameter name="lookup_table" optional="false" byreference="false" type="object" class="Imagick"/>
-    <parameter name="channel" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="coalesceImages" abstract="false" static="false" final="false">
     <docblock>
@@ -229,13 +230,14 @@
     </docblock>
     <parameter name="colorize" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="opacity" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="colorMatrixImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="color_matrix" optional="false" byreference="false" type="string"/>
+    <parameter name="color_matrix" optional="false" byreference="false" type="object" class="array"/>
   </method>
   <method name="combineImages" abstract="false" static="false" final="false">
     <docblock>
@@ -291,7 +293,7 @@
       <description compact="The Imagick constructor"/>
       <return type="void"/>
     </docblock>
-    <parameter name="files" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="files" optional="true" byreference="false" type="object" class="mixed"/>
   </constructor>
   <method name="contrastImage" abstract="false" static="false" final="false">
     <docblock>
@@ -319,10 +321,10 @@
   </method>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Description"/>
-      <return type="void"/>
+      <description compact="Get the number of images"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="mode" optional="true" byreference="false" type="string"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
   </method>
   <method name="cropImage" abstract="false" static="false" final="false">
     <docblock>
@@ -341,6 +343,7 @@
     </docblock>
     <parameter name="width" optional="false" byreference="false" type="int"/>
     <parameter name="height" optional="false" byreference="false" type="int"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="current" abstract="false" static="false" final="false">
     <docblock>
@@ -378,7 +381,7 @@
   <method name="deleteImageProperty" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
   </method>
@@ -499,10 +502,10 @@
   <method name="filter" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="ImagickKernel" optional="false" byreference="false" type="object" class="ImagickKernel"/>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="int"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="flattenImages" abstract="false" static="false" final="false">
     <docblock>
@@ -538,7 +541,7 @@
   <method name="forwardFourierTransformimage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="magnitude" optional="false" byreference="false" type="object" class="bool"/>
   </method>
@@ -1222,7 +1225,7 @@
   <method name="identifyFormat" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="string|false"/>
+      <return type="string"/>
     </docblock>
     <parameter name="embedText" optional="false" byreference="false" type="string"/>
   </method>
@@ -1256,10 +1259,10 @@
   <method name="inverseFourierTransformImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="complement" optional="false" byreference="false" type="string"/>
-    <parameter name="magnitude" optional="false" byreference="false" type="string"/>
+    <parameter name="complement" optional="false" byreference="false" type="object" class="Imagick"/>
+    <parameter name="magnitude" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="labelImage" abstract="false" static="false" final="false">
     <docblock>
@@ -1310,7 +1313,7 @@
   </method>
   <method name="mapImage" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Replaces the colors of an image with the closest color from a reference image."/>
+      <description compact="Replaces the colors of an image with the closest color from a reference image"/>
       <return type="bool"/>
     </docblock>
     <parameter name="map" optional="false" byreference="false" type="object" class="Imagick"/>
@@ -1377,12 +1380,12 @@
   <method name="morphology" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="morphologyMethod" optional="false" byreference="false" type="int"/>
     <parameter name="iterations" optional="false" byreference="false" type="int"/>
     <parameter name="ImagickKernel" optional="false" byreference="false" type="object" class="ImagickKernel"/>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="string"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="mosaicImages" abstract="false" static="false" final="false">
     <docblock>
@@ -1661,9 +1664,9 @@
   <method name="readImages" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="Imagick"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="filenames" optional="false" byreference="false" type="string"/>
+    <parameter name="filenames" optional="false" byreference="false" type="object" class="array"/>
   </method>
   <method name="recolorImage" abstract="false" static="false" final="false">
     <docblock>
@@ -1733,6 +1736,7 @@
     <parameter name="filter" optional="false" byreference="false" type="int"/>
     <parameter name="blur" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="bestfit" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="rollImage" abstract="false" static="false" final="false">
     <docblock>
@@ -1753,10 +1757,10 @@
   <method name="rotationalBlurImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="angle" optional="false" byreference="false" type="string"/>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="string"/>
+    <parameter name="angle" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="roundCorners" abstract="false" static="false" final="false">
     <docblock>
@@ -1785,6 +1789,7 @@
     <parameter name="cols" optional="false" byreference="false" type="int"/>
     <parameter name="rows" optional="false" byreference="false" type="int"/>
     <parameter name="bestfit" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="segmentImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -1799,12 +1804,12 @@
   <method name="selectiveBlurImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="radius" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="sigma" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="threshold" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="CHANNEL" optional="false" byreference="false" type="int"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="separateImageChannel" abstract="false" static="false" final="false">
     <docblock>
@@ -1907,7 +1912,7 @@
   <method name="setImageAttribute" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
     <parameter name="value" optional="false" byreference="false" type="string"/>
@@ -2260,14 +2265,14 @@
   <method name="setProgressMonitor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="setRegistry" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
     <parameter name="value" optional="false" byreference="false" type="string"/>
@@ -2282,7 +2287,7 @@
   </method>
   <method name="setResourceLimit" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Sets the limit for a particular resource in megabytes"/>
+      <description compact="Sets the limit for a particular resource"/>
       <return type="bool"/>
     </docblock>
     <parameter name="type" optional="false" byreference="false" type="int"/>
@@ -2388,8 +2393,8 @@
       <description compact="Description"/>
       <return type="Imagick"/>
     </docblock>
-    <parameter name="stack" optional="false" byreference="false" type="string"/>
-    <parameter name="offset" optional="false" byreference="false" type="string"/>
+    <parameter name="stack" optional="false" byreference="false" type="object" class="bool"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="solarizeImage" abstract="false" static="false" final="false">
     <docblock>
@@ -2427,12 +2432,12 @@
   <method name="statisticImage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Description"/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="type" optional="false" byreference="false" type="int"/>
     <parameter name="width" optional="false" byreference="false" type="int"/>
     <parameter name="height" optional="false" byreference="false" type="int"/>
-    <parameter name="CHANNEL" optional="true" byreference="false" type="string"/>
+    <parameter name="channel" optional="true" byreference="false" type="int"/>
   </method>
   <method name="steganoImage" abstract="false" static="false" final="false">
     <docblock>
@@ -2495,6 +2500,7 @@
     <parameter name="rows" optional="false" byreference="false" type="int"/>
     <parameter name="bestfit" optional="true" byreference="false" type="object" class="bool"/>
     <parameter name="fill" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="tintImage" abstract="false" static="false" final="false">
     <docblock>
@@ -2503,10 +2509,11 @@
     </docblock>
     <parameter name="tint" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="opacity" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="legacy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="__toString" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Returns the image as a string."/>
+      <description compact="Returns the image as a string"/>
       <return type="string"/>
     </docblock>
   </method>
@@ -2520,7 +2527,7 @@
   </method>
   <method name="transformImageColorspace" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Transforms an image to a new colorspace."/>
+      <description compact="Transforms an image to a new colorspace"/>
       <return type="bool"/>
     </docblock>
     <parameter name="colorspace" optional="false" byreference="false" type="int"/>
@@ -2615,6 +2622,7 @@
       <return type="bool"/>
     </docblock>
     <parameter name="filehandle" optional="false" byreference="false" type="object" class="resource"/>
+    <parameter name="format" optional="true" byreference="false" type="string"/>
   </method>
   <method name="writeImages" abstract="false" static="false" final="false">
     <docblock>
@@ -2630,5 +2638,6 @@
       <return type="bool"/>
     </docblock>
     <parameter name="filehandle" optional="false" byreference="false" type="object" class="resource"/>
+    <parameter name="format" optional="true" byreference="false" type="string"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlBreakIterator.xml phpdox-0.12.0/dependencies/php/classes/IntlBreakIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlBreakIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlBreakIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -105,145 +105,145 @@
   <method name="createCharacterInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Create break iterator for boundaries of combining character sequences&#10;  "/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createCodePointInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Create break iterator for boundaries of code points"/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
   </method>
   <method name="createLineInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Create break iterator for logically possible line breaks&#10;  "/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createSentenceInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Create break iterator for sentence breaks"/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createTitleInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Create break iterator for title-casing breaks"/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createWordInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Create break iterator for word breaks"/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get index of current position"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set position to the first character in the text"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="following" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Advance the iterator to the first boundary following specified offset&#10;  "/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get last error code on the object">Object oriented style (method):</description>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Get last error code on the object">Object oriented style (method):</description>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get last error message on the object">Object oriented style (method):</description>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Get last error message on the object">Object oriented style (method):</description>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getLocale" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the locale associated with the object"/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
-    <parameter name="&quot;locale_type&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="locale_type" optional="false" byreference="false" type="string"/>
   </method>
   <method name="getPartsIterator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Create iterator for navigating fragments between boundaries"/>
-      <return type="ReturnType"/>
+      <return type="IntlPartsIterator"/>
     </docblock>
-    <parameter name="&quot;key_type&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="key_type" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the text being scanned"/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="isBoundary" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Tell whether an offset is a boundary&#x2BC;s offset"/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set the iterator position to index beyond the last character"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="next" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Advance the iterator the next boundary"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="int"/>
   </method>
   <method name="preceding" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set the iterator position to the first boundary before an offset"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="previous" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set the iterator position to the boundary immediately before the current"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="setText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set the text being scanned"/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="&quot;text&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="text" optional="false" byreference="false" type="string"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlCalendar.xml phpdox-0.12.0/dependencies/php/classes/IntlCalendar.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlCalendar.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlCalendar.xml	2019-03-13 09:34:17.000000000 +0000
@@ -444,7 +444,7 @@
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
     <parameter name="locale" optional="false" byreference="false" type="string"/>
-    <parameter name="commonlyUsed" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="commonlyUsed" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
@@ -453,7 +453,7 @@
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
     <parameter name="locale" optional="false" byreference="false" type="string"/>
-    <parameter name="commonlyUsed" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="commonlyUsed" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="getLeastMaximum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -768,17 +768,17 @@
   <method name="setLenient" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set whether date/time interpretation is to be lenient">Object oriented style</description>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="isLenient" optional="false" byreference="false" type="string"/>
+    <parameter name="isLenient" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
-    <parameter name="isLenient" optional="false" byreference="false" type="string"/>
+    <parameter name="isLenient" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setMinimalDaysInFirstWeek" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlCodePointBreakIterator.xml phpdox-0.12.0/dependencies/php/classes/IntlCodePointBreakIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlCodePointBreakIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlCodePointBreakIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -99,7 +99,7 @@
   <method name="getLastCodePoint" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get last code point passed over after advancing or receding the iterator"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <constructor name="__construct" abstract="false" static="false" final="false">
@@ -111,145 +111,145 @@
   <method name="createCharacterInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createCodePointInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
   </method>
   <method name="createLineInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createSentenceInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createTitleInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createWordInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="following" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getLocale" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
-    <parameter name="&quot;locale_type&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="locale_type" optional="false" byreference="false" type="string"/>
   </method>
   <method name="getPartsIterator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlPartsIterator"/>
     </docblock>
-    <parameter name="&quot;key_type&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="key_type" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="isBoundary" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="next" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="int"/>
   </method>
   <method name="preceding" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="previous" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="setText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="&quot;text&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="text" optional="false" byreference="false" type="string"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlDateFormatter.xml phpdox-0.12.0/dependencies/php/classes/IntlDateFormatter.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlDateFormatter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlDateFormatter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -60,7 +60,7 @@
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get the error text from the last operation.">Object oriented style</description>
+      <description compact="Get the error text from the last operation">Object oriented style</description>
       <return type="string"/>
     </docblock>
   </method>
@@ -154,7 +154,7 @@
   <method name="setTimeZone" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Sets formatter&#x2BC;s timezone">Object oriented style</description>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="zone" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlGregorianCalendar.xml phpdox-0.12.0/dependencies/php/classes/IntlGregorianCalendar.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlGregorianCalendar.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlGregorianCalendar.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,900 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="IntlGregorianCalendar" namespace="" name="IntlGregorianCalendar">
+  <extends name="IntlCalendar" full="IntlCalendar"/>
+  <constant name="FIELD_ERA" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_YEAR" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_MONTH" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_WEEK_OF_YEAR" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_WEEK_OF_MONTH" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DATE" value="5">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DAY_OF_YEAR" value="6">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DAY_OF_WEEK" value="7">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DAY_OF_WEEK_IN_MONTH" value="8">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_AM_PM" value="9">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_HOUR" value="10">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_HOUR_OF_DAY" value="11">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_MINUTE" value="12">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_SECOND" value="13">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_MILLISECOND" value="14">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_ZONE_OFFSET" value="15">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DST_OFFSET" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_YEAR_WOY" value="17">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DOW_LOCAL" value="18">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_EXTENDED_YEAR" value="19">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_JULIAN_DAY" value="20">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_MILLISECONDS_IN_DAY" value="21">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_IS_LEAP_MONTH" value="22">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_FIELD_COUNT " value="23">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FIELD_DAY_OF_MONTH" value="5">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_SUNDAY" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_MONDAY" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_TUESDAY" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_WEDNESDAY" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_THURSDAY" value="5">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_FRIDAY" value="6">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_SATURDAY" value="7">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_TYPE_WEEKDAY" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_TYPE_WEEKEND" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_TYPE_WEEKEND_OFFSET" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOW_TYPE_WEEKEND_CEASE" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="WALLTIME_FIRST" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="WALLTIME_LAST" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="WALLTIME_NEXT_VALID" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create the Gregorian Calendar class"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tz" optional="true" byreference="false" type="object" class="IntlTimeZone"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
+  </constructor>
+  <method name="getGregorianChange" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the Gregorian Calendar change date"/>
+      <return type="float"/>
+    </docblock>
+  </method>
+  <method name="isLeapYear" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Determine if the given year is a leap year"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="year" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="setGregorianChange" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the Gregorian Calendar the change date"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="date" optional="false" byreference="false" type="object" class="float"/>
+  </method>
+  <method name="add" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+    <parameter name="amount" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+    <parameter name="amount" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="after" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="before" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="clear" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="field" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="true" byreference="false" type="int"/>
+  </method>
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="createInstance" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="IntlCalendar"/>
+    </docblock>
+    <parameter name="timeZone" optional="true" byreference="false" type="object" class="mixed"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="IntlCalendar"/>
+    </docblock>
+    <parameter name="timeZone" optional="true" byreference="false" type="object" class="mixed"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="equals" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="fieldDifference" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="when" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="when" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="fromDateTime" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="IntlCalendar"/>
+    </docblock>
+    <parameter name="dateTime" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="IntlCalendar"/>
+    </docblock>
+    <parameter name="dateTime" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getActualMaximum" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getActualMinimum" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getAvailableLocales" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getDayOfWeekType" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="dayOfWeek" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="dayOfWeek" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getFirstDayOfWeek" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getGreatestMinimum" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getKeywordValuesForLocale" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Iterator"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="locale" optional="false" byreference="false" type="string"/>
+    <parameter name="commonlyUsed" optional="false" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Iterator"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="locale" optional="false" byreference="false" type="string"/>
+    <parameter name="commonlyUsed" optional="false" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="getLeastMaximum" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getLocale" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="localeType" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="localeType" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getMaximum" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getMinimalDaysInFirstWeek" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getMinimum" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="getNow" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="float"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="float"/>
+    </docblock>
+  </method>
+  <method name="getRepeatedWallTimeOption" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getSkippedWallTimeOption" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getTime" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="float"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="float"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getTimeZone" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="IntlTimeZone"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="IntlTimeZone"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getType" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="getWeekendTransition" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="dayOfWeek" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="dayOfWeek" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="inDaylightTime" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="isEquivalentTo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="other" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="isLenient" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+  <method name="isSet" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="isWeekend" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="date" optional="true" byreference="false" type="object" class="float"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="date" optional="true" byreference="false" type="object" class="float"/>
+  </method>
+  <method name="roll" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+    <parameter name="amountOrUpOrDown" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+    <parameter name="amountOrUpOrDown" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="year" optional="false" byreference="false" type="int"/>
+    <parameter name="month" optional="false" byreference="false" type="int"/>
+    <parameter name="dayOfMonth" optional="true" byreference="false" type="int"/>
+    <parameter name="hour" optional="true" byreference="false" type="int"/>
+    <parameter name="minute" optional="true" byreference="false" type="int"/>
+    <parameter name="second" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="field" optional="false" byreference="false" type="int"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="year" optional="false" byreference="false" type="int"/>
+    <parameter name="month" optional="false" byreference="false" type="int"/>
+    <parameter name="dayOfMonth" optional="true" byreference="false" type="int"/>
+    <parameter name="hour" optional="true" byreference="false" type="int"/>
+    <parameter name="minute" optional="true" byreference="false" type="int"/>
+    <parameter name="second" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="setFirstDayOfWeek" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="dayOfWeek" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="dayOfWeek" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="setLenient" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="isLenient" optional="false" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="isLenient" optional="false" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="setMinimalDaysInFirstWeek" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="minimalDays" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="minimalDays" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="setRepeatedWallTimeOption" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="wallTimeOption" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="wallTimeOption" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="setSkippedWallTimeOption" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="wallTimeOption" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="wallTimeOption" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="setTime" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="date" optional="false" byreference="false" type="object" class="float"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="date" optional="false" byreference="false" type="object" class="float"/>
+  </method>
+  <method name="setTimeZone" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="timeZone" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+    <parameter name="timeZone" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="toDateTime" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DateTime"/>
+    </docblock>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="DateTime"/>
+    </docblock>
+    <parameter name="cal" optional="false" byreference="false" type="object" class="IntlCalendar"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlIterator.xml phpdox-0.12.0/dependencies/php/classes/IntlIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -4,31 +4,31 @@
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the current element"/>
-      <return type="ReturnType"/>
+      <return type="mixed"/>
     </docblock>
   </method>
   <method name="key" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the current key"/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="next" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Move forward to the next element"/>
-      <return type="ReturnType"/>
+      <return type="void"/>
     </docblock>
   </method>
   <method name="rewind" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Rewind the iterator to the first element"/>
-      <return type="ReturnType"/>
+      <return type="void"/>
     </docblock>
   </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Check if current position is valid"/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlPartsIterator.xml phpdox-0.12.0/dependencies/php/classes/IntlPartsIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlPartsIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlPartsIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -19,37 +19,37 @@
   <method name="getBreakIterator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get IntlBreakIterator backing this parts iterator"/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
   </method>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="mixed"/>
     </docblock>
   </method>
   <method name="key" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="next" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="void"/>
     </docblock>
   </method>
   <method name="rewind" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="void"/>
     </docblock>
   </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlRuleBasedBreakIterator.xml phpdox-0.12.0/dependencies/php/classes/IntlRuleBasedBreakIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlRuleBasedBreakIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlRuleBasedBreakIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -107,25 +107,25 @@
   <method name="getBinaryRules" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the binary form of compiled rules"/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getRules" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the rule set used to create this object"/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getRuleStatus" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the largest status value from the break rules that determined the current break position"/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getRuleStatusVec" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the status values from the break rules that determined the current break position"/>
-      <return type="ReturnType"/>
+      <return type="array"/>
     </docblock>
   </method>
   <constructor name="__construct" abstract="false" static="false" final="false">
@@ -137,145 +137,145 @@
   <method name="createCharacterInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createCodePointInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
   </method>
   <method name="createLineInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createSentenceInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createTitleInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="createWordInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlBreakIterator"/>
     </docblock>
-    <parameter name="&quot;locale&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="following" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="" abstract="false" static="false" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getLocale" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
-    <parameter name="&quot;locale_type&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="locale_type" optional="false" byreference="false" type="string"/>
   </method>
   <method name="getPartsIterator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="IntlPartsIterator"/>
     </docblock>
-    <parameter name="&quot;key_type&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="key_type" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="isBoundary" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="next" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="true" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="int"/>
   </method>
   <method name="preceding" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="&quot;offset&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="previous" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="setText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="ReturnType"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="&quot;text&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="text" optional="false" byreference="false" type="string"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/IntlTimeZone.xml phpdox-0.12.0/dependencies/php/classes/IntlTimeZone.xml
--- phpdox-0.11.2/dependencies/php/classes/IntlTimeZone.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/IntlTimeZone.xml	2019-03-13 09:34:17.000000000 +0000
@@ -13,7 +13,7 @@
   <method name="countEquivalentIDs" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the number of IDs in the equivalency group that includes the given ID"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="zoneId" optional="false" byreference="false" type="string"/>
   </method>
@@ -37,6 +37,15 @@
     </docblock>
     <parameter name="zoneId" optional="false" byreference="false" type="string"/>
   </method>
+  <method name="createTimeZoneIDEnumeration" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get an enumeration over system time zone IDs with the given filter conditions"/>
+      <return type="IntlIterator"/>
+    </docblock>
+    <parameter name="zoneType" optional="false" byreference="false" type="int"/>
+    <parameter name="region" optional="true" byreference="false" type="string"/>
+    <parameter name="rawOffset" optional="true" byreference="false" type="int"/>
+  </method>
   <method name="fromDateTimeZone" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Create a timezone object from DateTimeZone"/>
@@ -58,13 +67,13 @@
       <return type="string"/>
     </docblock>
     <parameter name="isDaylight" optional="true" byreference="false" type="object" class="bool"/>
-    <parameter name="style" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="style" optional="true" byreference="false" type="int"/>
     <parameter name="locale" optional="true" byreference="false" type="string"/>
   </method>
   <method name="getDSTSavings" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the amount of time to be added to local standard time to get local wall clock time"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getEquivalentID" abstract="false" static="false" visibility="public" final="false">
@@ -73,12 +82,12 @@
       <return type="string"/>
     </docblock>
     <parameter name="zoneId" optional="false" byreference="false" type="string"/>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get last error code on the object">Object oriented style (method):</description>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
@@ -99,28 +108,56 @@
       <return type="string"/>
     </docblock>
   </method>
+  <method name="getIDForWindowsID" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Translate a Windows timezone into a system timezone"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="timezone" optional="false" byreference="false" type="string"/>
+    <parameter name="region" optional="true" byreference="false" type="string"/>
+  </method>
   <method name="getOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the time zone raw and GMT offset for the given moment in time"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="date" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="local" optional="false" byreference="false" type="object" class="bool"/>
-    <parameter name="rawOffset" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="dstOffset" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="rawOffset" optional="false" byreference="false" type="int"/>
+    <parameter name="dstOffset" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getRawOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the raw GMT offset (before taking daylight savings time into account"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
+  <method name="getRegion" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the region code associated with the given system time zone ID"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="zoneId" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getTZDataVersion" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the timezone data version currently used by ICU"/>
       <return type="string"/>
     </docblock>
   </method>
+  <method name="getUnknown" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the &quot;unknown&quot; time zone"/>
+      <return type="IntlTimeZone"/>
+    </docblock>
+  </method>
+  <method name="getWindowsID" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Translate a system timezone into a Windows timezone"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="timezone" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="hasSameRules" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Check if this zone has the same rules and offset as another zone"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/JsonException.xml phpdox-0.12.0/dependencies/php/classes/JsonException.xml
--- phpdox-0.11.2/dependencies/php/classes/JsonException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/JsonException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="JsonException" namespace="" name="JsonException">
+  <extends name="Exception" full="Exception"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/KTaglib_Tag.xml phpdox-0.12.0/dependencies/php/classes/KTaglib_Tag.xml
--- phpdox-0.11.2/dependencies/php/classes/KTaglib_Tag.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/KTaglib_Tag.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,7 +2,7 @@
 <class xmlns="http://xml.phpdox.net/src" full="KTaglib_Tag" namespace="" name="KTaglib_Tag">
   <method name="getAlbum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the title string from a ID3 tag"/>
+      <description compact="Returns the album string from a ID3 tag"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Locale.xml phpdox-0.12.0/dependencies/php/classes/Locale.xml
--- phpdox-0.11.2/dependencies/php/classes/Locale.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Locale.xml	2019-03-13 09:34:17.000000000 +0000
@@ -123,14 +123,14 @@
   </method>
   <method name="parseLocale" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a key-value array of locale ID subtag elements.">Object oriented style</description>
+      <description compact="Returns a key-value array of locale ID subtag elements">Object oriented style</description>
       <return type="array"/>
     </docblock>
     <parameter name="locale" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setDefault" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="sets the default runtime locale">Object oriented style</description>
+      <description compact="Sets the default runtime locale">Object oriented style</description>
       <return type="bool"/>
     </docblock>
     <parameter name="locale" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/LuaClosure.xml phpdox-0.12.0/dependencies/php/classes/LuaClosure.xml
--- phpdox-0.11.2/dependencies/php/classes/LuaClosure.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/LuaClosure.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,10 +2,9 @@
 <class xmlns="http://xml.phpdox.net/src" full="LuaClosure" namespace="" name="LuaClosure">
   <method name="__invoke" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="invoke luaclosure"/>
+      <description compact="Invoke luaclosure"/>
       <return type="void"/>
     </docblock>
-    <parameter name="arg" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Memcached.xml phpdox-0.12.0/dependencies/php/classes/Memcached.xml
--- phpdox-0.11.2/dependencies/php/classes/Memcached.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Memcached.xml	2019-03-13 09:34:17.000000000 +0000
@@ -156,12 +156,12 @@
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Retrieve an item">Memcached::get returns the item that was previously stored under the key. If the item is found and cas_token variable is provided, it will contain the CAS token value for the item. See Memcached::cas for how to use CAS tokens. Read-through caching callback may be specified via cache_cb parameter.</description>
+      <description compact="Retrieve an item">Memcached::get returns the item that was previously stored under the key. If the item is found and the flags is given Memcached::GET_EXTENDED, it will also return the CAS token value for the item. See Memcached::cas for how to use CAS tokens. Read-through caching callback may be specified via cache_cb parameter.</description>
       <return type="mixed"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
     <parameter name="cache_cb" optional="true" byreference="false" type="object" class="callable"/>
-    <parameter name="cas_token" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="$flags" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getAllKeys" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -177,7 +177,7 @@
     <parameter name="server_key" optional="false" byreference="false" type="string"/>
     <parameter name="key" optional="false" byreference="false" type="string"/>
     <parameter name="cache_cb" optional="true" byreference="false" type="object" class="callable"/>
-    <parameter name="cas_token" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="flags" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getDelayed" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -200,11 +200,10 @@
   </method>
   <method name="getMulti" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Retrieve multiple items">Memcached::getMulti is similar to Memcached::get, but instead of a single key item, it retrieves multiple items the keys of which are specified in the keys array. If cas_tokens variable is provided, it is filled with the CAS token values for the found items. Unlike Memcached::get it is not possible to specify a read-through cache callback for Memcached::getMulti, because the memcache protocol does not provide information on which keys were not found in the multi-key request.</description>
+      <description compact="Retrieve multiple items">Memcached::getMulti is similar to Memcached::get, but instead of a single key item, it retrieves multiple items the keys of which are specified in the keys array. Before v3.0 a second argument cas_tokens was in use. It was filled with the CAS token values for the found items. The cas_tokens parameter was removed in v3.0 of the extension. It was replaced with a new flag Memcached::GET_EXTENDED that needs is to be used as the value for flags.</description>
       <return type="mixed"/>
     </docblock>
     <parameter name="keys" optional="false" byreference="false" type="object" class="array"/>
-    <parameter name="cas_tokens" optional="true" byreference="false" type="object" class="array"/>
     <parameter name="flags" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getMultiByKey" abstract="false" static="false" visibility="public" final="false">
@@ -214,7 +213,6 @@
     </docblock>
     <parameter name="server_key" optional="false" byreference="false" type="string"/>
     <parameter name="keys" optional="false" byreference="false" type="object" class="array"/>
-    <parameter name="cas_tokens" optional="true" byreference="false" type="string"/>
     <parameter name="flags" optional="true" byreference="false" type="int"/>
   </method>
   <method name="getOption" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/MessageFormatter.xml phpdox-0.12.0/dependencies/php/classes/MessageFormatter.xml
--- phpdox-0.11.2/dependencies/php/classes/MessageFormatter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MessageFormatter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -46,7 +46,7 @@
   </method>
   <method name="getLocale" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get the locale for which the formatter was created.">Object oriented style</description>
+      <description compact="Get the locale for which the formatter was created">Object oriented style</description>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoBinData.xml phpdox-0.12.0/dependencies/php/classes/MongoBinData.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoBinData.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoBinData.xml	2019-03-13 09:34:17.000000000 +0000
@@ -49,7 +49,7 @@
   </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new binary data object.">Creates a new binary data object.</description>
+      <description compact="Creates a new binary data object">Creates a new binary data object.</description>
       <return type="void"/>
     </docblock>
     <parameter name="data" optional="false" byreference="false" type="string"/>
@@ -57,7 +57,7 @@
   </constructor>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The string representation of this binary data object."/>
+      <description compact="The string representation of this binary data object"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoClient.xml phpdox-0.12.0/dependencies/php/classes/MongoClient.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoClient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoClient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -136,7 +136,7 @@
   </method>
   <method name="listDBs" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Lists all of the databases available."/>
+      <description compact="Lists all of the databases available"/>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoCollection.xml phpdox-0.12.0/dependencies/php/classes/MongoCollection.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoCollection.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoCollection.xml	2019-03-13 09:34:17.000000000 +0000
@@ -80,7 +80,7 @@
   </method>
   <method name="createIndex" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Creates an index on the specified field(s) if it does not already exist.&#10;  ">Creates an index on the specified field(s) if it does not already exist. Fields may be indexed with a direction (e.g. ascending or descending) or a special type (e.g. text, geospatial, hashed).</description>
+      <description compact="&#10;   Creates an index on the specified field(s) if it does not already exist&#10;  ">Creates an index on the specified field(s) if it does not already exist. Fields may be indexed with a direction (e.g. ascending or descending) or a special type (e.g. text, geospatial, hashed).</description>
       <return type="bool"/>
     </docblock>
     <parameter name="keys" optional="false" byreference="false" type="object" class="array"/>
@@ -101,7 +101,7 @@
   </method>
   <method name="distinct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Retrieve a list of distinct values for the given key across a collection."/>
+      <description compact="Retrieve a list of distinct values for the given key across a collection"/>
       <return type="array"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
@@ -115,7 +115,7 @@
   </method>
   <method name="ensureIndex" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Creates an index on the specified field(s) if it does not already exist.&#10;  ">This method is deprecated since version 1.5.0. Please use MongoCollection::createIndex instead.</description>
+      <description compact="&#10;   Creates an index on the specified field(s) if it does not already exist&#10;  ">This method is deprecated since version 1.5.0. Please use MongoCollection::createIndex instead.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="key|keys" optional="false" byreference="false" type="object" class="string|array"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoCommandCursor.xml phpdox-0.12.0/dependencies/php/classes/MongoCommandCursor.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoCommandCursor.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoCommandCursor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <implements name="MongoCursorInterface" full="MongoCursorInterface"/>
   <method name="batchSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Limits the number of elements returned in one batch."/>
+      <description compact="Limits the number of elements returned in one batch"/>
       <return type="MongoCommandCursor"/>
     </docblock>
     <parameter name="batchSize" optional="false" byreference="false" type="int"/>
@@ -85,7 +85,7 @@
   </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks if the cursor is reading a valid result."/>
+      <description compact="Checks if the cursor is reading a valid result"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoCursor.xml phpdox-0.12.0/dependencies/php/classes/MongoCursor.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoCursor.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoCursor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -32,7 +32,7 @@
   </method>
   <method name="batchSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Limits the number of elements returned in one batch."/>
+      <description compact="Limits the number of elements returned in one batch"/>
       <return type="MongoCursor"/>
     </docblock>
     <parameter name="batchSize" optional="false" byreference="false" type="int"/>
@@ -68,7 +68,7 @@
   </method>
   <method name="doQuery" abstract="false" static="false" visibility="protected" final="false">
     <docblock>
-      <description compact="Execute the query.">Please do not use me.</description>
+      <description compact="Execute the query">Please do not use me.</description>
       <return type="void"/>
     </docblock>
   </method>
@@ -227,7 +227,7 @@
   </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks if the cursor is reading a valid result."/>
+      <description compact="Checks if the cursor is reading a valid result"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDate.xml phpdox-0.12.0/dependencies/php/classes/MongoDate.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDate.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDate.xml	2019-03-13 09:34:17.000000000 +0000
@@ -14,7 +14,7 @@
   </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new date."/>
+      <description compact="Creates a new date"/>
       <return type="void"/>
     </docblock>
     <parameter name="sec" optional="true" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Binary.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Binary.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Binary.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Binary.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Binary" namespace="" name="MongoDB\BSON\Binary">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Binary" namespace="MongoDB\BSON" name="Binary">
+  <implements name="MongoDB\BSON\BinaryInterface" full="MongoDB\BSON\BinaryInterface"/>
   <constant name="TYPE_GENERIC" value="0">
     <docblock>
       <var type="integer"/>
@@ -42,7 +42,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="data" optional="false" byreference="false" type="string"/>
-    <parameter name="type" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="false" byreference="false" type="int"/>
   </constructor>
   <method name="getData" abstract="false" static="false" visibility="public" final="true">
     <docblock>
@@ -53,7 +53,7 @@
   <method name="getType" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the Binary's type"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_DBPointer.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_DBPointer.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_DBPointer.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_DBPointer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\DBPointer" namespace="MongoDB\BSON" name="DBPointer">
+  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+  <constructor name="__construct" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact="Construct a new DBPointer (unused)"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns a representation that can be converted to JSON"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="serialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Serialize a DBPointer"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns an empty string"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="unserialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Unserialize a DBPointer"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="serialized" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Decimal128.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Decimal128.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Decimal128.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Decimal128.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Decimal128" namespace="" name="MongoDB\BSON\Decimal128">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Decimal128" namespace="MongoDB\BSON" name="Decimal128">
+  <implements name="MongoDB\BSON\Decimal128Interface" full="MongoDB\BSON\Decimal128Interface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new Decimal128"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Int64.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Int64.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Int64.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Int64.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Int64" namespace="MongoDB\BSON" name="Int64">
+  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+  <constructor name="__construct" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact="Construct a new Int64 (unused)"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns a representation that can be converted to JSON"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="serialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Serialize an Int64"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the string representation of this Int64"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="unserialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Unserialize an Int64"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="serialized" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Javascript.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Javascript.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Javascript.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Javascript.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Javascript" namespace="" name="MongoDB\BSON\Javascript">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Javascript" namespace="MongoDB\BSON" name="Javascript">
+  <implements name="MongoDB\BSON\JavascriptInterface" full="MongoDB\BSON\JavascriptInterface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new Javascript"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_MaxKey.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_MaxKey.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_MaxKey.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_MaxKey.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\MaxKey" namespace="" name="MongoDB\BSON\MaxKey">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\MaxKey" namespace="MongoDB\BSON" name="MaxKey">
+  <implements name="MongoDB\BSON\MaxKeyInterface" full="MongoDB\BSON\MaxKeyInterface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new MaxKey"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_MinKey.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_MinKey.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_MinKey.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_MinKey.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\MinKey" namespace="" name="MongoDB\BSON\MinKey">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\MinKey" namespace="MongoDB\BSON" name="MinKey">
+  <implements name="MongoDB\BSON\MinKeyInterface" full="MongoDB\BSON\MinKeyInterface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new MinKey"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_ObjectId.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_ObjectId.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_ObjectId.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_ObjectId.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\ObjectId" namespace="MongoDB\BSON" name="ObjectId">
+  <implements name="MongoDB\BSON\ObjectIdInterface" full="MongoDB\BSON\ObjectIdInterface"/>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Construct a new ObjectId"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="id" optional="true" byreference="false" type="string"/>
+  </constructor>
+  <method name="getTimestamp" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the timestamp component of this ObjectId"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns a representation that can be converted to JSON"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="serialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Serialize an ObjectId"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the hexidecimal representation of this ObjectId"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="unserialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Unserialize an ObjectId"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="serialized" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_ObjectID.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_ObjectID.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_ObjectID.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_ObjectID.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\ObjectID" namespace="" name="MongoDB\BSON\ObjectID">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
-  <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
-    <docblock>
-      <description compact="Construct a new ObjectID"/>
-      <return type="void"/>
-    </docblock>
-    <parameter name="id" optional="true" byreference="false" type="string"/>
-  </constructor>
-  <method name="getTimestamp" abstract="false" static="false" visibility="public" final="true">
-    <docblock>
-      <description compact="Returns the timestamp component of this ObjectID"/>
-      <return type="integer"/>
-    </docblock>
-  </method>
-  <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
-    <docblock>
-      <description compact="Returns a representation that can be converted to JSON"/>
-      <return type="mixed"/>
-    </docblock>
-  </method>
-  <method name="serialize" abstract="false" static="false" visibility="public" final="true">
-    <docblock>
-      <description compact="Serialize an ObjectID"/>
-      <return type="string"/>
-    </docblock>
-  </method>
-  <method name="__toString" abstract="false" static="false" visibility="public" final="true">
-    <docblock>
-      <description compact="Returns the hexidecimal representation of this ObjectID"/>
-      <return type="string"/>
-    </docblock>
-  </method>
-  <method name="unserialize" abstract="false" static="false" visibility="public" final="true">
-    <docblock>
-      <description compact="Unserialize an ObjectID"/>
-      <return type="void"/>
-    </docblock>
-    <parameter name="serialized" optional="false" byreference="false" type="string"/>
-  </method>
-</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Persistable.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Persistable.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Persistable.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Persistable.xml	1970-01-01 00:00:00.000000000 +0000
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Persistable" namespace="" name="MongoDB\BSON\Persistable">
-  <implements name="MongoDB\BSON\Unserializable" full="MongoDB\BSON\Unserializable"/>
-  <method name="bsonSerialize" abstract="false" static="false" visibility="public" final="false">
-    <docblock>
-      <description compact=""/>
-      <return type="array|object"/>
-    </docblock>
-  </method>
-  <method name="bsonUnserialize" abstract="false" static="false" visibility="public" final="false">
-    <docblock>
-      <description compact=""/>
-      <return type="void"/>
-    </docblock>
-    <parameter name="data" optional="false" byreference="false" type="object" class="array"/>
-  </method>
-</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Regex.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Regex.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Regex.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Regex.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Regex" namespace="" name="MongoDB\BSON\Regex">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Regex" namespace="MongoDB\BSON" name="Regex">
+  <implements name="MongoDB\BSON\RegexInterface" full="MongoDB\BSON\RegexInterface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new Regex"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Symbol.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Symbol.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Symbol.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Symbol.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Symbol" namespace="MongoDB\BSON" name="Symbol">
+  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+  <constructor name="__construct" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact="Construct a new Symbol (unused)"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns a representation that can be converted to JSON"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="serialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Serialize a Symbol"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the Symbol as a string"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="unserialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Unserialize a Symbol"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="serialized" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Timestamp.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Timestamp.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Timestamp.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Timestamp.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,14 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Timestamp" namespace="" name="MongoDB\BSON\Timestamp">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Timestamp" namespace="MongoDB\BSON" name="Timestamp">
+  <implements name="MongoDB\BSON\TimestampInterface" full="MongoDB\BSON\TimestampInterface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new Timestamp"/>
       <return type="void"/>
     </docblock>
-    <parameter name="increment" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="timestamp" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="increment" optional="false" byreference="false" type="int"/>
+    <parameter name="timestamp" optional="false" byreference="false" type="int"/>
   </constructor>
+  <method name="getIncrement" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the increment component of this Timestamp"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTimestamp" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the timestamp component of this Timestamp"/>
+      <return type="int"/>
+    </docblock>
+  </method>
   <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns a representation that can be converted to JSON"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Undefined.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Undefined.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_Undefined.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_Undefined.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Undefined" namespace="MongoDB\BSON" name="Undefined">
+  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+  <constructor name="__construct" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact="Construct a new Undefined (unused)"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="jsonSerialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns a representation that can be converted to JSON"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="serialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Serialize a Undefined"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns an empty string"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="unserialize" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Unserialize a Undefined"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="serialized" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_UTCDateTime.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_UTCDateTime.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_BSON_UTCDateTime.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_BSON_UTCDateTime.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\UTCDateTime" namespace="" name="MongoDB\BSON\UTCDateTime">
-  <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\UTCDateTime" namespace="MongoDB\BSON" name="UTCDateTime">
+  <implements name="MongoDB\BSON\UTCDateTimeInterface" full="MongoDB\BSON\UTCDateTimeInterface"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Construct a new UTCDateTime"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_BulkWrite.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_BulkWrite.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_BulkWrite.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_BulkWrite.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\BulkWrite" namespace="" name="MongoDB\Driver\BulkWrite">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\BulkWrite" namespace="MongoDB\Driver" name="BulkWrite">
   <implements name="Countable" full="Countable"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Command.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Command.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Command.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Command.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Command" namespace="" name="MongoDB\Driver\Command">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Command" namespace="MongoDB\Driver" name="Command">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Create a new Command"/>
+      <description compact="Create a new Command">Constructs a new MongoDB\Driver\Command, which is an immutable value object that represents a database command. The command may then be executed with MongoDB\Driver\Manager::executeCommand.</description>
       <return type="void"/>
     </docblock>
     <parameter name="document" optional="false" byreference="false" type="object" class="array|object"/>
+    <parameter name="commandOptions" optional="true" byreference="false" type="object" class="array"/>
   </constructor>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_CursorId.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_CursorId.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_CursorId.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_CursorId.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\CursorId" namespace="" name="MongoDB\Driver\CursorId">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\CursorId" namespace="MongoDB\Driver" name="CursorId">
   <constructor name="__construct" abstract="false" static="false" final="true">
     <docblock>
       <description compact="Create a new CursorId (not used)"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Cursor.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Cursor.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Cursor.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Cursor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Cursor" namespace="" name="MongoDB\Driver\Cursor">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Cursor" namespace="MongoDB\Driver" name="Cursor">
   <implements name="Traversable" full="Traversable"/>
   <constructor name="__construct" abstract="false" static="false" final="true">
     <docblock>
@@ -21,7 +21,7 @@
   </method>
   <method name="isDead" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Checks if the cursor is still open on the server">Returns whether the cursor is still open on the server (i.e. the server has more results that have yet to be sent to the client).</description>
+      <description compact="Checks if the cursor may have additional results"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_AuthenticationException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_AuthenticationException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_AuthenticationException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_AuthenticationException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\AuthenticationException" namespace="" name="MongoDB\Driver\Exception\AuthenticationException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\AuthenticationException" namespace="MongoDB\Driver\Exception" name="AuthenticationException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -29,6 +36,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_BulkWriteException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_BulkWriteException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_BulkWriteException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_BulkWriteException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\BulkWriteException" namespace="" name="MongoDB\Driver\Exception\BulkWriteException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\BulkWriteException" namespace="MongoDB\Driver\Exception" name="BulkWriteException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
   <member name="writeResult" static="false" visibility="protected">
     <default>null</default>
@@ -8,6 +8,13 @@
       <var type="MongoDB\Driver\WriteResult"/>
     </docblock>
   </member>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -42,6 +49,13 @@
       <return type="MongoDB\Driver\WriteResult"/>
     </docblock>
   </method>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_CommandException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_CommandException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_CommandException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_CommandException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\CommandException" namespace="MongoDB\Driver\Exception" name="CommandException">
+  <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="resultDocument" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The result document associated with the failed command."/>
+      <var type="object"/>
+    </docblock>
+  </member>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getResultDocument" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the result document for the failed command"/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ConnectionException" namespace="" name="MongoDB\Driver\Exception\ConnectionException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ConnectionException" namespace="MongoDB\Driver\Exception" name="ConnectionException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -29,6 +36,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionTimeoutException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionTimeoutException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionTimeoutException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ConnectionTimeoutException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ConnectionTimeoutException" namespace="" name="MongoDB\Driver\Exception\ConnectionTimeoutException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ConnectionTimeoutException" namespace="MongoDB\Driver\Exception" name="ConnectionTimeoutException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -29,6 +36,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ExecutionTimeoutException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ExecutionTimeoutException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ExecutionTimeoutException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ExecutionTimeoutException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ExecutionTimeoutException" namespace="" name="MongoDB\Driver\Exception\ExecutionTimeoutException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ExecutionTimeoutException" namespace="MongoDB\Driver\Exception" name="ExecutionTimeoutException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -29,6 +36,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_InvalidArgumentException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_InvalidArgumentException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_InvalidArgumentException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_InvalidArgumentException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\InvalidArgumentException" namespace="" name="MongoDB\Driver\Exception\InvalidArgumentException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\InvalidArgumentException" namespace="MongoDB\Driver\Exception" name="InvalidArgumentException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_LogicException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_LogicException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_LogicException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_LogicException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\LogicException" namespace="" name="MongoDB\Driver\Exception\LogicException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\LogicException" namespace="MongoDB\Driver\Exception" name="LogicException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_RuntimeException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_RuntimeException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_RuntimeException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_RuntimeException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\RuntimeException" namespace="" name="MongoDB\Driver\Exception\RuntimeException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\RuntimeException" namespace="MongoDB\Driver\Exception" name="RuntimeException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -29,6 +36,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns whether an error label is associated with an exception"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ServerException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ServerException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_ServerException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_ServerException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\ServerException" namespace="MongoDB\Driver\Exception" name="ServerException">
+  <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_SSLConnectionException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_SSLConnectionException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_SSLConnectionException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_SSLConnectionException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\SSLConnectionException" namespace="" name="MongoDB\Driver\Exception\SSLConnectionException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\SSLConnectionException" namespace="MongoDB\Driver\Exception" name="SSLConnectionException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -29,6 +36,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_UnexpectedValueException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_UnexpectedValueException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_UnexpectedValueException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_UnexpectedValueException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\UnexpectedValueException" namespace="" name="MongoDB\Driver\Exception\UnexpectedValueException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\UnexpectedValueException" namespace="MongoDB\Driver\Exception" name="UnexpectedValueException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_WriteException.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_WriteException.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Exception_WriteException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Exception_WriteException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\WriteException" namespace="" name="MongoDB\Driver\Exception\WriteException">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\WriteException" namespace="MongoDB\Driver\Exception" name="WriteException">
   <implements name="MongoDB\Driver\Exception\Exception" full="MongoDB\Driver\Exception\Exception"/>
   <member name="writeResult" static="false" visibility="protected">
     <default>null</default>
@@ -8,6 +8,13 @@
       <var type="MongoDB\Driver\WriteResult"/>
     </docblock>
   </member>
+  <member name="errorLabels" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="Contains an array of error labels to go with an exception. For example, error labels can be used to detect whether a transaction can be retried safely if the TransientTransactionError label is present. The existence of a specific error label should be tested for with the MongoDB\Driver\Exception\RuntimeException::hasErrorLabel, instead of interpreting this errorLabels property manually."/>
+      <var type="bool"/>
+    </docblock>
+  </member>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -42,6 +49,13 @@
       <return type="MongoDB\Driver\WriteResult"/>
     </docblock>
   </method>
+  <method name="hasErrorLabel" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="errorLabel" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Manager.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Manager.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Manager.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Manager.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Manager" namespace="" name="MongoDB\Driver\Manager">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Manager" namespace="MongoDB\Driver" name="Manager">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Create new MongoDB Manager"/>
@@ -16,16 +16,16 @@
     </docblock>
     <parameter name="namespace" optional="false" byreference="false" type="string"/>
     <parameter name="bulk" optional="false" byreference="false" type="object" class="MongoDB\Driver\BulkWrite"/>
-    <parameter name="writeConcern" optional="true" byreference="false" type="object" class="MongoDB\Driver\WriteConcern"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="executeCommand" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Execute a database command"/>
+      <description compact="Execute a database command">Selects a server according to the "readPreference" option and executes the command on that server. By default, the read preference from the MongoDB Connection URI will be used.</description>
       <return type="MongoDB\Driver\Cursor"/>
     </docblock>
     <parameter name="db" optional="false" byreference="false" type="string"/>
     <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
-    <parameter name="readPreference" optional="true" byreference="false" type="object" class="MongoDB\Driver\ReadPreference"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="executeQuery" abstract="false" static="false" visibility="public" final="true">
     <docblock>
@@ -34,7 +34,34 @@
     </docblock>
     <parameter name="namespace" optional="false" byreference="false" type="string"/>
     <parameter name="query" optional="false" byreference="false" type="object" class="MongoDB\Driver\Query"/>
-    <parameter name="readPreference" optional="true" byreference="false" type="object" class="MongoDB\Driver\ReadPreference"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="executeReadCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Execute a database command that reads">Selects a server according to the "readPreference" option and executes the command on that server. By default, the read preference from the MongoDB Connection URI will be used.</description>
+      <return type="MongoDB\Driver\Cursor"/>
+    </docblock>
+    <parameter name="db" optional="false" byreference="false" type="string"/>
+    <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="executeReadWriteCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Execute a database command that reads and writes">Executes the command on the primary server.</description>
+      <return type="MongoDB\Driver\Cursor"/>
+    </docblock>
+    <parameter name="db" optional="false" byreference="false" type="string"/>
+    <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="executeWriteCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Execute a database command that writes">Executes the command on the primary server.</description>
+      <return type="MongoDB\Driver\Cursor"/>
+    </docblock>
+    <parameter name="db" optional="false" byreference="false" type="string"/>
+    <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="getReadConcern" abstract="false" static="false" visibility="public" final="true">
     <docblock>
@@ -50,7 +77,7 @@
   </method>
   <method name="getServers" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Return the servers to which this manager is connected">Returns an array of MongoDB\Driver\Server instances to which this manager is connected.</description>
+      <description compact="Return the servers to which this manager is connected"/>
       <return type="array"/>
     </docblock>
   </method>
@@ -62,9 +89,16 @@
   </method>
   <method name="selectServer" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Select a server matching a read preference">Selects a MongoDB\Driver\Server matching readPreference. This may be used to preselect a server in order to perform version checking before executing an operation.</description>
+      <description compact="Select a server matching a read preference"/>
       <return type="MongoDB\Driver\Server"/>
     </docblock>
     <parameter name="readPreference" optional="false" byreference="false" type="object" class="MongoDB\Driver\ReadPreference"/>
   </method>
+  <method name="startSession" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Start a new client session for use with this client"/>
+      <return type="MongoDB\Driver\Session"/>
+    </docblock>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandFailedEvent.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandFailedEvent.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandFailedEvent.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandFailedEvent.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Monitoring\CommandFailedEvent" namespace="MongoDB\Driver\Monitoring" name="CommandFailedEvent">
+  <method name="getCommandName" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command name"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getDurationMicros" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's duration in microseconds"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getError" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the Exception associated with the failed command"/>
+      <return type="Exception"/>
+    </docblock>
+  </method>
+  <method name="getOperationId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's operation ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getReply" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command reply document"/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="getRequestId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's request ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getServer" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the Server on which the command was executed"/>
+      <return type="MongoDB\Driver\Server"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandStartedEvent.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandStartedEvent.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandStartedEvent.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandStartedEvent.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Monitoring\CommandStartedEvent" namespace="MongoDB\Driver\Monitoring" name="CommandStartedEvent">
+  <method name="getCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command document"/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="getCommandName" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command name"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getDatabaseName" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the database on which the command was executed"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getOperationId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's operation ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getRequestId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's request ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getServer" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the Server on which the command was executed"/>
+      <return type="MongoDB\Driver\Server"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandSucceededEvent.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandSucceededEvent.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandSucceededEvent.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Monitoring_CommandSucceededEvent.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Monitoring\CommandSucceededEvent" namespace="MongoDB\Driver\Monitoring" name="CommandSucceededEvent">
+  <method name="getCommandName" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command name"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getDurationMicros" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's duration in microseconds"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getOperationId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's operation ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getReply" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command reply document"/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="getRequestId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the command's request ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getServer" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the Server on which the command was executed"/>
+      <return type="MongoDB\Driver\Server"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Query.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Query.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Query.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Query.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Query" namespace="" name="MongoDB\Driver\Query">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Query" namespace="MongoDB\Driver" name="Query">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Construct new Query"/>
+      <description compact="Create a new Query"/>
       <return type="void"/>
     </docblock>
     <parameter name="filter" optional="false" byreference="false" type="object" class="array|object"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_ReadConcern.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_ReadConcern.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_ReadConcern.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_ReadConcern.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\ReadConcern" namespace="" name="MongoDB\Driver\ReadConcern">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\ReadConcern" namespace="MongoDB\Driver" name="ReadConcern">
   <implements name="MongoDB\BSON\Serializable" full="MongoDB\BSON\Serializable"/>
+  <constant name="AVAILABLE" value="&quot;available&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
   <constant name="LINEARIZABLE" value="&quot;linearizable&quot;">
     <docblock>
       <var type="string"/>
@@ -24,7 +29,7 @@
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Construct immutable ReadConcern"/>
+      <description compact="Create a new ReadConcern"/>
       <return type="void"/>
     </docblock>
     <parameter name="level" optional="true" byreference="false" type="string"/>
@@ -35,4 +40,10 @@
       <return type="string|null"/>
     </docblock>
   </method>
+  <method name="isDefault" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Checks if this is the default read concern">Returns whether this is the default read concern (i.e. no options are specified). This method is primarily intended to be used in conjunction with MongoDB\Driver\Manager::getReadConcern to determine whether the Manager has been constructed without any read concern options.</description>
+      <return type="bool"/>
+    </docblock>
+  </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_ReadPreference.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_ReadPreference.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_ReadPreference.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_ReadPreference.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\ReadPreference" namespace="" name="MongoDB\Driver\ReadPreference">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\ReadPreference" namespace="MongoDB\Driver" name="ReadPreference">
   <implements name="MongoDB\BSON\Serializable" full="MongoDB\BSON\Serializable"/>
   <constant name="RP_PRIMARY" value="1">
     <docblock>
@@ -44,23 +44,23 @@
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Construct immutable ReadPreference"/>
+      <description compact="Create a new ReadPreference"/>
       <return type="void"/>
     </docblock>
-    <parameter name="mode" optional="false" byreference="false" type="int"/>
+    <parameter name="mode" optional="false" byreference="false" type="object" class="string|integer"/>
     <parameter name="tagSets" optional="true" byreference="false" type="object" class="array"/>
     <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </constructor>
   <method name="getMaxStalenessSeconds" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the ReadPreference's &quot;maxStalenessSeconds&quot; option"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getMode" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the ReadPreference's &quot;mode&quot; option"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getTagSets" abstract="false" static="false" visibility="public" final="true">
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Server.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Server.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Server.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Server.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Server" namespace="" name="MongoDB\Driver\Server">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Server" namespace="MongoDB\Driver" name="Server">
   <constant name="TYPE_UNKNOWN" value="0">
     <docblock>
       <var type="integer"/>
@@ -58,25 +58,52 @@
     </docblock>
     <parameter name="namespace" optional="false" byreference="false" type="string"/>
     <parameter name="bulk" optional="false" byreference="false" type="object" class="MongoDB\Driver\BulkWrite"/>
-    <parameter name="writeConcern" optional="true" byreference="false" type="object" class="MongoDB\Driver\WriteConcern"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="executeCommand" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Execute a database command on this server">Executes command on this server.</description>
+      <description compact="Execute a database command on this server">Executes the command on this server.</description>
       <return type="MongoDB\Driver\Cursor"/>
     </docblock>
     <parameter name="db" optional="false" byreference="false" type="string"/>
     <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
-    <parameter name="readPreference" optional="true" byreference="false" type="object" class="MongoDB\Driver\ReadPreference"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="executeQuery" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Execute a database query on this server">Executes query on this server.</description>
+      <description compact="Execute a database query on this server"/>
       <return type="MongoDB\Driver\Cursor"/>
     </docblock>
     <parameter name="namespace" optional="false" byreference="false" type="string"/>
     <parameter name="query" optional="false" byreference="false" type="object" class="MongoDB\Driver\Query"/>
-    <parameter name="readPreference" optional="true" byreference="false" type="object" class="MongoDB\Driver\ReadPreference"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="executeReadCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Execute a database command that reads on this server">Executes the command on this server.</description>
+      <return type="MongoDB\Driver\Cursor"/>
+    </docblock>
+    <parameter name="db" optional="false" byreference="false" type="string"/>
+    <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="executeReadWriteCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Execute a database command that reads and writes on this server">Executes the command on this server.</description>
+      <return type="MongoDB\Driver\Cursor"/>
+    </docblock>
+    <parameter name="db" optional="false" byreference="false" type="string"/>
+    <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="executeWriteCommand" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Execute a database command that writes on this server">Executes the command on this server.</description>
+      <return type="MongoDB\Driver\Cursor"/>
+    </docblock>
+    <parameter name="db" optional="false" byreference="false" type="string"/>
+    <parameter name="command" optional="false" byreference="false" type="object" class="MongoDB\Driver\Command"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="getHost" abstract="false" static="false" visibility="public" final="true">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Session.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Session.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_Session.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_Session.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Session" namespace="MongoDB\Driver" name="Session">
+  <method name="abortTransaction" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Aborts a transaction"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="advanceClusterTime" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Advances the cluster time for this session">Advances the cluster time for this session. If the cluster time is less than or equal to the session's current cluster time, this function is a no-op.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="clusterTime" optional="false" byreference="false" type="object" class="array|object"/>
+  </method>
+  <method name="advanceOperationTime" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Advances the operation time for this session">Advances the operation time for this session. If the operation time is less than or equal to the session's current operation time, this function is a no-op.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="operationTime" optional="false" byreference="false" type="object" class="MongoDB\BSON\TimestampInterface"/>
+  </method>
+  <method name="commitTransaction" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Commits a transaction"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <constructor name="__construct" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact="Create a new Session (not used)"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="endSession" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Terminates a session"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="getClusterTime" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the cluster time for this session"/>
+      <return type="object|null"/>
+    </docblock>
+  </method>
+  <method name="getLogicalSessionId" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the logical session ID for this session"/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="getOperationTime" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Returns the operation time for this session"/>
+      <return type="MongoDB\BSON\Timestamp|null"/>
+    </docblock>
+  </method>
+  <method name="startTransaction" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Starts a transaction">This method starts a new transaction within this session. When the session is attached to operations through the "session" argument, these operations become of the started transaction.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="options" optional="false" byreference="false" type="object" class="array|object"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteConcernError.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteConcernError.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteConcernError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteConcernError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteConcernError" namespace="" name="MongoDB\Driver\WriteConcernError">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteConcernError" namespace="MongoDB\Driver" name="WriteConcernError">
   <method name="getCode" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the WriteConcernError's error code"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteConcern.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteConcern.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteConcern.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteConcern.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteConcern" namespace="" name="MongoDB\Driver\WriteConcern">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteConcern" namespace="MongoDB\Driver" name="WriteConcern">
   <implements name="MongoDB\BSON\Serializable" full="MongoDB\BSON\Serializable"/>
   <constant name="MAJORITY" value="&quot;majority&quot;">
     <docblock>
@@ -14,23 +14,23 @@
   </method>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="Construct immutable WriteConcern"/>
+      <description compact="Create a new WriteConcern"/>
       <return type="void"/>
     </docblock>
-    <parameter name="w" optional="false" byreference="false" type="object" class="string|int"/>
-    <parameter name="wtimeout" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="journal" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="w" optional="false" byreference="false" type="object" class="string|integer"/>
+    <parameter name="wtimeout" optional="true" byreference="false" type="int"/>
+    <parameter name="journal" optional="true" byreference="false" type="object" class="bool"/>
   </constructor>
   <method name="getJournal" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the WriteConcern's &quot;journal&quot; option"/>
-      <return type="bool|null"/>
+      <return type="boolean|null"/>
     </docblock>
   </method>
   <method name="getW" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the WriteConcern's &quot;w&quot; option"/>
-      <return type="string|int|null"/>
+      <return type="string|integer|null"/>
     </docblock>
   </method>
   <method name="getWtimeout" abstract="false" static="false" visibility="public" final="true">
@@ -39,4 +39,10 @@
       <return type="int"/>
     </docblock>
   </method>
+  <method name="isDefault" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact="Checks if this is the default write concern">Returns whether this is the default write concern (i.e. no options are specified). This method is primarily intended to be used in conjunction with MongoDB\Driver\Manager::getWriteConcern to determine whether the Manager has been constructed without any write concern options.</description>
+      <return type="bool"/>
+    </docblock>
+  </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteError.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteError.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteError" namespace="" name="MongoDB\Driver\WriteError">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteError" namespace="MongoDB\Driver" name="WriteError">
   <method name="getCode" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the WriteError's error code"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteResult.xml phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteResult.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoDB_Driver_WriteResult.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoDB_Driver_WriteResult.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,27 +1,27 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteResult" namespace="" name="MongoDB\Driver\WriteResult">
+<class xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\WriteResult" namespace="MongoDB\Driver" name="WriteResult">
   <method name="getDeletedCount" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the number of documents deleted"/>
-      <return type="int|null"/>
+      <return type="integer|null"/>
     </docblock>
   </method>
   <method name="getInsertedCount" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the number of documents inserted (excluding upserts)"/>
-      <return type="int|null"/>
+      <return type="integer|null"/>
     </docblock>
   </method>
   <method name="getMatchedCount" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the number of documents selected for update"/>
-      <return type="int|null"/>
+      <return type="integer|null"/>
     </docblock>
   </method>
   <method name="getModifiedCount" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the number of existing documents updated"/>
-      <return type="int|null"/>
+      <return type="integer|null"/>
     </docblock>
   </method>
   <method name="getServer" abstract="false" static="false" visibility="public" final="true">
@@ -33,7 +33,7 @@
   <method name="getUpsertedCount" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Returns the number of documents inserted by an upsert"/>
-      <return type="int|null"/>
+      <return type="integer|null"/>
     </docblock>
   </method>
   <method name="getUpsertedIds" abstract="false" static="false" visibility="public" final="true">
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoInt32.xml phpdox-0.12.0/dependencies/php/classes/MongoInt32.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoInt32.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoInt32.xml	2019-03-13 09:34:17.000000000 +0000
@@ -9,14 +9,14 @@
   </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new 32-bit integer."/>
+      <description compact="Creates a new 32-bit integer"/>
       <return type="void"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </constructor>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the string representation of this 32-bit integer."/>
+      <description compact="Returns the string representation of this 32-bit integer"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoInt64.xml phpdox-0.12.0/dependencies/php/classes/MongoInt64.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoInt64.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoInt64.xml	2019-03-13 09:34:17.000000000 +0000
@@ -9,14 +9,14 @@
   </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new 64-bit integer."/>
+      <description compact="Creates a new 64-bit integer"/>
       <return type="void"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </constructor>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the string representation of this 64-bit integer."/>
+      <description compact="Returns the string representation of this 64-bit integer"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoPool.xml phpdox-0.12.0/dependencies/php/classes/MongoPool.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoPool.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoPool.xml	2019-03-13 09:34:17.000000000 +0000
@@ -8,13 +8,13 @@
   </method>
   <method name="info" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns information about all connection pools."/>
+      <description compact="Returns information about all connection pools"/>
       <return type="array"/>
     </docblock>
   </method>
   <method name="setSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Set the size for future connection pools."/>
+      <description compact="Set the size for future connection pools"/>
       <return type="bool"/>
     </docblock>
     <parameter name="size" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MongoTimestamp.xml phpdox-0.12.0/dependencies/php/classes/MongoTimestamp.xml
--- phpdox-0.11.2/dependencies/php/classes/MongoTimestamp.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MongoTimestamp.xml	2019-03-13 09:34:17.000000000 +0000
@@ -14,7 +14,7 @@
   </member>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new timestamp."/>
+      <description compact="Creates a new timestamp"/>
       <return type="void"/>
     </docblock>
     <parameter name="sec" optional="true" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Mongo.xml phpdox-0.12.0/dependencies/php/classes/Mongo.xml
--- phpdox-0.11.2/dependencies/php/classes/Mongo.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Mongo.xml	2019-03-13 09:34:17.000000000 +0000
@@ -27,13 +27,13 @@
   </method>
   <method name="poolDebug" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns information about all connection pools."/>
+      <description compact="Returns information about all connection pools"/>
       <return type="array"/>
     </docblock>
   </method>
   <method name="setPoolSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Set the size for future connection pools."/>
+      <description compact="Set the size for future connection pools"/>
       <return type="bool"/>
     </docblock>
     <parameter name="size" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Mutex.xml phpdox-0.12.0/dependencies/php/classes/Mutex.xml
--- phpdox-0.11.2/dependencies/php/classes/Mutex.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Mutex.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,37 +3,37 @@
   <method name="create" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Create a Mutex"/>
-      <return type="long"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="lock" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="lock" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Destroy Mutex"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="mutex" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="mutex" optional="false" byreference="false" type="int"/>
   </method>
   <method name="lock" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Acquire Mutex">Attempt to lock the Mutex for the caller.</description>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="mutex" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="mutex" optional="false" byreference="false" type="int"/>
   </method>
   <method name="trylock" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Attempt to Acquire Mutex"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="mutex" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="mutex" optional="false" byreference="false" type="int"/>
   </method>
   <method name="unlock" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact="Release Mutex"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="mutex" optional="false" byreference="false" type="object" class="long"/>
-    <parameter name="destroy" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="mutex" optional="false" byreference="false" type="int"/>
+    <parameter name="destroy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysqli_driver.xml phpdox-0.12.0/dependencies/php/classes/mysqli_driver.xml
--- phpdox-0.11.2/dependencies/php/classes/mysqli_driver.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysqli_driver.xml	2019-03-13 09:34:17.000000000 +0000
@@ -53,7 +53,7 @@
       <description compact="Initialize and start embedded server">Object oriented style</description>
       <return type="bool"/>
     </docblock>
-    <parameter name="start" optional="false" byreference="false" type="object" class="bool"/>
+    <parameter name="start" optional="false" byreference="false" type="int"/>
     <parameter name="arguments" optional="false" byreference="false" type="object" class="array"/>
     <parameter name="groups" optional="false" byreference="false" type="object" class="array"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysqli_stmt.xml phpdox-0.12.0/dependencies/php/classes/mysqli_stmt.xml
--- phpdox-0.11.2/dependencies/php/classes/mysqli_stmt.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysqli_stmt.xml	2019-03-13 09:34:17.000000000 +0000
@@ -147,6 +147,12 @@
     </docblock>
     <parameter name="stmt" optional="false" byreference="false" type="object" class="mysqli_stmt"/>
   </method>
+  <method name="num_rows" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact="Return the number of rows in statements result set">Object oriented style</description>
+      <return type="int"/>
+    </docblock>
+  </method>
   <method name="prepare" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Prepare an SQL statement for execution">Object oriented style</description>
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysqli.xml phpdox-0.12.0/dependencies/php/classes/mysqli.xml
--- phpdox-0.11.2/dependencies/php/classes/mysqli.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysqli.xml	2019-03-13 09:34:17.000000000 +0000
@@ -7,20 +7,6 @@
       <var type="int"/>
     </docblock>
   </member>
-  <member name="mysqli-&gt;client_info" static="false">
-    <default>null</default>
-    <docblock>
-      <description compact="Object oriented style">Object oriented style</description>
-      <var type="string"/>
-    </docblock>
-  </member>
-  <member name="mysqli-&gt;client_version" static="false">
-    <default>null</default>
-    <docblock>
-      <description compact="Object oriented style">Object oriented style</description>
-      <var type="int"/>
-    </docblock>
-  </member>
   <member name="mysqli-&gt;connect_errno" static="false">
     <default>null</default>
     <docblock>
@@ -63,6 +49,13 @@
       <var type="int"/>
     </docblock>
   </member>
+  <member name="mysqli-&gt;client_info" static="false">
+    <default>null</default>
+    <docblock>
+      <description compact="Object oriented style">Object oriented style</description>
+      <var type="string"/>
+    </docblock>
+  </member>
   <member name="mysqli-&gt;client_version" static="false">
     <default>null</default>
     <docblock>
@@ -181,6 +174,18 @@
     <parameter name="flags" optional="true" byreference="false" type="int"/>
     <parameter name="name" optional="true" byreference="false" type="string"/>
   </method>
+  <method name="connect" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact="Open a new connection to the MySQL server">Object oriented style</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="host" optional="true" byreference="false" type="string"/>
+    <parameter name="username" optional="true" byreference="false" type="string"/>
+    <parameter name="passwd" optional="true" byreference="false" type="string"/>
+    <parameter name="dbname" optional="true" byreference="false" type="string"/>
+    <parameter name="port" optional="true" byreference="false" type="int"/>
+    <parameter name="socket" optional="true" byreference="false" type="string"/>
+  </method>
   <method name="debug" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Performs debugging operations">Object oriented style</description>
@@ -212,6 +217,12 @@
       <return type="bool"/>
     </docblock>
   </method>
+  <method name="get_server_info" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
   <method name="get_warnings" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Get result of SHOW WARNINGS">Object oriented style</description>
@@ -305,7 +316,14 @@
   </method>
   <method name="escape_string" abstract="false" static="false" final="false">
     <docblock>
-      <description compact=""/>
+      <description compact="Escapes special characters in a string for use in an SQL statement, taking into account the current charset of the connection">Object oriented style</description>
+      <return type="string"/>
+    </docblock>
+    <parameter name="escapestr" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="real_escape_string" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact="Escapes special characters in a string for use in an SQL statement, taking into account the current charset of the connection">Object oriented style</description>
       <return type="string"/>
     </docblock>
     <parameter name="escapestr" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/MysqlndUhConnection.xml phpdox-0.12.0/dependencies/php/classes/MysqlndUhConnection.xml
--- phpdox-0.11.2/dependencies/php/classes/MysqlndUhConnection.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/MysqlndUhConnection.xml	2019-03-13 09:34:17.000000000 +0000
@@ -99,7 +99,7 @@
   </method>
   <method name="getLastInsertId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the auto generated id used in the last query."/>
+      <description compact="Returns the auto generated id used in the last query"/>
       <return type="int"/>
     </docblock>
     <parameter name="connection" optional="false" byreference="false" type="object" class="mysqlnd_connection"/>
@@ -148,7 +148,7 @@
   </method>
   <method name="getStatistics" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns statistics about the client connection."/>
+      <description compact="Returns statistics about the client connection"/>
       <return type="array"/>
     </docblock>
     <parameter name="connection" optional="false" byreference="false" type="object" class="mysqlnd_connection"/>
@@ -329,7 +329,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="MYSQLND_UH_RES_MYSQLND_NAME" optional="false" byreference="false" type="string"/>
-    <parameter name="&quot;level&quot;" optional="false" byreference="false" type="string"/>
+    <parameter name="level" optional="false" byreference="false" type="string"/>
   </method>
   <method name="simpleCommand" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionAdd.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionAdd.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionAdd.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionAdd.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CollectionAdd" namespace="mysql_xdevapi" name="CollectionAdd">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionFind.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionFind.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionFind.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionFind.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CollectionFind" namespace="mysql_xdevapi" name="CollectionFind">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\DocResult"/>
+    </docblock>
+  </method>
+  <method name="fields" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="projection" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="groupBy" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="having" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="lockExclusive" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="lock_waiting_option" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="lockShared" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="lock_waiting_option" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="offset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="position" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sort" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionModify.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionModify.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionModify.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionModify.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CollectionModify" namespace="mysql_xdevapi" name="CollectionModify">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="arrayAppend" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="collection_field" optional="false" byreference="false" type="string"/>
+    <parameter name="expression_or_literal" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="arrayInsert" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="collection_field" optional="false" byreference="false" type="string"/>
+    <parameter name="expression_or_literal" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="patch" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="document" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="replace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="collection_field" optional="false" byreference="false" type="string"/>
+    <parameter name="expression_or_literal" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="collection_field" optional="false" byreference="false" type="string"/>
+    <parameter name="expression_or_literal" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="skip" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="position" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sort" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="unset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="fields" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionRemove.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionRemove.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_CollectionRemove.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_CollectionRemove.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CollectionRemove" namespace="mysql_xdevapi" name="CollectionRemove">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionRemove"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionRemove"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sort" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionRemove"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Collection.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Collection.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Collection.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Collection.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Collection" namespace="mysql_xdevapi" name="Collection">
+  <implements name="mysql_xdevapi\SchemaObject" full="mysql_xdevapi\SchemaObject"/>
+  <member name="name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="add" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionAdd"/>
+    </docblock>
+    <parameter name="document" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="addOrReplaceOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+    <parameter name="id" optional="false" byreference="false" type="string"/>
+    <parameter name="doc" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="createIndex" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="index_name" optional="false" byreference="false" type="string"/>
+    <parameter name="index_desc_json" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="dropIndex" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="index_name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="existsInDatabase" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="find" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionFind"/>
+    </docblock>
+    <parameter name="search_condition" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="getName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Document"/>
+    </docblock>
+    <parameter name="id" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getSchema" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Schema Object"/>
+    </docblock>
+  </method>
+  <method name="getSession" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Session"/>
+    </docblock>
+  </method>
+  <method name="modify" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionModify"/>
+    </docblock>
+    <parameter name="search_condition" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="remove" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CollectionRemove"/>
+    </docblock>
+    <parameter name="search_condition" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="removeOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+    <parameter name="id" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="replaceOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+    <parameter name="id" optional="false" byreference="false" type="string"/>
+    <parameter name="doc" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_ColumnResult.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_ColumnResult.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_ColumnResult.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_ColumnResult.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\ColumnResult" namespace="mysql_xdevapi" name="ColumnResult">
+  <method name="getCharacterSetName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getCollationName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getColumnLabel" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getColumnName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getFractionalDigits" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="getLength" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="getSchemaName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getTableLabel" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getTableName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getType" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="isNumberSigned" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="isPadded" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_DocResult.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_DocResult.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_DocResult.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_DocResult.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\DocResult" namespace="mysql_xdevapi" name="DocResult">
+  <implements name="mysql_xdevapi\BaseResult" full="mysql_xdevapi\BaseResult"/>
+  <method name="fetchAll" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Array"/>
+    </docblock>
+  </method>
+  <method name="fetchOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Object"/>
+    </docblock>
+  </method>
+  <method name="getWarnings" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Array"/>
+    </docblock>
+  </method>
+  <method name="getWarningsCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Driver.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Driver.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Driver.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Driver.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Driver" namespace="mysql_xdevapi" name="Driver">
+  <constant name="version" value="8.0.3">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Exception.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Exception.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Exception.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Exception.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Exception" namespace="mysql_xdevapi" name="Exception">
+  <implements name="Throwable" full="Throwable"/>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_ExecutionStatus.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_ExecutionStatus.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_ExecutionStatus.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_ExecutionStatus.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\ExecutionStatus" namespace="mysql_xdevapi" name="ExecutionStatus">
+  <member name="affectedItems" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="matchedItems" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="foundItems" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="lastInsertId" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="lastDocumentId" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Expression.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Expression.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Expression.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Expression.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Expression" namespace="mysql_xdevapi" name="Expression">
+  <member name="name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="expression" optional="false" byreference="false" type="string"/>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_FieldMetadata.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_FieldMetadata.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_FieldMetadata.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_FieldMetadata.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\FieldMetadata" namespace="mysql_xdevapi" name="FieldMetadata">
+  <member name="type" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="type_name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="original_name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="table" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="original_table" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="schema" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="catalog" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="collation" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="fractional_digits" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="length" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="flags" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="content_type" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Result.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Result.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Result.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Result.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Result" namespace="mysql_xdevapi" name="Result">
+  <implements name="mysql_xdevapi\BaseResult" full="mysql_xdevapi\BaseResult"/>
+  <method name="getAutoIncrementValue" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getGeneratedIds" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ArrayOfInt"/>
+    </docblock>
+  </method>
+  <method name="getWarnings" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getWarningsCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_RowResult.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_RowResult.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_RowResult.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_RowResult.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\RowResult" namespace="mysql_xdevapi" name="RowResult">
+  <implements name="mysql_xdevapi\BaseResult" full="mysql_xdevapi\BaseResult"/>
+  <method name="fetchAll" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="fetchOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="getColumnCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="getColumnNames" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getColumns" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getWarnings" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getWarningsCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Schema.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Schema.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Schema.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Schema.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Schema" namespace="mysql_xdevapi" name="Schema">
+  <implements name="mysql_xdevapi\DatabaseObject" full="mysql_xdevapi\DatabaseObject"/>
+  <member name="name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="createCollection" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Collection"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="dropCollection" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="collection_name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="existsInDatabase" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="getCollection" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Collection"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getCollectionAsTable" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Table"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getCollections" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getSession" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Session"/>
+    </docblock>
+  </method>
+  <method name="getTable" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Table"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getTables" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Session.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Session.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Session.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Session.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Session" namespace="mysql_xdevapi" name="Session">
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="commit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Object"/>
+    </docblock>
+  </method>
+  <method name="createSchema" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Schema"/>
+    </docblock>
+    <parameter name="schema_name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="dropSchema" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="schema_name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="executeSql" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Object"/>
+    </docblock>
+    <parameter name="statement" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="generateUUID" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getClientId" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="getSchema" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Schema"/>
+    </docblock>
+    <parameter name="schema_name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getSchemas" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getServerVersion" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="killClient" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="object"/>
+    </docblock>
+    <parameter name="client_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="listClients" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="quoteName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="releaseSavepoint" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="rollback" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="rollbackTo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="setSavepoint" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="name" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="sql" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\SqlStatement"/>
+    </docblock>
+    <parameter name="query" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="startTransaction" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_SqlStatementResult.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_SqlStatementResult.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_SqlStatementResult.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_SqlStatementResult.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\SqlStatementResult" namespace="mysql_xdevapi" name="SqlStatementResult">
+  <implements name="mysql_xdevapi\BaseResult" full="mysql_xdevapi\BaseResult"/>
+  <method name="fetchAll" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="fetchOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="object"/>
+    </docblock>
+  </method>
+  <method name="getAffectedItemsCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="getColumnCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="getColumnNames" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getColumns" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Array"/>
+    </docblock>
+  </method>
+  <method name="getGeneratedIds" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getLastInsertId" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="String"/>
+    </docblock>
+  </method>
+  <method name="getWarnings" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getWarningCounts" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="hasData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="nextResult" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_SqlStatement.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_SqlStatement.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_SqlStatement.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_SqlStatement.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\SqlStatement" namespace="mysql_xdevapi" name="SqlStatement">
+  <constant name="EXECUTE_ASYNC" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="BUFFERED" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="statement" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\SqlStatement"/>
+    </docblock>
+    <parameter name="param" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="getNextResult" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="getResult" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="hasMoreResults" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Statement.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Statement.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Statement.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Statement.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Statement" namespace="mysql_xdevapi" name="Statement">
+  <constant name="EXECUTE_ASYNC" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="BUFFERED" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <method name="getNextResult" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="getResult" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="hasMoreResults" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableDelete.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableDelete.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableDelete.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableDelete.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\TableDelete" namespace="mysql_xdevapi" name="TableDelete">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableDelete"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableDelete"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="offset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableDelete"/>
+    </docblock>
+    <parameter name="position" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="orderby" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableDelete"/>
+    </docblock>
+    <parameter name="orderby_expr" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="where" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableDelete"/>
+    </docblock>
+    <parameter name="where_expr" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableInsert.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableInsert.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableInsert.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableInsert.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\TableInsert" namespace="mysql_xdevapi" name="TableInsert">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+  <method name="values" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableInsert"/>
+    </docblock>
+    <parameter name="row_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableSelect.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableSelect.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableSelect.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableSelect.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\TableSelect" namespace="mysql_xdevapi" name="TableSelect">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\RowResult"/>
+    </docblock>
+  </method>
+  <method name="groupBy" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="having" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="lockExclusive" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="lock_waiting_option" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="lockShared" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="lock_waiting_option" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="offset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="position" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="orderby" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="where" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="where_expr" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableUpdate.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableUpdate.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_TableUpdate.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_TableUpdate.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\TableUpdate" namespace="mysql_xdevapi" name="TableUpdate">
+  <implements name="mysql_xdevapi\Executable" full="mysql_xdevapi\Executable"/>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+  </method>
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="orderby" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+    <parameter name="orderby_expr" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+    <parameter name="table_field" optional="false" byreference="false" type="string"/>
+    <parameter name="expression_or_literal" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="where" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+    <parameter name="where_expr" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Table.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Table.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Table.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Table.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Table" namespace="mysql_xdevapi" name="Table">
+  <implements name="mysql_xdevapi\SchemaObject" full="mysql_xdevapi\SchemaObject"/>
+  <member name="name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="delete" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableDelete"/>
+    </docblock>
+  </method>
+  <method name="existsInDatabase" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="getName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getSchema" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Schema"/>
+    </docblock>
+  </method>
+  <method name="getSession" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Session"/>
+    </docblock>
+  </method>
+  <method name="insert" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableInsert"/>
+    </docblock>
+    <parameter name="columns" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="isView" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="select" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableSelect"/>
+    </docblock>
+    <parameter name="columns" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="update" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\TableUpdate"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Warning.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Warning.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_Warning.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_Warning.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Warning" namespace="mysql_xdevapi" name="Warning">
+  <member name="message" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="level" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_XSession.xml phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_XSession.xml
--- phpdox-0.11.2/dependencies/php/classes/mysql_xdevapi_XSession.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/mysql_xdevapi_XSession.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\XSession" namespace="mysql_xdevapi" name="XSession">
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/NoRewindIterator.xml phpdox-0.12.0/dependencies/php/classes/NoRewindIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/NoRewindIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/NoRewindIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -34,7 +34,7 @@
   </method>
   <method name="rewind" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Prevents the rewind operation on the inner iterator."/>
+      <description compact="Prevents the rewind operation on the inner iterator"/>
       <return type="void"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Normalizer.xml phpdox-0.12.0/dependencies/php/classes/Normalizer.xml
--- phpdox-0.11.2/dependencies/php/classes/Normalizer.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Normalizer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,8 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="Normalizer" namespace="" name="Normalizer">
+  <method name="getRawDecomposition" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the Decomposition_Mapping property for the given UTF-8 encoded code point">Object oriented style</description>
+      <return type="string"/>
+    </docblock>
+    <parameter name="input" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="isNormalized" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Checks if the provided string is already in the specified normalization&#10;   form.&#10;  ">Object oriented style</description>
+      <description compact="&#10;   Checks if the provided string is already in the specified normalization&#10;   form&#10;  ">Object oriented style</description>
       <return type="bool"/>
     </docblock>
     <parameter name="input" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/NumberFormatter.xml phpdox-0.12.0/dependencies/php/classes/NumberFormatter.xml
--- phpdox-0.11.2/dependencies/php/classes/NumberFormatter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/NumberFormatter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -43,13 +43,13 @@
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get formatter's last error code.">Object oriented style</description>
+      <description compact="Get formatter's last error code">Object oriented style</description>
       <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get formatter's last error message.">Object oriented style</description>
+      <description compact="Get formatter's last error message">Object oriented style</description>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/OAuth.xml phpdox-0.12.0/dependencies/php/classes/OAuth.xml
--- phpdox-0.11.2/dependencies/php/classes/OAuth.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/OAuth.xml	2019-03-13 09:34:17.000000000 +0000
@@ -144,7 +144,7 @@
   <method name="setAuthType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set authorization type"/>
-      <return type="mixed"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="auth_type" optional="false" byreference="false" type="int"/>
   </method>
@@ -179,7 +179,7 @@
   </method>
   <method name="setSSLChecks" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Tweak specific SSL checks for requests."/>
+      <description compact="Tweak specific SSL checks for requests"/>
       <return type="bool"/>
     </docblock>
     <parameter name="sslcheck" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ParentIterator.xml phpdox-0.12.0/dependencies/php/classes/ParentIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/ParentIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ParentIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -38,4 +38,10 @@
       <return type="void"/>
     </docblock>
   </method>
+  <method name="getInnerIterator" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Iterator"/>
+    </docblock>
+  </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_ErrorInfo.xml phpdox-0.12.0/dependencies/php/classes/Parle_ErrorInfo.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_ErrorInfo.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_ErrorInfo.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\ErrorInfo" namespace="Parle" name="ErrorInfo">
+  <member name="id" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Error id."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="position" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Position in the input, where the error occurred."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="token" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="If applicable - the Parle\Token related to the error, otherwise NULL."/>
+      <var type="mixed"/>
+    </docblock>
+  </member>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_LexerException.xml phpdox-0.12.0/dependencies/php/classes/Parle_LexerException.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_LexerException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_LexerException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\LexerException" namespace="Parle" name="LexerException">
+  <implements name="Throwable" full="Throwable"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_Lexer.xml phpdox-0.12.0/dependencies/php/classes/Parle_Lexer.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_Lexer.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_Lexer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\Lexer" namespace="Parle" name="Lexer">
+  <constant name="ICASE" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOT_NOT_LF" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOT_NOT_CRLF" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_WS" value="8">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="MATCH_ZERO_LEN" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="bol" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Start of input flag."/>
+      <var type="boolean"/>
+    </docblock>
+  </member>
+  <member name="flags" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Lexer flags."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="state" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Current lexer state, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="marker" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Position of the latest token match, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="cursor" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Current input offset, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <method name="advance" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Process next lexer rule"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="build" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Finalize the lexer rule set"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="callout" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Define token callback"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="id" optional="false" byreference="false" type="int"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="consume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pass the data for processing"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="dump" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Dump the state machine"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="getToken" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve the current token"/>
+      <return type="Parle\Token"/>
+    </docblock>
+  </method>
+  <method name="insertMacro" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Insert regex macro"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="regex" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a lexer rule"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="regex" optional="false" byreference="false" type="string"/>
+    <parameter name="id" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="reset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reset lexer"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="pos" optional="false" byreference="false" type="int"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_ParserException.xml phpdox-0.12.0/dependencies/php/classes/Parle_ParserException.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_ParserException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_ParserException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\ParserException" namespace="Parle" name="ParserException">
+  <implements name="Throwable" full="Throwable"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_Parser.xml phpdox-0.12.0/dependencies/php/classes/Parle_Parser.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_Parser.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_Parser.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\Parser" namespace="Parle" name="Parser">
+  <constant name="ACTION_ERROR" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_SHIFT" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_REDUCE" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_GOTO" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_ACCEPT" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR_SYNTAX" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR_NON_ASSOCIATIVE" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR_UNKOWN_TOKEN" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="action" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Current parser action that matches one of the action class constants, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="reduceId" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Grammar rule id just processed in the reduce action. The value corresponds either to a token or to a production id. Readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <method name="advance" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Process next parser rule"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="build" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Finalize the grammar rules"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="consume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Consume the data for processing"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="lexer" optional="false" byreference="false" type="object" class="Parle\Lexer"/>
+  </method>
+  <method name="dump" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Dump the grammar"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="errorInfo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve the error information"/>
+      <return type="Parle\ErrorInfo"/>
+    </docblock>
+  </method>
+  <method name="left" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token with left-associativity"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="nonassoc" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token with no associativity"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="precedence" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a precedence rule"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a grammar rule"/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="rule" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="reset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reset parser state"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tokenId" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="right" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token with right-associativity"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="sigil" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve a matching part of a rule"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="idx" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="token" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="tokenId" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get token id"/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="trace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Trace the parser operation"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="validate" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Validate input"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="lexer" optional="false" byreference="false" type="object" class="Parle\Lexer"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_RLexer.xml phpdox-0.12.0/dependencies/php/classes/Parle_RLexer.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_RLexer.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_RLexer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\RLexer" namespace="Parle" name="RLexer">
+  <constant name="ICASE" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOT_NOT_LF" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="DOT_NOT_CRLF" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_WS" value="8">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="MATCH_ZERO_LEN" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="bol" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Start of input flag."/>
+      <var type="boolean"/>
+    </docblock>
+  </member>
+  <member name="flags" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Lexer flags."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="state" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Current lexer state, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="marker" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Position of the latest token match, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="cursor" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Current input offset, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <method name="advance" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Process next lexer rule"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="build" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Finalize the lexer rule set"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="callout" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Define token callback"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="id" optional="false" byreference="false" type="int"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="consume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pass the data for processing"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="dump" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Dump the state machine"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="getToken" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve the current token"/>
+      <return type="Parle\Token"/>
+    </docblock>
+  </method>
+  <method name="insertMacro" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Insert regex macro"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="regex" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a lexer rule">Push a pattern for lexeme recognition.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="regex" optional="false" byreference="false" type="string"/>
+    <parameter name="id" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a lexer rule">Push a pattern for lexeme recognition.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="state" optional="false" byreference="false" type="string"/>
+    <parameter name="regex" optional="false" byreference="false" type="string"/>
+    <parameter name="id" optional="false" byreference="false" type="int"/>
+    <parameter name="newState" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a lexer rule">Push a pattern for lexeme recognition.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="state" optional="false" byreference="false" type="string"/>
+    <parameter name="regex" optional="false" byreference="false" type="string"/>
+    <parameter name="newState" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="pushState" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Push a new start state"/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="state" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="reset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reset lexer"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="pos" optional="false" byreference="false" type="int"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_RParser.xml phpdox-0.12.0/dependencies/php/classes/Parle_RParser.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_RParser.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_RParser.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\RParser" namespace="Parle" name="RParser">
+  <constant name="ACTION_ERROR" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_SHIFT" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_REDUCE" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_GOTO" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ACTION_ACCEPT" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR_SYNTAX" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR_NON_ASSOCIATIVE" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR_UNKOWN_TOKEN" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="action" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Current parser action that matches one of the action class constants, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="reduceId" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Grammar rule id just processed in the reduce action. The value corresponds either to a token or to a production id. Readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <method name="advance" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Process next parser rule"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="build" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Finalize the grammar rules"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="consume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Consume the data for processing"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="rlexer" optional="false" byreference="false" type="object" class="Parle\RLexer"/>
+  </method>
+  <method name="dump" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Dump the grammar"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="errorInfo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve the error information"/>
+      <return type="Parle\ErrorInfo"/>
+    </docblock>
+  </method>
+  <method name="left" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token with left-associativity"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="nonassoc" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token with no associativity"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="precedence" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a precedence rule"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a grammar rule"/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="rule" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="reset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reset parser state"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tokenId" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="right" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token with right-associativity"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="sigil" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve a matching part of a rule"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="idx" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="token" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Declare a token"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="tokenId" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get token id"/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="tok" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="trace" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Trace the parser operation"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="validate" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Validate input"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="lexer" optional="false" byreference="false" type="object" class="Parle\RLexer"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_Stack.xml phpdox-0.12.0/dependencies/php/classes/Parle_Stack.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_Stack.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_Stack.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\Stack" namespace="Parle" name="Stack">
+  <member name="empty" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Whether the stack is empty, readonly."/>
+      <var type="boolean"/>
+    </docblock>
+  </member>
+  <member name="size" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Stack size, readonly."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="top" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Element on the top of the stack."/>
+      <var type="mixed"/>
+    </docblock>
+  </member>
+  <method name="pop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pop an item from the stack"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Push an item into the stack"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="item" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Parle_Token.xml phpdox-0.12.0/dependencies/php/classes/Parle_Token.xml
--- phpdox-0.11.2/dependencies/php/classes/Parle_Token.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Parle_Token.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Parle\Token" namespace="Parle" name="Token">
+  <constant name="EOI" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="UNKNOWN" value="-1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP" value="-2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="id" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Token id."/>
+      <var type="integer"/>
+    </docblock>
+  </member>
+  <member name="value" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Token value."/>
+      <var type="string"/>
+    </docblock>
+  </member>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ParseError.xml phpdox-0.12.0/dependencies/php/classes/ParseError.xml
--- phpdox-0.11.2/dependencies/php/classes/ParseError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ParseError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="ParseError" namespace="" name="ParseError">
-  <extends name="Error" full="Error"/>
+  <extends name="CompileError" full="CompileError"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/PDOStatement.xml phpdox-0.12.0/dependencies/php/classes/PDOStatement.xml
--- phpdox-0.11.2/dependencies/php/classes/PDOStatement.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/PDOStatement.xml	2019-03-13 09:34:17.000000000 +0000
@@ -41,7 +41,7 @@
   </method>
   <method name="closeCursor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Closes the cursor, enabling the statement to be executed again.&#10;  ">PDOStatement::closeCursor frees up the connection to the server so that other SQL statements may be issued, but leaves the statement in a state that enables it to be executed again.</description>
+      <description compact="&#10;   Closes the cursor, enabling the statement to be executed again&#10;  ">PDOStatement::closeCursor frees up the connection to the server so that other SQL statements may be issued, but leaves the statement in a state that enables it to be executed again.</description>
       <return type="bool"/>
     </docblock>
   </method>
@@ -103,7 +103,7 @@
   </method>
   <method name="fetchObject" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Fetches the next row and returns it as an object.">Fetches the next row and returns it as an object. This function is an alternative to PDOStatement::fetch with PDO::FETCH_CLASS or PDO::FETCH_OBJ style.</description>
+      <description compact="Fetches the next row and returns it as an object">Fetches the next row and returns it as an object. This function is an alternative to PDOStatement::fetch with PDO::FETCH_CLASS or PDO::FETCH_OBJ style.</description>
       <return type="mixed"/>
     </docblock>
     <parameter name="class_name" optional="true" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/PDO.xml phpdox-0.12.0/dependencies/php/classes/PDO.xml
--- phpdox-0.11.2/dependencies/php/classes/PDO.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/PDO.xml	2019-03-13 09:34:17.000000000 +0000
@@ -7,7 +7,7 @@
     </docblock>
     <parameter name="dsn" optional="false" byreference="false" type="string"/>
     <parameter name="username" optional="true" byreference="false" type="string"/>
-    <parameter name="password" optional="true" byreference="false" type="string"/>
+    <parameter name="passwd" optional="true" byreference="false" type="string"/>
     <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </constructor>
   <method name="beginTransaction" abstract="false" static="false" visibility="public" final="false">
@@ -25,7 +25,7 @@
   <method name="errorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Fetch the SQLSTATE associated with the last operation on the database handle&#10;  "/>
-      <return type="mixed"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="errorInfo" abstract="false" static="false" visibility="public" final="false">
@@ -69,7 +69,7 @@
   </method>
   <method name="prepare" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Prepares a statement for execution and returns a statement object&#10;  ">Prepares an SQL statement to be executed by the PDOStatement::execute method. The SQL statement can contain zero or more named (:name) or question mark (?) parameter markers for which real values will be substituted when the statement is executed. You cannot use both named and question mark parameter markers within the same SQL statement; pick one or the other parameter style. Use these parameters to bind any user-input, do not include the user-input directly in the query.</description>
+      <description compact="&#10;   Prepares a statement for execution and returns a statement object&#10;  ">Prepares an SQL statement to be executed by the PDOStatement::execute method. The statement template can contain zero or more named (:name) or question mark (?) parameter markers for which real values will be substituted when the statement is executed. Both named and question mark parameter markers cannot be used within the same statement template; only one or the other parameter style. Use these parameters to bind any user-input, do not include the user-input directly in the query.</description>
       <return type="PDOStatement"/>
     </docblock>
     <parameter name="statement" optional="false" byreference="false" type="string"/>
@@ -84,7 +84,7 @@
   </method>
   <method name="quote" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Quotes a string for use in a query.&#10;  ">PDO::quote places quotes around the input string (if required) and escapes special characters within the input string, using a quoting style appropriate to the underlying driver.</description>
+      <description compact="&#10;   Quotes a string for use in a query&#10;  ">PDO::quote places quotes around the input string (if required) and escapes special characters within the input string, using a quoting style appropriate to the underlying driver.</description>
       <return type="string"/>
     </docblock>
     <parameter name="string" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/PharData.xml phpdox-0.12.0/dependencies/php/classes/PharData.xml
--- phpdox-0.11.2/dependencies/php/classes/PharData.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/PharData.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="PharData" namespace="" name="PharData">
-  <extends name="Phar" full="Phar"/>
+  <extends name="RecursiveDirectoryIterator" full="RecursiveDirectoryIterator"/>
+  <constant name="CURRENT_AS_PATHNAME" value="32">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_FILEINFO" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_SELF" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_MODE_MASK" value="240">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_PATHNAME" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_FILENAME" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FOLLOW_SYMLINKS" value="512">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_MODE_MASK" value="3840">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="NEW_CURRENT_AND_KEY" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_DOTS" value="4096">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="UNIX_PATHS" value="8192">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <method name="addEmptyDir" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Add an empty directory to the tar/zip archive"/>
-      <return type="bool"/>
+      <return type="void"/>
     </docblock>
     <parameter name="dirname" optional="false" byreference="false" type="string"/>
   </method>
@@ -19,7 +74,7 @@
   <method name="addFromString" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Add a file from the filesystem to the tar/zip archive"/>
-      <return type="bool"/>
+      <return type="void"/>
     </docblock>
     <parameter name="localname" optional="false" byreference="false" type="string"/>
     <parameter name="contents" optional="false" byreference="false" type="string"/>
@@ -34,7 +89,7 @@
   </method>
   <method name="buildFromIterator" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Construct a tar or zip archive from an iterator."/>
+      <description compact="Construct a tar or zip archive from an iterator"/>
       <return type="array"/>
     </docblock>
     <parameter name="iter" optional="false" byreference="false" type="object" class="Iterator"/>
@@ -51,7 +106,7 @@
   <method name="compressFiles" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Compresses all files in the current tar/zip archive">For tar-based archives, this method throws a BadMethodCallException, as compression of individual files within a tar archive is not supported by the file format. Use PharData::compress to compress an entire tar-based archive.</description>
-      <return type="bool"/>
+      <return type="void"/>
     </docblock>
     <parameter name="compression" optional="false" byreference="false" type="int"/>
   </method>
@@ -134,7 +189,7 @@
   </method>
   <method name="offsetSet" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="set the contents of a file within the tar/zip to those of an external file or string"/>
+      <description compact="Set the contents of a file within the tar/zip to those of an external file or string"/>
       <return type="void"/>
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="string"/>
@@ -142,21 +197,21 @@
   </method>
   <method name="offsetUnset" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="remove a file from a tar/zip archive"/>
+      <description compact="Remove a file from a tar/zip archive"/>
       <return type="bool"/>
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setAlias" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="dummy function (Phar::setAlias is not valid for PharData)"/>
+      <description compact="Dummy function (Phar::setAlias is not valid for PharData)"/>
       <return type="bool"/>
     </docblock>
     <parameter name="alias" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setDefaultStub" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="dummy function (Phar::setDefaultStub is not valid for PharData)"/>
+      <description compact="Dummy function (Phar::setDefaultStub is not valid for PharData)"/>
       <return type="bool"/>
     </docblock>
     <parameter name="index" optional="true" byreference="false" type="string"/>
@@ -171,14 +226,14 @@
   </method>
   <method name="setSignatureAlgorithm" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="set the signature algorithm for a phar and apply it.">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Set the signature algorithm for a phar and apply it">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="void"/>
     </docblock>
     <parameter name="sigtype" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setStub" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="dummy function (Phar::setStub is not valid for PharData)"/>
+      <description compact="Dummy function (Phar::setStub is not valid for PharData)"/>
       <return type="bool"/>
     </docblock>
     <parameter name="stub" optional="false" byreference="false" type="string"/>
@@ -353,6 +408,12 @@
     <parameter name="files" optional="true" byreference="false" type="object" class="string|array"/>
     <parameter name="overwrite" optional="true" byreference="false" type="object" class="bool"/>
   </method>
+  <method name="getAlias" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
   <method name="getMetadata" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -365,6 +426,12 @@
       <return type="bool"/>
     </docblock>
   </method>
+  <method name="getPath" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
   <method name="getSignature" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -531,7 +598,7 @@
   </method>
   <method name="setSignatureAlgorithm" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="set the signature algorithm for a phar and apply it.">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Set the signature algorithm for a phar and apply it">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="void"/>
     </docblock>
     <parameter name="sigtype" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/PharFileInfo.xml phpdox-0.12.0/dependencies/php/classes/PharFileInfo.xml
--- phpdox-0.11.2/dependencies/php/classes/PharFileInfo.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/PharFileInfo.xml	2019-03-13 09:34:17.000000000 +0000
@@ -46,6 +46,12 @@
       <return type="int"/>
     </docblock>
   </method>
+  <method name="getContent" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the complete file contents of the entry"/>
+      <return type="string"/>
+    </docblock>
+  </method>
   <method name="getMetadata" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns file-specific meta-data saved with a file"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Phar.xml phpdox-0.12.0/dependencies/php/classes/Phar.xml
--- phpdox-0.11.2/dependencies/php/classes/Phar.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Phar.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,61 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="Phar" namespace="" name="Phar">
   <implements name="Countable" full="Countable"/>
+  <constant name="CURRENT_AS_PATHNAME" value="32">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_FILEINFO" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_SELF" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_MODE_MASK" value="240">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_PATHNAME" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_FILENAME" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FOLLOW_SYMLINKS" value="512">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_MODE_MASK" value="3840">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="NEW_CURRENT_AND_KEY" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_DOTS" value="4096">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="UNIX_PATHS" value="8192">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <method name="addEmptyDir" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Add an empty directory to the phar archive">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
@@ -32,7 +87,7 @@
   </method>
   <method name="buildFromDirectory" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Construct a phar archive from the files within a directory.">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Construct a phar archive from the files within a directory">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="array"/>
     </docblock>
     <parameter name="base_dir" optional="false" byreference="false" type="string"/>
@@ -40,7 +95,7 @@
   </method>
   <method name="buildFromIterator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Construct a phar archive from an iterator.">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Construct a phar archive from an iterator">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="array"/>
     </docblock>
     <parameter name="iter" optional="false" byreference="false" type="object" class="Iterator"/>
@@ -170,6 +225,12 @@
     <parameter name="files" optional="true" byreference="false" type="object" class="string|array"/>
     <parameter name="overwrite" optional="true" byreference="false" type="object" class="bool"/>
   </method>
+  <method name="getAlias" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the alias for Phar"/>
+      <return type="string"/>
+    </docblock>
+  </method>
   <method name="getMetadata" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns phar archive meta-data"/>
@@ -182,6 +243,12 @@
       <return type="bool"/>
     </docblock>
   </method>
+  <method name="getPath" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the real path to the Phar archive on disk"/>
+      <return type="string"/>
+    </docblock>
+  </method>
   <method name="getSignature" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Return MD5/SHA1/SHA256/SHA512/OpenSSL signature of a Phar archive"/>
@@ -220,7 +287,7 @@
   </method>
   <method name="interceptFileFuncs" abstract="false" static="false" visibility="public" final="true">
     <docblock>
-      <description compact="instructs phar to intercept fopen, file_get_contents, opendir, and all of the stat-related functions">instructs phar to intercept fopen, readfile, file_get_contents, opendir, and all of the stat-related functions. If any of these functions is called from within a phar archive with a relative path, the call is modified to access a file within the phar archive. Absolute paths are assumed to be attempts to load external files from the filesystem.</description>
+      <description compact="Instructs phar to intercept fopen, file_get_contents, opendir, and all of the stat-related functions">instructs phar to intercept fopen, readfile, file_get_contents, opendir, and all of the stat-related functions. If any of these functions is called from within a phar archive with a relative path, the call is modified to access a file within the phar archive. Absolute paths are assumed to be attempts to load external files from the filesystem.</description>
       <return type="void"/>
     </docblock>
   </method>
@@ -290,7 +357,7 @@
   </method>
   <method name="offsetExists" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="determines whether a file exists in the phar">This is an implementation of the ArrayAccess interface allowing direct manipulation of the contents of a Phar archive using array access brackets.</description>
+      <description compact="Determines whether a file exists in the phar">This is an implementation of the ArrayAccess interface allowing direct manipulation of the contents of a Phar archive using array access brackets.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="string"/>
@@ -304,7 +371,7 @@
   </method>
   <method name="offsetSet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="set the contents of an internal file to those of an external file">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Set the contents of an internal file to those of an external file">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="void"/>
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="string"/>
@@ -312,7 +379,7 @@
   </method>
   <method name="offsetUnset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="remove a file from a phar">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Remove a file from a phar">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="string"/>
@@ -348,7 +415,7 @@
   </method>
   <method name="setSignatureAlgorithm" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="set the signature algorithm for a phar and apply it.">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
+      <description compact="Set the signature algorithm for a phar and apply it">This method requires the php.ini setting phar.readonly to be set to 0 in order to work for Phar objects. Otherwise, a PharException will be thrown.</description>
       <return type="void"/>
     </docblock>
     <parameter name="sigtype" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/phdfs.xml phpdox-0.12.0/dependencies/php/classes/phdfs.xml
--- phpdox-0.11.2/dependencies/php/classes/phdfs.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/phdfs.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="phdfs" namespace="" name="phdfs">
+  <member name="host" static="false">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="port" static="false">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="connect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="ip" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="copy" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="source_file" optional="false" byreference="false" type="string"/>
+    <parameter name="destination_file" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="create_directory" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="delete" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="disconnect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="exists" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="file_info" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="list_directory" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="level" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="read" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="length" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="rename" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="old_path" optional="false" byreference="false" type="string"/>
+    <parameter name="new_path" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="tell" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="int"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="read_length" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="write" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="buffer" optional="false" byreference="false" type="string"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/pht_AtomicInteger.xml phpdox-0.12.0/dependencies/php/classes/pht_AtomicInteger.xml
--- phpdox-0.11.2/dependencies/php/classes/pht_AtomicInteger.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/pht_AtomicInteger.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="pht\AtomicInteger" namespace="pht" name="AtomicInteger">
+  <implements name="pht\Threaded" full="pht\Threaded"/>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="AtomicInteger creation"/>
+      <return type="AtomicInteger"/>
+    </docblock>
+    <parameter name="value" optional="true" byreference="false" type="int"/>
+  </constructor>
+  <method name="dec" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Decrements the atomic integer's value by one"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the atomic integer's value"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="inc" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Increments the atomic integer's value by one"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Acquires the atomic integer's mutex lock">This method will acquire the mutex lock associated with the atomic integer. The mutex lock only needs to be acquired when needing to group together multiple operations.</description>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Sets the atomic integer's value"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Releases the atomic integer's mutex lock"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/pht_HashTable.xml phpdox-0.12.0/dependencies/php/classes/pht_HashTable.xml
--- phpdox-0.11.2/dependencies/php/classes/pht_HashTable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/pht_HashTable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="pht\HashTable" namespace="pht" name="HashTable">
+  <implements name="pht\Threaded" full="pht\Threaded"/>
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Acquires the hash table's mutex lock">This method will acquire the mutex lock associated with the hash table. The mutex lock should always be acquired when manipulating the hash table if it is being used by multiple threads.</description>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="size" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the size of the hash table"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Releases the hash table's mutex lock"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/pht_Queue.xml phpdox-0.12.0/dependencies/php/classes/pht_Queue.xml
--- phpdox-0.11.2/dependencies/php/classes/pht_Queue.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/pht_Queue.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="pht\Queue" namespace="pht" name="Queue">
+  <implements name="pht\Threaded" full="pht\Threaded"/>
+  <method name="front" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the first value from a queue">This method will remove a value from the front of the queue (in constant time). Attempting to return the front value from an empty queue will result in an Error exception.</description>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Acquires the queue's mutex lock">This method will acquire the mutex lock associated with the queue. The mutex lock should always be acquired when manipulating the queue if it is being used by multiple threads.</description>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="pop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pops a value off of the front of a queue"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pushes a value to the end of a queue"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="size" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the size of the queue"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Releases the queue's mutex lock"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/pht_Thread.xml phpdox-0.12.0/dependencies/php/classes/pht_Thread.xml
--- phpdox-0.11.2/dependencies/php/classes/pht_Thread.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/pht_Thread.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="pht\Thread" namespace="pht" name="Thread">
+  <method name="addClassTask" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Class threading"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="className" optional="false" byreference="false" type="string"/>
+    <parameter name="...ctorArgs" optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="addFileTask" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="File threading"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fileName" optional="false" byreference="false" type="string"/>
+    <parameter name="...globals" optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="addFunctionTask" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Function threading"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="func" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="...funcArgs" optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="join" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Joins a thread"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Starts the new thread"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="taskCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets a thread's task count"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/pht_Vector.xml phpdox-0.12.0/dependencies/php/classes/pht_Vector.xml
--- phpdox-0.11.2/dependencies/php/classes/pht_Vector.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/pht_Vector.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="pht\Vector" namespace="pht" name="Vector">
+  <implements name="pht\Threaded" full="pht\Threaded"/>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vector creation"/>
+      <return type="Vector"/>
+    </docblock>
+    <parameter name="size" optional="true" byreference="false" type="int"/>
+    <parameter name="value" optional="true" byreference="false" type="object" class="mixed"/>
+  </constructor>
+  <method name="deleteAt" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Deletes a value in the vector">This method deletes a value at the specified offset in the vector (in linear time).</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="insertAt" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Inserts a value into the vector"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Acquires the vector's mutex lock">This method will acquire the mutex lock associated with the vector. The mutex lock should always be acquired when manipulating the vector if it is being used by multiple threads.</description>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="pop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pops a value to the vector"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pushes a value to the vector">This method pushes a value onto the end of a vector (in constant time). The vector will automatically be resized if it is not large enough.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="resize" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Resizes a vector"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
+    <parameter name="value" optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="shift" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Shifts a value from the vector"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="size" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the size of the vector"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Releases the vector's mutex lock"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="unshift" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Unshifts a value to the vector front"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="updateAt" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Updates a value in the vector">This method updates a value at the specified offset in the vector (in linear time). The vector will automatically be resized if it is not large enough.</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Pool.xml phpdox-0.12.0/dependencies/php/classes/Pool.xml
--- phpdox-0.11.2/dependencies/php/classes/Pool.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Pool.xml	2019-03-13 09:34:17.000000000 +0000
@@ -18,12 +18,6 @@
       <description compact="references to Workers"/>
     </docblock>
   </member>
-  <member name="work" static="false" visibility="protected">
-    <default>null</default>
-    <docblock>
-      <description compact="references to Threaded objects submitted to the Pool"/>
-    </docblock>
-  </member>
   <member name="ctor" static="false" visibility="protected">
     <default>null</default>
     <docblock>
@@ -48,7 +42,7 @@
       <description compact="Creates a new Pool of Workers"/>
       <return type="Pool"/>
     </docblock>
-    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
     <parameter name="class" optional="true" byreference="false" type="string"/>
     <parameter name="ctor" optional="true" byreference="false" type="object" class="array"/>
   </constructor>
@@ -57,7 +51,7 @@
       <description compact="Resize the Pool"/>
       <return type="void"/>
     </docblock>
-    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
   </method>
   <method name="shutdown" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveArrayIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveArrayIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveArrayIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveArrayIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="RecursiveArrayIterator" namespace="" name="RecursiveArrayIterator">
   <implements name="RecursiveIterator" full="RecursiveIterator"/>
+  <constant name="" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constant name="" value="4">
     <docblock>
       <var type="integer"/>
@@ -8,13 +18,13 @@
   </constant>
   <method name="getChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns an iterator for the current entry if it is an array or an object."/>
+      <description compact="Returns an iterator for the current entry if it is an array or an object"/>
       <return type="RecursiveArrayIterator"/>
     </docblock>
   </method>
   <method name="hasChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns whether current entry is an array or an object."/>
+      <description compact="Returns whether current entry is an array or an object"/>
       <return type="bool"/>
     </docblock>
   </method>
@@ -96,31 +106,31 @@
   <method name="offsetExists" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="mixed"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetSet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
-    <parameter name="newval" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="newval" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetUnset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="rewind" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -153,14 +163,14 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="cmp_function" optional="false" byreference="false" type="string"/>
+    <parameter name="cmp_function" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="uksort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="cmp_function" optional="false" byreference="false" type="string"/>
+    <parameter name="cmp_function" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="unserialize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveCachingIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveCachingIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveCachingIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveCachingIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,13 +1,43 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="RecursiveCachingIterator" namespace="" name="RecursiveCachingIterator">
   <implements name="Countable" full="Countable"/>
+  <constant name="CALL_TOSTRING" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CATCH_GET_CHILD" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="TOSTRING_USE_KEY" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="TOSTRING_USE_CURRENT" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="TOSTRING_USE_INNER" value="8">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FULL_CACHE" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct"/>
       <return type="void"/>
     </docblock>
     <parameter name="iterator" optional="false" byreference="false" type="object" class="Iterator"/>
-    <parameter name="flags" optional="true" byreference="false" type="string"/>
+    <parameter name="flags" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="getChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -82,7 +112,7 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -96,8 +126,8 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="string"/>
-    <parameter name="newval" optional="false" byreference="false" type="string"/>
+    <parameter name="index" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="newval" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="offsetUnset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveCallbackFilterIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveCallbackFilterIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveCallbackFilterIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveCallbackFilterIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -24,7 +24,7 @@
   <method name="accept" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="string"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveDirectoryIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveDirectoryIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveDirectoryIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveDirectoryIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,61 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="RecursiveDirectoryIterator" namespace="" name="RecursiveDirectoryIterator">
   <implements name="SeekableIterator" full="SeekableIterator"/>
+  <constant name="CURRENT_AS_PATHNAME" value="32">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_FILEINFO" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_AS_SELF" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CURRENT_MODE_MASK" value="240">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_PATHNAME" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_AS_FILENAME" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="FOLLOW_SYMLINKS" value="512">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="KEY_MODE_MASK" value="3840">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="NEW_CURRENT_AND_KEY" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_DOTS" value="4096">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="UNIX_PATHS" value="8192">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Constructs a RecursiveDirectoryIterator"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveIteratorIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveIteratorIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveIteratorIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveIteratorIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -126,7 +126,7 @@
       <description compact="Set max depth"/>
       <return type="void"/>
     </docblock>
-    <parameter name="max_depth" optional="true" byreference="false" type="string"/>
+    <parameter name="max_depth" optional="true" byreference="false" type="int"/>
   </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveRegexIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveRegexIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveRegexIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveRegexIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,9 +1,39 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="RecursiveRegexIterator" namespace="" name="RecursiveRegexIterator">
   <implements name="RecursiveIterator" full="RecursiveIterator"/>
+  <constant name="" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new RecursiveRegexIterator."/>
+      <description compact="Creates a new RecursiveRegexIterator"/>
       <return type="void"/>
     </docblock>
     <parameter name="iterator" optional="false" byreference="false" type="object" class="RecursiveIterator"/>
@@ -14,13 +44,13 @@
   </constructor>
   <method name="getChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns an iterator for the current entry."/>
+      <description compact="Returns an iterator for the current entry"/>
       <return type="RecursiveRegexIterator"/>
     </docblock>
   </method>
   <method name="hasChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns whether an iterator can be obtained for the current entry."/>
+      <description compact="Returns whether an iterator can be obtained for the current entry"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RecursiveTreeIterator.xml phpdox-0.12.0/dependencies/php/classes/RecursiveTreeIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RecursiveTreeIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RecursiveTreeIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="RecursiveTreeIterator" namespace="" name="RecursiveTreeIterator">
   <implements name="OuterIterator" full="OuterIterator"/>
+  <constant name="LEAVES_ONLY" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SELF_FIRST" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CHILD_FIRST" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="CATCH_GET_CHILD" value="16">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constant name="BYPASS_CURRENT" value="4">
     <docblock>
       <var type="integer"/>
@@ -102,7 +122,7 @@
   <method name="getPostfix" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the postfix"/>
-      <return type="void"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getPrefix" abstract="false" static="false" visibility="public" final="false">
@@ -135,6 +155,13 @@
       <return type="void"/>
     </docblock>
   </method>
+  <method name="setPostfix" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set postfix"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="postfix" optional="false" byreference="false" type="string"/>
+  </method>
   <method name="setPrefixPart" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set a part of the prefix"/>
@@ -254,7 +281,7 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="max_depth" optional="true" byreference="false" type="string"/>
+    <parameter name="max_depth" optional="true" byreference="false" type="int"/>
   </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionClassConstant.xml phpdox-0.12.0/dependencies/php/classes/ReflectionClassConstant.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionClassConstant.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionClassConstant.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ReflectionClassConstant" namespace="" name="ReflectionClassConstant">
+  <implements name="Reflector" full="Reflector"/>
+  <member name="name" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Name of the class constant. Read-only, throws ReflectionException in attempt to write."/>
+    </docblock>
+  </member>
+  <member name="class" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact="Name of the class where the class constant is defined. Read-only, throws ReflectionException in attempt to write."/>
+    </docblock>
+  </member>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Constructs a ReflectionClassConstant"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="class" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </constructor>
+  <method name="export" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Export"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="class" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="return" optional="true" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="getDeclaringClass" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets declaring class"/>
+      <return type="ReflectionClass"/>
+    </docblock>
+  </method>
+  <method name="getDocComment" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets doc comments"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getModifiers" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the class constant modifiers"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get name of the constant"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getValue" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets value"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="isPrivate" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Checks if class constant is private"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isProtected" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Checks if class constant is protected"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isPublic" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Checks if class constant is public"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the string representation of the ReflectionClassConstant object"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionClass.xml phpdox-0.12.0/dependencies/php/classes/ReflectionClass.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionClass.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionClass.xml	2019-03-13 09:34:17.000000000 +0000
@@ -106,7 +106,7 @@
   </method>
   <method name="getMethod" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets a ReflectionMethod for a class method."/>
+      <description compact="Gets a ReflectionMethod for a class method"/>
       <return type="ReflectionMethod"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
@@ -156,6 +156,19 @@
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
   </method>
+  <method name="getReflectionConstant" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets a ReflectionClassConstant for a class's constant"/>
+      <return type="ReflectionClassConstant"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getReflectionConstants" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets class constants"/>
+      <return type="array"/>
+    </docblock>
+  </method>
   <method name="getShortName" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Gets short name"/>
@@ -283,6 +296,12 @@
       <return type="bool"/>
     </docblock>
   </method>
+  <method name="isIterable" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check whether this class is iterable"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isIterateable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if iterateable"/>
@@ -310,22 +329,21 @@
   </method>
   <method name="newInstance" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new class instance from given arguments."/>
+      <description compact="Creates a new class instance from given arguments"/>
       <return type="object"/>
     </docblock>
-    <parameter name="args" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="newInstanceArgs" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new class instance from given arguments."/>
+      <description compact="Creates a new class instance from given arguments"/>
       <return type="object"/>
     </docblock>
     <parameter name="args" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="newInstanceWithoutConstructor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Creates a new class instance without invoking the constructor."/>
+      <description compact="Creates a new class instance without invoking the constructor"/>
       <return type="object"/>
     </docblock>
   </method>
@@ -335,11 +353,11 @@
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="value" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the string representation of the ReflectionClass object."/>
+      <description compact="Returns the string representation of the ReflectionClass object"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionFunction.xml phpdox-0.12.0/dependencies/php/classes/ReflectionFunction.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionFunction.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionFunction.xml	2019-03-13 09:34:17.000000000 +0000
@@ -38,7 +38,6 @@
       <description compact="Invokes function"/>
       <return type="mixed"/>
     </docblock>
-    <parameter name="parameter" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="invokeArgs" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionMethod.xml phpdox-0.12.0/dependencies/php/classes/ReflectionMethod.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionMethod.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionMethod.xml	2019-03-13 09:34:17.000000000 +0000
@@ -53,7 +53,7 @@
   </constructor>
   <method name="export" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Export a reflection method."/>
+      <description compact="Export a reflection method"/>
       <return type="string"/>
     </docblock>
     <parameter name="class" optional="false" byreference="false" type="string"/>
@@ -69,7 +69,7 @@
   </method>
   <method name="getDeclaringClass" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets declaring class for the reflected method."/>
+      <description compact="Gets declaring class for the reflected method"/>
       <return type="ReflectionClass"/>
     </docblock>
   </method>
@@ -81,7 +81,7 @@
   </method>
   <method name="getPrototype" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the method prototype (if there is one)."/>
+      <description compact="Gets the method prototype (if there is one)"/>
       <return type="ReflectionMethod"/>
     </docblock>
   </method>
@@ -91,7 +91,6 @@
       <return type="mixed"/>
     </docblock>
     <parameter name="object" optional="false" byreference="false" type="object" class="object"/>
-    <parameter name="parameter" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="invokeArgs" abstract="false" static="false" visibility="public" final="false">
@@ -159,7 +158,7 @@
   </method>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the string representation of the Reflection method object."/>
+      <description compact="Returns the string representation of the Reflection method object"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionNamedType.xml phpdox-0.12.0/dependencies/php/classes/ReflectionNamedType.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionNamedType.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionNamedType.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ReflectionNamedType" namespace="" name="ReflectionNamedType">
+  <extends name="ReflectionType" full="ReflectionType"/>
+  <method name="getName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the text of the type hint"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="allowsNull" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isBuiltin" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionObject.xml phpdox-0.12.0/dependencies/php/classes/ReflectionObject.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionObject.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionObject.xml	2019-03-13 09:34:17.000000000 +0000
@@ -171,6 +171,19 @@
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
   </method>
+  <method name="getReflectionConstant" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReflectionClassConstant"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getReflectionConstants" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
   <method name="getShortName" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -298,6 +311,12 @@
       <return type="bool"/>
     </docblock>
   </method>
+  <method name="isIterable" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isIterateable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
@@ -328,7 +347,6 @@
       <description compact=""/>
       <return type="object"/>
     </docblock>
-    <parameter name="args" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="newInstanceArgs" abstract="false" static="false" visibility="public" final="false">
@@ -350,7 +368,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="value" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionParameter.xml phpdox-0.12.0/dependencies/php/classes/ReflectionParameter.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionParameter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionParameter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -116,7 +116,7 @@
   </method>
   <method name="isDefaultValueConstant" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns whether the default value of this parameter is constant"/>
+      <description compact="Returns whether the default value of this parameter is a constant"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ReflectionZendExtension.xml phpdox-0.12.0/dependencies/php/classes/ReflectionZendExtension.xml
--- phpdox-0.11.2/dependencies/php/classes/ReflectionZendExtension.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ReflectionZendExtension.xml	2019-03-13 09:34:17.000000000 +0000
@@ -26,7 +26,7 @@
       <return type="string"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="return" optional="true" byreference="false" type="string"/>
+    <parameter name="return" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="getAuthor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RegexIterator.xml phpdox-0.12.0/dependencies/php/classes/RegexIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/RegexIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RegexIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -56,13 +56,13 @@
   </method>
   <method name="getMode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns operation mode."/>
+      <description compact="Returns operation mode"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="getPregFlags" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the regular expression flags."/>
+      <description compact="Returns the regular expression flags"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -74,21 +74,21 @@
   </method>
   <method name="setFlags" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the flags."/>
+      <description compact="Sets the flags"/>
       <return type="void"/>
     </docblock>
     <parameter name="flags" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setMode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the operation mode."/>
+      <description compact="Sets the operation mode"/>
       <return type="void"/>
     </docblock>
     <parameter name="mode" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setPregFlags" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the regular expression flags."/>
+      <description compact="Sets the regular expression flags"/>
       <return type="void"/>
     </docblock>
     <parameter name="preg_flags" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ResourceBundle.xml phpdox-0.12.0/dependencies/php/classes/ResourceBundle.xml
--- phpdox-0.11.2/dependencies/php/classes/ResourceBundle.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ResourceBundle.xml	2019-03-13 09:34:17.000000000 +0000
@@ -26,13 +26,13 @@
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get bundle's last error code.">Object oriented style</description>
+      <description compact="Get bundle's last error code">Object oriented style</description>
       <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get bundle's last error message.">Object oriented style</description>
+      <description compact="Get bundle's last error message">Object oriented style</description>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RRDCreator.xml phpdox-0.12.0/dependencies/php/classes/RRDCreator.xml
--- phpdox-0.11.2/dependencies/php/classes/RRDCreator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RRDCreator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,14 +2,14 @@
 <class xmlns="http://xml.phpdox.net/src" full="RRDCreator" namespace="" name="RRDCreator">
   <method name="addArchive" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds RRA - archive of data values for each data source."/>
+      <description compact="Adds RRA - archive of data values for each data source"/>
       <return type="void"/>
     </docblock>
     <parameter name="description" optional="false" byreference="false" type="string"/>
   </method>
   <method name="addDataSource" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds data source definition for RRD database."/>
+      <description compact="Adds data source definition for RRD database"/>
       <return type="void"/>
     </docblock>
     <parameter name="description" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/RRDGraph.xml phpdox-0.12.0/dependencies/php/classes/RRDGraph.xml
--- phpdox-0.11.2/dependencies/php/classes/RRDGraph.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/RRDGraph.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,7 +15,7 @@
   </method>
   <method name="saveVerbose" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Saves the RRD database query into image and returns the verbose&#10;   information about generated graph.&#10;  "/>
+      <description compact="Saves the RRD database query into image and returns the verbose&#10;   information about generated graph&#10;  "/>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SeasLog.xml phpdox-0.12.0/dependencies/php/classes/SeasLog.xml
--- phpdox-0.11.2/dependencies/php/classes/SeasLog.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SeasLog.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="SeasLog" namespace="" name="SeasLog">
+  <method name="alert" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record alert log information">Record alert log information. "ALERT" - Action must be taken immediately. Immediate attention should be given to relevant personnel for emergency repairs.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="analyzerCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get log count by level, log_path and key_word"/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="level" optional="false" byreference="false" type="string"/>
+    <parameter name="log_path" optional="true" byreference="false" type="string"/>
+    <parameter name="key_word" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="analyzerDetail" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get log detail by level, log_path, key_word, start, limit, order"/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="level" optional="false" byreference="false" type="string"/>
+    <parameter name="log_path" optional="true" byreference="false" type="string"/>
+    <parameter name="key_word" optional="true" byreference="false" type="string"/>
+    <parameter name="start" optional="true" byreference="false" type="int"/>
+    <parameter name="limit" optional="true" byreference="false" type="int"/>
+    <parameter name="order" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="closeLoggerStream" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Manually release stream flow from logger"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="model" optional="false" byreference="false" type="int"/>
+    <parameter name="logger" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="critical" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record critical log information">Record critical log information. "CRITICAL" - Critical conditions.Need to be repaired immediately, and the program component is unavailable.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="debug" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record debug log information">Record debug log information. "DEBUG" - Detailed debug information.Fine-grained information events.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="emergency" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record emergency log information">Record emergency log information. "EMERGENCY" - System is unusable.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="error" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record error log information">Record error log information. "ERROR" - Runtime errors that do not require immediate action but should typically.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="flushBuffer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Flush logs buffer, dump to appender file, or send to remote api with tcp/udp">Flush logs buffer by seaslog.appender: dump to file, or send to remote api with tcp/udp. See also: seaslog.appender_retry seaslog.remote_host seaslog.remote_port</description>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="getBasePath" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getBuffer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the logs buffer in memory as array"/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getBufferEnabled" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Determin if buffer enabled"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="getDatetimeFormat" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get SeasLog datetime format style"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLastLogger" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get SeasLog last logger path"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getRequestID" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get SeasLog request_id differentiated requests"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getRequestVariable" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get SeasLog request variable"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="info" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record info log information">Record info log information. "INFO" - Interesting events.Emphasizes the running process of the application.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="log" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="The Common Record Log Function"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="level" optional="false" byreference="false" type="string"/>
+    <parameter name="message" optional="true" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="notice" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record notice log information">Record notice log information. "NOTICE" - Normal but significant events.Information that is more important than the INFO level during execution.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="setBasePath" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set SeasLog base path"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="base_path" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="setDatetimeFormat" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set SeasLog datetime format style"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="format" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="setLogger" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set SeasLog logger name"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="logger" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="setRequestID" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set SeasLog request_id differentiated requests"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="request_id" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="setRequestVariable" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Manually set SeasLog request variable"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="int"/>
+    <parameter name="value" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="warning" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Record warning log information">Record warning log information. "WARNING" - Exceptional occurrences that are not errors. Potentially aberrant information that needs attention and needs to be repaired.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="message" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="true" byreference="false" type="object" class="array"/>
+    <parameter name="logger" optional="true" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/SessionHandler.xml phpdox-0.12.0/dependencies/php/classes/SessionHandler.xml
--- phpdox-0.11.2/dependencies/php/classes/SessionHandler.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SessionHandler.xml	2019-03-13 09:34:17.000000000 +0000
@@ -23,7 +23,7 @@
   <method name="gc" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Cleanup old sessions">Cleans up expired sessions. Called randomly by PHP internally when a session starts or when session_start is invoked. The frequency this is called is based on the session.gc_divisor and session.gc_probability configuration directives.</description>
-      <return type="bool"/>
+      <return type="int"/>
     </docblock>
     <parameter name="maxlifetime" optional="false" byreference="false" type="int"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SimpleXMLIterator.xml phpdox-0.12.0/dependencies/php/classes/SimpleXMLIterator.xml
--- phpdox-0.11.2/dependencies/php/classes/SimpleXMLIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SimpleXMLIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,7 +15,7 @@
   </method>
   <method name="hasChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks whether the current element has sub elements."/>
+      <description compact="Checks whether the current element has sub elements"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SoapClient.xml phpdox-0.12.0/dependencies/php/classes/SoapClient.xml
--- phpdox-0.11.2/dependencies/php/classes/SoapClient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SoapClient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,16 +6,16 @@
       <return type="mixed"/>
     </docblock>
     <parameter name="function_name" optional="false" byreference="false" type="string"/>
-    <parameter name="arguments" optional="false" byreference="false" type="string"/>
+    <parameter name="arguments" optional="false" byreference="false" type="object" class="array"/>
   </method>
-  <method name="SoapClient" abstract="false" static="false" visibility="public" final="false">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="SoapClient constructor"/>
       <return type="void"/>
     </docblock>
     <parameter name="wsdl" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
-  </method>
+  </constructor>
   <method name="__doRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Performs a SOAP request">Performs SOAP request over HTTP.</description>
@@ -27,6 +27,12 @@
     <parameter name="version" optional="false" byreference="false" type="int"/>
     <parameter name="one_way" optional="true" byreference="false" type="int"/>
   </method>
+  <method name="__getCookies" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get list of cookies"/>
+      <return type="array"/>
+    </docblock>
+  </method>
   <method name="__getFunctions" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns list of available SOAP functions">Returns an array of functions described in the WSDL for the Web service.</description>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SoapServer.xml phpdox-0.12.0/dependencies/php/classes/SoapServer.xml
--- phpdox-0.11.2/dependencies/php/classes/SoapServer.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SoapServer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -52,7 +52,6 @@
       <return type="void"/>
     </docblock>
     <parameter name="class_name" optional="false" byreference="false" type="string"/>
-    <parameter name="args" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="setObject" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/SolrClient.xml phpdox-0.12.0/dependencies/php/classes/SolrClient.xml
--- phpdox-0.11.2/dependencies/php/classes/SolrClient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SolrClient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -130,14 +130,14 @@
   </destructor>
   <method name="getById" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get Document By Id. Utilizes Solr Realtime Get (RTG)."/>
+      <description compact="Get Document By Id. Utilizes Solr Realtime Get (RTG)"/>
       <return type="SolrQueryResponse"/>
     </docblock>
     <parameter name="id" optional="false" byreference="false" type="string"/>
   </method>
   <method name="getByIds" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get Documents by their Ids. Utilizes Solr Realtime Get (RTG)."/>
+      <description compact="Get Documents by their Ids. Utilizes Solr Realtime Get (RTG)"/>
       <return type="SolrQueryResponse"/>
     </docblock>
     <parameter name="ids" optional="false" byreference="false" type="object" class="array"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SolrCollapseFunction.xml phpdox-0.12.0/dependencies/php/classes/SolrCollapseFunction.xml
--- phpdox-0.11.2/dependencies/php/classes/SolrCollapseFunction.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SolrCollapseFunction.xml	2019-03-13 09:34:17.000000000 +0000
@@ -24,7 +24,7 @@
   </constructor>
   <method name="getField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the field that is being collapsed on."/>
+      <description compact="Returns the field that is being collapsed on"/>
       <return type="string"/>
     </docblock>
   </method>
@@ -55,7 +55,7 @@
   <method name="getSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns size parameter"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="setField" abstract="false" static="false" visibility="public" final="false">
@@ -74,7 +74,7 @@
   </method>
   <method name="setMax" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Selects the group heads by the max value of a numeric field or function query."/>
+      <description compact="Selects the group heads by the max value of a numeric field or function query"/>
       <return type="SolrCollapseFunction"/>
     </docblock>
     <parameter name="max" optional="false" byreference="false" type="string"/>
@@ -95,10 +95,10 @@
   </method>
   <method name="setSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the initial size of the collapse data structures when collapsing on a numeric field only."/>
+      <description compact="Sets the initial size of the collapse data structures when collapsing on a numeric field only"/>
       <return type="SolrCollapseFunction"/>
     </docblock>
-    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
   </method>
   <method name="__toString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SolrDisMaxQuery.xml phpdox-0.12.0/dependencies/php/classes/SolrDisMaxQuery.xml
--- phpdox-0.11.2/dependencies/php/classes/SolrDisMaxQuery.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SolrDisMaxQuery.xml	2019-03-13 09:34:17.000000000 +0000
@@ -147,7 +147,7 @@
   </method>
   <method name="setBoostFunction" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets a Boost Function (bf parameter).">Sets Boost Function (bf parameter).</description>
+      <description compact="Sets a Boost Function (bf parameter)">Sets Boost Function (bf parameter).</description>
       <return type="SolrDisMaxQuery"/>
     </docblock>
     <parameter name="function" optional="false" byreference="false" type="string"/>
@@ -189,7 +189,7 @@
   </method>
   <method name="setQueryPhraseSlop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="specifies the amount of slop permitted on phrase queries explicitly included in the user's query string (qf parameter)">The Query Phrase Slop is the amount of slop permitted on phrase queries explicitly included in the user's query string with the qf parameter.</description>
+      <description compact="Specifies the amount of slop permitted on phrase queries explicitly included in the user's query string (qf parameter)">The Query Phrase Slop is the amount of slop permitted on phrase queries explicitly included in the user's query string with the qf parameter.</description>
       <return type="SolrDisMaxQuery"/>
     </docblock>
     <parameter name="slop" optional="false" byreference="false" type="string"/>
@@ -319,7 +319,7 @@
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="field" optional="false" byreference="false" type="string"/>
-    <parameter name="order" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="order" optional="true" byreference="false" type="int"/>
   </method>
   <method name="addHighlightField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -406,7 +406,7 @@
   <method name="getExpandRows" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getExpandSortFields" abstract="false" static="false" visibility="public" final="false">
@@ -544,7 +544,7 @@
   <method name="getGroupCachePercent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getGroupFacet" abstract="false" static="false" visibility="public" final="false">
@@ -574,7 +574,7 @@
   <method name="getGroupLimit" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getGroupMain" abstract="false" static="false" visibility="public" final="false">
@@ -592,7 +592,7 @@
   <method name="getGroupOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getGroupQueries" abstract="false" static="false" visibility="public" final="false">
@@ -1048,7 +1048,7 @@
       <description compact=""/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setExplainOther" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -1172,7 +1172,7 @@
       <description compact=""/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="percent" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="percent" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setGroupFacet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -1193,7 +1193,7 @@
       <description compact=""/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setGroupMain" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -1214,7 +1214,7 @@
       <description compact=""/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setGroupTruncate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SolrDocument.xml phpdox-0.12.0/dependencies/php/classes/SolrDocument.xml
--- phpdox-0.11.2/dependencies/php/classes/SolrDocument.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SolrDocument.xml	2019-03-13 09:34:17.000000000 +0000
@@ -99,7 +99,7 @@
   <method name="getChildDocumentsCount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the number of child documents"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getField" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/SolrInputDocument.xml phpdox-0.12.0/dependencies/php/classes/SolrInputDocument.xml
--- phpdox-0.11.2/dependencies/php/classes/SolrInputDocument.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SolrInputDocument.xml	2019-03-13 09:34:17.000000000 +0000
@@ -106,7 +106,7 @@
   <method name="getChildDocumentsCount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the number of child documents"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getField" abstract="false" static="false" visibility="public" final="false">
@@ -138,7 +138,7 @@
   <method name="hasChildDocuments" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns true if the document has any child documents"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/SolrQuery.xml phpdox-0.12.0/dependencies/php/classes/SolrQuery.xml
--- phpdox-0.11.2/dependencies/php/classes/SolrQuery.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SolrQuery.xml	2019-03-13 09:34:17.000000000 +0000
@@ -33,14 +33,14 @@
   </constant>
   <method name="addExpandFilterQuery" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Overrides main filter query, determines which documents to include in the main group."/>
+      <description compact="Overrides main filter query, determines which documents to include in the main group"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="fq" optional="false" byreference="false" type="string"/>
   </method>
   <method name="addExpandSortField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Orders the documents within the expanded groups (expand.sort parameter)."/>
+      <description compact="Orders the documents within the expanded groups (expand.sort parameter)"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="field" optional="false" byreference="false" type="string"/>
@@ -91,32 +91,32 @@
   </method>
   <method name="addGroupField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Add a field to be used to group results."/>
+      <description compact="Add a field to be used to group results"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </method>
   <method name="addGroupFunction" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allows grouping results based on the unique values of a function query (group.func parameter)."/>
+      <description compact="Allows grouping results based on the unique values of a function query (group.func parameter)"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </method>
   <method name="addGroupQuery" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allows grouping of documents that match the given query."/>
+      <description compact="Allows grouping of documents that match the given query"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </method>
   <method name="addGroupSortField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Add a group sort field (group.sort parameter)."/>
+      <description compact="Add a group sort field (group.sort parameter)"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="field" optional="false" byreference="false" type="string"/>
-    <parameter name="order" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="order" optional="true" byreference="false" type="int"/>
   </method>
   <method name="addHighlightField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -203,7 +203,7 @@
   <method name="getExpandRows" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns The number of rows to display in each group (expand.rows)"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getExpandSortFields" abstract="false" static="false" visibility="public" final="false">
@@ -341,7 +341,7 @@
   <method name="getGroupCachePercent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns group cache percent value"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getGroupFacet" abstract="false" static="false" visibility="public" final="false">
@@ -371,7 +371,7 @@
   <method name="getGroupLimit" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the group.limit value"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getGroupMain" abstract="false" static="false" visibility="public" final="false">
@@ -389,7 +389,7 @@
   <method name="getGroupOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the group.offset value"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getGroupQueries" abstract="false" static="false" visibility="public" final="false">
@@ -722,7 +722,7 @@
   </method>
   <method name="removeExpandSortField" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes an expand sort field from the expand.sort parameter."/>
+      <description compact="Removes an expand sort field from the expand.sort parameter"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="field" optional="false" byreference="false" type="string"/>
@@ -845,7 +845,7 @@
       <description compact="Sets the number of rows to display in each group (expand.rows). Server Default 5"/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setExplainOther" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -969,7 +969,7 @@
       <description compact="Enables caching for result grouping"/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="percent" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="percent" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setGroupFacet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -980,42 +980,42 @@
   </method>
   <method name="setGroupFormat" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the group format, result structure (group.format parameter)."/>
+      <description compact="Sets the group format, result structure (group.format parameter)"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setGroupLimit" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Specifies the number of results to return for each group. The server default value is 1."/>
+      <description compact="Specifies the number of results to return for each group. The server default value is 1"/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setGroupMain" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="If true, the result of the first field grouping command is used as the main result list in the response, using group.format=simple."/>
+      <description compact="If true, the result of the first field grouping command is used as the main result list in the response, using group.format=simple"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="string"/>
   </method>
   <method name="setGroupNGroups" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="If true, Solr includes the number of groups that have matched the query in the results."/>
+      <description compact="If true, Solr includes the number of groups that have matched the query in the results"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setGroupOffset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the group.offset parameter."/>
+      <description compact="Sets the group.offset parameter"/>
       <return type="SolrQuery"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setGroupTruncate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="If true, facet counts are based on the most relevant document of each group matching the query."/>
+      <description compact="If true, facet counts are based on the most relevant document of each group matching the query"/>
       <return type="SolrQuery"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="bool"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplBool.xml phpdox-0.12.0/dependencies/php/classes/SplBool.xml
--- phpdox-0.11.2/dependencies/php/classes/SplBool.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplBool.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="SplBool" namespace="" name="SplBool">
   <extends name="SplEnum" full="SplEnum"/>
-  <constant name="__default" value="false">
+  <constant name="__default" value="FALSE">
     <docblock>
       <var type="boolean"/>
     </docblock>
   </constant>
-  <constant name="false" value="false">
+  <constant name="false" value="FALSE">
     <docblock>
       <var type="boolean"/>
     </docblock>
   </constant>
-  <constant name="true" value="true">
+  <constant name="true" value="TRUE">
     <docblock>
       <var type="boolean"/>
     </docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplDoublyLinkedList.xml phpdox-0.12.0/dependencies/php/classes/SplDoublyLinkedList.xml
--- phpdox-0.11.2/dependencies/php/classes/SplDoublyLinkedList.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplDoublyLinkedList.xml	2019-03-13 09:34:17.000000000 +0000
@@ -23,7 +23,7 @@
   </method>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Counts the number of elements in the doubly linked list."/>
+      <description compact="Counts the number of elements in the doubly linked list"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -41,7 +41,7 @@
   </method>
   <method name="isEmpty" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks whether the doubly linked list is empty."/>
+      <description compact="Checks whether the doubly linked list is empty"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplEnum.xml phpdox-0.12.0/dependencies/php/classes/SplEnum.xml
--- phpdox-0.11.2/dependencies/php/classes/SplEnum.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplEnum.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="SplEnum" namespace="" name="SplEnum">
   <extends name="SplType" full="SplType"/>
-  <constant name="__default" value="null">
+  <constant name="__default" value="NULL">
     <docblock>
       <var type="NULL"/>
     </docblock>
   </constant>
   <method name="getConstList" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns all consts (possible values) as an array."/>
+      <description compact="Returns all consts (possible values) as an array"/>
       <return type="array"/>
     </docblock>
     <parameter name="include_default" optional="true" byreference="false" type="object" class="bool"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplFileInfo.xml phpdox-0.12.0/dependencies/php/classes/SplFileInfo.xml
--- phpdox-0.11.2/dependencies/php/classes/SplFileInfo.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplFileInfo.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,7 +15,7 @@
   </method>
   <method name="getBasename" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the base name of the file"/>
+      <description compact="Gets the base name of the file">This method returns the base name of the file, directory, or link without path info.</description>
       <return type="string"/>
     </docblock>
     <parameter name="suffix" optional="true" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplFileObject.xml phpdox-0.12.0/dependencies/php/classes/SplFileObject.xml
--- phpdox-0.11.2/dependencies/php/classes/SplFileObject.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplFileObject.xml	2019-03-13 09:34:17.000000000 +0000
@@ -21,6 +21,16 @@
       <var type="integer"/>
     </docblock>
   </constant>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Construct a new file object"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="open_mode" optional="true" byreference="false" type="string"/>
+    <parameter name="use_include_path" optional="true" byreference="false" type="object" class="bool"/>
+    <parameter name="context" optional="true" byreference="false" type="object" class="resource"/>
+  </constructor>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Retrieve current line of file"/>
@@ -47,7 +57,7 @@
   </method>
   <method name="fgetcsv" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets line from file and parse as CSV fields"/>
+      <description compact="Gets line from file and parse as CSV fields">Gets a line from the file which is in CSV format and returns an array containing the fields read.</description>
       <return type="array"/>
     </docblock>
     <parameter name="delimiter" optional="true" byreference="false" type="string"/>
@@ -219,25 +229,12 @@
     </docblock>
     <parameter name="max_len" optional="false" byreference="false" type="int"/>
   </method>
-  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
-    <docblock>
-      <description compact="Alias of SplFileObject::current"/>
-      <return type="void"/>
-    </docblock>
-  </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Not at EOF"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
-    <docblock>
-      <description compact=""/>
-      <return type="void"/>
-    </docblock>
-    <parameter name="file_name" optional="false" byreference="false" type="string"/>
-  </constructor>
   <method name="getATime" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplFixedArray.xml phpdox-0.12.0/dependencies/php/classes/SplFixedArray.xml
--- phpdox-0.11.2/dependencies/php/classes/SplFixedArray.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplFixedArray.xml	2019-03-13 09:34:17.000000000 +0000
@@ -84,7 +84,7 @@
   <method name="setSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Change the size of an array"/>
-      <return type="int"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="size" optional="false" byreference="false" type="int"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplHeap.xml phpdox-0.12.0/dependencies/php/classes/SplHeap.xml
--- phpdox-0.11.2/dependencies/php/classes/SplHeap.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplHeap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -9,7 +9,7 @@
   </constructor>
   <method name="compare" abstract="false" static="false" visibility="protected" final="false">
     <docblock>
-      <description compact="Compare elements in order to place them correctly in the heap while sifting up.">Compare value1 with value2.</description>
+      <description compact="Compare elements in order to place them correctly in the heap while sifting up">Compare value1 with value2.</description>
       <return type="int"/>
     </docblock>
     <parameter name="value1" optional="false" byreference="false" type="object" class="mixed"/>
@@ -17,7 +17,7 @@
   </method>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Counts the number of elements in the heap."/>
+      <description compact="Counts the number of elements in the heap"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -29,20 +29,26 @@
   </method>
   <method name="extract" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Extracts a node from top of the heap and sift up."/>
+      <description compact="Extracts a node from top of the heap and sift up"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="insert" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Inserts an element in the heap by sifting it up."/>
+      <description compact="Inserts an element in the heap by sifting it up"/>
       <return type="void"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
+  <method name="isCorrupted" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Tells if the heap is in a corrupted state"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isEmpty" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks whether the heap is empty."/>
+      <description compact="Checks whether the heap is empty"/>
       <return type="bool"/>
     </docblock>
   </method>
@@ -60,7 +66,7 @@
   </method>
   <method name="recoverFromCorruption" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Recover from the corrupted state and allow further actions on the heap."/>
+      <description compact="Recover from the corrupted state and allow further actions on the heap"/>
       <return type="void"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplMaxHeap.xml phpdox-0.12.0/dependencies/php/classes/SplMaxHeap.xml
--- phpdox-0.11.2/dependencies/php/classes/SplMaxHeap.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplMaxHeap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <implements name="Iterator" full="Iterator"/>
   <method name="compare" abstract="false" static="false" visibility="protected" final="false">
     <docblock>
-      <description compact="Compare elements in order to place them correctly in the heap while sifting up."/>
+      <description compact="Compare elements in order to place them correctly in the heap while sifting up"/>
       <return type="int"/>
     </docblock>
     <parameter name="value1" optional="false" byreference="false" type="object" class="mixed"/>
@@ -42,6 +42,12 @@
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
+  <method name="isCorrupted" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isEmpty" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplMinHeap.xml phpdox-0.12.0/dependencies/php/classes/SplMinHeap.xml
--- phpdox-0.11.2/dependencies/php/classes/SplMinHeap.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplMinHeap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <implements name="Iterator" full="Iterator"/>
   <method name="compare" abstract="false" static="false" visibility="protected" final="false">
     <docblock>
-      <description compact="Compare elements in order to place them correctly in the heap while sifting up."/>
+      <description compact="Compare elements in order to place them correctly in the heap while sifting up"/>
       <return type="int"/>
     </docblock>
     <parameter name="value1" optional="false" byreference="false" type="object" class="mixed"/>
@@ -42,6 +42,12 @@
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
+  <method name="isCorrupted" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isEmpty" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplPriorityQueue.xml phpdox-0.12.0/dependencies/php/classes/SplPriorityQueue.xml
--- phpdox-0.11.2/dependencies/php/classes/SplPriorityQueue.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplPriorityQueue.xml	2019-03-13 09:34:17.000000000 +0000
@@ -9,7 +9,7 @@
   </constructor>
   <method name="compare" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Compare priorities in order to place elements correctly in the heap while sifting up."/>
+      <description compact="Compare priorities in order to place elements correctly in the heap while sifting up"/>
       <return type="int"/>
     </docblock>
     <parameter name="priority1" optional="false" byreference="false" type="object" class="mixed"/>
@@ -17,7 +17,7 @@
   </method>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Counts the number of elements in the queue."/>
+      <description compact="Counts the number of elements in the queue"/>
       <return type="int"/>
     </docblock>
   </method>
@@ -29,21 +29,33 @@
   </method>
   <method name="extract" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Extracts a node from top of the heap and shift up."/>
+      <description compact="Extracts a node from top of the heap and sift up"/>
       <return type="mixed"/>
     </docblock>
   </method>
+  <method name="getExtractFlags" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the flags of extraction"/>
+      <return type="int"/>
+    </docblock>
+  </method>
   <method name="insert" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Inserts an element in the queue by sifting it up."/>
+      <description compact="Inserts an element in the queue by sifting it up"/>
       <return type="void"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="priority" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
+  <method name="isCorrupted" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Tells if the priority queue is in a corrupted state"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
   <method name="isEmpty" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks whether the queue is empty."/>
+      <description compact="Checks whether the queue is empty"/>
       <return type="bool"/>
     </docblock>
   </method>
@@ -61,7 +73,7 @@
   </method>
   <method name="recoverFromCorruption" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Recover from the corrupted state and allow further actions on the queue."/>
+      <description compact="Recover from the corrupted state and allow further actions on the queue"/>
       <return type="void"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplQueue.xml phpdox-0.12.0/dependencies/php/classes/SplQueue.xml
--- phpdox-0.11.2/dependencies/php/classes/SplQueue.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplQueue.xml	2019-03-13 09:34:17.000000000 +0000
@@ -15,7 +15,7 @@
   </method>
   <method name="enqueue" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Adds an element to the queue.">Enqueues value at the end of the queue.</description>
+      <description compact="Adds an element to the queue">Enqueues value at the end of the queue.</description>
       <return type="void"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplTempFileObject.xml phpdox-0.12.0/dependencies/php/classes/SplTempFileObject.xml
--- phpdox-0.11.2/dependencies/php/classes/SplTempFileObject.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplTempFileObject.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="SplTempFileObject" namespace="" name="SplTempFileObject">
   <implements name="SeekableIterator" full="SeekableIterator"/>
+  <constant name="DROP_NEW_LINE" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="READ_AHEAD" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SKIP_EMPTY" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="READ_CSV" value="8">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new temporary file object"/>
@@ -206,12 +226,6 @@
     </docblock>
     <parameter name="max_len" optional="false" byreference="false" type="int"/>
   </method>
-  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
-    <docblock>
-      <description compact=""/>
-      <return type="void"/>
-    </docblock>
-  </method>
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SplType.xml phpdox-0.12.0/dependencies/php/classes/SplType.xml
--- phpdox-0.11.2/dependencies/php/classes/SplType.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SplType.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="SplType" namespace="" name="SplType">
-  <constant name="__default" value="null">
+  <constant name="__default" value="NULL">
     <docblock>
       <var type="NULL"/>
     </docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Spoofchecker.xml phpdox-0.12.0/dependencies/php/classes/Spoofchecker.xml
--- phpdox-0.11.2/dependencies/php/classes/Spoofchecker.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Spoofchecker.xml	2019-03-13 09:34:17.000000000 +0000
@@ -70,6 +70,6 @@
       <description compact="Set the checks to run"/>
       <return type="void"/>
     </docblock>
-    <parameter name="checks" optional="false" byreference="false" type="object" class="long"/>
+    <parameter name="checks" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/SQLite3Stmt.xml phpdox-0.12.0/dependencies/php/classes/SQLite3Stmt.xml
--- phpdox-0.11.2/dependencies/php/classes/SQLite3Stmt.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SQLite3Stmt.xml	2019-03-13 09:34:17.000000000 +0000
@@ -11,7 +11,7 @@
   </method>
   <method name="bindValue" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Binds the value of a parameter to a statement variable"/>
+      <description compact="Binds the value of a parameter to a statement variable">Binds the value of a parameter to a statement variable.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="sql_param" optional="false" byreference="false" type="object" class="mixed"/>
@@ -20,7 +20,7 @@
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Clears all current bound parameters"/>
+      <description compact="Clears all current bound parameters">Clears all current bound parameters (sets them to NULL).</description>
       <return type="bool"/>
     </docblock>
   </method>
@@ -36,6 +36,13 @@
       <return type="SQLite3Result"/>
     </docblock>
   </method>
+  <method name="getSQL" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the SQL of the statement"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="expanded" optional="true" byreference="false" type="object" class="bool"/>
+  </method>
   <method name="paramCount" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the number of parameters within the prepared statement"/>
@@ -44,7 +51,7 @@
   </method>
   <method name="readOnly" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact=""/>
+      <description compact="Returns whether a statement is definitely read only"/>
       <return type="bool"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SQLite3.xml phpdox-0.12.0/dependencies/php/classes/SQLite3.xml
--- phpdox-0.11.2/dependencies/php/classes/SQLite3.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SQLite3.xml	2019-03-13 09:34:17.000000000 +0000
@@ -111,15 +111,16 @@
     <parameter name="flags" optional="true" byreference="false" type="int"/>
     <parameter name="encryption_key" optional="true" byreference="false" type="string"/>
   </method>
-  <method name="open" abstract="false" static="false" visibility="public" final="false">
+  <method name="openBlob" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Opens an SQLite database"/>
+      <description compact="Opens a stream resource to read a BLOB">Opens a stream resource to read or write a BLOB, which would be selected by:</description>
       <return type="resource"/>
     </docblock>
     <parameter name="table" optional="false" byreference="false" type="string"/>
     <parameter name="column" optional="false" byreference="false" type="string"/>
     <parameter name="rowid" optional="false" byreference="false" type="int"/>
     <parameter name="dbname" optional="true" byreference="false" type="string"/>
+    <parameter name="flags" optional="true" byreference="false" type="int"/>
   </method>
   <method name="prepare" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SWFButton.xml phpdox-0.12.0/dependencies/php/classes/SWFButton.xml
--- phpdox-0.11.2/dependencies/php/classes/SWFButton.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SWFButton.xml	2019-03-13 09:34:17.000000000 +0000
@@ -53,7 +53,7 @@
   </method>
   <method name="setMenu" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="enable track as menu button behaviour"/>
+      <description compact="Enable track as menu button behaviour"/>
       <return type="void"/>
     </docblock>
     <parameter name="flag" optional="false" byreference="false" type="int"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SWFTextField.xml phpdox-0.12.0/dependencies/php/classes/SWFTextField.xml
--- phpdox-0.11.2/dependencies/php/classes/SWFTextField.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SWFTextField.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,7 +2,7 @@
 <class xmlns="http://xml.phpdox.net/src" full="SWFTextField" namespace="" name="SWFTextField">
   <method name="addChars" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="adds characters to a font that will be available within a textfield"/>
+      <description compact="Adds characters to a font that will be available within a textfield"/>
       <return type="void"/>
     </docblock>
     <parameter name="chars" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SWFText.xml phpdox-0.12.0/dependencies/php/classes/SWFText.xml
--- phpdox-0.11.2/dependencies/php/classes/SWFText.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SWFText.xml	2019-03-13 09:34:17.000000000 +0000
@@ -40,7 +40,7 @@
   </method>
   <method name="getUTF8Width" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="calculates the width of the given string in this text objects current font and size"/>
+      <description compact="Calculates the width of the given string in this text objects current font and size"/>
       <return type="float"/>
     </docblock>
     <parameter name="string" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Async.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Async.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Async.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Async.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Async" namespace="Swoole" name="Async">
+  <method name="dnsLookup" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Async and non-blocking hostname to IP lookup."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="hostname" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="read" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read file stream asynchronously."/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="chunk_size" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="readFile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read a file asynchronously."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Update the async I/O options."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="settings" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="write" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Write data to a file stream asynchronously."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="writeFile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="content" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
+    <parameter name="flags" optional="true" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Atomic.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Atomic.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Atomic.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Atomic.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Atomic" namespace="Swoole" name="Atomic">
+  <method name="add" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a number to the value to the atomic object."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="add_value" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="cmpset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Compare and set the value of the atomic object."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="cmp_value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="new_value" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the current value of the atomic object."/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set a new value to the atomic object."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sub" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Subtract a number to the value of the atomic object."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="sub_value" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Buffer.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Buffer.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Buffer.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Buffer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Buffer" namespace="Swoole" name="Buffer">
+  <method name="append" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Append the string or binary data at the end of the memory buffer and return the new size of memory allocated."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="clear" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Reset the memory buffer."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destruct the Swoole memory buffer."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="expand" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Expand the size of memory buffer."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="read" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read data from the memory buffer based on offset and length."/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="length" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="recycle" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Release the memory to OS which is not used by the memory buffer."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="substr" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read data from the memory buffer based on offset and length. Or remove data from the memory buffer."/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="length" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="remove" optional="true" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the string value of the memory buffer."/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="write" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Write data to the memory buffer. The memory allocated for the buffer will not be changed."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Channel.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Channel.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Channel.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Channel.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Channel" namespace="Swoole" name="Channel">
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destruct a Swoole channel."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="pop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read and pop data from swoole channel."/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Write and push data into Swoole channel.">Data can be any non-empty PHP variable, the variable will be serialized if it is not string type.</description>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="stats" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get stats of swoole channel."/>
+      <return type="array"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Client.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Client.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Client.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Client.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Client" namespace="Swoole" name="Client">
+  <constant name="MSG_OOB" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="MSG_PEEK" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="MSG_DONTWAIT" value="128">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="MSG_WAITALL" value="64">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <member name="errCode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="sock" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="reuse" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="reuseCount" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Close the connection established."/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="force" optional="true" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="connect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Connect to the remote TCP or UDP port."/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="flag" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destruct the Swoole client."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="getpeername" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the remote socket name of the connection."/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getsockname" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the local socket name of the connection."/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="isConnected" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if the connection is established."/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add callback functions triggered by events."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="pause" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Pause receiving data."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="pipe" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Redirect the data to another file descriptor."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="socket" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="recv" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Receive data from the remote socket."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="size" optional="true" byreference="false" type="string"/>
+    <parameter name="flag" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="resume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Resume receiving data."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="send" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the remote TCP socket."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="flag" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="sendfile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send file to the remote TCP socket."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="sendto" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the remote UDP address."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="ip" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the Swoole client parameters before the connection is established."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="settings" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="sleep" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Remove the TCP client from system event loop."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="wakeup" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add the TCP client back into the system event loop."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Connection_Iterator.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Connection_Iterator.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Connection_Iterator.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Connection_Iterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Connection\Iterator" namespace="Swoole\Connection" name="Iterator">
+  <implements name="Iterator" full="Iterator"/>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Count connections."/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="current" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Return current connection entry."/>
+      <return type="Connection"/>
+    </docblock>
+  </method>
+  <method name="key" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Return key of the current connection."/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="next" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Move to the next connection."/>
+      <return type="Connection"/>
+    </docblock>
+  </method>
+  <method name="offsetExists" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if offet exists."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="offsetGet" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Offset to retrieve."/>
+      <return type="Connection"/>
+    </docblock>
+    <parameter name="index" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="offsetSet" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Assign a Connection to the specified offset."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+    <parameter name="connection" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="offsetUnset" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Unset an offset."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="offset" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="rewind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Rewinds iterator"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="valid" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if current position is valid."/>
+      <return type="boolean"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Coroutine.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Coroutine.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Coroutine.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Coroutine.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Coroutine" namespace="Swoole" name="Coroutine">
+  <method name="call_user_func_array" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Call a callback with an array of parameters"/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="param_array" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="call_user_func" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Call a callback given by the first parameter"/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="cli_wait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="create" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="getuid" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="resume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="suspend" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Event.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Event.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Event.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Event.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Event" namespace="Swoole" name="Event">
+  <method name="add" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add new callback functions of a socket into the EventLoop."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="int"/>
+    <parameter name="read_callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="write_callback" optional="true" byreference="false" type="object" class="callable"/>
+    <parameter name="events" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="defer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a callback function to the next event loop."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="del" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Remove all event callback functions of a socket."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="exit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Exit the eventloop, only available at client side."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Update the event callback functions of a socket."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="int"/>
+    <parameter name="read_callback" optional="true" byreference="false" type="string"/>
+    <parameter name="write_callback" optional="true" byreference="false" type="string"/>
+    <parameter name="events" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="wait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="write" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Write data to the socket."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="string"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Exception.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Exception.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Exception.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Exception.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Exception" namespace="Swoole" name="Exception">
+  <implements name="Throwable" full="Throwable"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Client.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Client.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Client.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Client.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Http\Client" namespace="Swoole\Http" name="Client">
+  <member name="errCode" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <member name="sock" static="false" visibility="public">
+    <default>null</default>
+    <docblock>
+      <description compact=""/>
+    </docblock>
+  </member>
+  <method name="addFile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a file to the post form."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="type" optional="true" byreference="false" type="string"/>
+    <parameter name="filename" optional="true" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Close the http connection."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destruct the HTTP client."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="download" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Download a file from the remote server."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="file" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send the HTTP request after setting the parameters."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send GET http request to the remote server."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="isConnected" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if the HTTP connection is connected."/>
+      <return type="boolean"/>
+    </docblock>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Register callback function by event name."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="post" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send POST http request to the remote server."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Push data to websocket client."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="opcode" optional="true" byreference="false" type="string"/>
+    <parameter name="finish" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Update the HTTP client paramters."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="settings" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="setCookies" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the http request cookies."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="cookies" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="setData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the HTTP request body data."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="setHeaders" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the HTTP request headers."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="headers" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="setMethod" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the HTTP request method."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="method" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="upgrade" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Upgrade to websocket protocol."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Request.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Request.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Request.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Request.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Http\Request" namespace="Swoole\Http" name="Request">
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destruct the HTTP request."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="rawcontent" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the raw HTTP POST body."/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Response.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Response.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Response.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Response.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Http\Response" namespace="Swoole\Http" name="Response">
+  <method name="cookie" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the cookies of the HTTP response."/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="true" byreference="false" type="string"/>
+    <parameter name="expires" optional="true" byreference="false" type="string"/>
+    <parameter name="path" optional="true" byreference="false" type="string"/>
+    <parameter name="domain" optional="true" byreference="false" type="string"/>
+    <parameter name="secure" optional="true" byreference="false" type="string"/>
+    <parameter name="httponly" optional="true" byreference="false" type="string"/>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destruct the HTTP response."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="end" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data for the HTTP request and finish the response."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="content" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="gzip" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Enable the gzip of response content.&#10;"/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="compress_level" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="header" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the HTTP response headers."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="string"/>
+    <parameter name="ucwords" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="initHeader" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Init the HTTP response header."/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="rawcookie" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the raw cookies to the HTTP response."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="true" byreference="false" type="string"/>
+    <parameter name="expires" optional="true" byreference="false" type="string"/>
+    <parameter name="path" optional="true" byreference="false" type="string"/>
+    <parameter name="domain" optional="true" byreference="false" type="string"/>
+    <parameter name="secure" optional="true" byreference="false" type="string"/>
+    <parameter name="httponly" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="sendfile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send file through the HTTP response."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="status" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the status code of the HTTP response."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="http_code" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="write" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Append HTTP body content to the HTTP response."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="content" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Server.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Server.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Http_Server.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Http_Server.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,301 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Http\Server" namespace="Swoole\Http" name="Server">
+  <extends name="Swoole\Server" full="Swoole\Server"/>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Bind callback function to HTTP server by event name."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Start the swoole http server."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="addlistener" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="socket_type" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="addProcess" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="process" optional="false" byreference="false" type="object" class="swoole_process"/>
+  </method>
+  <method name="after" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="after_time_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="param" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="uid" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="clearTimer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reset" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="confirm" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="connection_info" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="connection_list" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="start_fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="pagesize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="defer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="exist" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="finish" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getClientInfo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="getClientList" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="start_fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="pagesize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="getLastError" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="heartbeat" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="if_close_connection" optional="false" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="listen" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="socket_type" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="pause" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="protect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="is_protected" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="reload" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+  </method>
+  <method name="resume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="send" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sendfile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sendMessage" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="worker_id" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="sendto" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="ip" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="server_socket" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="sendwait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="settings" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="shutdown" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="stats" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="stop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="worker_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="task" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="dst_worker_id" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="taskwait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="worker_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="taskWaitMulti" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tasks" optional="false" byreference="false" type="object" class="array"/>
+    <parameter name="timeout_ms" optional="true" byreference="false" type="object" class="double"/>
+  </method>
+  <method name="tick" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="interval_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Lock.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Lock.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Lock.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Lock.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Lock" namespace="Swoole" name="Lock">
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destory a Swoole memory lock."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="lock_read" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Lock a read-write lock for reading."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Try to acquire the lock. It will block if the lock is not available."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="trylock_read" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Try to lock a read-write lock for reading and return straight away even the lock is not available."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="trylock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Try to acquire the lock and return straight away even the lock is not available."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Release the lock."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Mmap.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Mmap.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Mmap.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Mmap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Mmap" namespace="Swoole" name="Mmap">
+  <method name="open" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Map a file into memory and return the stream resource which can be used by PHP stream operations."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="size" optional="true" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_MySQL_Exception.xml phpdox-0.12.0/dependencies/php/classes/Swoole_MySQL_Exception.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_MySQL_Exception.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_MySQL_Exception.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\MySQL\Exception" namespace="Swoole\MySQL" name="Exception">
+  <implements name="Throwable" full="Throwable"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_MySQL.xml phpdox-0.12.0/dependencies/php/classes/Swoole_MySQL.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_MySQL.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_MySQL.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\MySQL" namespace="Swoole" name="MySQL">
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Close the async MySQL connection."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="connect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Connect to the remote MySQL server."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="server_config" optional="false" byreference="false" type="object" class="array"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destory the async MySQL client."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="getBuffer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Register callback function based on event name."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="query" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Run the SQL query."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="sql" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Process.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Process.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Process.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Process.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Process" namespace="Swoole" name="Process">
+  <constant name="IPC_NOWAIT" value="256">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <method name="alarm" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="High precision timer which triggers signal with fixed interval."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="interval_usec" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Close the pipe to the child process."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="daemon" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Change the process to be a daemon process."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="nochdir" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="noclose" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <destructor name="__destruct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destory the process."/>
+      <return type="void"/>
+    </docblock>
+  </destructor>
+  <method name="exec" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Execute system commands."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="exec_file" optional="false" byreference="false" type="string"/>
+    <parameter name="args" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="exit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Stop the child processes."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="exit_code" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="freeQueue" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destory the message queue created by swoole_process::useQueue."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="kill" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send signal to the child process."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="pid" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="signal_no" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="name" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set name of the process."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="process_name" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="pop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read and pop data from the message queue."/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="maxsize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Write and push data into the message queue."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="read" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Read data sending to the process."/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="maxsize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="signal" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send signal to the child processes."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="signal_no" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Start the process."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="statQueue" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the stats of the message queue used as the communication method between processes."/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="useQueue" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create a message queue as the communication method between the parent process and child processes."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="mode" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="wait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Wait for the events of child processes."/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="blocking" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="write" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Write data into the pipe and communicate with the parent process or child processes."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Redis_Server.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Redis_Server.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Redis_Server.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Redis_Server.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,346 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Redis\Server" namespace="Swoole\Redis" name="Server">
+  <extends name="Swoole\Server" full="Swoole\Server"/>
+  <constant name="NIL" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="ERROR" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="STATUS" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="INT" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="STRING" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="SET" value="5">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="MAP" value="6">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <method name="format" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="type" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="setHandler" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="command" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="string"/>
+    <parameter name="number_of_string_param" optional="true" byreference="false" type="string"/>
+    <parameter name="type_of_array_param" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Description"/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="addlistener" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="socket_type" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="addProcess" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="process" optional="false" byreference="false" type="object" class="swoole_process"/>
+  </method>
+  <method name="after" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="after_time_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="param" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="uid" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="clearTimer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reset" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="confirm" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="connection_info" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="connection_list" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="start_fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="pagesize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="defer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="exist" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="finish" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getClientInfo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="getClientList" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="start_fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="pagesize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="getLastError" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="heartbeat" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="if_close_connection" optional="false" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="listen" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="socket_type" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="pause" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="protect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="is_protected" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="reload" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+  </method>
+  <method name="resume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="send" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sendfile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sendMessage" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="worker_id" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="sendto" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="ip" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="server_socket" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="sendwait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="settings" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="shutdown" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="stats" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="stop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="worker_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="task" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="dst_worker_id" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="taskwait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="worker_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="taskWaitMulti" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tasks" optional="false" byreference="false" type="object" class="array"/>
+    <parameter name="timeout_ms" optional="true" byreference="false" type="object" class="double"/>
+  </method>
+  <method name="tick" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="interval_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Serialize.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Serialize.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Serialize.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Serialize.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Serialize" namespace="Swoole" name="Serialize">
+  <method name="pack" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Serialize the data."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="is_fast" optional="true" byreference="false" type="int"/>
+  </method>
+  <method name="unpack" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Unserialize the data."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="args" optional="true" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Server.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Server.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Server.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Server.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,286 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Server" namespace="Swoole" name="Server">
+  <method name="addlistener" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a new listener to the server."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="socket_type" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="addProcess" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add a user defined swoole_process to the server."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="process" optional="false" byreference="false" type="object" class="swoole_process"/>
+  </method>
+  <method name="after" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Trigger a callback function after a period of time."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="after_time_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="param" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Bind the connection to a user defined user ID."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="uid" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="clearTimer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Stop and destory a timer.">Object oriented style (method):</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact="Stop and destory a timer.">Object oriented style (method):</description>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Close a connection to the client."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reset" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="confirm" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check status of the connection."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="connection_info" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the connection info by file description."/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="connection_list" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get all of the established connections."/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="start_fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="pagesize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="defer" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Delay execution of the callback function at the end of current EventLoop."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="exist" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if the connection is existed."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="finish" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Used in task process for sending result to the worker process when the task is finished."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="getClientInfo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the connection info by file description."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="getClientList" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get all of the established connections."/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="start_fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="pagesize" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="getLastError" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the error code of the most recent error."/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="heartbeat" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check all the connections on the server."/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="if_close_connection" optional="false" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="listen" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Listen on the given IP and port, socket type."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="host" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="socket_type" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Register a callback function by event name."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="pause" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Stop receiving data from the connection."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="protect" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the connection to be protected mode."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="is_protected" optional="true" byreference="false" type="object" class="boolean"/>
+  </method>
+  <method name="reload" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Restart all the worker process."/>
+      <return type="boolean"/>
+    </docblock>
+  </method>
+  <method name="resume" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Start receving data from the connection."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="send" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the client."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="reactor_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sendfile" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send file to the connection."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="filename" optional="false" byreference="false" type="string"/>
+    <parameter name="offset" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="sendMessage" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send message to worker processes by ID."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="worker_id" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="sendto" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the remote UDP address."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="ip" optional="false" byreference="false" type="string"/>
+    <parameter name="port" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="server_socket" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="sendwait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the remote socket in the blocking way."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the runtime settings of the swoole server."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="settings" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="shutdown" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Shutdown the master server process, this function can be called in worker processes."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Start the Swoole server."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="stats" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the stats of the Swoole server."/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="stop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Stop the Swoole server."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="worker_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="task" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the task worker processes."/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="dst_worker_id" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="taskwait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Send data to the task worker processes in blocking way."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="timeout" optional="true" byreference="false" type="object" class="float"/>
+    <parameter name="worker_id" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="taskWaitMulti" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Execute multiple tasks concurrently."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="tasks" optional="false" byreference="false" type="object" class="array"/>
+    <parameter name="timeout_ms" optional="true" byreference="false" type="object" class="double"/>
+  </method>
+  <method name="tick" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Repeats a given function at every given time-interval."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="interval_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Table.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Table.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Table.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Table.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Table" namespace="Swoole" name="Table">
+  <implements name="Iterator" full="Iterator"/>
+  <constant name="TYPE_INT" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="TYPE_STRING" value="7">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="TYPE_FLOAT" value="6">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <method name="column" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Set the data type and size of the columns."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="type" optional="false" byreference="false" type="string"/>
+    <parameter name="size" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Count the rows in the table, or count all the elements in the table if $mode = 1."/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+  <method name="create" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create the swoole memory table."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="current" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the current row."/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="decr" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Decrement the value in the Swoole table by $row_key and $column_key."/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="column" optional="false" byreference="false" type="string"/>
+    <parameter name="decrby" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="del" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Delete a row in the Swoole table by $row_key."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="destroy" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Destroy the Swoole table."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="exist" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if a row is existed by $row_key."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the value in the Swoole table by $row_key and $column_key."/>
+      <return type="integer"/>
+    </docblock>
+    <parameter name="row_key" optional="false" byreference="false" type="string"/>
+    <parameter name="column_key" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="incr" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Increment the value by $row_key and $column_key."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="column" optional="false" byreference="false" type="string"/>
+    <parameter name="incrby" optional="true" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="key" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get the key of current row."/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="next" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Iterator the next row."/>
+      <return type="ReturnType"/>
+    </docblock>
+  </method>
+  <method name="rewind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Rewind the iterator."/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Update a row of the table by $row_key."/>
+      <return type="VOID"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="valid" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check current if the current row is valid."/>
+      <return type="boolean"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_Timer.xml phpdox-0.12.0/dependencies/php/classes/Swoole_Timer.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_Timer.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_Timer.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\Timer" namespace="Swoole" name="Timer">
+  <method name="after" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Trigger a callback function after a period of time."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="after_time_ms" optional="false" byreference="false" type="int"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="clear" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Delete a timer by timer ID."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="exists" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if a timer is existed."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="timer_id" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="tick" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Repeats a given function at every given time-interval."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="interval_ms" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+    <parameter name="param" optional="true" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_WebSocket_Frame.xml phpdox-0.12.0/dependencies/php/classes/Swoole_WebSocket_Frame.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_WebSocket_Frame.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_WebSocket_Frame.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\WebSocket\Frame" namespace="Swoole\WebSocket" name="Frame"/>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Swoole_WebSocket_Server.xml phpdox-0.12.0/dependencies/php/classes/Swoole_WebSocket_Server.xml
--- phpdox-0.11.2/dependencies/php/classes/Swoole_WebSocket_Server.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Swoole_WebSocket_Server.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Swoole\WebSocket\Server" namespace="Swoole\WebSocket" name="Server">
+  <extends name="Swoole\Http\Server" full="Swoole\Http\Server"/>
+  <method name="exist" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Check if the the file description is existed."/>
+      <return type="boolean"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Register event callback function"/>
+      <return type="ReturnType"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="pack" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get a pack of binary data to send in a single frame."/>
+      <return type="binary"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="opcode" optional="true" byreference="false" type="string"/>
+    <parameter name="finish" optional="true" byreference="false" type="string"/>
+    <parameter name="mask" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="push" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Push data to the remote client."/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fd" optional="false" byreference="false" type="string"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+    <parameter name="opcode" optional="true" byreference="false" type="string"/>
+    <parameter name="finish" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="unpack" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Unpack the binary data received from the client."/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="object" class="binary"/>
+  </method>
+  <method name="on" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event_name" optional="false" byreference="false" type="string"/>
+    <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
+  </method>
+  <method name="start" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/SyncEvent.xml phpdox-0.12.0/dependencies/php/classes/SyncEvent.xml
--- phpdox-0.11.2/dependencies/php/classes/SyncEvent.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SyncEvent.xml	2019-03-13 09:34:17.000000000 +0000
@@ -26,6 +26,6 @@
       <description compact="Waits for the event to be fired/set"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="wait" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="wait" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/SyncMutex.xml phpdox-0.12.0/dependencies/php/classes/SyncMutex.xml
--- phpdox-0.11.2/dependencies/php/classes/SyncMutex.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SyncMutex.xml	2019-03-13 09:34:17.000000000 +0000
@@ -12,7 +12,7 @@
       <description compact="Waits for an exclusive lock"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="wait" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="wait" optional="true" byreference="false" type="int"/>
   </method>
   <method name="unlock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SyncReaderWriter.xml phpdox-0.12.0/dependencies/php/classes/SyncReaderWriter.xml
--- phpdox-0.11.2/dependencies/php/classes/SyncReaderWriter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SyncReaderWriter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -13,7 +13,7 @@
       <description compact="Waits for a read lock"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="wait" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="wait" optional="true" byreference="false" type="int"/>
   </method>
   <method name="readunlock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -26,7 +26,7 @@
       <description compact="Waits for an exclusive write lock"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="wait" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="wait" optional="true" byreference="false" type="int"/>
   </method>
   <method name="writeunlock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/SyncSemaphore.xml phpdox-0.12.0/dependencies/php/classes/SyncSemaphore.xml
--- phpdox-0.11.2/dependencies/php/classes/SyncSemaphore.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SyncSemaphore.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,7 +6,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="true" byreference="false" type="string"/>
-    <parameter name="initialval" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="initialval" optional="true" byreference="false" type="int"/>
     <parameter name="autounlock" optional="true" byreference="false" type="object" class="bool"/>
   </constructor>
   <method name="lock" abstract="false" static="false" visibility="public" final="false">
@@ -14,13 +14,13 @@
       <description compact="Decreases the count of the semaphore or waits"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="wait" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="wait" optional="true" byreference="false" type="int"/>
   </method>
   <method name="unlock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Increases the count of the semaphore"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="prevcount" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="prevcount" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/SyncSharedMemory.xml phpdox-0.12.0/dependencies/php/classes/SyncSharedMemory.xml
--- phpdox-0.11.2/dependencies/php/classes/SyncSharedMemory.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/SyncSharedMemory.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,7 +6,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
   </constructor>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -19,8 +19,8 @@
       <description compact="Copy data from named shared memory"/>
       <return type="void"/>
     </docblock>
-    <parameter name="start" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="length" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="start" optional="true" byreference="false" type="int"/>
+    <parameter name="length" optional="true" byreference="false" type="int"/>
   </method>
   <method name="size" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -34,6 +34,6 @@
       <return type="void"/>
     </docblock>
     <parameter name="string" optional="true" byreference="false" type="string"/>
-    <parameter name="start" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="start" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Threaded.xml phpdox-0.12.0/dependencies/php/classes/Threaded.xml
--- phpdox-0.11.2/dependencies/php/classes/Threaded.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Threaded.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="Threaded" namespace="" name="Threaded">
-  <implements name="Traversable" full="Traversable"/>
+  <implements name="Collectable" full="Collectable"/>
   <method name="chunk" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Manipulation"/>
       <return type="array"/>
     </docblock>
-    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="preserve" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
+    <parameter name="preserve" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Manipulation"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="extend" abstract="false" static="false" visibility="public" final="false">
@@ -40,31 +40,31 @@
   <method name="isRunning" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="State Detection"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isTerminated" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="State Detection"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isWaiting" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="State Detection"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="lock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Synchronization"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Manipulation"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="from" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="overwrite" optional="true" byreference="false" type="object" class="bool"/>
@@ -72,13 +72,19 @@
   <method name="notify" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Synchronization"/>
-      <return type="boolean"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="notifyOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Synchronization"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Manipulation"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="run" abstract="false" static="false" visibility="public" final="false">
@@ -104,14 +110,14 @@
   <method name="unlock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Synchronization"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="wait" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Synchronization"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Thread.xml phpdox-0.12.0/dependencies/php/classes/Thread.xml
--- phpdox-0.11.2/dependencies/php/classes/Thread.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Thread.xml	2019-03-13 09:34:17.000000000 +0000
@@ -10,7 +10,7 @@
   <method name="getCreatorId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Identification"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getCurrentThread" abstract="false" static="false" visibility="public" final="false">
@@ -22,13 +22,13 @@
   <method name="getCurrentThreadId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Identification"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getThreadId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Identification"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="globally" abstract="false" static="false" visibility="public" final="false">
@@ -40,19 +40,19 @@
   <method name="isJoined" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="State Detection"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isStarted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="State Detection"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="join" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Synchronization"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="kill" abstract="false" static="false" visibility="public" final="false">
@@ -64,22 +64,22 @@
   <method name="start" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Execution"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="options" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="options" optional="true" byreference="false" type="int"/>
   </method>
   <method name="chunk" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
       <return type="array"/>
     </docblock>
-    <parameter name="size" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="preserve" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
+    <parameter name="preserve" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="extend" abstract="false" static="false" visibility="public" final="false">
@@ -107,31 +107,31 @@
   <method name="isRunning" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isTerminated" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isWaiting" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="lock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="from" optional="false" byreference="false" type="object" class="mixed"/>
     <parameter name="overwrite" optional="true" byreference="false" type="object" class="bool"/>
@@ -139,13 +139,19 @@
   <method name="notify" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="notifyOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="run" abstract="false" static="false" visibility="public" final="false">
@@ -171,14 +177,14 @@
   <method name="unlock" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="wait" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/tidyNode.xml phpdox-0.12.0/dependencies/php/classes/tidyNode.xml
--- phpdox-0.11.2/dependencies/php/classes/tidyNode.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/tidyNode.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,117 +1,123 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="tidyNode" namespace="" name="tidyNode">
-  <member name="value" static="false">
+  <member name="value" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="The HTML representation of the node, including the surrounding tags."/>
       <var type="string"/>
     </docblock>
   </member>
-  <member name="name" static="false">
+  <member name="name" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="The name of the HTML node"/>
       <var type="string"/>
     </docblock>
   </member>
-  <member name="type" static="false">
+  <member name="type" static="false" visibility="public">
     <default>null</default>
     <docblock>
-      <description compact="The type of the tag (one of the constants above, e.g. TIDY_NODETYPE_PHP)"/>
+      <description compact="The type of the node (one of the nodetype constants, e.g. TIDY_NODETYPE_PHP)"/>
       <var type="int"/>
     </docblock>
   </member>
-  <member name="line" static="false">
+  <member name="line" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="The line number at which the tags is located in the file"/>
       <var type="int"/>
     </docblock>
   </member>
-  <member name="column" static="false">
+  <member name="column" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="The column number at which the tags is located in the file"/>
       <var type="int"/>
     </docblock>
   </member>
-  <member name="proprietary" static="false">
+  <member name="proprietary" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="Indicates if the node is a proprietary tag"/>
       <var type="bool"/>
     </docblock>
   </member>
-  <member name="id" static="false">
+  <member name="id" static="false" visibility="public">
     <default>null</default>
     <docblock>
-      <description compact="The ID of the tag (one of the constants above, e.g. TIDY_TAG_FRAME)"/>
+      <description compact="The ID of the node (one of the tag constants, e.g. TIDY_TAG_FRAME)"/>
       <var type="int"/>
     </docblock>
   </member>
-  <member name="attribute" static="false">
+  <member name="attribute" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="An array of string, representing the attributes names (as keys) of the current node."/>
       <var type="array"/>
     </docblock>
   </member>
-  <member name="child" static="false">
+  <member name="child" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="An array of tidyNode, representing the children of the current node."/>
       <var type="array"/>
     </docblock>
   </member>
-  <method name="getParent" abstract="false" static="false" final="false">
+  <constructor name="__construct" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact="Private constructor to disallow direct instantiation"/>
+      <return type="void"/>
+    </docblock>
+  </constructor>
+  <method name="getParent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the parent node of the current node"/>
       <return type="tidyNode"/>
     </docblock>
   </method>
-  <method name="hasChildren" abstract="false" static="false" final="false">
+  <method name="hasChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if a node has children"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="hasSiblings" abstract="false" static="false" final="false">
+  <method name="hasSiblings" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if a node has siblings"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isAsp" abstract="false" static="false" final="false">
+  <method name="isAsp" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if this node is ASP"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isComment" abstract="false" static="false" final="false">
+  <method name="isComment" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if a node represents a comment"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isHtml" abstract="false" static="false" final="false">
+  <method name="isHtml" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if a node is part of a HTML document"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isJste" abstract="false" static="false" final="false">
+  <method name="isJste" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if this node is JSTE"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isPhp" abstract="false" static="false" final="false">
+  <method name="isPhp" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if a node is PHP"/>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isText" abstract="false" static="false" final="false">
+  <method name="isText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if a node represents text (no markup)"/>
       <return type="bool"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/tidy.xml phpdox-0.12.0/dependencies/php/classes/tidy.xml
--- phpdox-0.11.2/dependencies/php/classes/tidy.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/tidy.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="tidy" namespace="" name="tidy">
-  <member name="tidy-&gt;errorBuffer" static="false">
+  <member name="tidy-&gt;errorBuffer" static="false" visibility="public">
     <default>null</default>
     <docblock>
       <description compact="Object oriented style (property):">Object oriented style (property):</description>
       <var type="string"/>
     </docblock>
   </member>
-  <method name="body" abstract="false" static="false" final="false">
+  <method name="body" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns a tidyNode object starting from the &lt;body&gt; tag of the tidy parse tree">Object oriented style</description>
       <return type="tidyNode"/>
     </docblock>
   </method>
-  <method name="cleanRepair" abstract="false" static="false" final="false">
+  <method name="cleanRepair" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Execute configured cleanup and repair operations on parsed markup">Object oriented style</description>
       <return type="bool"/>
     </docblock>
   </method>
-  <constructor name="__construct" abstract="false" static="false" final="false">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Constructs a new tidy object"/>
       <return type="void"/>
@@ -29,75 +29,75 @@
     <parameter name="encoding" optional="true" byreference="false" type="string"/>
     <parameter name="use_include_path" optional="true" byreference="false" type="object" class="bool"/>
   </constructor>
-  <method name="diagnose" abstract="false" static="false" final="false">
+  <method name="diagnose" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Run configured diagnostics on parsed and repaired markup">Object oriented style</description>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="getConfig" abstract="false" static="false" final="false">
+  <method name="getConfig" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get current Tidy configuration">Object oriented style</description>
       <return type="array"/>
     </docblock>
   </method>
-  <method name="getHtmlVer" abstract="false" static="false" final="false">
+  <method name="getHtmlVer" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the Detected HTML version for the specified document">Object oriented style</description>
       <return type="int"/>
     </docblock>
   </method>
-  <method name="getOpt" abstract="false" static="false" final="false">
+  <method name="getOpt" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the value of the specified configuration option for the tidy document">Object oriented style</description>
       <return type="mixed"/>
     </docblock>
     <parameter name="option" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="getOptDoc" abstract="false" static="false" final="false">
+  <method name="getOptDoc" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="&#10;   Returns the documentation for the given option name&#10;  ">Object oriented style</description>
       <return type="string"/>
     </docblock>
     <parameter name="optname" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="getRelease" abstract="false" static="false" final="false">
+  <method name="getRelease" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get release date (version) for Tidy library">Object oriented style</description>
       <return type="string"/>
     </docblock>
   </method>
-  <method name="getStatus" abstract="false" static="false" final="false">
+  <method name="getStatus" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get status of specified document">Object oriented style</description>
       <return type="int"/>
     </docblock>
   </method>
-  <method name="head" abstract="false" static="false" final="false">
+  <method name="head" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns a tidyNode object starting from the &lt;head&gt; tag of the tidy parse tree">Object oriented style</description>
       <return type="tidyNode"/>
     </docblock>
   </method>
-  <method name="html" abstract="false" static="false" final="false">
+  <method name="html" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns a tidyNode object starting from the &lt;html&gt; tag of the tidy parse tree">Object oriented style</description>
       <return type="tidyNode"/>
     </docblock>
   </method>
-  <method name="isXhtml" abstract="false" static="false" final="false">
+  <method name="isXhtml" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Indicates if the document is a XHTML document">Object oriented style</description>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="isXml" abstract="false" static="false" final="false">
+  <method name="isXml" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Indicates if the document is a generic (non HTML/XHTML) XML document">Object oriented style</description>
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="parseFile" abstract="false" static="false" final="false">
+  <method name="parseFile" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Parse markup in file or URI">Object oriented style</description>
       <return type="bool"/>
@@ -107,7 +107,7 @@
     <parameter name="encoding" optional="true" byreference="false" type="string"/>
     <parameter name="use_include_path" optional="true" byreference="false" type="object" class="bool"/>
   </method>
-  <method name="parseString" abstract="false" static="false" final="false">
+  <method name="parseString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Parse a document stored in a string">Object oriented style</description>
       <return type="bool"/>
@@ -116,7 +116,7 @@
     <parameter name="config" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="encoding" optional="true" byreference="false" type="string"/>
   </method>
-  <method name="repairFile" abstract="false" static="false" final="false">
+  <method name="repairFile" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Repair a file and return it as a string">Object oriented style</description>
       <return type="string"/>
@@ -126,7 +126,7 @@
     <parameter name="encoding" optional="true" byreference="false" type="string"/>
     <parameter name="use_include_path" optional="true" byreference="false" type="object" class="bool"/>
   </method>
-  <method name="repairString" abstract="false" static="false" final="false">
+  <method name="repairString" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Repair a string using an optionally provided configuration file">Object oriented style</description>
       <return type="string"/>
@@ -135,7 +135,7 @@
     <parameter name="config" optional="true" byreference="false" type="object" class="mixed"/>
     <parameter name="encoding" optional="true" byreference="false" type="string"/>
   </method>
-  <method name="root" abstract="false" static="false" final="false">
+  <method name="root" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns a tidyNode object representing the root of the tidy parse tree">Object oriented style</description>
       <return type="tidyNode"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/TypeError.xml phpdox-0.12.0/dependencies/php/classes/TypeError.xml
--- phpdox-0.11.2/dependencies/php/classes/TypeError.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/TypeError.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="TypeError" namespace="" name="TypeError">
   <extends name="Error" full="Error"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The error code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the error happened"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the error happened"/>
+      <var type="int"/>
+    </docblock>
+  </member>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
     <docblock>
       <description compact=""/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UConverter.xml phpdox-0.12.0/dependencies/php/classes/UConverter.xml
--- phpdox-0.11.2/dependencies/php/classes/UConverter.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UConverter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -226,17 +226,17 @@
       <description compact="Default &quot;from&quot; callback function"/>
       <return type="mixed"/>
     </docblock>
-    <parameter name="reason" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reason" optional="false" byreference="false" type="int"/>
     <parameter name="source" optional="false" byreference="false" type="string"/>
     <parameter name="codePoint" optional="false" byreference="false" type="string"/>
-    <parameter name="error" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="error" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getAliases" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the aliases of the given name"/>
       <return type="array"/>
     </docblock>
-    <parameter name="name" optional="true" byreference="false" type="string"/>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
   </method>
   <method name="getAvailable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -253,13 +253,13 @@
   <method name="getDestinationType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the destination converter type"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorCode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get last error code on the object"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getErrorMessage" abstract="false" static="false" visibility="public" final="false">
@@ -277,7 +277,7 @@
   <method name="getSourceType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the source convertor type"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getStandards" abstract="false" static="false" visibility="public" final="false">
@@ -297,7 +297,7 @@
       <description compact="Get string representation of the callback reason"/>
       <return type="string"/>
     </docblock>
-    <parameter name="reason" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="reason" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setDestinationEncoding" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -325,10 +325,10 @@
       <description compact="Default &quot;to&quot; callback function"/>
       <return type="mixed"/>
     </docblock>
-    <parameter name="reason" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="reason" optional="false" byreference="false" type="int"/>
     <parameter name="source" optional="false" byreference="false" type="string"/>
     <parameter name="codeUnits" optional="false" byreference="false" type="string"/>
-    <parameter name="error" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="error" optional="false" byreference="false" type="int"/>
   </method>
   <method name="transcode" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Area.xml phpdox-0.12.0/dependencies/php/classes/UI_Area.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Area.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Area.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Area" namespace="" name="UI\Area">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Area" namespace="UI" name="Area">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Ctrl" value="">
     <docblock>
@@ -47,8 +47,8 @@
       <return type="void"/>
     </docblock>
     <parameter name="key" optional="false" byreference="false" type="string"/>
-    <parameter name="ext" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="flags" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="ext" optional="false" byreference="false" type="int"/>
+    <parameter name="flags" optional="false" byreference="false" type="int"/>
   </method>
   <method name="onMouse" abstract="false" static="false" visibility="protected" final="false">
     <docblock>
@@ -57,7 +57,7 @@
     </docblock>
     <parameter name="areaPoint" optional="false" byreference="false" type="object" class="UI\Point"/>
     <parameter name="areaSize" optional="false" byreference="false" type="object" class="UI\Size"/>
-    <parameter name="flags" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="flags" optional="false" byreference="false" type="int"/>
   </method>
   <method name="redraw" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Box.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Box.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Box.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Box.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Box" namespace="" name="UI\Controls\Box">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Box" namespace="UI\Controls" name="Box">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Vertical" value="">
     <docblock>
@@ -22,27 +22,27 @@
       <description compact="Construct a new Box"/>
       <return type="void"/>
     </docblock>
-    <parameter name="orientation" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="orientation" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Append Control"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="control" optional="false" byreference="false" type="object" class="Control"/>
-    <parameter name="stretchy" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="stretchy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="delete" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Delete Control"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getOrientation" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get Orientation"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="isPadded" abstract="false" static="false" visibility="public" final="false">
@@ -56,7 +56,7 @@
       <description compact="Set Padding"/>
       <return type="void"/>
     </docblock>
-    <parameter name="padded" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="padded" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Button.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Button.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Button.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Button.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Button" namespace="" name="UI\Controls\Button">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Button" namespace="UI\Controls" name="Button">
   <extends name="UI\Control" full="UI\Control"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Check.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Check.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Check.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Check.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Check" namespace="" name="UI\Controls\Check">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Check" namespace="UI\Controls" name="Check">
   <extends name="UI\Control" full="UI\Control"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -31,7 +31,7 @@
       <description compact="Set Checked"/>
       <return type="void"/>
     </docblock>
-    <parameter name="checked" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="checked" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_ColorButton.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_ColorButton.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_ColorButton.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_ColorButton.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\ColorButton" namespace="" name="UI\Controls\ColorButton">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\ColorButton" namespace="UI\Controls" name="ColorButton">
   <extends name="UI\Control" full="UI\Control"/>
   <method name="getColor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -25,7 +25,7 @@
       <description compact="Set Color"/>
       <return type="void"/>
     </docblock>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Combo.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Combo.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Combo.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Combo.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Combo" namespace="" name="UI\Controls\Combo">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Combo" namespace="UI\Controls" name="Combo">
   <extends name="UI\Control" full="UI\Control"/>
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -11,7 +11,7 @@
   <method name="getSelected" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get Selected Option"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="onSelected" abstract="false" static="false" visibility="protected" final="false">
@@ -25,7 +25,7 @@
       <description compact="Set Selected Option"/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_EditableCombo.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_EditableCombo.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_EditableCombo.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_EditableCombo.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\EditableCombo" namespace="" name="UI\Controls\EditableCombo">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\EditableCombo" namespace="UI\Controls" name="EditableCombo">
   <extends name="UI\Control" full="UI\Control"/>
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Entry.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Entry.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Entry.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Entry.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Entry" namespace="" name="UI\Controls\Entry">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Entry" namespace="UI\Controls" name="Entry">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Normal" value="">
     <docblock>
@@ -21,7 +21,7 @@
       <description compact="Construct a new Entry"/>
       <return type="void"/>
     </docblock>
-    <parameter name="type" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="getText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -46,7 +46,7 @@
       <description compact="Set Read Only"/>
       <return type="void"/>
     </docblock>
-    <parameter name="readOnly" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="readOnly" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Form.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Form.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Form.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Form.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Form" namespace="" name="UI\Controls\Form">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Form" namespace="UI\Controls" name="Form">
   <extends name="UI\Control" full="UI\Control"/>
   <member name="controls" static="false" visibility="protected">
     <default>null</default>
@@ -10,18 +10,18 @@
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Append Control"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="label" optional="false" byreference="false" type="string"/>
     <parameter name="control" optional="false" byreference="false" type="object" class="UI\Control"/>
-    <parameter name="stretchy" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="stretchy" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="delete" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Delete Control"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="isPadded" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -34,7 +34,7 @@
       <description compact="Set Padding"/>
       <return type="void"/>
     </docblock>
-    <parameter name="padded" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="padded" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Grid.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Grid.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Grid.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Grid.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Grid" namespace="" name="UI\Controls\Grid">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Grid" namespace="UI\Controls" name="Grid">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Fill" value="">
     <docblock>
@@ -53,14 +53,14 @@
       <return type="void"/>
     </docblock>
     <parameter name="control" optional="false" byreference="false" type="object" class="UI\Control"/>
-    <parameter name="left" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="top" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="xspan" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="yspan" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="hexpand" optional="false" byreference="false" type="object" class="boolean"/>
-    <parameter name="halign" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="vexpand" optional="false" byreference="false" type="object" class="boolean"/>
-    <parameter name="valign" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="left" optional="false" byreference="false" type="int"/>
+    <parameter name="top" optional="false" byreference="false" type="int"/>
+    <parameter name="xspan" optional="false" byreference="false" type="int"/>
+    <parameter name="yspan" optional="false" byreference="false" type="int"/>
+    <parameter name="hexpand" optional="false" byreference="false" type="object" class="bool"/>
+    <parameter name="halign" optional="false" byreference="false" type="int"/>
+    <parameter name="vexpand" optional="false" byreference="false" type="object" class="bool"/>
+    <parameter name="valign" optional="false" byreference="false" type="int"/>
   </method>
   <method name="isPadded" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -73,7 +73,7 @@
       <description compact="Set Padding"/>
       <return type="void"/>
     </docblock>
-    <parameter name="padding" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="padding" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Group.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Group.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Group.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Group.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Group" namespace="" name="UI\Controls\Group">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Group" namespace="UI\Controls" name="Group">
   <extends name="UI\Control" full="UI\Control"/>
   <member name="controls" static="false" visibility="protected">
     <default>null</default>
@@ -38,7 +38,7 @@
       <description compact="Set Margin"/>
       <return type="void"/>
     </docblock>
-    <parameter name="margin" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="margin" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setTitle" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Label.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Label.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Label.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Label.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Label" namespace="" name="UI\Controls\Label">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Label" namespace="UI\Controls" name="Label">
   <extends name="UI\Control" full="UI\Control"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_MultilineEntry.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_MultilineEntry.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_MultilineEntry.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_MultilineEntry.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\MultilineEntry" namespace="" name="UI\Controls\MultilineEntry">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\MultilineEntry" namespace="UI\Controls" name="MultilineEntry">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Wrap" value="">
     <docblock>
@@ -16,7 +16,7 @@
       <description compact="Construct a new Multiline Entry"/>
       <return type="void"/>
     </docblock>
-    <parameter name="type" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -48,7 +48,7 @@
       <description compact="Set Read Only"/>
       <return type="void"/>
     </docblock>
-    <parameter name="readOnly" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="readOnly" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setText" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Picker.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Picker.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Picker.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Picker.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Picker" namespace="" name="UI\Controls\Picker">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Picker" namespace="UI\Controls" name="Picker">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Date" value="">
     <docblock>
@@ -21,7 +21,7 @@
       <description compact="Construct a new Picker"/>
       <return type="void"/>
     </docblock>
-    <parameter name="type" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Progress.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Progress.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Progress.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Progress.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Progress" namespace="" name="UI\Controls\Progress">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Progress" namespace="UI\Controls" name="Progress">
   <extends name="UI\Control" full="UI\Control"/>
   <method name="getValue" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -12,7 +12,7 @@
       <description compact="Set Value"/>
       <return type="void"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Radio.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Radio.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Radio.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Radio.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Radio" namespace="" name="UI\Controls\Radio">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Radio" namespace="UI\Controls" name="Radio">
   <extends name="UI\Control" full="UI\Control"/>
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -11,7 +11,7 @@
   <method name="getSelected" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get Selected Option"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="onSelected" abstract="false" static="false" visibility="protected" final="false">
@@ -25,7 +25,7 @@
       <description compact="Set Selected Option"/>
       <return type="void"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Separator.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Separator.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Separator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Separator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Separator" namespace="" name="UI\Controls\Separator">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Separator" namespace="UI\Controls" name="Separator">
   <extends name="UI\Control" full="UI\Control"/>
   <constant name="Horizontal" value="">
     <docblock>
@@ -16,7 +16,7 @@
       <description compact="Construct a new Separator"/>
       <return type="void"/>
     </docblock>
-    <parameter name="type" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Slider.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Slider.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Slider.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Slider.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Slider" namespace="" name="UI\Controls\Slider">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Slider" namespace="UI\Controls" name="Slider">
   <extends name="UI\Control" full="UI\Control"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Slider"/>
       <return type="void"/>
     </docblock>
-    <parameter name="min" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="max" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="min" optional="false" byreference="false" type="int"/>
+    <parameter name="max" optional="false" byreference="false" type="int"/>
   </constructor>
   <method name="getValue" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get Value"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="onChange" abstract="false" static="false" visibility="protected" final="false">
@@ -26,7 +26,7 @@
       <description compact="Set Value"/>
       <return type="void"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Spin.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Spin.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Spin.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Spin.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Spin" namespace="" name="UI\Controls\Spin">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Spin" namespace="UI\Controls" name="Spin">
   <extends name="UI\Control" full="UI\Control"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Spin"/>
       <return type="void"/>
     </docblock>
-    <parameter name="min" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="max" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="min" optional="false" byreference="false" type="int"/>
+    <parameter name="max" optional="false" byreference="false" type="int"/>
   </constructor>
   <method name="getValue" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -26,7 +26,7 @@
       <description compact="Set Value"/>
       <return type="void"/>
     </docblock>
-    <parameter name="value" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="value" optional="false" byreference="false" type="int"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Controls_Tab.xml phpdox-0.12.0/dependencies/php/classes/UI_Controls_Tab.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Controls_Tab.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Controls_Tab.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Tab" namespace="" name="UI\Controls\Tab">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Controls\Tab" namespace="UI\Controls" name="Tab">
   <extends name="UI\Control" full="UI\Control"/>
   <member name="controls" static="false" visibility="protected">
     <default>null</default>
@@ -10,7 +10,7 @@
   <method name="append" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Append Page"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="control" optional="false" byreference="false" type="object" class="UI\Control"/>
@@ -18,16 +18,16 @@
   <method name="delete" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Delete Page"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="hasMargin" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Margin Detection"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="page" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="page" optional="false" byreference="false" type="int"/>
   </method>
   <method name="insertAt" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -35,13 +35,13 @@
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
-    <parameter name="page" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="page" optional="false" byreference="false" type="int"/>
     <parameter name="control" optional="false" byreference="false" type="object" class="UI\Control"/>
   </method>
   <method name="pages" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Page Count"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="setMargin" abstract="false" static="false" visibility="public" final="false">
@@ -49,8 +49,8 @@
       <description compact="Set Margin"/>
       <return type="void"/>
     </docblock>
-    <parameter name="page" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="margin" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="page" optional="false" byreference="false" type="int"/>
+    <parameter name="margin" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Control.xml phpdox-0.12.0/dependencies/php/classes/UI_Control.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Control.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Control.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Control" namespace="" name="UI\Control">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Control" namespace="UI" name="Control">
   <method name="destroy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Destroy Control"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush_Gradient.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush_Gradient.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush_Gradient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush_Gradient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush\Gradient" namespace="" name="UI\Draw\Brush\Gradient">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush\Gradient" namespace="UI\Draw\Brush" name="Gradient">
   <extends name="UI\Draw\Brush\Gradient" full="UI\Draw\Brush\Gradient"/>
   <method name="addStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Stop Manipulation"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
@@ -12,35 +12,35 @@
   <method name="addStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Stop Manipulation"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
   <method name="delStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Stop Manipulation"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Stop Manipulation"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
   </method>
   <method name="setStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Stop Manipulation"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
   <method name="getColor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -60,6 +60,6 @@
       <description compact=""/>
       <return type="void"/>
     </docblock>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush_LinearGradient.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush_LinearGradient.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush_LinearGradient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush_LinearGradient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush\LinearGradient" namespace="" name="UI\Draw\Brush\LinearGradient">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush\LinearGradient" namespace="UI\Draw\Brush" name="LinearGradient">
   <extends name="UI\Draw\Brush\Gradient" full="UI\Draw\Brush\Gradient"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -12,7 +12,7 @@
   <method name="addStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
@@ -20,34 +20,34 @@
   <method name="addStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
   <method name="delStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
   </method>
   <method name="setStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush_RadialGradient.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush_RadialGradient.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush_RadialGradient.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush_RadialGradient.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush\RadialGradient" namespace="" name="UI\Draw\Brush\RadialGradient">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush\RadialGradient" namespace="UI\Draw\Brush" name="RadialGradient">
   <extends name="UI\Draw\Brush\Gradient" full="UI\Draw\Brush\Gradient"/>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -13,7 +13,7 @@
   <method name="addStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
@@ -21,34 +21,34 @@
   <method name="addStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
   <method name="delStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
   </method>
   <method name="setStop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="index" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="index" optional="false" byreference="false" type="int"/>
     <parameter name="position" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Brush.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Brush.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush" namespace="" name="UI\Draw\Brush">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Brush" namespace="UI\Draw" name="Brush">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Brush"/>
@@ -12,7 +12,7 @@
       <description compact="Construct a new Brush"/>
       <return type="void"/>
     </docblock>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </constructor>
   <method name="getColor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -32,6 +32,6 @@
       <description compact="Set Color"/>
       <return type="void"/>
     </docblock>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Color.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Color.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Color.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Color.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Color" namespace="" name="UI\Draw\Color">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Color" namespace="UI\Draw" name="Color">
   <constant name="Red" value="">
     <docblock>
       <var type="integer"/>
@@ -56,21 +56,21 @@
       <description compact="Construct new Color"/>
       <return type="void"/>
     </docblock>
-    <parameter name="color" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="getChannel" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Color Manipulation"/>
       <return type="float"/>
     </docblock>
-    <parameter name="channel" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="channel" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setChannel" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Color Manipulation"/>
       <return type="void"/>
     </docblock>
-    <parameter name="channel" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="channel" optional="false" byreference="false" type="int"/>
     <parameter name="value" optional="false" byreference="false" type="object" class="float"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Line_Cap.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Line_Cap.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Line_Cap.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Line_Cap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Line\Cap" namespace="" name="UI\Draw\Line\Cap">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Line\Cap" namespace="UI\Draw\Line" name="Cap">
   <constant name="Flat" value="">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Line_Join.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Line_Join.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Line_Join.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Line_Join.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Line\Join" namespace="" name="UI\Draw\Line\Join">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Line\Join" namespace="UI\Draw\Line" name="Join">
   <constant name="Miter" value="">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Matrix.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Matrix.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Matrix.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Matrix.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Matrix" namespace="" name="UI\Draw\Matrix">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Matrix" namespace="UI\Draw" name="Matrix">
   <method name="invert" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Invert Matrix"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Path.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Path.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Path.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Path.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Path" namespace="" name="UI\Draw\Path">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Path" namespace="UI\Draw" name="Path">
   <constant name="Winding" value="">
     <docblock>
       <var type="integer"/>
@@ -15,7 +15,7 @@
       <description compact="Construct a new Path"/>
       <return type="void"/>
     </docblock>
-    <parameter name="mode" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="addRectangle" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Pen.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Pen.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Pen.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Pen.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Pen" namespace="" name="UI\Draw\Pen">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Pen" namespace="UI\Draw" name="Pen">
   <method name="clip" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Clip a Path"/>
@@ -29,7 +29,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="object" class="UI\Draw\Path"/>
-    <parameter name="with" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="with" optional="false" byreference="false" type="int"/>
   </method>
   <method name="restore" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -67,7 +67,7 @@
       <return type="void"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="object" class="UI\Draw\Path"/>
-    <parameter name="with" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="with" optional="false" byreference="false" type="int"/>
     <parameter name="stroke" optional="false" byreference="false" type="object" class="UI\Draw\Stroke"/>
   </method>
   <method name="transform" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Stroke.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Stroke.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Stroke.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Stroke.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Stroke" namespace="" name="UI\Draw\Stroke">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Stroke" namespace="UI\Draw" name="Stroke">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Stroke"/>
       <return type="void"/>
     </docblock>
-    <parameter name="cap" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="join" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="cap" optional="true" byreference="false" type="int"/>
+    <parameter name="join" optional="true" byreference="false" type="int"/>
     <parameter name="thickness" optional="true" byreference="false" type="object" class="float"/>
     <parameter name="miterLimit" optional="true" byreference="false" type="object" class="float"/>
   </constructor>
   <method name="getCap" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get Line Cap"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getJoin" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get Line Join"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getMiterLimit" abstract="false" static="false" visibility="public" final="false">
@@ -39,14 +39,14 @@
       <description compact="Set Line Cap"/>
       <return type="void"/>
     </docblock>
-    <parameter name="cap" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="cap" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setJoin" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set Line Join"/>
       <return type="void"/>
     </docblock>
-    <parameter name="join" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="join" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setMiterLimit" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Descriptor.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Descriptor.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Descriptor.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Descriptor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Descriptor" namespace="" name="UI\Draw\Text\Font\Descriptor">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Descriptor" namespace="UI\Draw\Text\Font" name="Descriptor">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Font Descriptor"/>
@@ -7,9 +7,9 @@
     </docblock>
     <parameter name="family" optional="false" byreference="false" type="string"/>
     <parameter name="size" optional="false" byreference="false" type="object" class="float"/>
-    <parameter name="weight" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="italic" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="stretch" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="weight" optional="true" byreference="false" type="int"/>
+    <parameter name="italic" optional="true" byreference="false" type="int"/>
+    <parameter name="stretch" optional="true" byreference="false" type="int"/>
   </constructor>
   <method name="getFamily" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Italic.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Italic.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Italic.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Italic.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Italic" namespace="" name="UI\Draw\Text\Font\Italic">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Italic" namespace="UI\Draw\Text\Font" name="Italic">
   <constant name="Normal" value="0">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Stretch.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Stretch.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Stretch.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Stretch.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Stretch" namespace="" name="UI\Draw\Text\Font\Stretch">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Stretch" namespace="UI\Draw\Text\Font" name="Stretch">
   <constant name="UltraCondensed" value="0">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Weight.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Weight.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font_Weight.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font_Weight.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Weight" namespace="" name="UI\Draw\Text\Font\Weight">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font\Weight" namespace="UI\Draw\Text\Font" name="Weight">
   <constant name="Thin" value="">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Font.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Font.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font" namespace="" name="UI\Draw\Text\Font">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Font" namespace="UI\Draw\Text" name="Font">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Font"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Layout.xml phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Layout.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Draw_Text_Layout.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Draw_Text_Layout.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Layout" namespace="" name="UI\Draw\Text\Layout">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Draw\Text\Layout" namespace="UI\Draw\Text" name="Layout">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Text Layout"/>
@@ -15,17 +15,17 @@
       <return type="void"/>
     </docblock>
     <parameter name="color" optional="false" byreference="false" type="object" class="UI\Draw\Color"/>
-    <parameter name="start" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="end" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="start" optional="true" byreference="false" type="int"/>
+    <parameter name="end" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setColor" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set Color"/>
       <return type="void"/>
     </docblock>
-    <parameter name="color" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="start" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="end" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="color" optional="false" byreference="false" type="int"/>
+    <parameter name="start" optional="true" byreference="false" type="int"/>
+    <parameter name="end" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setWidth" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Exception_InvalidArgumentException.xml phpdox-0.12.0/dependencies/php/classes/UI_Exception_InvalidArgumentException.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Exception_InvalidArgumentException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Exception_InvalidArgumentException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Exception\InvalidArgumentException" namespace="" name="UI\Exception\InvalidArgumentException">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Exception\InvalidArgumentException" namespace="UI\Exception" name="InvalidArgumentException">
   <implements name="Throwable" full="Throwable"/>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Exception_RuntimeException.xml phpdox-0.12.0/dependencies/php/classes/UI_Exception_RuntimeException.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Exception_RuntimeException.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Exception_RuntimeException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Exception\RuntimeException" namespace="" name="UI\Exception\RuntimeException">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Exception\RuntimeException" namespace="UI\Exception" name="RuntimeException">
   <implements name="Throwable" full="Throwable"/>
   <member name="message" static="false" visibility="protected">
     <default>null</default>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Executor.xml phpdox-0.12.0/dependencies/php/classes/UI_Executor.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Executor.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Executor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Executor" namespace="" name="UI\Executor">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Executor" namespace="UI" name="Executor">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Executor"/>
@@ -11,15 +11,15 @@
       <description compact="Construct a new Executor"/>
       <return type="void"/>
     </docblock>
-    <parameter name="microseconds" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="microseconds" optional="false" byreference="false" type="int"/>
   </constructor>
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Executor"/>
       <return type="void"/>
     </docblock>
-    <parameter name="seconds" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="microseconds" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="seconds" optional="false" byreference="false" type="int"/>
+    <parameter name="microseconds" optional="false" byreference="false" type="int"/>
   </constructor>
   <method name="kill" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -38,14 +38,14 @@
       <description compact="Interval Manipulation"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="microseconds" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="microseconds" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setInterval" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Interval Manipulation"/>
       <return type="bool"/>
     </docblock>
-    <parameter name="seconds" optional="false" byreference="false" type="object" class="integer"/>
-    <parameter name="microseconds" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="seconds" optional="false" byreference="false" type="int"/>
+    <parameter name="microseconds" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Key.xml phpdox-0.12.0/dependencies/php/classes/UI_Key.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Key.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Key.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Key" namespace="" name="UI\Key">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Key" namespace="UI" name="Key">
   <constant name="Escape" value="">
     <docblock>
       <var type="integer"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_MenuItem.xml phpdox-0.12.0/dependencies/php/classes/UI_MenuItem.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_MenuItem.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_MenuItem.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\MenuItem" namespace="" name="UI\MenuItem">
+<class xmlns="http://xml.phpdox.net/src" full="UI\MenuItem" namespace="UI" name="MenuItem">
   <method name="disable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Disable Menu Item"/>
@@ -29,6 +29,6 @@
       <description compact="Set Checked"/>
       <return type="void"/>
     </docblock>
-    <parameter name="checked" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="checked" optional="false" byreference="false" type="object" class="bool"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Menu.xml phpdox-0.12.0/dependencies/php/classes/UI_Menu.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Menu.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Menu.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Menu" namespace="" name="UI\Menu">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Menu" namespace="UI" name="Menu">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Construct a new Menu"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Point.xml phpdox-0.12.0/dependencies/php/classes/UI_Point.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Point.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Point.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Point" namespace="" name="UI\Point">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Point" namespace="UI" name="Point">
   <member name="x" static="false" visibility="public">
     <default>null</default>
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Size.xml phpdox-0.12.0/dependencies/php/classes/UI_Size.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Size.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Size.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Size" namespace="" name="UI\Size">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Size" namespace="UI" name="Size">
   <member name="width" static="false" visibility="public">
     <default>null</default>
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/UI_Window.xml phpdox-0.12.0/dependencies/php/classes/UI_Window.xml
--- phpdox-0.11.2/dependencies/php/classes/UI_Window.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/UI_Window.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="UI\Window" namespace="" name="UI\Window">
+<class xmlns="http://xml.phpdox.net/src" full="UI\Window" namespace="UI" name="Window">
   <extends name="UI\Control" full="UI\Control"/>
   <member name="controls" static="false" visibility="protected">
     <default>null</default>
@@ -14,7 +14,7 @@
     </docblock>
     <parameter name="title" optional="false" byreference="false" type="string"/>
     <parameter name="size" optional="false" byreference="false" type="object" class="Size"/>
-    <parameter name="menu" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="menu" optional="true" byreference="false" type="object" class="bool"/>
   </constructor>
   <method name="add" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -92,21 +92,21 @@
       <description compact="Border Use"/>
       <return type="void"/>
     </docblock>
-    <parameter name="borders" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="borders" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setFullScreen" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Full Screen Use"/>
       <return type="void"/>
     </docblock>
-    <parameter name="full" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="full" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setMargin" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Margin Use"/>
       <return type="void"/>
     </docblock>
-    <parameter name="margin" optional="false" byreference="false" type="object" class="boolean"/>
+    <parameter name="margin" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Volatile.xml phpdox-0.12.0/dependencies/php/classes/Volatile.xml
--- phpdox-0.11.2/dependencies/php/classes/Volatile.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Volatile.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Volatile" namespace="" name="Volatile">
+  <implements name="Collectable" full="Collectable"/>
+  <method name="chunk" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="size" optional="false" byreference="false" type="int"/>
+    <parameter name="preserve" optional="false" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="extend" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="class" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="from" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="Threaded"/>
+    </docblock>
+    <parameter name="run" optional="false" byreference="false" type="object" class="Closure"/>
+    <parameter name="construct" optional="true" byreference="false" type="object" class="Closure"/>
+    <parameter name="args" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="getTerminationInfo" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="isRunning" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isTerminated" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="isWaiting" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="merge" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="from" optional="false" byreference="false" type="object" class="mixed"/>
+    <parameter name="overwrite" optional="true" byreference="false" type="object" class="bool"/>
+  </method>
+  <method name="notify" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="notifyOne" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="pop" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="run" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="shift" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="synchronized" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="block" optional="false" byreference="false" type="object" class="Closure"/>
+    <parameter name="..." optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="wait" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="timeout" optional="true" byreference="false" type="int"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Vtiful_Kernel_Excel.xml phpdox-0.12.0/dependencies/php/classes/Vtiful_Kernel_Excel.xml
--- phpdox-0.11.2/dependencies/php/classes/Vtiful_Kernel_Excel.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Vtiful_Kernel_Excel.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Vtiful\Kernel\Excel" namespace="Vtiful\Kernel" name="Excel">
+  <method name="addSheet" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel addSheet"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="sheetName" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="autoFilter" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel autoFilter"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="scope" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="constMemory" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel constMemory"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fileName" optional="false" byreference="false" type="string"/>
+    <parameter name="sheetName" optional="true" byreference="false" type="string"/>
+  </method>
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel constructor"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="config" optional="false" byreference="false" type="object" class="array"/>
+  </constructor>
+  <method name="data" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel data"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="fileName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel fileName"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="fileName" optional="false" byreference="false" type="string"/>
+    <parameter name="sheetName" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="getHandle" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel getHandle"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="header" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel header"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="headerData" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="insertFormula" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel insertFormula"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="row" optional="false" byreference="false" type="int"/>
+    <parameter name="column" optional="false" byreference="false" type="int"/>
+    <parameter name="formula" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="insertImage" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel insertImage"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="row" optional="false" byreference="false" type="int"/>
+    <parameter name="column" optional="false" byreference="false" type="int"/>
+    <parameter name="localImagePath" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="insertText" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel insertText"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="row" optional="false" byreference="false" type="int"/>
+    <parameter name="column" optional="false" byreference="false" type="int"/>
+    <parameter name="data" optional="false" byreference="false" type="object" class="string"/>
+    <parameter name="format" optional="true" byreference="false" type="string"/>
+  </method>
+  <method name="mergeCells" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel mergeCells"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="scope" optional="false" byreference="false" type="string"/>
+    <parameter name="data" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="output" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel output"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="setColumn" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel setColumn"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="range" optional="false" byreference="false" type="string"/>
+    <parameter name="width" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="format" optional="true" byreference="false" type="object" class="resource"/>
+  </method>
+  <method name="setRow" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Excel setRow"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="range" optional="false" byreference="false" type="string"/>
+    <parameter name="height" optional="false" byreference="false" type="object" class="float"/>
+    <parameter name="format" optional="true" byreference="false" type="object" class="resource"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Vtiful_Kernel_Format.xml phpdox-0.12.0/dependencies/php/classes/Vtiful_Kernel_Format.xml
--- phpdox-0.11.2/dependencies/php/classes/Vtiful_Kernel_Format.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Vtiful_Kernel_Format.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Vtiful\Kernel\Format" namespace="Vtiful\Kernel" name="Format">
+  <constant name="FORMAT_ALIGN_LEFT" value="1">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_CENTER" value="2">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_RIGHT" value="3">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_FILL" value="4">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_JUSTIFY" value="5">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_CENTER_ACROSS" value="6">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_DISTRIBUTED" value="7">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_VERTICAL_TOP" value="8">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_VERTICAL_BOTTOM" value="9">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_VERTICAL_CENTER" value="10">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_VERTICAL_JUSTIFY" value="11">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="FORMAT_ALIGN_VERTICAL_DISTRIBUTED" value="12">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="UNDERLINE_SINGLE" value="1">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="UNDERLINE_DOUBLE" value="2">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="UNDERLINE_SINGLE_ACCOUNTING" value="3">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <constant name="UNDERLINE_DOUBLE_ACCOUNTING" value="4">
+    <docblock>
+      <var type="int"/>
+    </docblock>
+  </constant>
+  <method name="align" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Format align"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="handle" optional="false" byreference="false" type="object" class="resource"/>
+    <parameter name="style" optional="false" byreference="false" type="int"/>
+  </method>
+  <method name="bold" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Format bold"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="handle" optional="false" byreference="false" type="object" class="resource"/>
+  </method>
+  <method name="italic" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Format italic"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="handle" optional="false" byreference="false" type="object" class="resource"/>
+  </method>
+  <method name="underline" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Vtiful\Kernel\Format underline"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="handle" optional="false" byreference="false" type="object" class="resource"/>
+    <parameter name="style" optional="false" byreference="false" type="int"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/WeakMap.xml phpdox-0.12.0/dependencies/php/classes/WeakMap.xml
--- phpdox-0.11.2/dependencies/php/classes/WeakMap.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/WeakMap.xml	2019-03-13 09:34:17.000000000 +0000
@@ -21,7 +21,7 @@
   </method>
   <method name="key" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current key under iteration."/>
+      <description compact="Returns the current key under iteration"/>
       <return type="object"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/wkhtmltox_Image_Converter.xml phpdox-0.12.0/dependencies/php/classes/wkhtmltox_Image_Converter.xml
--- phpdox-0.11.2/dependencies/php/classes/wkhtmltox_Image_Converter.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/wkhtmltox_Image_Converter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="wkhtmltox\Image\Converter" namespace="wkhtmltox\Image" name="Converter">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create a new Image converter"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="buffer" optional="true" byreference="false" type="string"/>
+    <parameter name="settings" optional="true" byreference="false" type="object" class="array"/>
+  </constructor>
+  <method name="convert" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Perform Image conversion"/>
+      <return type="?string"/>
+    </docblock>
+  </method>
+  <method name="getVersion" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Determine version of Converter"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/wkhtmltox_PDF_Converter.xml phpdox-0.12.0/dependencies/php/classes/wkhtmltox_PDF_Converter.xml
--- phpdox-0.11.2/dependencies/php/classes/wkhtmltox_PDF_Converter.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/wkhtmltox_PDF_Converter.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="wkhtmltox\PDF\Converter" namespace="wkhtmltox\PDF" name="Converter">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create a new PDF converter"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="settings" optional="true" byreference="false" type="object" class="array"/>
+  </constructor>
+  <method name="add" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add an object for conversion"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="object" optional="false" byreference="false" type="object" class="wkhtmltox\PDF\Object"/>
+  </method>
+  <method name="convert" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Perform PDF conversion"/>
+      <return type="?string"/>
+    </docblock>
+  </method>
+  <method name="getVersion" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Determine version of Converter"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/wkhtmltox_PDF_Object.xml phpdox-0.12.0/dependencies/php/classes/wkhtmltox_PDF_Object.xml
--- phpdox-0.11.2/dependencies/php/classes/wkhtmltox_PDF_Object.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/wkhtmltox_PDF_Object.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="wkhtmltox\PDF\Object" namespace="wkhtmltox\PDF" name="Object">
+  <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create a new PDF Object"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="buffer" optional="false" byreference="false" type="string"/>
+    <parameter name="settings" optional="true" byreference="false" type="object" class="array"/>
+  </constructor>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Worker.xml phpdox-0.12.0/dependencies/php/classes/Worker.xml
--- phpdox-0.11.2/dependencies/php/classes/Worker.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Worker.xml	2019-03-13 09:34:17.000000000 +0000
@@ -23,7 +23,7 @@
   <method name="isWorking" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="State Detection"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="shutdown" abstract="false" static="false" visibility="public" final="false">
@@ -54,7 +54,7 @@
   <method name="getCreatorId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getCurrentThread" abstract="false" static="false" visibility="public" final="false">
@@ -66,13 +66,13 @@
   <method name="getCurrentThreadId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getThreadId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="globally" abstract="false" static="false" visibility="public" final="false">
@@ -84,19 +84,19 @@
   <method name="isJoined" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isStarted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="join" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="kill" abstract="false" static="false" visibility="public" final="false">
@@ -108,8 +108,8 @@
   <method name="start" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
-    <parameter name="options" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="options" optional="true" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/XMLDiff_Base.xml phpdox-0.12.0/dependencies/php/classes/XMLDiff_Base.xml
--- phpdox-0.11.2/dependencies/php/classes/XMLDiff_Base.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/XMLDiff_Base.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\Base" namespace="" name="XMLDiff\Base">
+<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\Base" namespace="XMLDiff" name="Base">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Constructor"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/XMLDiff_DOM.xml phpdox-0.12.0/dependencies/php/classes/XMLDiff_DOM.xml
--- phpdox-0.11.2/dependencies/php/classes/XMLDiff_DOM.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/XMLDiff_DOM.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\DOM" namespace="" name="XMLDiff\DOM">
+<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\DOM" namespace="XMLDiff" name="DOM">
   <extends name="XMLDiff\Base" full="XMLDiff\Base"/>
   <method name="diff" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/XMLDiff_File.xml phpdox-0.12.0/dependencies/php/classes/XMLDiff_File.xml
--- phpdox-0.11.2/dependencies/php/classes/XMLDiff_File.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/XMLDiff_File.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\File" namespace="" name="XMLDiff\File">
+<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\File" namespace="XMLDiff" name="File">
   <extends name="XMLDiff\Base" full="XMLDiff\Base"/>
   <method name="diff" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/XMLDiff_Memory.xml phpdox-0.12.0/dependencies/php/classes/XMLDiff_Memory.xml
--- phpdox-0.11.2/dependencies/php/classes/XMLDiff_Memory.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/XMLDiff_Memory.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\Memory" namespace="" name="XMLDiff\Memory">
+<class xmlns="http://xml.phpdox.net/src" full="XMLDiff\Memory" namespace="XMLDiff" name="Memory">
   <extends name="XMLDiff\Base" full="XMLDiff\Base"/>
   <method name="diff" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/classes/XMLReader.xml phpdox-0.12.0/dependencies/php/classes/XMLReader.xml
--- phpdox-0.11.2/dependencies/php/classes/XMLReader.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/XMLReader.xml	2019-03-13 09:34:17.000000000 +0000
@@ -325,13 +325,13 @@
       <return type="bool"/>
     </docblock>
   </method>
-  <method name="readInnerXML" abstract="false" static="false" visibility="public" final="false">
+  <method name="readInnerXml" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Retrieve XML from current node"/>
       <return type="string"/>
     </docblock>
   </method>
-  <method name="readOuterXML" abstract="false" static="false" visibility="public" final="false">
+  <method name="readOuterXml" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Retrieve XML from current node, including itself"/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/XSLTProcessor.xml phpdox-0.12.0/dependencies/php/classes/XSLTProcessor.xml
--- phpdox-0.11.2/dependencies/php/classes/XSLTProcessor.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/XSLTProcessor.xml	2019-03-13 09:34:17.000000000 +0000
@@ -80,7 +80,7 @@
     <parameter name="doc" optional="false" byreference="false" type="object" class="DOMDocument"/>
     <parameter name="uri" optional="false" byreference="false" type="string"/>
   </method>
-  <method name="transformToXML" abstract="false" static="false" final="false">
+  <method name="transformToXml" abstract="false" static="false" final="false">
     <docblock>
       <description compact="Transform to XML"/>
       <return type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaconf.xml phpdox-0.12.0/dependencies/php/classes/Yaconf.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaconf.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaconf.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="Yaconf" namespace="" name="Yaconf">
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve a item"/>
+      <return type="mixed"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="default_value" optional="true" byreference="false" type="object" class="mixed"/>
+  </method>
+  <method name="has" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Determine if a item exists"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Action_Abstract.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Action_Abstract.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Action_Abstract.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Action_Abstract.xml	2019-03-13 09:34:17.000000000 +0000
@@ -89,7 +89,7 @@
   <method name="getViewpath" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="init" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Application.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Application.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Application.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Application.xml	2019-03-13 09:34:17.000000000 +0000
@@ -39,7 +39,7 @@
   <method name="app" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Retrieve an Application instance"/>
-      <return type="void"/>
+      <return type="mixed"/>
     </docblock>
   </method>
   <method name="bootstrap" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Config_Ini.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Config_Ini.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Config_Ini.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Config_Ini.xml	2019-03-13 09:34:17.000000000 +0000
@@ -11,39 +11,39 @@
   </constructor>
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The count purpose"/>
+      <description compact="Count all elements in Yaf_Config.ini"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="current" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The current purpose"/>
+      <description compact="Retrieve the current value"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="__get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The __get purpose"/>
+      <description compact="Retrieve a element"/>
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="true" byreference="false" type="string"/>
   </method>
   <method name="__isset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The __isset purpose"/>
+      <description compact="Determine if a key is exists"/>
       <return type="void"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
   </method>
   <method name="key" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The key purpose"/>
+      <description compact="Fetch current element's key"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="next" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The next purpose"/>
+      <description compact="Advance the internal pointer"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -98,7 +98,7 @@
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a PHP array"/>
+      <description compact="Return config as a PHP array"/>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Controller_Abstract.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Controller_Abstract.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Controller_Abstract.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Controller_Abstract.xml	2019-03-13 09:34:17.000000000 +0000
@@ -64,7 +64,7 @@
   </method>
   <method name="forward" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="foward to another action">forward current execution process to other action. this method doesn't switch to the destination action immediately, it will take place after current flow finish.</description>
+      <description compact="Foward to another action">forward current execution process to other action. this method doesn't switch to the destination action immediately, it will take place after current flow finish.</description>
       <return type="void"/>
     </docblock>
     <parameter name="action" optional="false" byreference="false" type="string"/>
@@ -110,7 +110,7 @@
   <method name="getViewpath" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The getViewpath purpose"/>
-      <return type="void"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="init" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Dispatcher.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Dispatcher.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Dispatcher.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Dispatcher.xml	2019-03-13 09:34:17.000000000 +0000
@@ -107,7 +107,7 @@
   </method>
   <method name="enableView" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="enable view rendering"/>
+      <description compact="Enable view rendering"/>
       <return type="Yaf_Dispatcher"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Loader.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Loader.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Loader.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Loader.xml	2019-03-13 09:34:17.000000000 +0000
@@ -56,7 +56,7 @@
   </method>
   <method name="getLibraryPath" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="get the library path"/>
+      <description compact="Get the library path"/>
       <return type="Yaf_Loader"/>
     </docblock>
     <parameter name="is_global" optional="true" byreference="false" type="object" class="bool"/>
@@ -81,7 +81,7 @@
   </method>
   <method name="registerLocalNamespace" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="register local class prefix">Register local class prefix name, Yaf_Loader search classes in two library directories, the one is configured via application.library.directory(in application.ini) which is called local libraray directory; the other is configured via yaf.library (in php.ini) which is callled global library directory, since it can be shared by many applications in the same server.</description>
+      <description compact="Register local class prefix">Register local class prefix name, Yaf_Loader search classes in two library directories, the one is configured via application.library.directory(in application.ini) which is called local libraray directory; the other is configured via yaf.library (in php.ini) which is callled global library directory, since it can be shared by many applications in the same server.</description>
       <return type="void"/>
     </docblock>
     <parameter name="prefix" optional="false" byreference="false" type="object" class="mixed"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Plugin_Abstract.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Plugin_Abstract.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Plugin_Abstract.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Plugin_Abstract.xml	2019-03-13 09:34:17.000000000 +0000
@@ -10,7 +10,7 @@
   </method>
   <method name="dispatchLoopStartup" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The dispatchLoopStartup purpose"/>
+      <description compact="Hook before dispatch loop"/>
       <return type="void"/>
     </docblock>
     <parameter name="request" optional="false" byreference="false" type="object" class="Yaf_Request_Abstract"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Request_Abstract.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Request_Abstract.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Request_Abstract.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Request_Abstract.xml	2019-03-13 09:34:17.000000000 +0000
@@ -110,14 +110,14 @@
   </method>
   <method name="getLanguage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The getLanguage purpose"/>
+      <description compact="Retrieve client's prefered language"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="getMethod" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The getMethod purpose"/>
-      <return type="void"/>
+      <description compact="Retrieve the request method"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getModuleName" abstract="false" static="false" visibility="public" final="false">
@@ -128,16 +128,16 @@
   </method>
   <method name="getParam" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The getParam purpose"/>
-      <return type="void"/>
+      <description compact="Retrieve calling parameter"/>
+      <return type="mixed"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="default" optional="true" byreference="false" type="string"/>
   </method>
   <method name="getParams" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The getParams purpose"/>
-      <return type="void"/>
+      <description compact="Retrieve all calling parameters"/>
+      <return type="array"/>
     </docblock>
   </method>
   <method name="getRequestUri" abstract="false" static="false" visibility="public" final="false">
@@ -156,56 +156,56 @@
   </method>
   <method name="isCli" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isCli purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is CLI request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isDispatched" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isDispatched purpose"/>
-      <return type="void"/>
+      <description compact="Determin if the request is dispatched"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isGet purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is GET request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isHead" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isHead purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is HEAD request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isOptions" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isOptions purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is OPTIONS request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isPost" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isPost purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is POST request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isPut" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isPut purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is PUT request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isRouted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isRouted purpose"/>
-      <return type="void"/>
+      <description compact="Determin if request has been routed"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isXmlHttpRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isXmlHttpRequest purpose"/>
-      <return type="void"/>
+      <description compact="Determine if request is AJAX request"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="setActionName" abstract="false" static="false" visibility="public" final="false">
@@ -217,7 +217,7 @@
   </method>
   <method name="setBaseUri" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="set base URI">Set base URI, base URI is used when doing routing, in routing phase request URI is used to route a request, while base URI is used to skip the leadding part(base URI) of request URI. That is, if comes a request with request URI a/b/c, then if you set base URI to "a/b", only "/c" will be used in routing phase. generally, you don't need to set this, Yaf will determine it automatically.</description>
+      <description compact="Set base URI">Set base URI, base URI is used when doing routing, in routing phase request URI is used to route a request, while base URI is used to skip the leadding part(base URI) of request URI. That is, if comes a request with request URI a/b/c, then if you set base URI to "a/b", only "/c" will be used in routing phase. generally, you don't need to set this, Yaf will determine it automatically.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="uir" optional="false" byreference="false" type="string"/>
@@ -244,8 +244,8 @@
   </method>
   <method name="setParam" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The setParam purpose"/>
-      <return type="void"/>
+      <description compact="Set a calling parameter to a request"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="value" optional="true" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Request_Http.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Request_Http.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Request_Http.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Request_Http.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <extends name="Yaf_Request_Abstract" full="Yaf_Request_Abstract"/>
   <method name="__clone" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="The __clone purpose"/>
+      <description compact="Yaf_Request_Http can not be cloned"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -53,6 +53,12 @@
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="default" optional="true" byreference="false" type="string"/>
   </method>
+  <method name="getRaw" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Retrieve Raw request body"/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
   <method name="getRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="The getRequest purpose"/>
@@ -61,7 +67,7 @@
   </method>
   <method name="isXmlHttpRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Whether a Ajax Request">Check the request whether it is a Ajax Request. This method depends on the request header: HTTP_X_REQUESTED_WITH, some Javascript library doesn't set this header while doing Ajax request</description>
+      <description compact="Determin if request is Ajax Request">Check the request whether it is a Ajax Request. This method depends on the request header: HTTP_X_REQUESTED_WITH, some Javascript library doesn't set this header while doing Ajax request</description>
       <return type="bool"/>
     </docblock>
   </method>
@@ -106,7 +112,7 @@
   <method name="getMethod" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getModuleName" abstract="false" static="false" visibility="public" final="false">
@@ -118,7 +124,7 @@
   <method name="getParam" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="mixed"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="default" optional="true" byreference="false" type="string"/>
@@ -126,7 +132,7 @@
   <method name="getParams" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="array"/>
     </docblock>
   </method>
   <method name="getRequestUri" abstract="false" static="false" visibility="public" final="false">
@@ -146,55 +152,55 @@
   <method name="isCli" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isDispatched" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isHead" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isOptions" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isPost" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isPut" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isRouted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isXmlHttpRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="setActionName" abstract="false" static="false" visibility="public" final="false">
@@ -234,7 +240,7 @@
   <method name="setParam" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="value" optional="true" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Request_Simple.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Request_Simple.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Request_Simple.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Request_Simple.xml	2019-03-13 09:34:17.000000000 +0000
@@ -66,7 +66,7 @@
   </method>
   <method name="isXmlHttpRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The isXmlHttpRequest purpose"/>
+      <description compact="Determin if request is AJAX request"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -111,7 +111,7 @@
   <method name="getMethod" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getModuleName" abstract="false" static="false" visibility="public" final="false">
@@ -123,7 +123,7 @@
   <method name="getParam" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="mixed"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="default" optional="true" byreference="false" type="string"/>
@@ -131,7 +131,7 @@
   <method name="getParams" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="array"/>
     </docblock>
   </method>
   <method name="getRequestUri" abstract="false" static="false" visibility="public" final="false">
@@ -151,55 +151,55 @@
   <method name="isCli" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isDispatched" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isGet" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isHead" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isOptions" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isPost" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isPut" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isRouted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="isXmlHttpRequest" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="setActionName" abstract="false" static="false" visibility="public" final="false">
@@ -239,7 +239,7 @@
   <method name="setParam" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="void"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
     <parameter name="value" optional="true" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yaf_Response_Abstract.xml phpdox-0.12.0/dependencies/php/classes/Yaf_Response_Abstract.xml
--- phpdox-0.11.2/dependencies/php/classes/Yaf_Response_Abstract.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yaf_Response_Abstract.xml	2019-03-13 09:34:17.000000000 +0000
@@ -25,7 +25,7 @@
   </member>
   <method name="appendBody" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="append to body"/>
+      <description compact="Append to response body"/>
       <return type="bool"/>
     </docblock>
     <parameter name="content" optional="false" byreference="false" type="string"/>
@@ -33,14 +33,14 @@
   </method>
   <method name="clearBody" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The clearBody purpose"/>
+      <description compact="Discard all exists response body"/>
       <return type="bool"/>
     </docblock>
     <parameter name="key" optional="true" byreference="false" type="string"/>
   </method>
   <method name="clearHeaders" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The clearHeaders purpose"/>
+      <description compact="Discard all set headers"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -85,7 +85,7 @@
   </method>
   <method name="response" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="send response"/>
+      <description compact="Send response"/>
       <return type="void"/>
     </docblock>
   </method>
@@ -105,9 +105,12 @@
   </method>
   <method name="setHeader" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The setHeader purpose"/>
-      <return type="void"/>
+      <description compact="Set reponse header"/>
+      <return type="bool"/>
     </docblock>
+    <parameter name="name" optional="false" byreference="false" type="string"/>
+    <parameter name="value" optional="false" byreference="false" type="string"/>
+    <parameter name="replace" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setRedirect" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -117,8 +120,8 @@
   </method>
   <method name="__toString" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="The __toString purpose"/>
-      <return type="void"/>
+      <description compact="Retrieve all bodys as string"/>
+      <return type="string"/>
     </docblock>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yar_Client_Exception.xml phpdox-0.12.0/dependencies/php/classes/Yar_Client_Exception.xml
--- phpdox-0.11.2/dependencies/php/classes/Yar_Client_Exception.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yar_Client_Exception.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,8 +3,8 @@
   <extends name="Exception" full="Exception"/>
   <method name="getType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The getType purpose"/>
-      <return type="void"/>
+      <description compact="Retrieve exception's type"/>
+      <return type="string"/>
     </docblock>
   </method>
   <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yar_Client.xml phpdox-0.12.0/dependencies/php/classes/Yar_Client.xml
--- phpdox-0.11.2/dependencies/php/classes/Yar_Client.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yar_Client.xml	2019-03-13 09:34:17.000000000 +0000
@@ -38,13 +38,14 @@
       <return type="void"/>
     </docblock>
     <parameter name="url" optional="false" byreference="false" type="string"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </constructor>
   <method name="setOpt" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set calling contexts"/>
-      <return type="boolean"/>
+      <return type="Yar_Client"/>
     </docblock>
-    <parameter name="name" optional="false" byreference="false" type="object" class="number"/>
+    <parameter name="name" optional="false" byreference="false" type="int"/>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yar_Concurrent_Client.xml phpdox-0.12.0/dependencies/php/classes/Yar_Concurrent_Client.xml
--- phpdox-0.11.2/dependencies/php/classes/Yar_Concurrent_Client.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yar_Concurrent_Client.xml	2019-03-13 09:34:17.000000000 +0000
@@ -25,13 +25,15 @@
     </docblock>
     <parameter name="uri" optional="false" byreference="false" type="string"/>
     <parameter name="method" optional="false" byreference="false" type="string"/>
-    <parameter name="parameters" optional="false" byreference="false" type="object" class="array"/>
+    <parameter name="parameters" optional="true" byreference="false" type="object" class="array"/>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
+    <parameter name="error_callback" optional="true" byreference="false" type="object" class="callable"/>
+    <parameter name="options" optional="true" byreference="false" type="object" class="array"/>
   </method>
   <method name="loop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Send all calls"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
     <parameter name="error_callback" optional="true" byreference="false" type="object" class="callable"/>
@@ -39,7 +41,7 @@
   <method name="reset" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Clean all registered calls"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yar_Server_Exception.xml phpdox-0.12.0/dependencies/php/classes/Yar_Server_Exception.xml
--- phpdox-0.11.2/dependencies/php/classes/Yar_Server_Exception.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yar_Server_Exception.xml	2019-03-13 09:34:17.000000000 +0000
@@ -9,7 +9,7 @@
   </member>
   <method name="getType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="The getType purpose"/>
+      <description compact="Retrieve exception's type"/>
       <return type="string"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/Yar_Server.xml phpdox-0.12.0/dependencies/php/classes/Yar_Server.xml
--- phpdox-0.11.2/dependencies/php/classes/Yar_Server.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Yar_Server.xml	2019-03-13 09:34:17.000000000 +0000
@@ -16,7 +16,7 @@
   <method name="handle" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Start RPC Server">Start a RPC HTTP server, and ready for accpet RPC requests. Usual RPC calls will be issued as HTTP POST requests. If a HTTP GET request is issued to the uri, the service information (commented section above) will be printed on the page</description>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZipArchive.xml phpdox-0.12.0/dependencies/php/classes/ZipArchive.xml
--- phpdox-0.11.2/dependencies/php/classes/ZipArchive.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZipArchive.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <class xmlns="http://xml.phpdox.net/src" full="ZipArchive" namespace="" name="ZipArchive">
+  <implements name="Countable" full="Countable"/>
   <member name="status" static="false">
     <default>null</default>
     <docblock>
@@ -84,16 +85,22 @@
       <return type="bool"/>
     </docblock>
   </method>
+  <method name="count" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Counts the number of files in the achive"/>
+      <return type="int"/>
+    </docblock>
+  </method>
   <method name="deleteIndex" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="delete an entry in the archive using its index"/>
+      <description compact="Delete an entry in the archive using its index"/>
       <return type="bool"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="deleteName" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="delete an entry in the archive using its name"/>
+      <description compact="Delete an entry in the archive using its name"/>
       <return type="bool"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
@@ -183,7 +190,7 @@
   </method>
   <method name="getStream" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Get a file handler to the entry defined by its name (read only)."/>
+      <description compact="Get a file handler to the entry defined by its name (read only)"/>
       <return type="resource"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
@@ -308,7 +315,7 @@
   </method>
   <method name="statIndex" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Get the details of an entry defined by its index."/>
+      <description compact="Get the details of an entry defined by its index"/>
       <return type="array"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -316,7 +323,7 @@
   </method>
   <method name="statName" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Get the details of an entry defined by its name."/>
+      <description compact="Get the details of an entry defined by its name"/>
       <return type="array"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
@@ -330,7 +337,7 @@
   </method>
   <method name="unchangeArchive" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Revert all global changes done in the archive."/>
+      <description compact="Revert all global changes done in the archive"/>
       <return type="bool"/>
     </docblock>
   </method>
@@ -343,7 +350,7 @@
   </method>
   <method name="unchangeName" abstract="false" static="false" final="false">
     <docblock>
-      <description compact="Revert all changes done to an entry with the given name."/>
+      <description compact="Revert all changes done to an entry with the given name"/>
       <return type="bool"/>
     </docblock>
     <parameter name="name" optional="false" byreference="false" type="string"/>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZMQContext.xml phpdox-0.12.0/dependencies/php/classes/ZMQContext.xml
--- phpdox-0.11.2/dependencies/php/classes/ZMQContext.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZMQContext.xml	2019-03-13 09:34:17.000000000 +0000
@@ -5,8 +5,8 @@
       <description compact="Construct a new ZMQContext object"/>
       <return type="void"/>
     </docblock>
-    <parameter name="io_threads" optional="true" byreference="false" type="object" class="integer"/>
-    <parameter name="is_persistent" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="io_threads" optional="true" byreference="false" type="int"/>
+    <parameter name="is_persistent" optional="true" byreference="false" type="object" class="bool"/>
   </constructor>
   <method name="getOpt" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -20,14 +20,14 @@
       <description compact="Create a new socket"/>
       <return type="ZMQSocket"/>
     </docblock>
-    <parameter name="type" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="false" byreference="false" type="int"/>
     <parameter name="persistent_id" optional="true" byreference="false" type="string"/>
     <parameter name="on_new_socket" optional="true" byreference="false" type="object" class="callback"/>
   </method>
   <method name="isPersistent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Whether the context is persistent"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="setOpt" abstract="false" static="false" visibility="public" final="false">
@@ -35,7 +35,7 @@
       <description compact="Set a socket option"/>
       <return type="ZMQContext"/>
     </docblock>
-    <parameter name="key" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="key" optional="false" byreference="false" type="int"/>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZMQDevice.xml phpdox-0.12.0/dependencies/php/classes/ZMQDevice.xml
--- phpdox-0.11.2/dependencies/php/classes/ZMQDevice.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZMQDevice.xml	2019-03-13 09:34:17.000000000 +0000
@@ -33,7 +33,7 @@
       <return type="ZMQDevice"/>
     </docblock>
     <parameter name="cb_func" optional="false" byreference="false" type="object" class="callable"/>
-    <parameter name="timeout" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="false" byreference="false" type="int"/>
     <parameter name="user_data" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="setIdleTimeout" abstract="false" static="false" visibility="public" final="false">
@@ -41,7 +41,7 @@
       <description compact="Set the idle timeout"/>
       <return type="ZMQDevice"/>
     </docblock>
-    <parameter name="timeout" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setTimerCallback" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -49,7 +49,7 @@
       <return type="ZMQDevice"/>
     </docblock>
     <parameter name="cb_func" optional="false" byreference="false" type="object" class="callable"/>
-    <parameter name="timeout" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="false" byreference="false" type="int"/>
     <parameter name="user_data" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="setTimerTimeout" abstract="false" static="false" visibility="public" final="false">
@@ -57,6 +57,6 @@
       <description compact="Set the timer timeout"/>
       <return type="ZMQDevice"/>
     </docblock>
-    <parameter name="timeout" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="false" byreference="false" type="int"/>
   </method>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZMQPoll.xml phpdox-0.12.0/dependencies/php/classes/ZMQPoll.xml
--- phpdox-0.11.2/dependencies/php/classes/ZMQPoll.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZMQPoll.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,7 +6,7 @@
       <return type="string"/>
     </docblock>
     <parameter name="entry" optional="false" byreference="false" type="object" class="mixed"/>
-    <parameter name="type" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="type" optional="false" byreference="false" type="int"/>
   </method>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -17,7 +17,7 @@
   <method name="count" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Count items in the poll set"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getLastErrors" abstract="false" static="false" visibility="public" final="false">
@@ -29,16 +29,16 @@
   <method name="poll" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Poll the items"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
     <parameter name="readable" optional="false" byreference="false" type="object" class="array"/>
     <parameter name="writable" optional="false" byreference="false" type="object" class="array"/>
-    <parameter name="timeout" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="timeout" optional="true" byreference="false" type="int"/>
   </method>
   <method name="remove" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Remove item from poll set"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="item" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZMQSocket.xml phpdox-0.12.0/dependencies/php/classes/ZMQSocket.xml
--- phpdox-0.11.2/dependencies/php/classes/ZMQSocket.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZMQSocket.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,7 +6,7 @@
       <return type="ZMQSocket"/>
     </docblock>
     <parameter name="dsn" optional="false" byreference="false" type="string"/>
-    <parameter name="force" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="force" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <method name="connect" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -14,7 +14,7 @@
       <return type="ZMQSocket"/>
     </docblock>
     <parameter name="dsn" optional="false" byreference="false" type="string"/>
-    <parameter name="force" optional="true" byreference="false" type="object" class="boolean"/>
+    <parameter name="force" optional="true" byreference="false" type="object" class="bool"/>
   </method>
   <constructor name="__construct" abstract="false" static="false" final="false">
     <docblock>
@@ -48,7 +48,7 @@
   <method name="getSocketType" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Get the socket type"/>
-      <return type="integer"/>
+      <return type="int"/>
     </docblock>
   </method>
   <method name="getSockOpt" abstract="false" static="false" visibility="public" final="false">
@@ -61,7 +61,7 @@
   <method name="isPersistent" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Whether the socket is persistent"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
   <method name="recv" abstract="false" static="false" visibility="public" final="false">
@@ -69,14 +69,14 @@
       <description compact="Receives a message"/>
       <return type="string"/>
     </docblock>
-    <parameter name="mode" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
   </method>
   <method name="recvMulti" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Receives a multipart message"/>
-      <return type="string"/>
+      <return type="array"/>
     </docblock>
-    <parameter name="mode" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
   </method>
   <method name="send" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -84,7 +84,7 @@
       <return type="ZMQSocket"/>
     </docblock>
     <parameter name="message" optional="false" byreference="false" type="string"/>
-    <parameter name="mode" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
   </method>
   <method name="send" abstract="false" static="false" visibility="public" final="false">
     <docblock>
@@ -92,14 +92,14 @@
       <return type="ZMQSocket"/>
     </docblock>
     <parameter name="message" optional="false" byreference="false" type="object" class="array"/>
-    <parameter name="mode" optional="true" byreference="false" type="object" class="integer"/>
+    <parameter name="mode" optional="true" byreference="false" type="int"/>
   </method>
   <method name="setSockOpt" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Set a socket option"/>
       <return type="ZMQSocket"/>
     </docblock>
-    <parameter name="key" optional="false" byreference="false" type="object" class="integer"/>
+    <parameter name="key" optional="false" byreference="false" type="int"/>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="unbind" abstract="false" static="false" visibility="public" final="false">
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperAuthenticationException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperAuthenticationException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperAuthenticationException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperAuthenticationException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperAuthenticationException" namespace="" name="ZookeeperAuthenticationException">
+  <extends name="ZookeeperException" full="ZookeeperException"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperConfig.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperConfig.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperConfig.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperConfig.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperConfig" namespace="" name="ZookeeperConfig">
+  <method name="add" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Add servers to the ensemble"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="members" optional="false" byreference="false" type="string"/>
+    <parameter name="version" optional="true" byreference="false" type="int"/>
+    <parameter name="stat" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="get" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Gets the last committed configuration of the ZooKeeper cluster as it is known to the server to which the client is connected, synchronously"/>
+      <return type="string"/>
+    </docblock>
+    <parameter name="watcher_cb" optional="true" byreference="false" type="object" class="callable"/>
+    <parameter name="stat" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="remove" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Remove servers from the ensemble"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="id_list" optional="false" byreference="false" type="string"/>
+    <parameter name="version" optional="true" byreference="false" type="int"/>
+    <parameter name="stat" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+  <method name="set" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Change ZK cluster ensemble membership and roles of ensemble peers"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="members" optional="false" byreference="false" type="string"/>
+    <parameter name="version" optional="true" byreference="false" type="int"/>
+    <parameter name="stat" optional="true" byreference="false" type="object" class="array"/>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperConnectionException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperConnectionException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperConnectionException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperConnectionException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperConnectionException" namespace="" name="ZookeeperConnectionException">
+  <extends name="ZookeeperException" full="ZookeeperException"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperException" namespace="" name="ZookeeperException">
+  <extends name="Exception" full="Exception"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperMarshallingException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperMarshallingException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperMarshallingException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperMarshallingException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperMarshallingException" namespace="" name="ZookeeperMarshallingException">
+  <extends name="ZookeeperException" full="ZookeeperException"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperNoNodeException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperNoNodeException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperNoNodeException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperNoNodeException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperNoNodeException" namespace="" name="ZookeeperNoNodeException">
+  <extends name="ZookeeperException" full="ZookeeperException"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperOperationTimeoutException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperOperationTimeoutException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperOperationTimeoutException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperOperationTimeoutException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperOperationTimeoutException" namespace="" name="ZookeeperOperationTimeoutException">
+  <extends name="ZookeeperException" full="ZookeeperException"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/ZookeeperSessionException.xml phpdox-0.12.0/dependencies/php/classes/ZookeeperSessionException.xml
--- phpdox-0.11.2/dependencies/php/classes/ZookeeperSessionException.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/ZookeeperSessionException.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<class xmlns="http://xml.phpdox.net/src" full="ZookeeperSessionException" namespace="" name="ZookeeperSessionException">
+  <extends name="ZookeeperException" full="ZookeeperException"/>
+  <member name="message" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception message"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="code" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The exception code"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <member name="file" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The filename where the exception was created"/>
+      <var type="string"/>
+    </docblock>
+  </member>
+  <member name="line" static="false" visibility="protected">
+    <default>null</default>
+    <docblock>
+      <description compact="The line where the exception was created"/>
+      <var type="int"/>
+    </docblock>
+  </member>
+  <method name="getMessage" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPrevious" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="Throwable"/>
+    </docblock>
+  </method>
+  <method name="getCode" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="mixed"/>
+    </docblock>
+  </method>
+  <method name="getFile" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getLine" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTrace" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getTraceAsString" abstract="false" static="false" visibility="public" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__clone" abstract="false" static="false" final="true">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/classes/Zookeeper.xml phpdox-0.12.0/dependencies/php/classes/Zookeeper.xml
--- phpdox-0.11.2/dependencies/php/classes/Zookeeper.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/classes/Zookeeper.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,7 +2,7 @@
 <class xmlns="http://xml.phpdox.net/src" full="Zookeeper" namespace="" name="Zookeeper">
   <constructor name="__construct" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Create a handle to used communicate with zookeeper."/>
+      <description compact="Create a handle to used communicate with zookeeper"/>
       <return type="void"/>
     </docblock>
     <parameter name="host" optional="true" byreference="false" type="string"/>
@@ -11,16 +11,22 @@
   </constructor>
   <method name="addAuth" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Specify application credentials."/>
+      <description compact="Specify application credentials"/>
       <return type="bool"/>
     </docblock>
     <parameter name="scheme" optional="false" byreference="false" type="string"/>
     <parameter name="cert" optional="false" byreference="false" type="string"/>
     <parameter name="completion_cb" optional="true" byreference="false" type="object" class="callable"/>
   </method>
+  <method name="close" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Close the zookeeper handle and free up any resources"/>
+      <return type="void"/>
+    </docblock>
+  </method>
   <method name="connect" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Create a handle to used communicate with zookeeper."/>
+      <description compact="Create a handle to used communicate with zookeeper"/>
       <return type="void"/>
     </docblock>
     <parameter name="host" optional="false" byreference="false" type="string"/>
@@ -29,7 +35,7 @@
   </method>
   <method name="create" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Create a node synchronously."/>
+      <description compact="Create a node synchronously"/>
       <return type="string"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
@@ -39,7 +45,7 @@
   </method>
   <method name="delete" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Delete a node in zookeeper synchronously."/>
+      <description compact="Delete a node in zookeeper synchronously"/>
       <return type="bool"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
@@ -47,7 +53,7 @@
   </method>
   <method name="exists" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks the existence of a node in zookeeper synchronously."/>
+      <description compact="Checks the existence of a node in zookeeper synchronously"/>
       <return type="bool"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
@@ -55,7 +61,7 @@
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the data associated with a node synchronously."/>
+      <description compact="Gets the data associated with a node synchronously"/>
       <return type="string"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
@@ -65,38 +71,52 @@
   </method>
   <method name="getAcl" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Gets the acl associated with a node synchronously."/>
+      <description compact="Gets the acl associated with a node synchronously"/>
       <return type="array"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
   </method>
+  <method name="getChildren" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Lists the children of a node synchronously"/>
+      <return type="array"/>
+    </docblock>
+    <parameter name="path" optional="false" byreference="false" type="string"/>
+    <parameter name="watcher_cb" optional="true" byreference="false" type="object" class="callable"/>
+  </method>
   <method name="getClientId" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="return the client session id, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE)"/>
+      <description compact="Return the client session id, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE)"/>
       <return type="int"/>
     </docblock>
   </method>
+  <method name="getConfig" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Get instance of ZookeeperConfig"/>
+      <return type="ZookeeperConfig"/>
+    </docblock>
+  </method>
   <method name="getRecvTimeout" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Return the timeout for this session, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE). This value may change after a server re-connect."/>
+      <description compact="Return the timeout for this session, only valid if the connections is currently connected (ie. last watcher state is ZOO_CONNECTED_STATE). This value may change after a server re-connect"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="getState" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Get the state of the zookeeper connection."/>
+      <description compact="Get the state of the zookeeper connection"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="isRecoverable" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Checks if the current zookeeper connection state can be recovered."/>
+      <description compact="Checks if the current zookeeper connection state can be recovered"/>
       <return type="bool"/>
     </docblock>
   </method>
   <method name="set" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the data associated with a node."/>
+      <description compact="Sets the data associated with a node"/>
       <return type="bool"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
@@ -106,7 +126,7 @@
   </method>
   <method name="setAcl" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the acl associated with a node synchronously."/>
+      <description compact="Sets the acl associated with a node synchronously"/>
       <return type="bool"/>
     </docblock>
     <parameter name="path" optional="false" byreference="false" type="string"/>
@@ -115,28 +135,28 @@
   </method>
   <method name="setDebugLevel" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the debugging level for the library."/>
+      <description compact="Sets the debugging level for the library"/>
       <return type="bool"/>
     </docblock>
     <parameter name="logLevel" optional="false" byreference="false" type="int"/>
   </method>
   <method name="setDeterministicConnOrder" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Enable/disable quorum endpoint order randomization."/>
+      <description compact="Enable/disable quorum endpoint order randomization"/>
       <return type="bool"/>
     </docblock>
     <parameter name="yesOrNo" optional="false" byreference="false" type="object" class="bool"/>
   </method>
   <method name="setLogStream" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Sets the stream to be used by the library for logging."/>
+      <description compact="Sets the stream to be used by the library for logging"/>
       <return type="bool"/>
     </docblock>
     <parameter name="stream" optional="false" byreference="false" type="object" class="resource"/>
   </method>
   <method name="setWatcher" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Set a watcher function."/>
+      <description compact="Set a watcher function"/>
       <return type="bool"/>
     </docblock>
     <parameter name="watcher_cb" optional="false" byreference="false" type="object" class="callable"/>
@@ -181,6 +201,16 @@
       <var type="integer"/>
     </docblock>
   </constant>
+  <constant name="" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
   <constant name="" value="3">
     <docblock>
       <var type="integer"/>
@@ -225,5 +255,185 @@
     <docblock>
       <var type="integer"/>
     </docblock>
+  </constant>
+  <constant name="" value="1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-1">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-2">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-3">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-4">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-5">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-6">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-7">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-8">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-9">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-13">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-14">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="0">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-100">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-101">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-102">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-103">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-108">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-110">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-111">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-112">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-113">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-114">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-115">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-116">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-117">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-118">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-119">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-120">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-121">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
+  </constant>
+  <constant name="" value="-122">
+    <docblock>
+      <var type="integer"/>
+    </docblock>
   </constant>
 </class>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/index.xml phpdox-0.12.0/dependencies/php/index.xml
--- phpdox-0.11.2/dependencies/php/index.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/index.xml	2019-03-13 09:34:17.000000000 +0000
@@ -4,9 +4,11 @@
     <class name="Exception" xml="classes/Exception.xml"/>
     <class name="ErrorException" xml="classes/ErrorException.xml"/>
     <class name="Error" xml="classes/Error.xml"/>
+    <class name="ArgumentCountError" xml="classes/ArgumentCountError.xml"/>
     <class name="ArithmeticError" xml="classes/ArithmeticError.xml"/>
     <class name="AssertionError" xml="classes/AssertionError.xml"/>
     <class name="DivisionByZeroError" xml="classes/DivisionByZeroError.xml"/>
+    <class name="CompileError" xml="classes/CompileError.xml"/>
     <class name="ParseError" xml="classes/ParseError.xml"/>
     <class name="TypeError" xml="classes/TypeError.xml"/>
     <class name="Closure" xml="classes/Closure.xml"/>
@@ -29,6 +31,7 @@
     <class name="RarEntry" xml="classes/RarEntry.xml"/>
     <class name="RarException" xml="classes/RarException.xml"/>
     <class name="ZipArchive" xml="classes/ZipArchive.xml"/>
+    <class name="HashContext" xml="classes/HashContext.xml"/>
     <class name="PDO" xml="classes/PDO.xml"/>
     <class name="PDOStatement" xml="classes/PDOStatement.xml"/>
     <class name="PDOException" xml="classes/PDOException.xml"/>
@@ -68,40 +71,6 @@
     <class name="MongoProtocolException" xml="classes/MongoProtocolException.xml"/>
     <class name="MongoExecutionTimeoutException" xml="classes/MongoExecutionTimeoutException.xml"/>
     <class name="MongoWriteConcernException" xml="classes/MongoWriteConcernException.xml"/>
-    <class name="MongoDB\Driver\Manager" xml="classes/MongoDB_Driver_Manager.xml"/>
-    <class name="MongoDB\Driver\Command" xml="classes/MongoDB_Driver_Command.xml"/>
-    <class name="MongoDB\Driver\Query" xml="classes/MongoDB_Driver_Query.xml"/>
-    <class name="MongoDB\Driver\BulkWrite" xml="classes/MongoDB_Driver_BulkWrite.xml"/>
-    <class name="MongoDB\Driver\WriteConcern" xml="classes/MongoDB_Driver_WriteConcern.xml"/>
-    <class name="MongoDB\Driver\ReadPreference" xml="classes/MongoDB_Driver_ReadPreference.xml"/>
-    <class name="MongoDB\Driver\ReadConcern" xml="classes/MongoDB_Driver_ReadConcern.xml"/>
-    <class name="MongoDB\Driver\Cursor" xml="classes/MongoDB_Driver_Cursor.xml"/>
-    <class name="MongoDB\Driver\CursorId" xml="classes/MongoDB_Driver_CursorId.xml"/>
-    <class name="MongoDB\Driver\Server" xml="classes/MongoDB_Driver_Server.xml"/>
-    <class name="MongoDB\Driver\WriteConcernError" xml="classes/MongoDB_Driver_WriteConcernError.xml"/>
-    <class name="MongoDB\Driver\WriteError" xml="classes/MongoDB_Driver_WriteError.xml"/>
-    <class name="MongoDB\Driver\WriteResult" xml="classes/MongoDB_Driver_WriteResult.xml"/>
-    <class name="MongoDB\BSON\Binary" xml="classes/MongoDB_BSON_Binary.xml"/>
-    <class name="MongoDB\BSON\Decimal128" xml="classes/MongoDB_BSON_Decimal128.xml"/>
-    <class name="MongoDB\BSON\Javascript" xml="classes/MongoDB_BSON_Javascript.xml"/>
-    <class name="MongoDB\BSON\MaxKey" xml="classes/MongoDB_BSON_MaxKey.xml"/>
-    <class name="MongoDB\BSON\MinKey" xml="classes/MongoDB_BSON_MinKey.xml"/>
-    <class name="MongoDB\BSON\ObjectID" xml="classes/MongoDB_BSON_ObjectID.xml"/>
-    <class name="MongoDB\BSON\Regex" xml="classes/MongoDB_BSON_Regex.xml"/>
-    <class name="MongoDB\BSON\Timestamp" xml="classes/MongoDB_BSON_Timestamp.xml"/>
-    <class name="MongoDB\BSON\UTCDateTime" xml="classes/MongoDB_BSON_UTCDateTime.xml"/>
-    <class name="MongoDB\BSON\Persistable" xml="classes/MongoDB_BSON_Persistable.xml"/>
-    <class name="MongoDB\Driver\Exception\AuthenticationException" xml="classes/MongoDB_Driver_Exception_AuthenticationException.xml"/>
-    <class name="MongoDB\Driver\Exception\BulkWriteException" xml="classes/MongoDB_Driver_Exception_BulkWriteException.xml"/>
-    <class name="MongoDB\Driver\Exception\ConnectionException" xml="classes/MongoDB_Driver_Exception_ConnectionException.xml"/>
-    <class name="MongoDB\Driver\Exception\ConnectionTimeoutException" xml="classes/MongoDB_Driver_Exception_ConnectionTimeoutException.xml"/>
-    <class name="MongoDB\Driver\Exception\ExecutionTimeoutException" xml="classes/MongoDB_Driver_Exception_ExecutionTimeoutException.xml"/>
-    <class name="MongoDB\Driver\Exception\InvalidArgumentException" xml="classes/MongoDB_Driver_Exception_InvalidArgumentException.xml"/>
-    <class name="MongoDB\Driver\Exception\LogicException" xml="classes/MongoDB_Driver_Exception_LogicException.xml"/>
-    <class name="MongoDB\Driver\Exception\RuntimeException" xml="classes/MongoDB_Driver_Exception_RuntimeException.xml"/>
-    <class name="MongoDB\Driver\Exception\SSLConnectionException" xml="classes/MongoDB_Driver_Exception_SSLConnectionException.xml"/>
-    <class name="MongoDB\Driver\Exception\UnexpectedValueException" xml="classes/MongoDB_Driver_Exception_UnexpectedValueException.xml"/>
-    <class name="MongoDB\Driver\Exception\WriteException" xml="classes/MongoDB_Driver_Exception_WriteException.xml"/>
     <class name="mysqli" xml="classes/mysqli.xml"/>
     <class name="mysqli_stmt" xml="classes/mysqli_stmt.xml"/>
     <class name="mysqli_result" xml="classes/mysqli_result.xml"/>
@@ -125,18 +94,16 @@
     <class name="DateTimeZone" xml="classes/DateTimeZone.xml"/>
     <class name="DateInterval" xml="classes/DateInterval.xml"/>
     <class name="DatePeriod" xml="classes/DatePeriod.xml"/>
-    <class name="HRTime\PerformanceCounter" xml="classes/HRTime_PerformanceCounter.xml"/>
-    <class name="HRTime\StopWatch" xml="classes/HRTime_StopWatch.xml"/>
-    <class name="HRTime\Unit" xml="classes/HRTime_Unit.xml"/>
     <class name="Directory" xml="classes/Directory.xml"/>
     <class name="finfo" xml="classes/finfo.xml"/>
-    <class name="Gender\Gender" xml="classes/Gender_Gender.xml"/>
+    <class name="phdfs" xml="classes/phdfs.xml"/>
     <class name="Collator" xml="classes/Collator.xml"/>
     <class name="NumberFormatter" xml="classes/NumberFormatter.xml"/>
     <class name="Locale" xml="classes/Locale.xml"/>
     <class name="Normalizer" xml="classes/Normalizer.xml"/>
     <class name="MessageFormatter" xml="classes/MessageFormatter.xml"/>
     <class name="IntlCalendar" xml="classes/IntlCalendar.xml"/>
+    <class name="IntlGregorianCalendar" xml="classes/IntlGregorianCalendar.xml"/>
     <class name="IntlTimeZone" xml="classes/IntlTimeZone.xml"/>
     <class name="IntlDateFormatter" xml="classes/IntlDateFormatter.xml"/>
     <class name="ResourceBundle" xml="classes/ResourceBundle.xml"/>
@@ -248,15 +215,18 @@
     <class name="Pool" xml="classes/Pool.xml"/>
     <class name="Mutex" xml="classes/Mutex.xml"/>
     <class name="Cond" xml="classes/Cond.xml"/>
+    <class name="Volatile" xml="classes/Volatile.xml"/>
     <class name="SyncMutex" xml="classes/SyncMutex.xml"/>
     <class name="SyncSemaphore" xml="classes/SyncSemaphore.xml"/>
     <class name="SyncEvent" xml="classes/SyncEvent.xml"/>
     <class name="SyncReaderWriter" xml="classes/SyncReaderWriter.xml"/>
     <class name="SyncSharedMemory" xml="classes/SyncSharedMemory.xml"/>
     <class name="FANNConnection" xml="classes/FANNConnection.xml"/>
+    <class name="JsonException" xml="classes/JsonException.xml"/>
     <class name="Judy" xml="classes/Judy.xml"/>
     <class name="Lua" xml="classes/Lua.xml"/>
     <class name="LuaClosure" xml="classes/LuaClosure.xml"/>
+    <class name="SeasLog" xml="classes/SeasLog.xml"/>
     <class name="SplDoublyLinkedList" xml="classes/SplDoublyLinkedList.xml"/>
     <class name="SplStack" xml="classes/SplStack.xml"/>
     <class name="SplQueue" xml="classes/SplQueue.xml"/>
@@ -352,6 +322,7 @@
     <class name="Yaf_Exception_LoadFailed_Controller" xml="classes/Yaf_Exception_LoadFailed_Controller.xml"/>
     <class name="Yaf_Exception_LoadFailed_Action" xml="classes/Yaf_Exception_LoadFailed_Action.xml"/>
     <class name="Yaf_Exception_LoadFailed_View" xml="classes/Yaf_Exception_LoadFailed_View.xml"/>
+    <class name="Yaconf" xml="classes/Yaconf.xml"/>
     <class name="chdb" xml="classes/chdb.xml"/>
     <class name="CURLFile" xml="classes/CURLFile.xml"/>
     <class name="Event" xml="classes/Event.xml"/>
@@ -393,6 +364,14 @@
     <class name="ZMQPoll" xml="classes/ZMQPoll.xml"/>
     <class name="ZMQDevice" xml="classes/ZMQDevice.xml"/>
     <class name="Zookeeper" xml="classes/Zookeeper.xml"/>
+    <class name="ZookeeperConfig" xml="classes/ZookeeperConfig.xml"/>
+    <class name="ZookeeperException" xml="classes/ZookeeperException.xml"/>
+    <class name="ZookeeperAuthenticationException" xml="classes/ZookeeperAuthenticationException.xml"/>
+    <class name="ZookeeperConnectionException" xml="classes/ZookeeperConnectionException.xml"/>
+    <class name="ZookeeperMarshallingException" xml="classes/ZookeeperMarshallingException.xml"/>
+    <class name="ZookeeperNoNodeException" xml="classes/ZookeeperNoNodeException.xml"/>
+    <class name="ZookeeperOperationTimeoutException" xml="classes/ZookeeperOperationTimeoutException.xml"/>
+    <class name="ZookeeperSessionException" xml="classes/ZookeeperSessionException.xml"/>
     <class name="SolrUtils" xml="classes/SolrUtils.xml"/>
     <class name="SolrInputDocument" xml="classes/SolrInputDocument.xml"/>
     <class name="SolrDocument" xml="classes/SolrDocument.xml"/>
@@ -417,25 +396,19 @@
     <class name="SolrMissingMandatoryParameterException" xml="classes/SolrMissingMandatoryParameterException.xml"/>
     <class name="SphinxClient" xml="classes/SphinxClient.xml"/>
     <class name="SessionHandler" xml="classes/SessionHandler.xml"/>
-    <class name="Ds\Vector" xml="classes/Ds_Vector.xml"/>
-    <class name="Ds\Deque" xml="classes/Ds_Deque.xml"/>
-    <class name="Ds\Map" xml="classes/Ds_Map.xml"/>
-    <class name="Ds\Pair" xml="classes/Ds_Pair.xml"/>
-    <class name="Ds\Set" xml="classes/Ds_Set.xml"/>
-    <class name="Ds\Stack" xml="classes/Ds_Stack.xml"/>
-    <class name="Ds\Queue" xml="classes/Ds_Queue.xml"/>
-    <class name="Ds\PriorityQueue" xml="classes/Ds_PriorityQueue.xml"/>
     <class name="QuickHashIntSet" xml="classes/QuickHashIntSet.xml"/>
     <class name="QuickHashIntHash" xml="classes/QuickHashIntHash.xml"/>
     <class name="QuickHashStringIntHash" xml="classes/QuickHashStringIntHash.xml"/>
     <class name="QuickHashIntStringHash" xml="classes/QuickHashIntStringHash.xml"/>
     <class name="Reflection" xml="classes/Reflection.xml"/>
     <class name="ReflectionClass" xml="classes/ReflectionClass.xml"/>
+    <class name="ReflectionClassConstant" xml="classes/ReflectionClassConstant.xml"/>
     <class name="ReflectionZendExtension" xml="classes/ReflectionZendExtension.xml"/>
     <class name="ReflectionExtension" xml="classes/ReflectionExtension.xml"/>
     <class name="ReflectionFunction" xml="classes/ReflectionFunction.xml"/>
     <class name="ReflectionFunctionAbstract" xml="classes/ReflectionFunctionAbstract.xml"/>
     <class name="ReflectionMethod" xml="classes/ReflectionMethod.xml"/>
+    <class name="ReflectionNamedType" xml="classes/ReflectionNamedType.xml"/>
     <class name="ReflectionObject" xml="classes/ReflectionObject.xml"/>
     <class name="ReflectionParameter" xml="classes/ReflectionParameter.xml"/>
     <class name="ReflectionProperty" xml="classes/ReflectionProperty.xml"/>
@@ -478,59 +451,8 @@
     <class name="libXMLError" xml="classes/libXMLError.xml"/>
     <class name="SimpleXMLElement" xml="classes/SimpleXMLElement.xml"/>
     <class name="SimpleXMLIterator" xml="classes/SimpleXMLIterator.xml"/>
-    <class name="XMLDiff\Base" xml="classes/XMLDiff_Base.xml"/>
-    <class name="XMLDiff\DOM" xml="classes/XMLDiff_DOM.xml"/>
-    <class name="XMLDiff\Memory" xml="classes/XMLDiff_Memory.xml"/>
-    <class name="XMLDiff\File" xml="classes/XMLDiff_File.xml"/>
     <class name="XMLReader" xml="classes/XMLReader.xml"/>
     <class name="XSLTProcessor" xml="classes/XSLTProcessor.xml"/>
-    <class name="UI\Point" xml="classes/UI_Point.xml"/>
-    <class name="UI\Size" xml="classes/UI_Size.xml"/>
-    <class name="UI\Window" xml="classes/UI_Window.xml"/>
-    <class name="UI\Control" xml="classes/UI_Control.xml"/>
-    <class name="UI\Menu" xml="classes/UI_Menu.xml"/>
-    <class name="UI\MenuItem" xml="classes/UI_MenuItem.xml"/>
-    <class name="UI\Area" xml="classes/UI_Area.xml"/>
-    <class name="UI\Executor" xml="classes/UI_Executor.xml"/>
-    <class name="UI\Controls\Tab" xml="classes/UI_Controls_Tab.xml"/>
-    <class name="UI\Controls\Check" xml="classes/UI_Controls_Check.xml"/>
-    <class name="UI\Controls\Button" xml="classes/UI_Controls_Button.xml"/>
-    <class name="UI\Controls\ColorButton" xml="classes/UI_Controls_ColorButton.xml"/>
-    <class name="UI\Controls\Label" xml="classes/UI_Controls_Label.xml"/>
-    <class name="UI\Controls\Entry" xml="classes/UI_Controls_Entry.xml"/>
-    <class name="UI\Controls\MultilineEntry" xml="classes/UI_Controls_MultilineEntry.xml"/>
-    <class name="UI\Controls\Spin" xml="classes/UI_Controls_Spin.xml"/>
-    <class name="UI\Controls\Slider" xml="classes/UI_Controls_Slider.xml"/>
-    <class name="UI\Controls\Progress" xml="classes/UI_Controls_Progress.xml"/>
-    <class name="UI\Controls\Separator" xml="classes/UI_Controls_Separator.xml"/>
-    <class name="UI\Controls\Combo" xml="classes/UI_Controls_Combo.xml"/>
-    <class name="UI\Controls\EditableCombo" xml="classes/UI_Controls_EditableCombo.xml"/>
-    <class name="UI\Controls\Radio" xml="classes/UI_Controls_Radio.xml"/>
-    <class name="UI\Controls\Picker" xml="classes/UI_Controls_Picker.xml"/>
-    <class name="UI\Controls\Form" xml="classes/UI_Controls_Form.xml"/>
-    <class name="UI\Controls\Grid" xml="classes/UI_Controls_Grid.xml"/>
-    <class name="UI\Controls\Group" xml="classes/UI_Controls_Group.xml"/>
-    <class name="UI\Controls\Box" xml="classes/UI_Controls_Box.xml"/>
-    <class name="UI\Draw\Pen" xml="classes/UI_Draw_Pen.xml"/>
-    <class name="UI\Draw\Path" xml="classes/UI_Draw_Path.xml"/>
-    <class name="UI\Draw\Matrix" xml="classes/UI_Draw_Matrix.xml"/>
-    <class name="UI\Draw\Color" xml="classes/UI_Draw_Color.xml"/>
-    <class name="UI\Draw\Stroke" xml="classes/UI_Draw_Stroke.xml"/>
-    <class name="UI\Draw\Brush" xml="classes/UI_Draw_Brush.xml"/>
-    <class name="UI\Draw\Brush\Gradient" xml="classes/UI_Draw_Brush_Gradient.xml"/>
-    <class name="UI\Draw\Brush\LinearGradient" xml="classes/UI_Draw_Brush_LinearGradient.xml"/>
-    <class name="UI\Draw\Brush\RadialGradient" xml="classes/UI_Draw_Brush_RadialGradient.xml"/>
-    <class name="UI\Draw\Text\Layout" xml="classes/UI_Draw_Text_Layout.xml"/>
-    <class name="UI\Draw\Text\Font" xml="classes/UI_Draw_Text_Font.xml"/>
-    <class name="UI\Draw\Text\Font\Descriptor" xml="classes/UI_Draw_Text_Font_Descriptor.xml"/>
-    <class name="UI\Draw\Text\Font\Weight" xml="classes/UI_Draw_Text_Font_Weight.xml"/>
-    <class name="UI\Draw\Text\Font\Italic" xml="classes/UI_Draw_Text_Font_Italic.xml"/>
-    <class name="UI\Draw\Text\Font\Stretch" xml="classes/UI_Draw_Text_Font_Stretch.xml"/>
-    <class name="UI\Draw\Line\Cap" xml="classes/UI_Draw_Line_Cap.xml"/>
-    <class name="UI\Draw\Line\Join" xml="classes/UI_Draw_Line_Join.xml"/>
-    <class name="UI\Key" xml="classes/UI_Key.xml"/>
-    <class name="UI\Exception\InvalidArgumentException" xml="classes/UI_Exception_InvalidArgumentException.xml"/>
-    <class name="UI\Exception\RuntimeException" xml="classes/UI_Exception_RuntimeException.xml"/>
     <class name="Counter" xml="classes/Counter.xml"/>
     <interface name="Traversable" xml="interfaces/Traversable.xml"/>
     <interface name="Iterator" xml="interfaces/Iterator.xml"/>
@@ -539,10 +461,6 @@
     <interface name="ArrayAccess" xml="interfaces/ArrayAccess.xml"/>
     <interface name="Serializable" xml="interfaces/Serializable.xml"/>
     <interface name="MongoCursorInterface" xml="interfaces/MongoCursorInterface.xml"/>
-    <interface name="MongoDB\BSON\Type" xml="interfaces/MongoDB_BSON_Type.xml"/>
-    <interface name="MongoDB\BSON\Serializable" xml="interfaces/MongoDB_BSON_Serializable.xml"/>
-    <interface name="MongoDB\BSON\Unserializable" xml="interfaces/MongoDB_BSON_Unserializable.xml"/>
-    <interface name="MongoDB\Driver\Exception\Exception" xml="interfaces/MongoDB_Driver_Exception_Exception.xml"/>
     <interface name="DateTimeInterface" xml="interfaces/DateTimeInterface.xml"/>
     <interface name="Collectable" xml="interfaces/Collectable.xml"/>
     <interface name="JsonSerializable" xml="interfaces/JsonSerializable.xml"/>
@@ -556,9 +474,312 @@
     <interface name="Yaf_Route_Interface" xml="interfaces/Yaf_Route_Interface.xml"/>
     <interface name="Yaf_Router" xml="interfaces/Yaf_Router.xml"/>
     <interface name="SessionHandlerInterface" xml="interfaces/SessionHandlerInterface.xml"/>
-    <interface name="Ds\Collection" xml="interfaces/Ds_Collection.xml"/>
-    <interface name="Ds\Hashable" xml="interfaces/Ds_Hashable.xml"/>
-    <interface name="Ds\Sequence" xml="interfaces/Ds_Sequence.xml"/>
+    <interface name="SessionIdInterface" xml="interfaces/SessionIdInterface.xml"/>
+    <interface name="SessionUpdateTimestampHandlerInterface" xml="interfaces/SessionUpdateTimestampHandlerInterface.xml"/>
     <interface name="Reflector" xml="interfaces/Reflector.xml"/>
   </namespace>
+  <namespace name="Componere\Abstract">
+    <class name="Definition" xml="classes/Componere_Abstract_Definition.xml"/>
+  </namespace>
+  <namespace name="Componere">
+    <class name="Definition" xml="classes/Componere_Definition.xml"/>
+    <class name="Patch" xml="classes/Componere_Patch.xml"/>
+    <class name="Method" xml="classes/Componere_Method.xml"/>
+    <class name="Value" xml="classes/Componere_Value.xml"/>
+  </namespace>
+  <namespace name="MongoDB\Driver">
+    <class name="Manager" xml="classes/MongoDB_Driver_Manager.xml"/>
+    <class name="Command" xml="classes/MongoDB_Driver_Command.xml"/>
+    <class name="Query" xml="classes/MongoDB_Driver_Query.xml"/>
+    <class name="BulkWrite" xml="classes/MongoDB_Driver_BulkWrite.xml"/>
+    <class name="Session" xml="classes/MongoDB_Driver_Session.xml"/>
+    <class name="WriteConcern" xml="classes/MongoDB_Driver_WriteConcern.xml"/>
+    <class name="ReadPreference" xml="classes/MongoDB_Driver_ReadPreference.xml"/>
+    <class name="ReadConcern" xml="classes/MongoDB_Driver_ReadConcern.xml"/>
+    <class name="Cursor" xml="classes/MongoDB_Driver_Cursor.xml"/>
+    <class name="CursorId" xml="classes/MongoDB_Driver_CursorId.xml"/>
+    <class name="Server" xml="classes/MongoDB_Driver_Server.xml"/>
+    <class name="WriteConcernError" xml="classes/MongoDB_Driver_WriteConcernError.xml"/>
+    <class name="WriteError" xml="classes/MongoDB_Driver_WriteError.xml"/>
+    <class name="WriteResult" xml="classes/MongoDB_Driver_WriteResult.xml"/>
+  </namespace>
+  <namespace name="MongoDB\BSON">
+    <class name="Binary" xml="classes/MongoDB_BSON_Binary.xml"/>
+    <class name="Decimal128" xml="classes/MongoDB_BSON_Decimal128.xml"/>
+    <class name="Javascript" xml="classes/MongoDB_BSON_Javascript.xml"/>
+    <class name="MaxKey" xml="classes/MongoDB_BSON_MaxKey.xml"/>
+    <class name="MinKey" xml="classes/MongoDB_BSON_MinKey.xml"/>
+    <class name="ObjectId" xml="classes/MongoDB_BSON_ObjectId.xml"/>
+    <class name="Regex" xml="classes/MongoDB_BSON_Regex.xml"/>
+    <class name="Timestamp" xml="classes/MongoDB_BSON_Timestamp.xml"/>
+    <class name="UTCDateTime" xml="classes/MongoDB_BSON_UTCDateTime.xml"/>
+    <class name="DBPointer" xml="classes/MongoDB_BSON_DBPointer.xml"/>
+    <class name="Int64" xml="classes/MongoDB_BSON_Int64.xml"/>
+    <class name="Symbol" xml="classes/MongoDB_BSON_Symbol.xml"/>
+    <class name="Undefined" xml="classes/MongoDB_BSON_Undefined.xml"/>
+    <interface name="Type" xml="interfaces/MongoDB_BSON_Type.xml"/>
+    <interface name="Persistable" xml="interfaces/MongoDB_BSON_Persistable.xml"/>
+    <interface name="Serializable" xml="interfaces/MongoDB_BSON_Serializable.xml"/>
+    <interface name="Unserializable" xml="interfaces/MongoDB_BSON_Unserializable.xml"/>
+    <interface name="BinaryInterface" xml="interfaces/MongoDB_BSON_BinaryInterface.xml"/>
+    <interface name="Decimal128Interface" xml="interfaces/MongoDB_BSON_Decimal128Interface.xml"/>
+    <interface name="JavascriptInterface" xml="interfaces/MongoDB_BSON_JavascriptInterface.xml"/>
+    <interface name="MaxKeyInterface" xml="interfaces/MongoDB_BSON_MaxKeyInterface.xml"/>
+    <interface name="MinKeyInterface" xml="interfaces/MongoDB_BSON_MinKeyInterface.xml"/>
+    <interface name="ObjectIdInterface" xml="interfaces/MongoDB_BSON_ObjectIdInterface.xml"/>
+    <interface name="RegexInterface" xml="interfaces/MongoDB_BSON_RegexInterface.xml"/>
+    <interface name="TimestampInterface" xml="interfaces/MongoDB_BSON_TimestampInterface.xml"/>
+    <interface name="UTCDateTimeInterface" xml="interfaces/MongoDB_BSON_UTCDateTimeInterface.xml"/>
+  </namespace>
+  <namespace name="MongoDB\Driver\Monitoring">
+    <class name="CommandFailedEvent" xml="classes/MongoDB_Driver_Monitoring_CommandFailedEvent.xml"/>
+    <class name="CommandStartedEvent" xml="classes/MongoDB_Driver_Monitoring_CommandStartedEvent.xml"/>
+    <class name="CommandSucceededEvent" xml="classes/MongoDB_Driver_Monitoring_CommandSucceededEvent.xml"/>
+    <interface name="CommandSubscriber" xml="interfaces/MongoDB_Driver_Monitoring_CommandSubscriber.xml"/>
+    <interface name="Subscriber" xml="interfaces/MongoDB_Driver_Monitoring_Subscriber.xml"/>
+  </namespace>
+  <namespace name="MongoDB\Driver\Exception">
+    <class name="AuthenticationException" xml="classes/MongoDB_Driver_Exception_AuthenticationException.xml"/>
+    <class name="BulkWriteException" xml="classes/MongoDB_Driver_Exception_BulkWriteException.xml"/>
+    <class name="CommandException" xml="classes/MongoDB_Driver_Exception_CommandException.xml"/>
+    <class name="ConnectionException" xml="classes/MongoDB_Driver_Exception_ConnectionException.xml"/>
+    <class name="ConnectionTimeoutException" xml="classes/MongoDB_Driver_Exception_ConnectionTimeoutException.xml"/>
+    <class name="ExecutionTimeoutException" xml="classes/MongoDB_Driver_Exception_ExecutionTimeoutException.xml"/>
+    <class name="InvalidArgumentException" xml="classes/MongoDB_Driver_Exception_InvalidArgumentException.xml"/>
+    <class name="LogicException" xml="classes/MongoDB_Driver_Exception_LogicException.xml"/>
+    <class name="RuntimeException" xml="classes/MongoDB_Driver_Exception_RuntimeException.xml"/>
+    <class name="ServerException" xml="classes/MongoDB_Driver_Exception_ServerException.xml"/>
+    <class name="SSLConnectionException" xml="classes/MongoDB_Driver_Exception_SSLConnectionException.xml"/>
+    <class name="UnexpectedValueException" xml="classes/MongoDB_Driver_Exception_UnexpectedValueException.xml"/>
+    <class name="WriteException" xml="classes/MongoDB_Driver_Exception_WriteException.xml"/>
+    <interface name="Exception" xml="interfaces/MongoDB_Driver_Exception_Exception.xml"/>
+  </namespace>
+  <namespace name="mysql_xdevapi">
+    <class name="Collection" xml="classes/mysql_xdevapi_Collection.xml"/>
+    <class name="CollectionAdd" xml="classes/mysql_xdevapi_CollectionAdd.xml"/>
+    <class name="CollectionFind" xml="classes/mysql_xdevapi_CollectionFind.xml"/>
+    <class name="CollectionModify" xml="classes/mysql_xdevapi_CollectionModify.xml"/>
+    <class name="CollectionRemove" xml="classes/mysql_xdevapi_CollectionRemove.xml"/>
+    <class name="ColumnResult" xml="classes/mysql_xdevapi_ColumnResult.xml"/>
+    <class name="DocResult" xml="classes/mysql_xdevapi_DocResult.xml"/>
+    <class name="Driver" xml="classes/mysql_xdevapi_Driver.xml"/>
+    <class name="Exception" xml="classes/mysql_xdevapi_Exception.xml"/>
+    <class name="ExecutionStatus" xml="classes/mysql_xdevapi_ExecutionStatus.xml"/>
+    <class name="Expression" xml="classes/mysql_xdevapi_Expression.xml"/>
+    <class name="FieldMetadata" xml="classes/mysql_xdevapi_FieldMetadata.xml"/>
+    <class name="Result" xml="classes/mysql_xdevapi_Result.xml"/>
+    <class name="RowResult" xml="classes/mysql_xdevapi_RowResult.xml"/>
+    <class name="Schema" xml="classes/mysql_xdevapi_Schema.xml"/>
+    <class name="Session" xml="classes/mysql_xdevapi_Session.xml"/>
+    <class name="SqlStatement" xml="classes/mysql_xdevapi_SqlStatement.xml"/>
+    <class name="SqlStatementResult" xml="classes/mysql_xdevapi_SqlStatementResult.xml"/>
+    <class name="Statement" xml="classes/mysql_xdevapi_Statement.xml"/>
+    <class name="Table" xml="classes/mysql_xdevapi_Table.xml"/>
+    <class name="TableDelete" xml="classes/mysql_xdevapi_TableDelete.xml"/>
+    <class name="TableInsert" xml="classes/mysql_xdevapi_TableInsert.xml"/>
+    <class name="TableSelect" xml="classes/mysql_xdevapi_TableSelect.xml"/>
+    <class name="TableUpdate" xml="classes/mysql_xdevapi_TableUpdate.xml"/>
+    <class name="Warning" xml="classes/mysql_xdevapi_Warning.xml"/>
+    <class name="XSession" xml="classes/mysql_xdevapi_XSession.xml"/>
+    <interface name="BaseResult" xml="interfaces/mysql_xdevapi_BaseResult.xml"/>
+    <interface name="CrudOperationBindable" xml="interfaces/mysql_xdevapi_CrudOperationBindable.xml"/>
+    <interface name="CrudOperationLimitable" xml="interfaces/mysql_xdevapi_CrudOperationLimitable.xml"/>
+    <interface name="CrudOperationSkippable" xml="interfaces/mysql_xdevapi_CrudOperationSkippable.xml"/>
+    <interface name="CrudOperationSortable" xml="interfaces/mysql_xdevapi_CrudOperationSortable.xml"/>
+    <interface name="DatabaseObject" xml="interfaces/mysql_xdevapi_DatabaseObject.xml"/>
+    <interface name="Executable" xml="interfaces/mysql_xdevapi_Executable.xml"/>
+    <interface name="SchemaObject" xml="interfaces/mysql_xdevapi_SchemaObject.xml"/>
+  </namespace>
+  <namespace name="HRTime">
+    <class name="PerformanceCounter" xml="classes/HRTime_PerformanceCounter.xml"/>
+    <class name="StopWatch" xml="classes/HRTime_StopWatch.xml"/>
+    <class name="Unit" xml="classes/HRTime_Unit.xml"/>
+  </namespace>
+  <namespace name="Gender">
+    <class name="Gender" xml="classes/Gender_Gender.xml"/>
+  </namespace>
+  <namespace name="wkhtmltox\PDF">
+    <class name="Converter" xml="classes/wkhtmltox_PDF_Converter.xml"/>
+    <class name="Object" xml="classes/wkhtmltox_PDF_Object.xml"/>
+  </namespace>
+  <namespace name="wkhtmltox\Image">
+    <class name="Converter" xml="classes/wkhtmltox_Image_Converter.xml"/>
+  </namespace>
+  <namespace name="Vtiful\Kernel">
+    <class name="Excel" xml="classes/Vtiful_Kernel_Excel.xml"/>
+    <class name="Format" xml="classes/Vtiful_Kernel_Format.xml"/>
+  </namespace>
+  <namespace name="pht">
+    <class name="Thread" xml="classes/pht_Thread.xml"/>
+    <class name="HashTable" xml="classes/pht_HashTable.xml"/>
+    <class name="Vector" xml="classes/pht_Vector.xml"/>
+    <class name="Queue" xml="classes/pht_Queue.xml"/>
+    <class name="AtomicInteger" xml="classes/pht_AtomicInteger.xml"/>
+    <interface name="Runnable" xml="interfaces/pht_Runnable.xml"/>
+    <interface name="Threaded" xml="interfaces/pht_Threaded.xml"/>
+  </namespace>
+  <namespace name="Swoole">
+    <class name="Async" xml="classes/Swoole_Async.xml"/>
+    <class name="Atomic" xml="classes/Swoole_Atomic.xml"/>
+    <class name="Buffer" xml="classes/Swoole_Buffer.xml"/>
+    <class name="Channel" xml="classes/Swoole_Channel.xml"/>
+    <class name="Client" xml="classes/Swoole_Client.xml"/>
+    <class name="Coroutine" xml="classes/Swoole_Coroutine.xml"/>
+    <class name="Event" xml="classes/Swoole_Event.xml"/>
+    <class name="Exception" xml="classes/Swoole_Exception.xml"/>
+    <class name="Lock" xml="classes/Swoole_Lock.xml"/>
+    <class name="Mmap" xml="classes/Swoole_Mmap.xml"/>
+    <class name="MySQL" xml="classes/Swoole_MySQL.xml"/>
+    <class name="Process" xml="classes/Swoole_Process.xml"/>
+    <class name="Serialize" xml="classes/Swoole_Serialize.xml"/>
+    <class name="Server" xml="classes/Swoole_Server.xml"/>
+    <class name="Table" xml="classes/Swoole_Table.xml"/>
+    <class name="Timer" xml="classes/Swoole_Timer.xml"/>
+  </namespace>
+  <namespace name="Swoole\Connection">
+    <class name="Iterator" xml="classes/Swoole_Connection_Iterator.xml"/>
+  </namespace>
+  <namespace name="Swoole\Http">
+    <class name="Client" xml="classes/Swoole_Http_Client.xml"/>
+    <class name="Request" xml="classes/Swoole_Http_Request.xml"/>
+    <class name="Response" xml="classes/Swoole_Http_Response.xml"/>
+    <class name="Server" xml="classes/Swoole_Http_Server.xml"/>
+  </namespace>
+  <namespace name="Swoole\MySQL">
+    <class name="Exception" xml="classes/Swoole_MySQL_Exception.xml"/>
+  </namespace>
+  <namespace name="Swoole\Redis">
+    <class name="Server" xml="classes/Swoole_Redis_Server.xml"/>
+  </namespace>
+  <namespace name="Swoole\WebSocket">
+    <class name="Frame" xml="classes/Swoole_WebSocket_Frame.xml"/>
+    <class name="Server" xml="classes/Swoole_WebSocket_Server.xml"/>
+  </namespace>
+  <namespace name="Ds">
+    <class name="Vector" xml="classes/Ds_Vector.xml"/>
+    <class name="Deque" xml="classes/Ds_Deque.xml"/>
+    <class name="Map" xml="classes/Ds_Map.xml"/>
+    <class name="Pair" xml="classes/Ds_Pair.xml"/>
+    <class name="Set" xml="classes/Ds_Set.xml"/>
+    <class name="Stack" xml="classes/Ds_Stack.xml"/>
+    <class name="Queue" xml="classes/Ds_Queue.xml"/>
+    <class name="PriorityQueue" xml="classes/Ds_PriorityQueue.xml"/>
+    <interface name="Collection" xml="interfaces/Ds_Collection.xml"/>
+    <interface name="Hashable" xml="interfaces/Ds_Hashable.xml"/>
+    <interface name="Sequence" xml="interfaces/Ds_Sequence.xml"/>
+  </namespace>
+  <namespace name="CommonMark\Node">
+    <class name="Document" xml="classes/CommonMark_Node_Document.xml"/>
+    <class name="Heading" xml="classes/CommonMark_Node_Heading.xml"/>
+    <class name="Paragraph" xml="classes/CommonMark_Node_Paragraph.xml"/>
+    <class name="BlockQuote" xml="classes/CommonMark_Node_BlockQuote.xml"/>
+    <class name="BulletList" xml="classes/CommonMark_Node_BulletList.xml"/>
+    <class name="OrderedList" xml="classes/CommonMark_Node_OrderedList.xml"/>
+    <class name="Item" xml="classes/CommonMark_Node_Item.xml"/>
+    <class name="Text" xml="classes/CommonMark_Node_Text.xml"/>
+    <class name="ThematicBreak" xml="classes/CommonMark_Node_ThematicBreak.xml"/>
+    <class name="SoftBreak" xml="classes/CommonMark_Node_SoftBreak.xml"/>
+    <class name="LineBreak" xml="classes/CommonMark_Node_LineBreak.xml"/>
+    <class name="Code" xml="classes/CommonMark_Node_Code.xml"/>
+    <class name="CodeBlock" xml="classes/CommonMark_Node_CodeBlock.xml"/>
+    <class name="HTMLBlock" xml="classes/CommonMark_Node_HTMLBlock.xml"/>
+    <class name="HTMLInline" xml="classes/CommonMark_Node_HTMLInline.xml"/>
+    <class name="Image" xml="classes/CommonMark_Node_Image.xml"/>
+    <class name="Link" xml="classes/CommonMark_Node_Link.xml"/>
+    <class name="CustomBlock" xml="classes/CommonMark_Node_CustomBlock.xml"/>
+    <class name="CustomInline" xml="classes/CommonMark_Node_CustomInline.xml"/>
+  </namespace>
+  <namespace name="CommonMark\Node\Text">
+    <class name="Strong" xml="classes/CommonMark_Node_Text_Strong.xml"/>
+    <class name="Emphasis" xml="classes/CommonMark_Node_Text_Emphasis.xml"/>
+  </namespace>
+  <namespace name="CommonMark">
+    <class name="Node" xml="classes/CommonMark_Node.xml"/>
+    <class name="Parser" xml="classes/CommonMark_Parser.xml"/>
+    <class name="CQL" xml="classes/CommonMark_CQL.xml"/>
+  </namespace>
+  <namespace name="CommonMark\Interfaces">
+    <class name="IVisitor" xml="classes/CommonMark_Interfaces_IVisitor.xml"/>
+    <interface name="IVisitable" xml="interfaces/CommonMark_Interfaces_IVisitable.xml"/>
+  </namespace>
+  <namespace name="Parle">
+    <class name="Lexer" xml="classes/Parle_Lexer.xml"/>
+    <class name="RLexer" xml="classes/Parle_RLexer.xml"/>
+    <class name="Parser" xml="classes/Parle_Parser.xml"/>
+    <class name="RParser" xml="classes/Parle_RParser.xml"/>
+    <class name="Stack" xml="classes/Parle_Stack.xml"/>
+    <class name="Token" xml="classes/Parle_Token.xml"/>
+    <class name="ErrorInfo" xml="classes/Parle_ErrorInfo.xml"/>
+    <class name="LexerException" xml="classes/Parle_LexerException.xml"/>
+    <class name="ParserException" xml="classes/Parle_ParserException.xml"/>
+  </namespace>
+  <namespace name="XMLDiff">
+    <class name="Base" xml="classes/XMLDiff_Base.xml"/>
+    <class name="DOM" xml="classes/XMLDiff_DOM.xml"/>
+    <class name="Memory" xml="classes/XMLDiff_Memory.xml"/>
+    <class name="File" xml="classes/XMLDiff_File.xml"/>
+  </namespace>
+  <namespace name="UI">
+    <class name="Point" xml="classes/UI_Point.xml"/>
+    <class name="Size" xml="classes/UI_Size.xml"/>
+    <class name="Window" xml="classes/UI_Window.xml"/>
+    <class name="Control" xml="classes/UI_Control.xml"/>
+    <class name="Menu" xml="classes/UI_Menu.xml"/>
+    <class name="MenuItem" xml="classes/UI_MenuItem.xml"/>
+    <class name="Area" xml="classes/UI_Area.xml"/>
+    <class name="Executor" xml="classes/UI_Executor.xml"/>
+    <class name="Key" xml="classes/UI_Key.xml"/>
+  </namespace>
+  <namespace name="UI\Controls">
+    <class name="Tab" xml="classes/UI_Controls_Tab.xml"/>
+    <class name="Check" xml="classes/UI_Controls_Check.xml"/>
+    <class name="Button" xml="classes/UI_Controls_Button.xml"/>
+    <class name="ColorButton" xml="classes/UI_Controls_ColorButton.xml"/>
+    <class name="Label" xml="classes/UI_Controls_Label.xml"/>
+    <class name="Entry" xml="classes/UI_Controls_Entry.xml"/>
+    <class name="MultilineEntry" xml="classes/UI_Controls_MultilineEntry.xml"/>
+    <class name="Spin" xml="classes/UI_Controls_Spin.xml"/>
+    <class name="Slider" xml="classes/UI_Controls_Slider.xml"/>
+    <class name="Progress" xml="classes/UI_Controls_Progress.xml"/>
+    <class name="Separator" xml="classes/UI_Controls_Separator.xml"/>
+    <class name="Combo" xml="classes/UI_Controls_Combo.xml"/>
+    <class name="EditableCombo" xml="classes/UI_Controls_EditableCombo.xml"/>
+    <class name="Radio" xml="classes/UI_Controls_Radio.xml"/>
+    <class name="Picker" xml="classes/UI_Controls_Picker.xml"/>
+    <class name="Form" xml="classes/UI_Controls_Form.xml"/>
+    <class name="Grid" xml="classes/UI_Controls_Grid.xml"/>
+    <class name="Group" xml="classes/UI_Controls_Group.xml"/>
+    <class name="Box" xml="classes/UI_Controls_Box.xml"/>
+  </namespace>
+  <namespace name="UI\Draw">
+    <class name="Pen" xml="classes/UI_Draw_Pen.xml"/>
+    <class name="Path" xml="classes/UI_Draw_Path.xml"/>
+    <class name="Matrix" xml="classes/UI_Draw_Matrix.xml"/>
+    <class name="Color" xml="classes/UI_Draw_Color.xml"/>
+    <class name="Stroke" xml="classes/UI_Draw_Stroke.xml"/>
+    <class name="Brush" xml="classes/UI_Draw_Brush.xml"/>
+  </namespace>
+  <namespace name="UI\Draw\Brush">
+    <class name="Gradient" xml="classes/UI_Draw_Brush_Gradient.xml"/>
+    <class name="LinearGradient" xml="classes/UI_Draw_Brush_LinearGradient.xml"/>
+    <class name="RadialGradient" xml="classes/UI_Draw_Brush_RadialGradient.xml"/>
+  </namespace>
+  <namespace name="UI\Draw\Text">
+    <class name="Layout" xml="classes/UI_Draw_Text_Layout.xml"/>
+    <class name="Font" xml="classes/UI_Draw_Text_Font.xml"/>
+  </namespace>
+  <namespace name="UI\Draw\Text\Font">
+    <class name="Descriptor" xml="classes/UI_Draw_Text_Font_Descriptor.xml"/>
+    <class name="Weight" xml="classes/UI_Draw_Text_Font_Weight.xml"/>
+    <class name="Italic" xml="classes/UI_Draw_Text_Font_Italic.xml"/>
+    <class name="Stretch" xml="classes/UI_Draw_Text_Font_Stretch.xml"/>
+  </namespace>
+  <namespace name="UI\Draw\Line">
+    <class name="Cap" xml="classes/UI_Draw_Line_Cap.xml"/>
+    <class name="Join" xml="classes/UI_Draw_Line_Join.xml"/>
+  </namespace>
+  <namespace name="UI\Exception">
+    <class name="InvalidArgumentException" xml="classes/UI_Exception_InvalidArgumentException.xml"/>
+    <class name="RuntimeException" xml="classes/UI_Exception_RuntimeException.xml"/>
+  </namespace>
 </index>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/ArrayAccess.xml phpdox-0.12.0/dependencies/php/interfaces/ArrayAccess.xml
--- phpdox-0.11.2/dependencies/php/interfaces/ArrayAccess.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/ArrayAccess.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <method name="offsetExists" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Whether an offset exists">Whether or not an offset exists.</description>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
     <parameter name="offset" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/Collectable.xml phpdox-0.12.0/dependencies/php/interfaces/Collectable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/Collectable.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/Collectable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <interface xmlns="http://xml.phpdox.net/src" full="Collectable" namespace="" name="Collectable">
-  <extends name="Threaded" full="Threaded"/>
   <method name="isGarbage" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Determine whether an object has been marked as garbage"/>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/CommonMark_Interfaces_IVisitable.xml phpdox-0.12.0/dependencies/php/interfaces/CommonMark_Interfaces_IVisitable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/CommonMark_Interfaces_IVisitable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/CommonMark_Interfaces_IVisitable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="CommonMark\Interfaces\IVisitable" namespace="CommonMark\Interfaces" name="IVisitable">
+  <method name="accept" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Visitation"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="visitor" optional="false" byreference="false" type="object" class="CommonMark\Interfaces\IVisitor"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/DateTimeInterface.xml phpdox-0.12.0/dependencies/php/interfaces/DateTimeInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/DateTimeInterface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/DateTimeInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,65 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <interface xmlns="http://xml.phpdox.net/src" full="DateTimeInterface" namespace="" name="DateTimeInterface">
+  <constant name="ATOM" value="&quot;Y-m-d\TH:i:sP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="COOKIE" value="&quot;l, d-M-Y H:i:s T&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="ISO8601" value="&quot;Y-m-d\TH:i:sO&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC822" value="&quot;D, d M y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC850" value="&quot;l, d-M-y H:i:s T&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC1036" value="&quot;D, d M y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC1123" value="&quot;D, d M Y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC2822" value="&quot;D, d M Y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC3339" value="&quot;Y-m-d\TH:i:sP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RFC3339_EXTENDED" value="&quot;Y-m-d\TH:i:s.vP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="RSS" value="&quot;D, d M Y H:i:s O&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
+  <constant name="W3C" value="&quot;Y-m-d\TH:i:sP&quot;">
+    <docblock>
+      <var type="string"/>
+    </docblock>
+  </constant>
   <method name="diff" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Returns the difference between two DateTime objects">Object oriented style</description>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/Ds_Collection.xml phpdox-0.12.0/dependencies/php/interfaces/Ds_Collection.xml
--- phpdox-0.11.2/dependencies/php/interfaces/Ds_Collection.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/Ds_Collection.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="Ds\Collection" namespace="" name="Ds\Collection">
+<interface xmlns="http://xml.phpdox.net/src" full="Ds\Collection" namespace="Ds" name="Collection">
   <implements name="Traversable" full="Traversable"/>
   <method name="clear" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes all values."/>
+      <description compact="Removes all values"/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="copy" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a shallow copy of the collection."/>
+      <description compact="Returns a shallow copy of the collection"/>
       <return type="Ds\Collection"/>
     </docblock>
   </method>
@@ -21,7 +21,7 @@
   </method>
   <method name="toArray" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Converts the collection to an array.&#10;  ">Converts the collection to an array.</description>
+      <description compact="&#10;    Converts the collection to an array&#10;  ">Converts the collection to an array.</description>
       <return type="array"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/Ds_Hashable.xml phpdox-0.12.0/dependencies/php/interfaces/Ds_Hashable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/Ds_Hashable.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/Ds_Hashable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="Ds\Hashable" namespace="" name="Ds\Hashable">
+<interface xmlns="http://xml.phpdox.net/src" full="Ds\Hashable" namespace="Ds" name="Hashable">
   <method name="equals" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines whether an object is equal to the current instance.">Determines whether another object is equal to the current instance.</description>
+      <description compact="Determines whether an object is equal to the current instance">Determines whether another object is equal to the current instance.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="obj" optional="false" byreference="false" type="object" class="object"/>
   </method>
   <method name="hash" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a scalar value to be used as a hash value.">Returns a scalar value to be used as the hash value of the objects.</description>
+      <description compact="Returns a scalar value to be used as a hash value">Returns a scalar value to be used as the hash value of the objects.</description>
       <return type="mixed"/>
     </docblock>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/Ds_Sequence.xml phpdox-0.12.0/dependencies/php/interfaces/Ds_Sequence.xml
--- phpdox-0.11.2/dependencies/php/interfaces/Ds_Sequence.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/Ds_Sequence.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,63 +1,63 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="Ds\Sequence" namespace="" name="Ds\Sequence">
+<interface xmlns="http://xml.phpdox.net/src" full="Ds\Sequence" namespace="Ds" name="Sequence">
   <implements name="Ds\Collection" full="Ds\Collection"/>
   <method name="allocate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Allocates enough memory for a required capacity."/>
+      <description compact="Allocates enough memory for a required capacity"/>
       <return type="void"/>
     </docblock>
     <parameter name="capacity" optional="false" byreference="false" type="int"/>
   </method>
   <method name="apply" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates all values by applying a callback function to each value."/>
+      <description compact="Updates all values by applying a callback function to each value"/>
       <return type="void"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="capacity" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the current capacity."/>
+      <description compact="Returns the current capacity"/>
       <return type="int"/>
     </docblock>
   </method>
   <method name="contains" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Determines if the sequence contains given values."/>
+      <description compact="Determines if the sequence contains given values"/>
       <return type="bool"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="filter" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Creates a new sequence using a callable to&#10;    determine which values to include.&#10; "/>
+      <description compact="&#10;    Creates a new sequence using a callable to&#10;    determine which values to include&#10; "/>
       <return type="Ds\Sequence"/>
     </docblock>
     <parameter name="callback" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="find" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Attempts to find a value's index.&#10;  "/>
+      <description compact="&#10;    Attempts to find a value's index&#10;  "/>
       <return type="mixed"/>
     </docblock>
     <parameter name="value" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="first" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the first value in the sequence."/>
+      <description compact="Returns the first value in the sequence"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="get" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the value at a given index."/>
+      <description compact="Returns the value at a given index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="insert" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Inserts values at a given index."/>
+      <description compact="Inserts values at a given index"/>
       <return type="void"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -65,47 +65,47 @@
   </method>
   <method name="join" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Joins all values together as a string."/>
+      <description compact="Joins all values together as a string"/>
       <return type="string"/>
     </docblock>
     <parameter name="glue" optional="true" byreference="false" type="string"/>
   </method>
   <method name="last" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the last value."/>
+      <description compact="Returns the last value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="map" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of applying a callback to each value."/>
+      <description compact="Returns the result of applying a callback to each value"/>
       <return type="Ds\Sequence"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
   </method>
   <method name="merge" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the result of adding all given values to the sequence."/>
+      <description compact="Returns the result of adding all given values to the sequence"/>
       <return type="Ds\Sequence"/>
     </docblock>
     <parameter name="values" optional="false" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="pop" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the last value."/>
+      <description compact="Removes and returns the last value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="push" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the end of the sequence."/>
+      <description compact="Adds values to the end of the sequence"/>
       <return type="void"/>
     </docblock>
     <parameter name="...values" optional="true" byreference="false" type="object" class="mixed"/>
   </method>
   <method name="reduce" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Reduces the sequence to a single value using a callback function."/>
+      <description compact="Reduces the sequence to a single value using a callback function"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="callback" optional="false" byreference="false" type="object" class="callable"/>
@@ -113,33 +113,33 @@
   </method>
   <method name="remove" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns a value by index."/>
+      <description compact="Removes and returns a value by index"/>
       <return type="mixed"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
   </method>
   <method name="reverse" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Reverses the sequence in-place.&#10;  "/>
+      <description compact="&#10;    Reverses the sequence in-place&#10;  "/>
       <return type="void"/>
     </docblock>
   </method>
   <method name="reversed" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a reversed copy."/>
+      <description compact="Returns a reversed copy"/>
       <return type="Ds\Sequence"/>
     </docblock>
   </method>
   <method name="rotate" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Rotates the sequence by a given number of rotations."/>
+      <description compact="Rotates the sequence by a given number of rotations"/>
       <return type="void"/>
     </docblock>
     <parameter name="rotations" optional="false" byreference="false" type="int"/>
   </method>
   <method name="set" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Updates a value at a given index."/>
+      <description compact="Updates a value at a given index"/>
       <return type="void"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -147,13 +147,13 @@
   </method>
   <method name="shift" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Removes and returns the first value."/>
+      <description compact="Removes and returns the first value"/>
       <return type="mixed"/>
     </docblock>
   </method>
   <method name="slice" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;   Returns a sub-sequence of a given range.&#10;  "/>
+      <description compact="&#10;   Returns a sub-sequence of a given range&#10;  "/>
       <return type="Ds\Sequence"/>
     </docblock>
     <parameter name="index" optional="false" byreference="false" type="int"/>
@@ -161,27 +161,27 @@
   </method>
   <method name="sort" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="&#10;    Sorts the sequence in-place.&#10; "/>
+      <description compact="&#10;    Sorts the sequence in-place&#10; "/>
       <return type="void"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sorted" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns a sorted copy."/>
+      <description compact="Returns a sorted copy"/>
       <return type="Ds\Sequence"/>
     </docblock>
     <parameter name="comparator" optional="true" byreference="false" type="object" class="callable"/>
   </method>
   <method name="sum" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the sum of all values in the sequence.">Returns the sum of all values in the sequence.</description>
+      <description compact="Returns the sum of all values in the sequence">Returns the sum of all values in the sequence.</description>
       <return type="number"/>
     </docblock>
   </method>
   <method name="unshift" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Adds values to the front of the sequence."/>
+      <description compact="Adds values to the front of the sequence"/>
       <return type="void"/>
     </docblock>
     <parameter name="values" optional="true" byreference="false" type="object" class="mixed"/>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/Iterator.xml phpdox-0.12.0/dependencies/php/interfaces/Iterator.xml
--- phpdox-0.11.2/dependencies/php/interfaces/Iterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/Iterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -28,7 +28,7 @@
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Checks if current position is valid"/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoCursorInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoCursorInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoCursorInterface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoCursorInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <extends name="Iterator" full="Iterator"/>
   <method name="batchSize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Limits the number of elements returned in one batch."/>
+      <description compact="Limits the number of elements returned in one batch"/>
       <return type="MongoCursorInterface"/>
     </docblock>
     <parameter name="batchSize" optional="false" byreference="false" type="int"/>
@@ -68,7 +68,7 @@
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_BinaryInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_BinaryInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_BinaryInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_BinaryInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\BinaryInterface" namespace="MongoDB\BSON" name="BinaryInterface">
+  <method name="getData" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the BinaryInterface's data"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getType" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the BinaryInterface's type"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the BinaryInterface's data"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Decimal128Interface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Decimal128Interface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Decimal128Interface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Decimal128Interface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Decimal128Interface" namespace="MongoDB\BSON" name="Decimal128Interface">
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the string representation of this Decimal128Interface"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_JavascriptInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_JavascriptInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_JavascriptInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_JavascriptInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\JavascriptInterface" namespace="MongoDB\BSON" name="JavascriptInterface">
+  <method name="getCode" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the JavascriptInterface's code"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getScope" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the JavascriptInterface's scope document"/>
+      <return type="object|null"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the JavascriptInterface's code"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_MaxKeyInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_MaxKeyInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_MaxKeyInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_MaxKeyInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\MaxKeyInterface" namespace="MongoDB\BSON" name="MaxKeyInterface"/>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_MinKeyInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_MinKeyInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_MinKeyInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_MinKeyInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\MinKeyInterface" namespace="MongoDB\BSON" name="MinKeyInterface"/>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_ObjectIdInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_ObjectIdInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_ObjectIdInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_ObjectIdInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\ObjectIdInterface" namespace="MongoDB\BSON" name="ObjectIdInterface">
+  <method name="getTimestamp" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the timestamp component of this ObjectIdInterface"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the hexidecimal representation of this ObjectIdInterface"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Persistable.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Persistable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Persistable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Persistable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Persistable" namespace="MongoDB\BSON" name="Persistable">
+  <implements name="MongoDB\BSON\Unserializable" full="MongoDB\BSON\Unserializable"/>
+  <method name="bsonSerialize" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array|object"/>
+    </docblock>
+  </method>
+  <method name="bsonUnserialize" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="data" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_RegexInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_RegexInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_RegexInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_RegexInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\RegexInterface" namespace="MongoDB\BSON" name="RegexInterface">
+  <method name="getFlags" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the RegexInterface's flags"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getPattern" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the RegexInterface's pattern"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the string representation of this RegexInterface"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Serializable.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Serializable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Serializable.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Serializable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Serializable" namespace="" name="MongoDB\BSON\Serializable">
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Serializable" namespace="MongoDB\BSON" name="Serializable">
   <implements name="MongoDB\BSON\Type" full="MongoDB\BSON\Type"/>
   <method name="bsonSerialize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_TimestampInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_TimestampInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_TimestampInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_TimestampInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\TimestampInterface" namespace="MongoDB\BSON" name="TimestampInterface">
+  <method name="getIncrement" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the increment component of this TimestampInterface"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="getTimestamp" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the timestamp component of this TimestampInterface"/>
+      <return type="int"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the string representation of this TimestampInterface"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Type.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Type.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Type.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Type.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Type" namespace="" name="MongoDB\BSON\Type"/>
\ No newline at end of file
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Type" namespace="MongoDB\BSON" name="Type"/>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Unserializable.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Unserializable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_Unserializable.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_Unserializable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Unserializable" namespace="" name="MongoDB\BSON\Unserializable">
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\Unserializable" namespace="MongoDB\BSON" name="Unserializable">
   <method name="bsonUnserialize" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Constructs the object from a BSON array or document">Called during unserialization of the object from BSON. The properties of the BSON array or document will be passed to the method as an array.</description>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_UTCDateTimeInterface.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_UTCDateTimeInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_BSON_UTCDateTimeInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_BSON_UTCDateTimeInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\BSON\UTCDateTimeInterface" namespace="MongoDB\BSON" name="UTCDateTimeInterface">
+  <method name="toDateTime" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the DateTime representation of this UTCDateTimeInterface"/>
+      <return type="DateTime"/>
+    </docblock>
+  </method>
+  <method name="__toString" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Returns the string representation of this UTCDateTimeInterface"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_Driver_Exception_Exception.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_Driver_Exception_Exception.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_Driver_Exception_Exception.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_Driver_Exception_Exception.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\Exception" namespace="" name="MongoDB\Driver\Exception\Exception"/>
\ No newline at end of file
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Exception\Exception" namespace="MongoDB\Driver\Exception" name="Exception"/>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_Driver_Monitoring_CommandSubscriber.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_Driver_Monitoring_CommandSubscriber.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_Driver_Monitoring_CommandSubscriber.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_Driver_Monitoring_CommandSubscriber.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Monitoring\CommandSubscriber" namespace="MongoDB\Driver\Monitoring" name="CommandSubscriber">
+  <implements name="MongoDB\Driver\Monitoring\Subscriber" full="MongoDB\Driver\Monitoring\Subscriber"/>
+  <method name="commandFailed" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Notification method for a failed command"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event" optional="false" byreference="false" type="object" class="MongoDB\Driver\Monitoring\CommandFailedEvent"/>
+  </method>
+  <method name="commandStarted" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Notification method for a started command"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event" optional="false" byreference="false" type="object" class="MongoDB\Driver\Monitoring\CommandStartedEvent"/>
+  </method>
+  <method name="commandSucceeded" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Notification method for a successful command"/>
+      <return type="void"/>
+    </docblock>
+    <parameter name="event" optional="false" byreference="false" type="object" class="MongoDB\Driver\Monitoring\CommandSucceededEvent"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/MongoDB_Driver_Monitoring_Subscriber.xml phpdox-0.12.0/dependencies/php/interfaces/MongoDB_Driver_Monitoring_Subscriber.xml
--- phpdox-0.11.2/dependencies/php/interfaces/MongoDB_Driver_Monitoring_Subscriber.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/MongoDB_Driver_Monitoring_Subscriber.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="MongoDB\Driver\Monitoring\Subscriber" namespace="MongoDB\Driver\Monitoring" name="Subscriber"/>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_BaseResult.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_BaseResult.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_BaseResult.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_BaseResult.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\BaseResult" namespace="mysql_xdevapi" name="BaseResult">
+  <method name="getWarnings" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="array"/>
+    </docblock>
+  </method>
+  <method name="getWarningsCount" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="integer"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationBindable.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationBindable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationBindable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationBindable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CrudOperationBindable" namespace="mysql_xdevapi" name="CrudOperationBindable">
+  <method name="bind" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CrudOperationBindable"/>
+    </docblock>
+    <parameter name="placeholder_values" optional="false" byreference="false" type="object" class="array"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationLimitable.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationLimitable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationLimitable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationLimitable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CrudOperationLimitable" namespace="mysql_xdevapi" name="CrudOperationLimitable">
+  <method name="limit" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CrudOperationLimitable"/>
+    </docblock>
+    <parameter name="rows" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSkippable.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSkippable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSkippable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSkippable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CrudOperationSkippable" namespace="mysql_xdevapi" name="CrudOperationSkippable">
+  <method name="skip" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CrudOperationSkippable"/>
+    </docblock>
+    <parameter name="skip" optional="false" byreference="false" type="object" class="integer"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSortable.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSortable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSortable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_CrudOperationSortable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\CrudOperationSortable" namespace="mysql_xdevapi" name="CrudOperationSortable">
+  <method name="sort" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\CrudOperationSortable"/>
+    </docblock>
+    <parameter name="sort_expr" optional="false" byreference="false" type="string"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_DatabaseObject.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_DatabaseObject.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_DatabaseObject.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_DatabaseObject.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\DatabaseObject" namespace="mysql_xdevapi" name="DatabaseObject">
+  <method name="existsInDatabase" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="bool"/>
+    </docblock>
+  </method>
+  <method name="getName" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="string"/>
+    </docblock>
+  </method>
+  <method name="getSession" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Session"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_Executable.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_Executable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_Executable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_Executable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\Executable" namespace="mysql_xdevapi" name="Executable">
+  <method name="execute" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Result"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_SchemaObject.xml phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_SchemaObject.xml
--- phpdox-0.11.2/dependencies/php/interfaces/mysql_xdevapi_SchemaObject.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/mysql_xdevapi_SchemaObject.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="mysql_xdevapi\SchemaObject" namespace="mysql_xdevapi" name="SchemaObject">
+  <implements name="mysql_xdevapi\DatabaseObject" full="mysql_xdevapi\DatabaseObject"/>
+  <method name="getSchema" abstract="false" static="false" final="false">
+    <docblock>
+      <description compact=""/>
+      <return type="mysql_xdevapi\Schema"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/OuterIterator.xml phpdox-0.12.0/dependencies/php/interfaces/OuterIterator.xml
--- phpdox-0.11.2/dependencies/php/interfaces/OuterIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/OuterIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <extends name="Iterator" full="Iterator"/>
   <method name="getInnerIterator" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns the inner iterator for the current entry."/>
+      <description compact="Returns the inner iterator for the current entry"/>
       <return type="Iterator"/>
     </docblock>
   </method>
@@ -34,7 +34,7 @@
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/pht_Runnable.xml phpdox-0.12.0/dependencies/php/interfaces/pht_Runnable.xml
--- phpdox-0.11.2/dependencies/php/interfaces/pht_Runnable.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/pht_Runnable.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="pht\Runnable" namespace="pht" name="Runnable">
+  <method name="run" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="The entry point of a threaded class"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/pht_Threaded.xml phpdox-0.12.0/dependencies/php/interfaces/pht_Threaded.xml
--- phpdox-0.11.2/dependencies/php/interfaces/pht_Threaded.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/pht_Threaded.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="pht\Threaded" namespace="pht" name="Threaded">
+  <method name="lock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Acquires the mutex lock"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+  <method name="unlock" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Releases the mutex lock"/>
+      <return type="void"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/RecursiveIterator.xml phpdox-0.12.0/dependencies/php/interfaces/RecursiveIterator.xml
--- phpdox-0.11.2/dependencies/php/interfaces/RecursiveIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/RecursiveIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -3,7 +3,7 @@
   <extends name="Iterator" full="Iterator"/>
   <method name="getChildren" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="Returns an iterator for the current entry."/>
+      <description compact="Returns an iterator for the current entry"/>
       <return type="RecursiveIterator"/>
     </docblock>
   </method>
@@ -40,7 +40,7 @@
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/SeekableIterator.xml phpdox-0.12.0/dependencies/php/interfaces/SeekableIterator.xml
--- phpdox-0.11.2/dependencies/php/interfaces/SeekableIterator.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/SeekableIterator.xml	2019-03-13 09:34:17.000000000 +0000
@@ -35,7 +35,7 @@
   <method name="valid" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact=""/>
-      <return type="boolean"/>
+      <return type="bool"/>
     </docblock>
   </method>
 </interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/SessionHandlerInterface.xml phpdox-0.12.0/dependencies/php/interfaces/SessionHandlerInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/SessionHandlerInterface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/SessionHandlerInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -16,7 +16,7 @@
   <method name="gc" abstract="false" static="false" visibility="public" final="false">
     <docblock>
       <description compact="Cleanup old sessions"/>
-      <return type="bool"/>
+      <return type="int"/>
     </docblock>
     <parameter name="maxlifetime" optional="false" byreference="false" type="int"/>
   </method>
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/SessionIdInterface.xml phpdox-0.12.0/dependencies/php/interfaces/SessionIdInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/SessionIdInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/SessionIdInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="SessionIdInterface" namespace="" name="SessionIdInterface">
+  <method name="create_sid" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Create session ID"/>
+      <return type="string"/>
+    </docblock>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/SessionUpdateTimestampHandlerInterface.xml phpdox-0.12.0/dependencies/php/interfaces/SessionUpdateTimestampHandlerInterface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/SessionUpdateTimestampHandlerInterface.xml	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/SessionUpdateTimestampHandlerInterface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<interface xmlns="http://xml.phpdox.net/src" full="SessionUpdateTimestampHandlerInterface" namespace="" name="SessionUpdateTimestampHandlerInterface">
+  <method name="updateTimestamp" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Update timestamp"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+    <parameter name="val" optional="false" byreference="false" type="string"/>
+  </method>
+  <method name="validateId" abstract="false" static="false" visibility="public" final="false">
+    <docblock>
+      <description compact="Validate ID"/>
+      <return type="bool"/>
+    </docblock>
+    <parameter name="key" optional="false" byreference="false" type="string"/>
+  </method>
+</interface>
\ No newline at end of file
diff -Nru phpdox-0.11.2/dependencies/php/interfaces/Yaf_Route_Interface.xml phpdox-0.12.0/dependencies/php/interfaces/Yaf_Route_Interface.xml
--- phpdox-0.11.2/dependencies/php/interfaces/Yaf_Route_Interface.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/dependencies/php/interfaces/Yaf_Route_Interface.xml	2019-03-13 09:34:17.000000000 +0000
@@ -2,7 +2,7 @@
 <interface xmlns="http://xml.phpdox.net/src" full="Yaf_Route_Interface" namespace="" name="Yaf_Route_Interface">
   <method name="assemble" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="assemble a request">this method returns a url according to the argument info, and append query strings to the url according to the argument query.</description>
+      <description compact="Assemble a request">this method returns a url according to the argument info, and append query strings to the url according to the argument query.</description>
       <return type="string"/>
     </docblock>
     <parameter name="info" optional="false" byreference="false" type="object" class="array"/>
@@ -10,7 +10,7 @@
   </method>
   <method name="route" abstract="false" static="false" visibility="public" final="false">
     <docblock>
-      <description compact="route a request">Yaf_Route_Interface::route is the only method that a custom route should implement. since of 2.3.0, there is another method should also be implemented, see Yaf_Route_Interface::assemble.</description>
+      <description compact="Route a request">Yaf_Route_Interface::route is the only method that a custom route should implement. since of 2.3.0, there is another method should also be implemented, see Yaf_Route_Interface::assemble.</description>
       <return type="bool"/>
     </docblock>
     <parameter name="request" optional="false" byreference="false" type="object" class="Yaf_Request_Abstract"/>
diff -Nru phpdox-0.11.2/.gitignore phpdox-0.12.0/.gitignore
--- phpdox-0.11.2/.gitignore	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/.gitignore	2019-03-13 09:34:17.000000000 +0000
@@ -10,3 +10,4 @@
 /tests/data/*/xml
 /tests/data/*/docs
 /tools
+.php_cs.cache
diff -Nru phpdox-0.11.2/LICENSE phpdox-0.12.0/LICENSE
--- phpdox-0.11.2/LICENSE	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/LICENSE	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 phpDox
 
-Copyright (c) 2010-2015 Arne Blankerts <arne@blankerts.de>
+Copyright (c) 2010-2019 Arne Blankerts <arne@blankerts.de> and contributors
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -28,4 +28,3 @@
 CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
-
diff -Nru phpdox-0.11.2/phive.xml phpdox-0.12.0/phive.xml
--- phpdox-0.11.2/phive.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/phive.xml	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phive xmlns="https://phar.io/phive">
-  <phar name="phploc" version="^3.0.1" installed="3.0.1" location="./tools/phploc"/>
-  <phar name="phpunit" version="^6.0" installed="6.2.2" location="./tools/phpunit"/>
-  <phar name="phpab" version="^1.23.0" installed="1.24.1" location="./tools/phpab"/>
+  <phar name="phploc" version="^3.0.1" installed="3.0.1" location="./tools/phploc" copy="false"/>
+  <phar name="phpunit" version="^7.0" installed="7.5.3" location="./tools/phpunit" copy="false"/>
+  <phar name="phpab" version="^1.25.2" installed="1.25.2" location="./tools/phpab" copy="false"/>
 </phive>
diff -Nru phpdox-0.11.2/.php_cs.dist phpdox-0.12.0/.php_cs.dist
--- phpdox-0.11.2/.php_cs.dist	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/.php_cs.dist	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,206 @@
+<?php declare(strict_types=1);
+
+return PhpCsFixer\Config::create()
+    ->setRiskyAllowed(true)
+    ->setUsingCache(false)
+    ->setRules(
+        [
+            'align_multiline_comment'                       => true,
+            'array_indentation'                             => true,
+            'array_syntax'                                  => ['syntax' => 'short'],
+            'binary_operator_spaces'                        => [
+                'operators' => [
+                    '='  => 'align',
+                    '=>' => 'align',
+                ],
+            ],
+            'blank_line_after_namespace'                    => true,
+            'blank_line_after_opening_tag'                  => false,
+            'blank_line_before_statement'                   => [
+                'statements' => [
+                    'break',
+                    'continue',
+                    'declare',
+                    'do',
+                    'for',
+                    'foreach',
+                    'if',
+                    'include',
+                    'include_once',
+                    'require',
+                    'require_once',
+                    'return',
+                    'switch',
+                    'throw',
+                    'try',
+                    'while',
+                    'yield',
+                ],
+            ],
+            'braces'                                        => [
+                'allow_single_line_closure'                   => false,
+                'position_after_anonymous_constructs'         => 'same',
+                'position_after_control_structures'           => 'same',
+                'position_after_functions_and_oop_constructs' => 'same'
+            ],
+            'cast_spaces'                                   => ['space' => 'none'],
+            'class_attributes_separation'                   => ['elements' => ['const', 'method', 'property']],
+            'combine_consecutive_issets'                    => true,
+            'combine_consecutive_unsets'                    => true,
+            'compact_nullable_typehint'                     => true,
+            'concat_space'                                  => ['spacing' => 'one'],
+            'date_time_immutable'                           => true,
+            'declare_equal_normalize'                       => ['space' => 'single'],
+            'declare_strict_types'                          => true,
+            'dir_constant'                                  => true,
+            'elseif'                                        => true,
+            'encoding'                                      => true,
+            'full_opening_tag'                              => true,
+            'fully_qualified_strict_types'                  => true,
+            'function_declaration'                          => [
+                'closure_function_spacing' => 'one'
+            ],
+            'header_comment'                                => [
+                'header' => ''
+            ],
+            'indentation_type'                              => true,
+            'is_null'                                       => true,
+            'line_ending'                                   => true,
+            'list_syntax'                                   => ['syntax' => 'short'],
+            'logical_operators'                             => true,
+            'lowercase_cast'                                => true,
+            'lowercase_constants'                           => true,
+            'lowercase_keywords'                            => true,
+            'lowercase_static_reference'                    => true,
+            'magic_constant_casing'                         => true,
+            'method_argument_space'                         => ['ensure_fully_multiline' => true],
+            'modernize_types_casting'                       => true,
+            'multiline_comment_opening_closing'             => true,
+            'multiline_whitespace_before_semicolons'        => true,
+            'native_constant_invocation'                    => true,
+            'native_function_casing'                        => true,
+            'native_function_invocation'                    => true,
+            'new_with_braces'                               => false,
+            'no_alias_functions'                            => true,
+            'no_alternative_syntax'                         => true,
+            'no_blank_lines_after_class_opening'            => false,
+            'no_blank_lines_after_phpdoc'                   => true,
+            'no_blank_lines_before_namespace'               => true,
+            'no_closing_tag'                                => true,
+            'no_empty_comment'                              => true,
+            'no_empty_phpdoc'                               => true,
+            'no_empty_statement'                            => true,
+            'no_extra_blank_lines'                          => true,
+            'no_homoglyph_names'                            => true,
+            'no_leading_import_slash'                       => true,
+            'no_leading_namespace_whitespace'               => true,
+            'no_mixed_echo_print'                           => ['use' => 'print'],
+            'no_multiline_whitespace_around_double_arrow'   => true,
+            'no_null_property_initialization'               => true,
+            'no_php4_constructor'                           => true,
+            'no_short_bool_cast'                            => true,
+            'no_short_echo_tag'                             => true,
+            'no_singleline_whitespace_before_semicolons'    => true,
+            'no_spaces_after_function_name'                 => true,
+            'no_spaces_inside_parenthesis'                  => true,
+            'no_superfluous_elseif'                         => true,
+            'no_superfluous_phpdoc_tags'                    => true,
+            'no_trailing_comma_in_list_call'                => true,
+            'no_trailing_comma_in_singleline_array'         => true,
+            'no_trailing_whitespace'                        => true,
+            'no_trailing_whitespace_in_comment'             => true,
+            'no_unneeded_control_parentheses'               => false,
+            'no_unneeded_curly_braces'                      => false,
+            'no_unneeded_final_method'                      => true,
+            'no_unreachable_default_argument_value'         => true,
+            'no_unset_on_property'                          => true,
+            'no_unused_imports'                             => true,
+            'no_useless_else'                               => true,
+            'no_useless_return'                             => true,
+            'no_whitespace_before_comma_in_array'           => true,
+            'no_whitespace_in_blank_line'                   => true,
+            'non_printable_character'                       => true,
+            'normalize_index_brace'                         => true,
+            'object_operator_without_whitespace'            => true,
+            'ordered_class_elements'                        => [
+                'order' => [
+                    'use_trait',
+                    'constant_public',
+                    'constant_protected',
+                    'constant_private',
+                    'property_public_static',
+                    'property_protected_static',
+                    'property_private_static',
+                    'property_public',
+                    'property_protected',
+                    'property_private',
+                    'method_public_static',
+                    'construct',
+                    'destruct',
+                    'magic',
+                    'phpunit',
+                    'method_public',
+                    'method_protected',
+                    'method_private',
+                    'method_protected_static',
+                    'method_private_static',
+                ],
+            ],
+            'ordered_imports'                               => true,
+            'phpdoc_add_missing_param_annotation'           => true,
+            'phpdoc_align'                                  => true,
+            'phpdoc_annotation_without_dot'                 => true,
+            'phpdoc_indent'                                 => true,
+            'phpdoc_no_access'                              => true,
+            'phpdoc_no_empty_return'                        => true,
+            'phpdoc_no_package'                             => true,
+            'phpdoc_order'                                  => true,
+            'phpdoc_return_self_reference'                  => true,
+            'phpdoc_scalar'                                 => true,
+            'phpdoc_separation'                             => true,
+            'phpdoc_single_line_var_spacing'                => true,
+            'phpdoc_to_comment'                             => true,
+            'phpdoc_trim'                                   => true,
+            'phpdoc_trim_consecutive_blank_line_separation' => true,
+            'phpdoc_types'                                  => ['groups' => ['simple', 'meta']],
+            'phpdoc_types_order'                            => true,
+            'phpdoc_to_return_type'                         => true,
+            'phpdoc_var_without_name'                       => true,
+            'pow_to_exponentiation'                         => true,
+            'protected_to_private'                          => true,
+            'return_assignment'                             => true,
+            'return_type_declaration'                       => ['space_before' => 'none'],
+            'self_accessor'                                 => true,
+            'semicolon_after_instruction'                   => true,
+            'set_type_to_cast'                              => true,
+            'short_scalar_cast'                             => true,
+            'simplified_null_return'                        => true,
+            'single_blank_line_at_eof'                      => true,
+            'single_import_per_statement'                   => true,
+            'single_line_after_imports'                     => true,
+            'single_quote'                                  => true,
+            'standardize_not_equals'                        => true,
+            'ternary_to_null_coalescing'                    => true,
+            'trailing_comma_in_multiline_array'             => false,
+            'trim_array_spaces'                             => true,
+            'unary_operator_spaces'                         => true,
+            'visibility_required'                           => [
+                'elements' => [
+                    'const',
+                    'method',
+                    'property',
+                ],
+            ],
+            'void_return'                                   => true,
+            'whitespace_after_comma_in_array'               => true,
+            'yoda_style'                                    => false
+        ]
+    )
+    ->setFinder(
+        PhpCsFixer\Finder::create()
+            ->files()
+            ->in(__DIR__ . '/build')
+            ->in(__DIR__ . '/src')
+            ->in(__DIR__ . '/tests')
+            ->notName('*.phpt')
+    );
diff -Nru phpdox-0.11.2/phpdox phpdox-0.12.0/phpdox
--- phpdox-0.11.2/phpdox	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/phpdox	2019-03-13 09:34:17.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /*
- * Copyright (c) 2010-2017 Arne Blankerts <arne@blankerts.de>
+ * Copyright (c) 2010-2019 Arne Blankerts <arne@blankerts.de>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
@@ -61,8 +61,9 @@
 
 $factory = new TheSeer\phpDox\Factory(
     new \TheSeer\phpDox\FileInfo(__DIR__),
-    new \TheSeer\phpDox\Version('0.11.0-dev')
+    new \TheSeer\phpDox\Version('0.12.0-dev')
 );
+
 exit($factory->getCLI()->run(
     new TheSeer\phpDox\CLIOptions($_SERVER['argv'])
 ));
diff -Nru phpdox-0.11.2/phpunit.xml.dist phpdox-0.12.0/phpunit.xml.dist
--- phpdox-0.11.2/phpunit.xml.dist	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/phpunit.xml.dist	2019-03-13 09:34:17.000000000 +0000
@@ -1,34 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated by PHP Project Wizard (PPW) 1.0.4 on Fri Mar 11 16:37:31 CET 2011 -->
-
-<phpunit backupGlobals="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/7.3/phpunit.xsd"
+         backupGlobals="false"
          backupStaticAttributes="false"
-         strict="true"
          verbose="true"
-         bootstrap="tests/bootstrap.php"
->
-  <testsuites>
-    <testsuite name="phpDox">
-      <directory suffix="Test.php">tests/Unit</directory>
-      <directory suffix="Test.php">tests/Integration</directory>
-    </testsuite>
-  </testsuites>
+         beStrictAboutCoversAnnotation="true"
+         beStrictAboutOutputDuringTests="true"
+         beStrictAboutTestsThatDoNotTestAnything="true"
+         beStrictAboutTodoAnnotatedTests="true"
+         beStrictAboutChangesToGlobalState="true"
+         bootstrap="tests/bootstrap.php">
+    <testsuites>
+        <testsuite name="phpDox">
+            <directory suffix="Test.php">tests/Unit</directory>
+            <directory suffix="Test.php">tests/Integration</directory>
+        </testsuite>
+    </testsuites>
 
-  <logging>
-    <log type="coverage-html" target="build/logs/coverage/html" title="phpDox"
-         charset="UTF-8" yui="true" highlight="true"
-         lowUpperBound="35" highLowerBound="70"/>
-    <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="coverage-xml" target="build/logs/coverage/xml"/>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
-  </logging>
+    <logging>
+        <log type="coverage-html" showUncoveredFiles="true" target="build/logs/coverage/html" lowUpperBound="35" highLowerBound="70"/>
+        <log type="coverage-clover" target="build/logs/clover.xml"/>
+        <log type="coverage-xml" target="build/logs/coverage/xml"/>
+        <log type="junit" target="build/logs/junit.xml"/>
+    </logging>
 
-  <filter>
-    <whitelist addUncoveredFilesFromWhitelist="true">
-      <directory suffix=".php">src</directory>
-      <exclude>
-        <directory suffix=".php">src/bootstrap</directory>
-      </exclude>
-    </whitelist>
-  </filter>
+    <filter>
+        <whitelist addUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+            <exclude>
+                <directory suffix=".php">src/bootstrap</directory>
+            </exclude>
+        </whitelist>
+    </filter>
 </phpunit>
diff -Nru phpdox-0.11.2/README.md phpdox-0.12.0/README.md
--- phpdox-0.11.2/README.md	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/README.md	2019-03-13 09:34:17.000000000 +0000
@@ -12,7 +12,7 @@
 Requirements
 ------------
 
-- PHP Version 5.5+ (PHP 7.x recommended)
+- PHP Version 7.1+ (For PHP 5.5+, use phpDox 0.11.2)
   - ext/dom
   - ext/xsl
   - ext/iconv and [libiconv version >= 2.12](http://www.gnu.org/software/libiconv/documentation/libiconv/iconv.1.html)
diff -Nru phpdox-0.11.2/src/ApplicationException.php phpdox-0.12.0/src/ApplicationException.php
--- phpdox-0.11.2/src/ApplicationException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/ApplicationException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,13 +1,14 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class ApplicationException extends \Exception {
+class ApplicationException extends \Exception {
+    public const InvalidSrcDirectory = 1;
 
-        const InvalidSrcDirectory = 1;
-        const UnknownEngine = 2;
-        const UnknownEnricher = 3;
-        const IndexMissing = 4;
-        const SourceMissing = 5;
-    }
+    public const UnknownEngine = 2;
 
+    public const UnknownEnricher = 3;
+
+    public const IndexMissing = 4;
+
+    public const SourceMissing = 5;
 }
diff -Nru phpdox-0.11.2/src/Application.php phpdox-0.12.0/src/Application.php
--- phpdox-0.11.2/src/Application.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/Application.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,254 +1,227 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\phpDox\Collector\InheritanceResolver;
+use TheSeer\phpDox\Generator\Enricher\EnricherException;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
+ * The main Application class
  *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * @author     Arne Blankerts <arne@blankerts.de>
+ * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
+ * @license    BSD License
  *
+ * @link       http://phpDox.net
  */
-namespace TheSeer\phpDox {
+class Application {
+    /**
+     * Logger for progress and error reporting
+     *
+     * @var ProgressLogger
+     */
+    private $logger;
 
-    use TheSeer\DirectoryScanner\DirectoryScanner;
-    use TheSeer\phpDox\Collector\InheritanceResolver;
-    use TheSeer\phpDox\Generator\Enricher\EnricherException;
-
-    /**
-     * The main Application class
-     *
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     * @link       http://phpDox.net
-     */
-    class Application {
-
-        /**
-         * Logger for progress and error reporting
-         *
-         * @var ProgressLogger
-         */
-        private $logger;
-
-        /**
-         * Factory instance
-         * @var Factory
-         */
-        private $factory;
-
-        /**
-         * Constructor of PHPDox Application
-         *
-         * @param Factory   $factory   Factory instance
-         * @param ProgressLogger $logger Instance of the SilentProgressLogger class
-         */
-        public function __construct(Factory $factory, ProgressLogger $logger) {
-            $this->factory = $factory;
-            $this->logger = $logger;
-        }
-
-        /**
-         * Run Bootstrap code for given list of bootstrap files
-         *
-         * @param FileInfoCollection $requires
-         *
-         * @return Bootstrap
-         */
-        public function runBootstrap(FileInfoCollection $requires) {
-            $bootstrap = $this->factory->getBootstrap();
-            $bootstrap->load($requires, true);
-            return $bootstrap;
-        }
+    /**
+     * Factory instance
+     *
+     * @var Factory
+     */
+    private $factory;
 
+    /**
+     * Constructor of PHPDox Application
+     *
+     * @param Factory        $factory Factory instance
+     * @param ProgressLogger $logger  Instance of the SilentProgressLogger class
+     */
+    public function __construct(Factory $factory, ProgressLogger $logger) {
+        $this->factory = $factory;
+        $this->logger  = $logger;
+    }
 
-        public function runConfigChangeDetection(FileInfo $workDirectory, FileInfo $configFile) {
-            $index = new FileInfo( (string)$workDirectory . '/index.xml');
-            if (!$index->exists() || ($index->getMTime() >= $configFile->getMTime())) {
-                return;
-            }
-            $this->logger->log("Configuration change detected - cleaning cache");
-            $cleaner = $this->factory->getDirectoryCleaner();
-            $cleaner->process($workDirectory);
-        }
-
-        /**
-         * Run collection process on given directory tree
-         *
-         * @param CollectorConfig $config Configuration options
-         *
-         * @throws ApplicationException
-         * @return void
-         */
-        public function runCollector(CollectorConfig $config) {
-            $this->logger->log("Starting collector");
-
-            $srcDir = $config->getSourceDirectory();
-            if (!$srcDir->isDir()) {
-                throw new ApplicationException(
-                    sprintf('Invalid src directory "%s" specified', $srcDir),
-                    ApplicationException::InvalidSrcDirectory
-                );
-            }
+    /**
+     * Run Bootstrap code for given list of bootstrap files
+     */
+    public function runBootstrap(FileInfoCollection $requires): Bootstrap {
+        $bootstrap = $this->factory->getBootstrap();
+        $bootstrap->load($requires, true);
+
+        return $bootstrap;
+    }
+
+    public function runConfigChangeDetection(FileInfo $workDirectory, FileInfo $configFile): void {
+        $index = new FileInfo((string)$workDirectory . '/index.xml');
 
-            $collector = $this->factory->getCollector($config);
+        if (!$index->exists() || ($index->getMTime() >= $configFile->getMTime())) {
+            return;
+        }
+        $this->logger->log('Configuration change detected - cleaning cache');
+        $cleaner = $this->factory->getDirectoryCleaner();
+        $cleaner->process($workDirectory);
+    }
 
-            $scanner = $this->factory->getScanner(
-                $config->getIncludeMasks(),
-                $config->getExcludeMasks()
+    /**
+     * Run collection process on given directory tree
+     *
+     * @param CollectorConfig $config Configuration options
+     *
+     * @throws ApplicationException
+     */
+    public function runCollector(CollectorConfig $config): void {
+        $this->logger->log('Starting collector');
+
+        $srcDir = $config->getSourceDirectory();
+
+        if (!$srcDir->isDir()) {
+            throw new ApplicationException(
+                \sprintf('Invalid src directory "%s" specified', $srcDir),
+                ApplicationException::InvalidSrcDirectory
             );
-            $project = $collector->run($scanner);
+        }
 
-            if ($collector->hasParseErrors()) {
-                $this->logger->log('The following file(s) had errors during processing and were excluded:');
-                foreach($collector->getParseErrors() as $file => $message) {
-                    $this->logger->log(' - ' . $file . ' (' . $message . ')');
-                }
+        $collector = $this->factory->getCollector($config);
+
+        $scanner = $this->factory->getScanner(
+            $config->getIncludeMasks(),
+            $config->getExcludeMasks()
+        );
+        $project = $collector->run($scanner);
+
+        if ($collector->hasParseErrors()) {
+            $this->logger->log('The following file(s) had errors during processing and were excluded:');
+
+            foreach ($collector->getParseErrors() as $file => $message) {
+                $this->logger->log(' - ' . $file . ' (' . $message . ')');
             }
+        }
 
-            $this->logger->log(
-                sprintf("Saving results to directory '%s'", $config->getWorkDirectory())
-            );
-            $vanished = $project->cleanVanishedFiles();
-            if (count($vanished) > 0) {
-                $this->logger->log(sprintf("Removed %d vanished file(s) from project:", count($vanished)));
-                foreach($vanished as $file) {
-                    $this->logger->log(' - ' . $file);
-                }
+        $this->logger->log(
+            \sprintf("Saving results to directory '%s'", $config->getWorkDirectory())
+        );
+        $vanished = $project->cleanVanishedFiles();
+
+        if (\count($vanished) > 0) {
+            $this->logger->log(\sprintf('Removed %d vanished file(s) from project:', \count($vanished)));
+
+            foreach ($vanished as $file) {
+                $this->logger->log(' - ' . $file);
             }
-            $changed = $project->save();
-            if ($config->doResolveInheritance()) {
-                /** @var $resolver InheritanceResolver */
-                $resolver = $this->factory->getInheritanceResolver();
-                $resolver->resolve($changed, $project, $config->getInheritanceConfig());
-
-                if ($resolver->hasUnresolved()) {
-                    $this->logger->log('The following unit(s) had missing dependencies during inheritance resolution:');
-                    foreach($resolver->getUnresolved() as $class => $missing) {
-                        if (is_array($missing)) {
-                            $missing = join(', ', $missing);
-                        }
-                        $this->logger->log(' - ' . $class . ' (missing ' . $missing . ')');
+        }
+        $changed = $project->save();
+
+        if ($config->doResolveInheritance()) {
+            /** @var $resolver InheritanceResolver */
+            $resolver = $this->factory->getInheritanceResolver();
+            $resolver->resolve($changed, $project, $config->getInheritanceConfig());
+
+            if ($resolver->hasUnresolved()) {
+                $this->logger->log('The following unit(s) had missing dependencies during inheritance resolution:');
+
+                foreach ($resolver->getUnresolved() as $class => $missing) {
+                    if (\is_array($missing)) {
+                        $missing = \implode(', ', $missing);
                     }
+                    $this->logger->log(' - ' . $class . ' (missing ' . $missing . ')');
                 }
+            }
 
-                if ($resolver->hasErrors()) {
-                    $this->logger->log('The following unit(s) caused errors during inheritance resolution:');
-                    foreach($resolver->getErrors() as $class => $error) {
-                        $this->logger->log(' - ' . $class . ': ' . implode(', ', $error));
-                    }
+            if ($resolver->hasErrors()) {
+                $this->logger->log('The following unit(s) caused errors during inheritance resolution:');
+
+                foreach ($resolver->getErrors() as $class => $error) {
+                    $this->logger->log(' - ' . $class . ': ' . \implode(', ', $error));
                 }
             }
-            $this->logger->log("Collector process completed\n");
         }
+        $this->logger->log("Collector process completed\n");
+    }
 
-        /**
-         * Run Documentation generation process
-         *
-         * @param GeneratorConfig $config
-         *
-         * @throws ApplicationException
-         * @return void
-         */
-        public function runGenerator(GeneratorConfig $config) {
-            $this->logger->reset();
-            $this->logger->log("Starting generator");
-
-            $engineFactory = $this->factory->getEngineFactory();
-            $enricherFactory = $this->factory->getEnricherFactory();
-
-            $failed = array_diff($config->getRequiredEngines(), $engineFactory->getEngineList());
-            if (count($failed)) {
-               $list = join("', '", $failed);
-               throw new ApplicationException("The engine(s) '$list' is/are not registered", ApplicationException::UnknownEngine);
-            }
+    /**
+     * Run Documentation generation process
+     *
+     * @throws ApplicationException
+     */
+    public function runGenerator(GeneratorConfig $config): void {
+        $this->logger->reset();
+        $this->logger->log('Starting generator');
 
-            $failed = array_diff($config->getRequiredEnrichers(), $enricherFactory->getEnricherList());
-            if (count($failed)) {
-                $list = join("', '", $failed);
-                throw new ApplicationException("The enricher(s) '$list' is/are not registered", ApplicationException::UnknownEnricher);
-            }
+        $engineFactory   = $this->factory->getEngineFactory();
+        $enricherFactory = $this->factory->getEnricherFactory();
 
-            $generator = $this->factory->getGenerator();
+        $failed = \array_diff($config->getRequiredEngines(), $engineFactory->getEngineList());
 
-            foreach($config->getActiveBuilds() as $buildCfg) {
-                $generator->addEngine( $engineFactory->getInstanceFor($buildCfg) );
-            }
+        if (\count($failed)) {
+            $list = \implode("', '", $failed);
 
-            $this->logger->log('Loading enrichers');
-            foreach($config->getActiveEnrichSources() as $type => $enrichCfg) {
-                try {
-                    $enricher = $enricherFactory->getInstanceFor($enrichCfg);
-                    $generator->addEnricher($enricher);
-                    $this->logger->log(
-                        sprintf('Enricher %s initialized successfully', $enricher->getName())
-                    );
-                } catch (EnricherException $e) {
-                    $this->logger->log(
-                        sprintf("Exception while initializing enricher %s:\n\n    %s\n",
-                            $type,
-                            $e->getMessage()
-                        )
-                    );
-                }
-            }
+            throw new ApplicationException("The engine(s) '$list' is/are not registered", ApplicationException::UnknownEngine);
+        }
 
-            $pconfig = $config->getProjectConfig();
+        $failed = \array_diff($config->getRequiredEnrichers(), $enricherFactory->getEnricherList());
 
-            if (!file_exists($pconfig->getWorkDirectory() . '/index.xml')) {
-                throw new ApplicationException(
-                    'Workdirectory does not contain an index.xml file. Did you run the collector?',
-                    ApplicationException::IndexMissing
-                );
-            }
+        if (\count($failed)) {
+            $list = \implode("', '", $failed);
 
-            if (!file_exists($pconfig->getWorkDirectory() . '/source.xml')) {
-                throw new ApplicationException(
-                    'Workdirectory does not contain an source.xml file. Did you run the collector?',
-                    ApplicationException::SourceMissing
-                );
-            }
+            throw new ApplicationException("The enricher(s) '$list' is/are not registered", ApplicationException::UnknownEnricher);
+        }
+
+        $generator = $this->factory->getGenerator();
 
-            $srcDir = $pconfig->getSourceDirectory();
-            if (!file_exists($srcDir) || !is_dir($srcDir)) {
-                throw new ApplicationException(
-                    sprintf('Invalid src directory "%s" specified', $srcDir),
-                    ApplicationException::InvalidSrcDirectory
+        foreach ($config->getActiveBuilds() as $buildCfg) {
+            $generator->addEngine($engineFactory->getInstanceFor($buildCfg));
+        }
+
+        $this->logger->log('Loading enrichers');
+
+        foreach ($config->getActiveEnrichSources() as $type => $enrichCfg) {
+            try {
+                $enricher = $enricherFactory->getInstanceFor($enrichCfg);
+                $generator->addEnricher($enricher);
+                $this->logger->log(
+                    \sprintf('Enricher %s initialized successfully', $enricher->getName())
+                );
+            } catch (EnricherException $e) {
+                $this->logger->log(
+                    \sprintf(
+                        "Exception while initializing enricher %s:\n\n    %s\n",
+                        $type,
+                        $e->getMessage()
+                    )
                 );
             }
+        }
 
-            $this->logger->log("Starting event loop.\n");
-            $generator->run(
-                new \TheSeer\phpDox\Generator\Project(
-                    $srcDir,
-                    $pconfig->getWorkDirectory()
-                )
+        $pconfig = $config->getProjectConfig();
+
+        if (!\file_exists($pconfig->getWorkDirectory() . '/index.xml')) {
+            throw new ApplicationException(
+                'Workdirectory does not contain an index.xml file. Did you run the collector?',
+                ApplicationException::IndexMissing
             );
-            $this->logger->log("Generator process completed");
         }
 
-    }
+        if (!\file_exists($pconfig->getWorkDirectory() . '/source.xml')) {
+            throw new ApplicationException(
+                'Workdirectory does not contain an source.xml file. Did you run the collector?',
+                ApplicationException::SourceMissing
+            );
+        }
+
+        $srcDir = $pconfig->getSourceDirectory();
 
+        if (!$srcDir->exists() || !$srcDir->isDir()) {
+            throw new ApplicationException(
+                \sprintf('Invalid src directory "%s" specified', $srcDir),
+                ApplicationException::InvalidSrcDirectory
+            );
+        }
+
+        $this->logger->log("Starting event loop.\n");
+        $generator->run(
+            new \TheSeer\phpDox\Generator\Project(
+                $srcDir,
+                $pconfig->getWorkDirectory()
+            )
+        );
+        $this->logger->log('Generator process completed');
+    }
 }
diff -Nru phpdox-0.11.2/src/autoload.php phpdox-0.12.0/src/autoload.php
--- phpdox-0.11.2/src/autoload.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/autoload.php	2019-03-13 09:34:17.000000000 +0000
@@ -95,6 +95,7 @@
                 'theseer\\phpdox\\factoryinterface' => '/shared/FactoryInterface.php',
                 'theseer\\phpdox\\fileinfo' => '/shared/FileInfo.php',
                 'theseer\\phpdox\\fileinfocollection' => '/shared/FileInfoCollection.php',
+                'theseer\\phpdox\\fileinfocollectionexception' => '/shared/FileInfoCollectionException.php',
                 'theseer\\phpdox\\fileinfoexception' => '/shared/FileInfoException.php',
                 'theseer\\phpdox\\generator\\abstractclassevent' => '/generator/events/AbstractClassEvent.php',
                 'theseer\\phpdox\\generator\\abstractcollection' => '/generator/project/collections/AbstractCollection.php',
diff -Nru phpdox-0.11.2/src/bootstrap/BackendBootstrapApi.php phpdox-0.12.0/src/bootstrap/BackendBootstrapApi.php
--- phpdox-0.11.2/src/bootstrap/BackendBootstrapApi.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/BackendBootstrapApi.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,63 +1,27 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    use TheSeer\phpDox\Collector\Backend\Factory as BackendFactory;
-
-    class BackendBootstrapApi {
-
-        protected $name;
-        protected $factory;
-
-        public function __construct($name, BackendFactory $factory) {
-            $this->name = $name;
-            $this->factory = $factory;
-        }
-
-        public function implementedByClass($class) {
-            $this->factory->addBackendClass($this->name, $class);
-            return $this;
-        }
-
-        public function instantiatedByFactory(FactoryInterface $factory) {
-            $this->factory->addBackendFactory($this->name, $factory);
-            return $this;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+use TheSeer\phpDox\Collector\Backend\Factory as BackendFactory;
+
+class BackendBootstrapApi {
+    protected $name;
+
+    protected $factory;
+
+    public function __construct($name, BackendFactory $factory) {
+        $this->name    = $name;
+        $this->factory = $factory;
+    }
+
+    public function implementedByClass($class) {
+        $this->factory->addBackendClass($this->name, $class);
+
+        return $this;
+    }
+
+    public function instantiatedByFactory(FactoryInterface $factory) {
+        $this->factory->addBackendFactory($this->name, $factory);
+
+        return $this;
     }
 }
diff -Nru phpdox-0.11.2/src/bootstrap/BootstrapApi.php phpdox-0.12.0/src/bootstrap/BootstrapApi.php
--- phpdox-0.11.2/src/bootstrap/BootstrapApi.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/BootstrapApi.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,195 +1,147 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\phpDox\Collector\Backend\Factory as BackendFactory;
+use TheSeer\phpDox\DocBlock\Factory as DocBlockFactory;
+use TheSeer\phpDox\Generator\Engine\Factory as EngineFactory;
+use TheSeer\phpDox\Generator\Enricher\Factory as EnricherFactory;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
+ * Bootstrapping API for registering backends, generator engines and parsers
  *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
+ * This class provides the API for use within the bootstrap process to register
+ * collecting backends, additional parsers for annotations, generator engines for
+ * additional output formats as well as enrichment plugins
  *
  * @author     Arne Blankerts <arne@blankerts.de>
  * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
  * @license    BSD License
- *
  */
-namespace TheSeer\phpDox {
+class BootstrapApi {
+    /**
+     * Reference to the BackendFactory instance
+     *
+     * @var BackendFactory
+     */
+    private $backendFactory;
+
+    /**
+     * Reference to the EngineFactory instance
+     *
+     * @var EngineFactory
+     */
+    private $engineFactory;
+
+    /**
+     * Reference to the DocblockParserFactory instance
+     *
+     * @var DocBlockFactory
+     */
+    private $parserFactory;
+
+    /**
+     * @var EnricherFactory
+     */
+    private $enricherFactory;
+
+    /**
+     * Array of registered engines
+     *
+     * @var array
+     */
+    private $engines = [];
+
+    /**
+     * Array of registered enrichers
+     *
+     * @var array
+     */
+    private $enrichers = [];
+
+    /**
+     * Array of registered backends
+     *
+     * @var array
+     */
+    private $backends = [];
+
+    /**
+     * Constructor
+     */
+    public function __construct(BackendFactory $bf, DocBlockFactory $df, EnricherFactory $erf, EngineFactory $enf, ProgressLogger $logger) {
+        $this->backendFactory  = $bf;
+        $this->engineFactory   = $enf;
+        $this->parserFactory   = $df;
+        $this->enricherFactory = $erf;
+        $this->logger          = $logger;
+    }
+
+    /**
+     * Get list of all registered generator engines
+     */
+    public function getEngines(): array {
+        return $this->engines;
+    }
+
+    /**
+     * Get list of all registered enrichers
+     */
+    public function getEnrichers(): array {
+        return $this->enrichers;
+    }
+
+    /**
+     * Get list of all registered collector backends
+     */
+    public function getBackends(): array {
+        return $this->backends;
+    }
+
+    /**
+     * Register a new backend
+     *
+     * @param string $name        Name of the collector backend
+     * @param string $description A describing text
+     */
+    public function registerBackend($name, $description = 'no description set'): BackendBootstrapApi {
+        $this->logger->log("Registered collector backend '$name'");
+        $this->backends[$name] = $description;
+
+        return new BackendBootstrapApi($name, $this->backendFactory);
+    }
+
+    /**
+     * Register a new generator enginge
+     *
+     * @param string $name        Name of the generator engine
+     * @param string $description A describing text
+     */
+    public function registerEngine($name, $description): EngineBootstrapApi {
+        $this->logger->log("Registered output engine '$name'");
+        $this->engines[$name] = $description;
+
+        return new EngineBootstrapApi($name, $this->engineFactory);
+    }
+
+    /**
+     * @param $annotation
+     */
+    public function registerParser($annotation): ParserBootstrapApi {
+        $this->logger->log("Registered parser for '$annotation' annotation");
+
+        return new ParserBootstrapApi($annotation, $this->parserFactory);
+    }
+
+    /**
+     * Register a new enricher
+     *
+     * @param string $name        Name of the enricher
+     * @param string $description A describing text
+     */
+    public function registerEnricher($name, $description): EnricherBootstrapApi {
+        $this->logger->log("Registered enricher '$name'");
+        $this->enrichers[$name] = $description;
 
-    use \TheSeer\phpDox\Collector\Backend\Factory as BackendFactory;
-    use \TheSeer\phpDox\DocBlock\Factory as DocBlockFactory;
-    use \TheSeer\phpDox\Generator\Engine\Factory as EngineFactory;
-    use \TheSeer\phpDox\Generator\Enricher\Factory as EnricherFactory;
-
-    /**
-     * Bootstrapping API for registering backends, generator engines and parsers
-     *
-     * This class provides the API for use within the bootstrap process to register
-     * collecting backends, additional parsers for annotations, generator engines for
-     * additional output formats as well as enrichment plugins
-     *
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     *
-     */
-    class BootstrapApi {
-
-        /**
-         * Reference to the BackendFactory instance
-         *
-         * @var BackendFactory
-         */
-        private $backendFactory;
-
-        /**
-         * Reference to the EngineFactory instance
-         *
-         * @var EngineFactory
-         */
-        private $engineFactory;
-
-        /**
-         * Reference to the DocblockParserFactory instance
-         *
-         * @var DocBlockFactory
-         */
-        private $parserFactory;
-
-        /**
-         * @var EnricherFactory
-         */
-        private $enricherFactory;
-
-        /**
-         * Array of registered engines
-         *
-         * @var array
-         */
-        private $engines = array();
-
-        /**
-         * Array of registered enrichers
-         *
-         * @var array
-         */
-        private $enrichers = array();
-        /**
-         * Array of registered backends
-         *
-         * @var array
-         */
-        private $backends = array();
-
-        /**
-         * Constructor
-         *
-         * @param FactoryInterface $factory
-         */
-        public function __construct(BackendFactory $bf, DocBlockFactory $df, EnricherFactory $erf, EngineFactory $enf, ProgressLogger $logger) {
-            $this->backendFactory = $bf;
-            $this->engineFactory = $enf;
-            $this->parserFactory = $df;
-            $this->enricherFactory = $erf;
-            $this->logger = $logger;
-        }
-
-        /**
-         * Get list of all registered generator engines
-         *
-         * @return array
-         */
-        public function getEngines() {
-            return $this->engines;
-        }
-
-        /**
-         * Get list of all registered enrichers
-         *
-         * @return array
-         */
-        public function getEnrichers() {
-            return $this->enrichers;
-        }
-
-        /**
-         * Get list of all registered collector backends
-         *
-         * @return array
-         */
-        public function getBackends() {
-            return $this->backends;
-        }
-
-        /**
-         * Register a new backend
-         *
-         * @param string $name        Name of the collector backend
-         * @param string $description A describing text
-         *
-         * @return BackendBootstrapApi
-         */
-        public function registerBackend($name, $description = 'no description set') {
-            $this->logger->log("Registered collector backend '$name'");
-            $this->backends[$name] = $description;
-            return new BackendBootstrapApi($name, $this->backendFactory);
-        }
-
-        /**
-         * Register a new generator enginge
-         *
-         * @param string $name         Name of the generator engine
-         * @param string $description  A describing text
-         *
-         * @return EngineBootstrapApi
-         */
-        public function registerEngine($name, $description) {
-            $this->logger->log("Registered output engine '$name'");
-            $this->engines[$name] = $description;
-            return new EngineBootstrapApi($name, $this->engineFactory);
-        }
-
-        /**
-         * @param $annotation
-         * @return ParserBootstrapApi
-         */
-        public function registerParser($annotation) {
-            $this->logger->log("Registered parser for '$annotation' annotation");
-            return new ParserBootstrapApi($annotation, $this->parserFactory);
-        }
-
-        /**
-         * Register a new enricher
-         *
-         * @param string $name         Name of the enricher
-         * @param string $description  A describing text
-         *
-         * @return EnricherBootstrapApi
-         */
-        public function registerEnricher($name, $description) {
-            $this->logger->log("Registered enricher '$name'");
-            $this->enrichers[$name] = $description;
-            return new EnricherBootstrapApi($name, $this->enricherFactory);
-        }
+        return new EnricherBootstrapApi($name, $this->enricherFactory);
     }
 }
diff -Nru phpdox-0.11.2/src/bootstrap/BootstrapException.php phpdox-0.12.0/src/bootstrap/BootstrapException.php
--- phpdox-0.11.2/src/bootstrap/BootstrapException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/BootstrapException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,6 @@
-<?php
-namespace TheSeer\phpDox {
-
-    class BootstrapException extends \Exception {
-
-        const RequireFailed = 1;
-
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+class BootstrapException extends \Exception {
+    public const RequireFailed = 1;
 }
diff -Nru phpdox-0.11.2/src/bootstrap/Bootstrap.php phpdox-0.12.0/src/bootstrap/Bootstrap.php
--- phpdox-0.11.2/src/bootstrap/Bootstrap.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/Bootstrap.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,93 +1,54 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    class Bootstrap {
-
-        public function __construct(ProgressLogger $logger, BootstrapApi $api) {
-            $this->logger = $logger;
-            $this->api = $api;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+class Bootstrap {
+    public function __construct(ProgressLogger $logger, BootstrapApi $api) {
+        $this->logger = $logger;
+        $this->api    = $api;
+    }
 
-        /**
-         * Load bootstrap files to register components and builder
-         *
-         * @param FileInfoCollection $require list of files to require
-         *
-         * @throws BootstrapException
-         */
-        public function load(FileInfoCollection $require, $silent = TRUE) {
-            foreach($require as $file) {
-                /** @var FileInfo $file */
-                if (!$file->exists()) {
-                    throw new BootstrapException(
-                        sprintf("Require file '%s' not found or not a file", $file->getRealPath()),
-                        BootstrapException::RequireFailed
-                    );
-                }
-                if (!$silent) {
-                    $this->logger->log(
-                        sprintf("Loading bootstrap file '%s'", $file->getRealPath())
-                    );
-                }
-                $this->loadBootstrap($file);
+    /**
+     * Load bootstrap files to register components and builder
+     *
+     * @param FileInfoCollection $require list of files to require
+     *
+     * @throws BootstrapException
+     */
+    public function load(FileInfoCollection $require, $silent = true): void {
+        foreach ($require as $file) {
+            /** @var FileInfo $file */
+            if (!$file->exists()) {
+                throw new BootstrapException(
+                    \sprintf("Require file '%s' not found or not a file", $file->getRealPath()),
+                    BootstrapException::RequireFailed
+                );
             }
-        }
 
-        public function getBackends() {
-            return $this->api->getBackends();
+            if (!$silent) {
+                $this->logger->log(
+                    \sprintf("Loading bootstrap file '%s'", $file->getRealPath())
+                );
+            }
+            $this->loadBootstrap($file);
         }
+    }
 
-        public function getEngines() {
-            return $this->api->getEngines();
-        }
+    public function getBackends() {
+        return $this->api->getBackends();
+    }
 
-        public function getEnrichers() {
-            return $this->api->getEnrichers();
-        }
+    public function getEngines() {
+        return $this->api->getEngines();
+    }
 
-        private function loadBootstrap($filename) {
-            /** @noinspection PhpUnusedLocalVariableInspection */
-            $phpDox = $this->api;
-            /** @noinspection PhpIncludeInspection */
-            require $filename;
-        }
+    public function getEnrichers() {
+        return $this->api->getEnrichers();
     }
 
+    private function loadBootstrap($filename): void {
+        /** @noinspection PhpUnusedLocalVariableInspection */
+        $phpDox = $this->api;
+        /** @noinspection PhpIncludeInspection */
+        require $filename;
+    }
 }
diff -Nru phpdox-0.11.2/src/bootstrap/EngineBootstrapApi.php phpdox-0.12.0/src/bootstrap/EngineBootstrapApi.php
--- phpdox-0.11.2/src/bootstrap/EngineBootstrapApi.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/EngineBootstrapApi.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,68 +1,33 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    use TheSeer\phpDox\Generator\Engine\Factory as EngineFactory;
-
-    class EngineBootstrapApi {
-
-        private $name;
-        private $factory;
-
-        public function __construct($name, EngineFactory $factory) {
-            $this->name = $name;
-            $this->factory = $factory;
-        }
-
-        public function implementedByClass($class) {
-            $this->factory->addEngineClass($this->name, $class);
-            return $this;
-        }
-
-        public function instantiatedByFactory(FactoryInterface $factory) {
-            $this->factory->addEngineFactory($this->name, $factory);
-            return $this;
-        }
-
-        public function withConfigClass($class) {
-            $this->factory->setConfigClass($this->name, $class);
-            return $this;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+use TheSeer\phpDox\Generator\Engine\Factory as EngineFactory;
+
+class EngineBootstrapApi {
+    private $name;
+
+    private $factory;
+
+    public function __construct($name, EngineFactory $factory) {
+        $this->name    = $name;
+        $this->factory = $factory;
+    }
+
+    public function implementedByClass($class) {
+        $this->factory->addEngineClass($this->name, $class);
+
+        return $this;
+    }
+
+    public function instantiatedByFactory(FactoryInterface $factory) {
+        $this->factory->addEngineFactory($this->name, $factory);
+
+        return $this;
+    }
+
+    public function withConfigClass($class) {
+        $this->factory->setConfigClass($this->name, $class);
+
+        return $this;
     }
 }
diff -Nru phpdox-0.11.2/src/bootstrap/EnricherBootstrapApi.php phpdox-0.12.0/src/bootstrap/EnricherBootstrapApi.php
--- phpdox-0.11.2/src/bootstrap/EnricherBootstrapApi.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/EnricherBootstrapApi.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,68 +1,33 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    use TheSeer\phpDox\Generator\Enricher\Factory as EnricherFactory;
-
-    class EnricherBootstrapApi {
-
-        private $name;
-        private $factory;
-
-        public function __construct($name, EnricherFactory $factory) {
-            $this->name = $name;
-            $this->factory = $factory;
-        }
-
-        public function implementedByClass($class) {
-            $this->factory->addEnricherClass($this->name, $class);
-            return $this;
-        }
-
-        public function instantiatedByFactory(FactoryInterface $factory) {
-            $this->factory->addEnricherFactory($this->name, $factory);
-            return $this;
-        }
-
-        public function withConfigClass($class) {
-            $this->factory->setConfigClass($this->name, $class);
-            return $this;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+use TheSeer\phpDox\Generator\Enricher\Factory as EnricherFactory;
+
+class EnricherBootstrapApi {
+    private $name;
+
+    private $factory;
+
+    public function __construct($name, EnricherFactory $factory) {
+        $this->name    = $name;
+        $this->factory = $factory;
+    }
+
+    public function implementedByClass($class) {
+        $this->factory->addEnricherClass($this->name, $class);
+
+        return $this;
+    }
+
+    public function instantiatedByFactory(FactoryInterface $factory) {
+        $this->factory->addEnricherFactory($this->name, $factory);
+
+        return $this;
+    }
+
+    public function withConfigClass($class) {
+        $this->factory->setConfigClass($this->name, $class);
+
+        return $this;
     }
 }
diff -Nru phpdox-0.11.2/src/bootstrap/ParserBootstrapApi.php phpdox-0.12.0/src/bootstrap/ParserBootstrapApi.php
--- phpdox-0.11.2/src/bootstrap/ParserBootstrapApi.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/bootstrap/ParserBootstrapApi.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,61 +1,23 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    use TheSeer\phpDox\DocBlock\Factory as DocBlockFactory;
-
-    class ParserBootstrapApi {
-
-        private $annotation;
-        private $factory;
-
-        public function __construct($annotation, DocBlockFactory $factory) {
-            $this->annotation = $annotation;
-            $this->factory = $factory;
-        }
-
-        public function implementedByClass($class) {
-            $this->factory->addParserClass($this->annotation, $class);
-        }
-
-        public function instantiatedByFactory(FactoryInterface $factory) {
-            $this->factory->addParserFactory($this->annotation, $factory);
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+use TheSeer\phpDox\DocBlock\Factory as DocBlockFactory;
+
+class ParserBootstrapApi {
+    private $annotation;
+
+    private $factory;
+
+    public function __construct($annotation, DocBlockFactory $factory) {
+        $this->annotation = $annotation;
+        $this->factory    = $factory;
+    }
+
+    public function implementedByClass($class): void {
+        $this->factory->addParserClass($this->annotation, $class);
+    }
+
+    public function instantiatedByFactory(FactoryInterface $factory): void {
+        $this->factory->addParserFactory($this->annotation, $factory);
     }
 }
diff -Nru phpdox-0.11.2/src/CLIOptionsException.php phpdox-0.12.0/src/CLIOptionsException.php
--- phpdox-0.11.2/src/CLIOptionsException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/CLIOptionsException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,8 +1,5 @@
-<?php
-namespace TheSeer\phpDox {
-
-    class CLIOptionsException extends \Exception {
-
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+class CLIOptionsException extends \Exception {
 }
diff -Nru phpdox-0.11.2/src/CLIOptions.php phpdox-0.12.0/src/CLIOptions.php
--- phpdox-0.11.2/src/CLIOptions.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/CLIOptions.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,54 +1,17 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     *
-     */
-
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class CLIOptions {
+class CLIOptions {
+    private $argv;
 
-        private $argv;
-        private $parsed;
+    private $parsed;
 
-        public function __construct(array $argv) {
-            $this->argv = $argv;
-        }
+    public function __construct(array $argv) {
+        $this->argv = $argv;
+    }
 
-        public function getHelpScreen() {
-            return <<<EOF
+    public function getHelpScreen() {
+        return <<<EOF
 Usage: phpdox [switches]
 
   -f, --file       Configuration file to use (defaults to ./phpdox.xml[.dist])
@@ -68,141 +31,154 @@
 
 
 EOF;
+    }
 
-        }
+    public function showHelp() {
+        $this->parse();
 
-        public function showHelp() {
-            $this->parse();
-            return $this->parsed['help'];
-        }
+        return $this->parsed['help'];
+    }
 
-        public function showVersion() {
-            $this->parse();
-            return $this->parsed['version'];
-        }
+    public function showVersion() {
+        $this->parse();
 
-        public function listBackends() {
-            $this->parse();
-            return $this->parsed['backends'];
-        }
+        return $this->parsed['version'];
+    }
 
-        public function listEngines() {
-            $this->parse();
-            return $this->parsed['engines'];
-        }
+    public function listBackends() {
+        $this->parse();
 
-        public function listEnrichers() {
-            $this->parse();
-            return $this->parsed['enrichers'];
-        }
+        return $this->parsed['backends'];
+    }
 
-        public function generateSkel() {
-            $this->parse();
-            return $this->parsed['skel'];
-        }
+    public function listEngines() {
+        $this->parse();
 
-        public function generateStrippedSkel() {
-            $this->parse();
-            return $this->parsed['strip'];
-        }
+        return $this->parsed['engines'];
+    }
 
-        public function configFile() {
-            $this->parse();
-            if (!is_string($this->parsed['file'])) {
-                return '';
-            }
-            return $this->parsed['file'];
-        }
+    public function listEnrichers() {
+        $this->parse();
 
-        public function generatorOnly() {
-            $this->parse();
-            return $this->parsed['generator'];
-        }
+        return $this->parsed['enrichers'];
+    }
+
+    public function generateSkel() {
+        $this->parse();
+
+        return $this->parsed['skel'];
+    }
+
+    public function generateStrippedSkel() {
+        $this->parse();
+
+        return $this->parsed['strip'];
+    }
 
-        public function collectorOnly() {
-            $this->parse();
-            return $this->parsed['collector'];
+    public function configFile() {
+        $this->parse();
+
+        if (!\is_string($this->parsed['file'])) {
+            return '';
         }
 
-        private function parse() {
-            $options = array(
-                'file','help','version','collector','generator', 'engines', 'enrichers', 'backends', 'skel', 'strip'
-            );
-            $shortMap = array(
-                'f' => 'file',
-                'h' => 'help',
-                'c' => 'collector',
-                'g' => 'generator',
-                'v' => 'version'
-            );
-            $valueOptions = array(
-                'file'
-            );
-
-            $conflictingOptions = array(
-                'collector' => array('generator'),
-                'generator' => array('collector')
-            );
+        return $this->parsed['file'];
+    }
 
-            $argv = $this->argv;
-            array_map('trim', $argv);
+    public function generatorOnly() {
+        $this->parse();
 
-            if (isset($argv[0][0]) && $argv[0][0] != '-') {
-                array_shift($argv);
-            }
+        return $this->parsed['generator'];
+    }
 
-            foreach($options as $opt) {
-                $this->parsed[$opt] = FALSE;
-            }
+    public function collectorOnly() {
+        $this->parse();
+
+        return $this->parsed['collector'];
+    }
+
+    private function parse(): void {
+        $options = [
+            'file', 'help', 'version', 'collector', 'generator', 'engines', 'enrichers', 'backends', 'skel', 'strip'
+        ];
+        $shortMap = [
+            'f' => 'file',
+            'h' => 'help',
+            'c' => 'collector',
+            'g' => 'generator',
+            'v' => 'version'
+        ];
+        $valueOptions = [
+            'file'
+        ];
+
+        $conflictingOptions = [
+            'collector' => ['generator'],
+            'generator' => ['collector']
+        ];
+
+        $argv = $this->argv;
+        \array_map('trim', $argv);
+
+        if (isset($argv[0][0]) && $argv[0][0] != '-') {
+            \array_shift($argv);
+        }
+
+        foreach ($options as $opt) {
+            $this->parsed[$opt] = false;
+        }
+
+        $valueExcepted = false;
+        $argName       = '';
+
+        foreach ($argv as $arg) {
+            if ($arg[0] == '-') {
+                if (\strlen($arg) == 1) {
+                    throw new CLIOptionsException(
+                        \sprintf('Syntax error while parsing option (unnamed switch or option)')
+                    );
+                }
+
+                if ($arg[1] == '-') {
+                    $argName = \mb_substr($arg, 2);
 
-            $valueExcepted = false;
-            $argName = '';
-            foreach($argv as $arg) {
-                if ($arg[0] == '-') {
-                    if (strlen($arg) == 1) {
+                    if (!\in_array($argName, $options)) {
                         throw new CLIOptionsException(
-                            sprintf('Syntax error while parsing option (unnamed switch or option)')
+                            \sprintf('Option "%s" is not defined', $argName)
                         );
                     }
-                    if ($arg[1] == '-') {
-                        $argName = mb_substr($arg, 2);
-                        if (!in_array($argName, $options)) {
-                            throw new CLIOptionsException(
-                                sprintf('Option "%s" is not defined', $argName)
-                            );
-                        }
-                    } else {
-                        $argChar = mb_substr($arg, 1);
-                        if (!isset($shortMap[$argChar])) {
+                } else {
+                    $argChar = \mb_substr($arg, 1);
+
+                    if (!isset($shortMap[$argChar])) {
+                        throw new CLIOptionsException(
+                            \sprintf('Option "%s" is not defined', $argChar)
+                        );
+                    }
+                    $argName = $shortMap[$argChar];
+                }
+
+                if (isset($conflictingOptions[$argName])) {
+                    foreach ($conflictingOptions[$argName] as $conflict) {
+                        if ($this->parsed[$conflict]) {
                             throw new CLIOptionsException(
-                                sprintf('Option "%s" is not defined', $argChar)
+                                \sprintf('Option "%s" conflicts with already set option "%s"', $argName, $conflict)
                             );
                         }
-                        $argName = $shortMap[$argChar];
                     }
-                    if (isset($conflictingOptions[$argName])) {
-                        foreach($conflictingOptions[$argName] as $conflict) {
-                            if ($this->parsed[$conflict]) {
-                                throw new CLIOptionsException(
-                                    sprintf('Option "%s" conflicts with already set option "%s"', $argName, $conflict)
-                                );
-                            }
-                        }
-                    }
-                    $this->parsed[$argName] = TRUE;
-                    $valueExcepted = in_array($argName, $valueOptions);
-                    continue;
                 }
-                if (!$valueExcepted) {
-                    throw new CLIOptionsException(
-                        sprintf('Value for option "%s" provided but none expected', $argName)
-                    );
-                }
-                $this->parsed[$argName] = $arg;
+                $this->parsed[$argName] = true;
+                $valueExcepted          = \in_array($argName, $valueOptions);
+
+                continue;
             }
 
+            if (!$valueExcepted) {
+                throw new CLIOptionsException(
+                    \sprintf('Value for option "%s" provided but none expected', $argName)
+                );
+            }
+            $this->parsed[$argName] = $arg;
         }
-
     }
-
 }
diff -Nru phpdox-0.11.2/src/CLI.php phpdox-0.12.0/src/CLI.php
--- phpdox-0.11.2/src/CLI.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/CLI.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,255 +1,219 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * Exit codes:
- *   0 - No error
- *   1 - Execution Error
- *   3 - Parameter Error
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMException;
-
-    class CLI {
-
-        const ExitOK = 0;
-        const ExitExecError = 1;
-        const ExitEnvError = 2;
-        const ExitParamError = 3;
-        const ExitConfigError = 4;
-        const ExitException = 5;
-
-        /**
-         * @var Environment
-         */
-        private $environment;
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        /**
-         * Factory instance
-         *
-         * @var Factory
-         */
-        private $factory;
-
-        /**
-         * @param Environment $env
-         * @param Factory     $factory
-         */
-        public function __construct(Environment $env, Version $version, Factory $factory) {
-            $this->environment = $env;
-            $this->version = $version;
-            $this->factory = $factory;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-        /**
-         * Main executor for CLI process.
-         */
-        public function run(CLIOptions $options) {
-            $errorHandler = $this->factory->getErrorHandler();
-            $errorHandler->register();
-
-            try {
-
-                $this->environment->ensureFitness();
-
-                if ($options->showHelp() === TRUE) {
-                    $this->showVersion();
-                    echo $options->getHelpScreen();
-                    return self::ExitOK;
-                }
+use TheSeer\fDOM\fDOMException;
 
-                if ($options->showVersion() === TRUE) {
-                    $this->showVersion();
-                    return self::ExitOK;
-                }
+class CLI {
+    public const ExitOK = 0;
 
-                if ($options->generateSkel() === TRUE) {
-                    $this->showSkeletonConfig($options->generateStrippedSkel());
-                    return self::ExitOK;
-                }
+    public const ExitExecError = 1;
 
-                $config = $this->loadConfig($options);
+    public const ExitEnvError = 2;
 
-                if ($config->isSilentMode()) {
-                    $this->factory->activateSilentMode();
-                } else {
-                    $this->showVersion();
-                }
+    public const ExitParamError = 3;
 
-                $logger = $this->factory->getLogger();
-                $logger->log("Using config file '". $config->getConfigFile()->getPathname() . "'");
+    public const ExitConfigError = 4;
 
-                $app = $this->factory->getApplication();
+    public const ExitException = 5;
 
-                $defBootstrapFiles = new FileInfoCollection();
-                $defBootstrapFiles->add(new FileInfo(__DIR__ . '/../bootstrap/backends.php'));
-                $defBootstrapFiles->add(new FileInfo(__DIR__ . '/../bootstrap/enrichers.php'));
-                $defBootstrapFiles->add(new FileInfo(__DIR__ . '/../bootstrap/engines.php'));
-
-                $bootstrap = $app->runBootstrap($defBootstrapFiles);
-                $bootstrap->load($config->getCustomBootstrapFiles(), false);
-
-                if ($options->listEngines()) {
-                    $this->showVersion();
-                    $this->showList('engines', $bootstrap->getEngines());
-                }
+    /**
+     * @var Environment
+     */
+    private $environment;
 
-                if ($options->listEnrichers()) {
-                    $this->showVersion();
-                    $this->showList('enrichers', $bootstrap->getEnrichers());
-                }
+    /**
+     * @var Version
+     */
+    private $version;
 
-                if ($options->listBackends()) {
-                    $this->showVersion();
-                    $this->showList('backends', $bootstrap->getBackends());
-                }
+    /**
+     * Factory instance
+     *
+     * @var Factory
+     */
+    private $factory;
 
-                if ($options->listBackends() || $options->listEngines() || $options->listEnrichers()) {
-                    return self::ExitOK;
-                }
+    public function __construct(Environment $env, Version $version, Factory $factory) {
+        $this->environment = $env;
+        $this->version     = $version;
+        $this->factory     = $factory;
+    }
 
-                foreach($config->getProjects() as $projectName => $projectConfig) {
+    /**
+     * Main executor for CLI process.
+     */
+    public function run(CLIOptions $options) {
+        $errorHandler = $this->factory->getErrorHandler();
+        $errorHandler->register();
 
-                    $logger->log("Starting to process project '$projectName'");
+        try {
+            $this->environment->ensureFitness();
 
-                    $app->runConfigChangeDetection(
-                        $projectConfig->getWorkDirectory(),
-                        $config->getConfigFile()
-                    );
+            if ($options->showHelp() === true) {
+                $this->showVersion();
+                print $options->getHelpScreen();
 
-                    if (!$options->generatorOnly()) {
-                        $app->runCollector( $projectConfig->getCollectorConfig() );
-                    }
+                return self::ExitOK;
+            }
 
-                    if (!$options->collectorOnly()) {
-                        $app->runGenerator( $projectConfig->getGeneratorConfig() );
-                    }
+            if ($options->showVersion() === true) {
+                $this->showVersion();
 
-                    $logger->log("Processing project '$projectName' completed.");
+                return self::ExitOK;
+            }
 
-                }
+            if ($options->generateSkel() === true) {
+                $this->showSkeletonConfig($options->generateStrippedSkel());
 
-                $logger->buildSummary();
                 return self::ExitOK;
+            }
 
-            } catch (EnvironmentException $e) {
+            $config = $this->loadConfig($options);
+
+            if ($config->isSilentMode()) {
+                $this->factory->activateSilentMode();
+            } else {
                 $this->showVersion();
-                fwrite(STDERR, 'Sorry, but your PHP environment is currently not able to run phpDox due to');
-                fwrite(STDERR, "\nthe following issue(s):\n\n" . $e->getMessage() . "\n\n");
-                fwrite(STDERR, "Please adjust your PHP configuration and try again.\n\n");
-                return self::ExitEnvError;
-            } catch (CLIOptionsException $e) {
-                $this->showVersion();
-                fwrite(STDERR, $e->getMessage()."\n\n");
-                fwrite(STDERR, $options->getHelpScreen());
-                return self::ExitParamError;
-            } catch (ConfigLoaderException $e) {
-                $this->showVersion();
-                fwrite(STDERR, "\nAn error occured while trying to load the configuration file:\n\n" . $e->getMessage(). "\n\n");
-                if ($e->getCode() == ConfigLoaderException::NeitherCandidateExists) {
-                    fwrite(STDERR, "Using --skel might get you started.\n\n");
-                }
-                return self::ExitConfigError;
-            } catch (ConfigException $e) {
-                fwrite(STDERR, "\nYour configuration seems to be corrupted:\n\n\t" . $e->getMessage()."\n\nPlease verify your configuration xml file.\n\n");
-                return self::ExitConfigError;
-            } catch (ApplicationException $e) {
-                fwrite(STDERR, "\nAn application error occured while processing:\n\n\t" . $e->getMessage()."\n\nPlease verify your configuration.\n\n");
-                return self::ExitExecError;
-            } catch (\Exception $e) {
-                if ($e instanceof fDOMException) {
-                    $e->toggleFullMessage(TRUE);
-                }
+            }
+
+            $logger = $this->factory->getLogger();
+            $logger->log("Using config file '" . $config->getConfigFile()->getPathname() . "'");
+
+            $app = $this->factory->getApplication();
+
+            $defBootstrapFiles = new FileInfoCollection();
+            $defBootstrapFiles->add(new FileInfo(__DIR__ . '/../bootstrap/backends.php'));
+            $defBootstrapFiles->add(new FileInfo(__DIR__ . '/../bootstrap/enrichers.php'));
+            $defBootstrapFiles->add(new FileInfo(__DIR__ . '/../bootstrap/engines.php'));
+
+            $bootstrap = $app->runBootstrap($defBootstrapFiles);
+            $bootstrap->load($config->getCustomBootstrapFiles(), false);
+
+            if ($options->listEngines()) {
                 $this->showVersion();
-                $errorHandler->handleException($e);
-                return self::ExitException;
-            } catch (\Throwable $e) {
+                $this->showList('engines', $bootstrap->getEngines());
+            }
+
+            if ($options->listEnrichers()) {
                 $this->showVersion();
-                $errorHandler->handleException($e);
-                return self::ExitException;
+                $this->showList('enrichers', $bootstrap->getEnrichers());
             }
-        }
 
-        /**
-         * Helper to output version information.
-         */
-        private function showVersion() {
-            static $shown = FALSE;
-            if ($shown) {
-                return;
+            if ($options->listBackends()) {
+                $this->showVersion();
+                $this->showList('backends', $bootstrap->getBackends());
             }
-            $shown = TRUE;
-            echo $this->version->getInfoString() . "\n\n";
-        }
 
-        private function showSkeletonConfig($strip) {
-            $skel = $this->factory->getConfigSkeleton();
-            echo $strip ? $skel->renderStripped() : $skel->render();
-        }
+            if ($options->listBackends() || $options->listEngines() || $options->listEnrichers()) {
+                return self::ExitOK;
+            }
+
+            foreach ($config->getProjects() as $projectName => $projectConfig) {
+                $logger->log("Starting to process project '$projectName'");
+
+                $app->runConfigChangeDetection(
+                    $projectConfig->getWorkDirectory(),
+                    $config->getConfigFile()
+                );
+
+                if (!$options->generatorOnly()) {
+                    $app->runCollector($projectConfig->getCollectorConfig());
+                }
 
-        private function showList($title, Array $list) {
-            echo "\nThe following $title are registered:\n\n";
-            foreach($list as $name => $desc) {
-                printf("   %s \t %s\n", $name, $desc);
+                if (!$options->collectorOnly()) {
+                    $app->runGenerator($projectConfig->getGeneratorConfig());
+                }
+
+                $logger->log("Processing project '$projectName' completed.");
+            }
+
+            $logger->buildSummary();
+
+            return self::ExitOK;
+        } catch (EnvironmentException $e) {
+            $this->showVersion();
+            \fwrite(\STDERR, 'Sorry, but your PHP environment is currently not able to run phpDox due to');
+            \fwrite(\STDERR, "\nthe following issue(s):\n\n" . $e->getMessage() . "\n\n");
+            \fwrite(\STDERR, "Please adjust your PHP configuration and try again.\n\n");
+
+            return self::ExitEnvError;
+        } catch (CLIOptionsException $e) {
+            $this->showVersion();
+            \fwrite(\STDERR, $e->getMessage() . "\n\n");
+            \fwrite(\STDERR, $options->getHelpScreen());
+
+            return self::ExitParamError;
+        } catch (ConfigLoaderException $e) {
+            $this->showVersion();
+            \fwrite(\STDERR, "\nAn error occured while trying to load the configuration file:\n\n" . $e->getMessage() . "\n\n");
+
+            if ($e->getCode() == ConfigLoaderException::NeitherCandidateExists) {
+                \fwrite(\STDERR, "Using --skel might get you started.\n\n");
             }
-            echo "\n\n";
-        }
 
-        /**
-         * @param CLIOptions $options
-         *
-         * @return GlobalConfig
-         * @throws ConfigLoaderException
-         */
-        private function loadConfig(CLIOptions $options) {
-            $cfgLoader = $this->factory->getConfigLoader();
-            $cfgFile = $options->configFile();
-            if ($cfgFile != '') {
-                return $cfgLoader->load($cfgFile);
+            return self::ExitConfigError;
+        } catch (ConfigException $e) {
+            \fwrite(\STDERR, "\nYour configuration seems to be corrupted:\n\n\t" . $e->getMessage() . "\n\nPlease verify your configuration xml file.\n\n");
+
+            return self::ExitConfigError;
+        } catch (ApplicationException $e) {
+            \fwrite(\STDERR, "\nAn application error occured while processing:\n\n\t" . $e->getMessage() . "\n\nPlease verify your configuration.\n\n");
+
+            return self::ExitExecError;
+        } catch (\Exception $e) {
+            if ($e instanceof fDOMException) {
+                $e->toggleFullMessage(true);
             }
-            return $cfgLoader->autodetect();
+            $this->showVersion();
+            $errorHandler->handleException($e);
+
+            return self::ExitException;
+        } catch (\Throwable $e) {
+            $this->showVersion();
+            $errorHandler->handleException($e);
+
+            return self::ExitException;
+        }
+    }
+
+    /**
+     * Helper to output version information.
+     */
+    private function showVersion(): void {
+        static $shown = false;
+
+        if ($shown) {
+            return;
         }
+        $shown = true;
+        print $this->version->getInfoString() . "\n\n";
+    }
 
+    private function showSkeletonConfig($strip): void {
+        $skel = $this->factory->getConfigSkeleton();
+        print $strip ? $skel->renderStripped() : $skel->render();
     }
 
+    private function showList($title, array $list): void {
+        print "\nThe following $title are registered:\n\n";
+
+        foreach ($list as $name => $desc) {
+            \printf("   %s \t %s\n", $name, $desc);
+        }
+        print "\n\n";
+    }
+
+    /**
+     * @throws ConfigLoaderException
+     */
+    private function loadConfig(CLIOptions $options): GlobalConfig {
+        $cfgLoader = $this->factory->getConfigLoader();
+        $cfgFile   = $options->configFile();
+
+        if ($cfgFile != '') {
+            return $cfgLoader->load($cfgFile);
+        }
+
+        return $cfgLoader->autodetect();
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/backend/BackendInterface.php phpdox-0.12.0/src/collector/backend/BackendInterface.php
--- phpdox-0.11.2/src/collector/backend/BackendInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/BackendInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,54 +1,11 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector\Backend {
-    use TheSeer\phpDox\Collector\SourceFile;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
+
+use TheSeer\phpDox\Collector\SourceFile;
 
+interface BackendInterface {
     /**
-     *
+     * @param bool $publicOnly
      */
-    interface BackendInterface {
-
-        /**
-         * @param SourceFile $sourceFile
-         * @param bool $publicOnly
-         *
-         * @return ParseResult
-         */
-        public function parse(SourceFile $sourceFile, $publicOnly);
-
-    }
+    public function parse(SourceFile $sourceFile, $publicOnly): ParseResult;
 }
diff -Nru phpdox-0.11.2/src/collector/backend/Factory.php phpdox-0.12.0/src/collector/backend/Factory.php
--- phpdox-0.11.2/src/collector/backend/Factory.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/Factory.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,68 +1,32 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector\Backend {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
 
-    use TheSeer\phpDox\Factory as MasterFactory;
+use TheSeer\phpDox\Factory as MasterFactory;
 
-    class Factory {
+class Factory {
+    /** @var MasterFactory */
+    private $master;
 
-        /** @var MasterFactory */
-        private $master;
-
-        public function __construct(MasterFactory $factory) {
-            $this->master = $factory;
-        }
+    public function __construct(MasterFactory $factory) {
+        $this->master = $factory;
+    }
 
-        public function getInstanceFor($type) {
-            switch ($type) {
-                case 'parser': {
+    public function getInstanceFor($type) {
+        switch ($type) {
+            case 'parser':
+                {
                     return new PHPParser(
                         $this->master->getDocblockParser(),
                         $this->master->getErrorHandler()
                     );
                 }
-                default: {
+            default:
+                {
                     throw new FactoryException("'$type' is not a known backend.");
                 }
-            }
         }
-
     }
+}
 
-    class FactoryException extends \Exception {}
-
+class FactoryException extends \Exception {
 }
diff -Nru phpdox-0.11.2/src/collector/backend/ParseErrorException.php phpdox-0.12.0/src/collector/backend/ParseErrorException.php
--- phpdox-0.11.2/src/collector/backend/ParseErrorException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/ParseErrorException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,44 +1,8 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector\Backend {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
 
-    class ParseErrorException extends \Exception {
-        const GeneralParseError = 1;
-        const UnexpectedExpr = 2;
-    }
+class ParseErrorException extends \Exception {
+    public const GeneralParseError = 1;
 
+    public const UnexpectedExpr = 2;
 }
diff -Nru phpdox-0.11.2/src/collector/backend/parser/CustomLexer.php phpdox-0.12.0/src/collector/backend/parser/CustomLexer.php
--- phpdox-0.11.2/src/collector/backend/parser/CustomLexer.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/parser/CustomLexer.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,66 +1,27 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector\Backend {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
 
-    use PhpParser\Lexer\Emulative;
-    use PhpParser\Parser\Tokens;
+use PhpParser\Lexer\Emulative;
+use PhpParser\Parser\Tokens;
 
-    /**
-     * CustomLexer as suggest for workaround for issue 26 (https://github.com/nikic/PHP-Parser/issues/26)
-     */
-    class CustomLexer extends Emulative {
-
-        public function getNextToken(&$value = NULL, &$startAttributes = NULL, &$endAttributes = NULL) {
-            $tokenId = parent::getNextToken($value, $startAttributes, $endAttributes);
-
-            if ($tokenId == Tokens::T_CONSTANT_ENCAPSED_STRING
-                || $tokenId == Tokens::T_LNUMBER
-                || $tokenId == Tokens::T_DNUMBER
-            ) {
-                $endAttributes['originalValue'] = $value;
-            }
-            return $tokenId;
-        }
-
-        protected function resetErrors() {
-            // kill PHPParser_Lexer's Error reset code as it breaks phpDox's error handling
-            return;
+/**
+ * CustomLexer as suggest for workaround for issue 26 (https://github.com/nikic/PHP-Parser/issues/26)
+ */
+class CustomLexer extends Emulative {
+    public function getNextToken(&$value = null, &$startAttributes = null, &$endAttributes = null): int {
+        $tokenId = parent::getNextToken($value, $startAttributes, $endAttributes);
+
+        if ($tokenId == Tokens::T_CONSTANT_ENCAPSED_STRING
+            || $tokenId == Tokens::T_LNUMBER
+            || $tokenId == Tokens::T_DNUMBER
+        ) {
+            $endAttributes['originalValue'] = $value;
         }
 
+        return $tokenId;
     }
 
+    protected function resetErrors(): void {
+        // kill PHPParser_Lexer's Error reset code as it breaks phpDox's error handling
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/backend/parser/PHPParser.php phpdox-0.12.0/src/collector/backend/parser/PHPParser.php
--- phpdox-0.11.2/src/collector/backend/parser/PHPParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/parser/PHPParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,124 +1,76 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
+
+use PhpParser\ParserFactory;
+use TheSeer\phpDox\Collector\SourceFile;
+use TheSeer\phpDox\DocBlock\Parser as DocblockParser;
+use TheSeer\phpDox\ErrorHandler;
+
+class PHPParser implements BackendInterface {
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
+     * @var \PhpParser\Parser
      */
-namespace TheSeer\phpDox\Collector\Backend {
+    private $parser;
 
-    use TheSeer\phpDox\Collector\SourceFile;
-    use TheSeer\phpDox\DocBlock\Parser as DocblockParser;
-    use PhpParser\ParserFactory;
-    use TheSeer\phpDox\ErrorHandler;
+    /**
+     * @var DocblockParser
+     */
+    private $docblockParser;
 
     /**
-     *
+     * @var ErrorHandler
      */
-    class PHPParser implements BackendInterface {
+    private $errorHandler;
 
-        /**
-         * @var \PhpParser\Parser
-         */
-        private $parser = NULL;
-
-        /**
-         * @var DocblockParser
-         */
-        private $docblockParser = NULL;
-
-        /**
-         * @var ErrorHandler
-         */
-        private $errorHandler;
-
-        /**
-         * @param DocblockParser $parser
-         */
-        public function __construct(DocblockParser $parser, ErrorHandler $errorHandler) {
-            $this->docblockParser = $parser;
-            $this->errorHandler = $errorHandler;
-        }
+    public function __construct(DocblockParser $parser, ErrorHandler $errorHandler) {
+        $this->docblockParser = $parser;
+        $this->errorHandler   = $errorHandler;
+    }
 
-        /**
-         *
-         * @param SourceFile $sourceFile
-         * @param bool $publicOnly
-         *
-         * @throws ParseErrorException
-         * @return ParseResult
-         */
-        public function parse(SourceFile $sourceFile, $publicOnly) {
-
-            try {
-                $result = new ParseResult($sourceFile);
-                $parser = $this->getParserInstance();
-                $nodes = $parser->parse($sourceFile->getSource());
-                if (!$nodes) {
-                    throw new ParseErrorException("Parser didn't return any nodes", ParseErrorException::GeneralParseError);
-                }
-                $this->getTraverserInstance($result, $publicOnly)->traverse($nodes);
-                return $result;
-            } catch (\Exception $e) {
-                $this->errorHandler->clearLastError();
-                throw new ParseErrorException('Internal Error during parsing', ParseErrorException::GeneralParseError, $e);
-            }
-        }
+    /**
+     * @param bool $publicOnly
+     *
+     * @throws ParseErrorException
+     */
+    public function parse(SourceFile $sourceFile, $publicOnly): ParseResult {
+        try {
+            $result = new ParseResult($sourceFile);
+            $parser = $this->getParserInstance();
+            $nodes  = $parser->parse($sourceFile->getSource());
 
-        /**
-         * @return \PhpParser\Parser
-         */
-        private function getParserInstance() {
-            if ($this->parser === NULL) {
-                $this->parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7, new CustomLexer());
+            if (!$nodes) {
+                throw new ParseErrorException("Parser didn't return any nodes", ParseErrorException::GeneralParseError);
             }
-            return $this->parser;
+            $this->getTraverserInstance($result, $publicOnly)->traverse($nodes);
+
+            return $result;
+        } catch (\Exception $e) {
+            $this->errorHandler->clearLastError();
+
+            throw new ParseErrorException('Internal Error during parsing', ParseErrorException::GeneralParseError, $e);
         }
+    }
 
-        /**
-         * @param ParseResult $result
-         * @param bool $publicOnly
-         *
-         * @return \PhpParser\NodeTraverser
-         */
-        private function getTraverserInstance(ParseResult $result, $publicOnly) {
-            $traverser = new \PhpParser\NodeTraverser();
-            $traverser->addVisitor(new \PhpParser\NodeVisitor\NameResolver());
-            if ($publicOnly === true) {
-                $traverser->addVisitor(new PublicOnlyVisitor());
-            }
-            $traverser->addVisitor(new UnitCollectingVisitor($this->docblockParser, $result));
-            return $traverser;
+    private function getParserInstance(): \PhpParser\Parser {
+        if ($this->parser === null) {
+            $this->parser = (new ParserFactory)->create(ParserFactory::PREFER_PHP7, new CustomLexer());
         }
+
+        return $this->parser;
     }
 
+    /**
+     * @param bool $publicOnly
+     */
+    private function getTraverserInstance(ParseResult $result, $publicOnly): \PhpParser\NodeTraverser {
+        $traverser = new \PhpParser\NodeTraverser();
+        $traverser->addVisitor(new \PhpParser\NodeVisitor\NameResolver());
+
+        if ($publicOnly === true) {
+            $traverser->addVisitor(new PublicOnlyVisitor());
+        }
+        $traverser->addVisitor(new UnitCollectingVisitor($this->docblockParser, $result));
+
+        return $traverser;
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/backend/parser/PublicOnlyVisitor.php phpdox-0.12.0/src/collector/backend/parser/PublicOnlyVisitor.php
--- phpdox-0.11.2/src/collector/backend/parser/PublicOnlyVisitor.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/parser/PublicOnlyVisitor.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,62 +1,21 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Collector\Backend {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
 
-    use PhpParser\Node;
-    use PhpParser\NodeVisitorAbstract;
-    use PhpParser\Node\Stmt as NodeType;
-
-    class PublicOnlyVisitor extends NodeVisitorAbstract {
-
-        /**
-         * @param Node $node
-         *
-         * @return int|Node
-         */
-        public function enterNode(Node $node) {
-            if (($node instanceof NodeType\Property ||
+use PhpParser\Node;
+use PhpParser\Node\Stmt as NodeType;
+use PhpParser\NodeVisitorAbstract;
+
+class PublicOnlyVisitor extends NodeVisitorAbstract {
+    /**
+     * @return int|Node
+     */
+    public function enterNode(Node $node) {
+        if (($node instanceof NodeType\Property ||
                 $node instanceof NodeType\ClassMethod ||
                 $node instanceof NodeType\ClassConst) && !$node->isPublic()) {
-
-                return new NodeType\Nop();
-            }
-
-            return $node;
+            return new NodeType\Nop();
         }
 
+        return $node;
     }
 }
diff -Nru phpdox-0.11.2/src/collector/backend/parser/UnitCollectingVisitor.php phpdox-0.12.0/src/collector/backend/parser/UnitCollectingVisitor.php
--- phpdox-0.11.2/src/collector/backend/parser/UnitCollectingVisitor.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/parser/UnitCollectingVisitor.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,539 +1,530 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
+
+use PhpParser\Node\Expr;
+use PhpParser\Node\Expr\Array_;
+use PhpParser\Node\Expr\BinaryOp;
+use PhpParser\Node\Expr\ClassConstFetch;
+use PhpParser\Node\Expr\ConstFetch;
+use PhpParser\Node\Expr\UnaryMinus;
+use PhpParser\Node\Expr\UnaryPlus;
+use PhpParser\Node\Name\FullyQualified;
+use PhpParser\Node\NullableType;
+use PhpParser\Node\Scalar\DNumber;
+use PhpParser\Node\Scalar\LNumber;
+use PhpParser\Node\Scalar\MagicConst;
+use PhpParser\Node\Scalar\String_;
+use PhpParser\Node\Stmt as NodeType;
+use PhpParser\NodeVisitorAbstract;
+use TheSeer\phpDox\Collector\AbstractUnitObject;
+use TheSeer\phpDox\Collector\AbstractVariableObject;
+use TheSeer\phpDox\Collector\InlineComment;
+use TheSeer\phpDox\Collector\MethodObject;
+use TheSeer\phpDox\DocBlock\Parser as DocBlockParser;
+
+class UnitCollectingVisitor extends NodeVisitorAbstract {
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
+     * @var \TheSeer\phpDox\DocBlock\Parser
      */
-namespace TheSeer\phpDox\Collector\Backend {
+    private $docBlockParser;
 
-    use PhpParser\Node\Expr;
-    use PhpParser\Node\Expr\Array_;
-    use PhpParser\Node\Expr\BinaryOp;
-    use PhpParser\Node\Expr\ClassConstFetch;
-    use PhpParser\Node\Expr\ConstFetch;
-    use PhpParser\Node\Expr\UnaryMinus;
-    use PhpParser\Node\Expr\UnaryPlus;
-    use PhpParser\Node\Name\FullyQualified;
-    use PhpParser\Node\NullableType;
-    use PhpParser\Node\Scalar\DNumber;
-    use PhpParser\Node\Scalar\LNumber;
-    use PhpParser\Node\Scalar\MagicConst;
-    use PhpParser\Node\Scalar\String_;
-    use TheSeer\phpDox\Collector\AbstractUnitObject;
-    use TheSeer\phpDox\Collector\AbstractVariableObject;
-    use TheSeer\phpDox\Collector\InlineComment;
-    use TheSeer\phpDox\Collector\MethodObject;
-    use TheSeer\phpDox\DocBlock\Parser as DocBlockParser;
-    use PhpParser\NodeVisitorAbstract;
-    use PhpParser\Node\Stmt as NodeType;
+    /**
+     * @var array
+     */
+    private $aliasMap = [];
 
     /**
-     *
+     * @var string
      */
-    class UnitCollectingVisitor extends NodeVisitorAbstract {
+    private $namespace = '\\';
 
-        /**
-         * @var \TheSeer\phpDox\DocBlock\Parser
-         */
-        private $docBlockParser;
-
-        /**
-         * @var array
-         */
-        private $aliasMap = array();
-
-        /**
-         * @var string
-         */
-        private $namespace = '\\';
-
-        /**
-         * @var ParseResult
-         */
-        private $result;
-
-        /**
-         * @var AbstractUnitObject
-         */
-        private $unit;
-
-        private $modifier = array(
-            NodeType\Class_::MODIFIER_PUBLIC    => 'public',
-            NodeType\Class_::MODIFIER_PROTECTED => 'protected',
-            NodeType\Class_::MODIFIER_PRIVATE   => 'private',
-        );
+    /**
+     * @var ParseResult
+     */
+    private $result;
 
-        /**
-         * @param \TheSeer\phpDox\DocBlock\Parser $parser
-         * @param ParseResult                     $result
-         */
-        public function __construct(DocBlockParser $parser, ParseResult $result) {
-            $this->docBlockParser = $parser;
-            $this->result = $result;
-        }
-
-        /**
-         * @param \PhpParser\Node $node
-         *
-         * @return int|null|\PhpParser\Node|void
-         */
-        public function enterNode(\PhpParser\Node $node) {
-            if ($node instanceof NodeType\Namespace_ && $node->name != NULL) {
-                $this->namespace = implode('\\', $node->name->parts);
-                $this->aliasMap['::context'] = $this->namespace;
-            } else if ($node instanceof NodeType\UseUse) {
-                $this->aliasMap[$node->alias] = implode('\\', $node->name->parts);
-            } else if ($node instanceof NodeType\Class_) {
-                $this->aliasMap['::unit'] = (string)$node->namespacedName;
-                $this->unit = $this->result->addClass((string)$node->namespacedName);
-                $this->processUnit($node);
-                return;
-            } else if ($node instanceof NodeType\Interface_) {
-                $this->aliasMap['::unit'] = (string)$node->namespacedName;
-                $this->unit = $this->result->addInterface((string)$node->namespacedName);
-                $this->processUnit($node);
-                return;
-            } else if ($node instanceof NodeType\Trait_) {
-                $this->aliasMap['::unit'] = (string)$node->namespacedName;
-                $this->unit = $this->result->addTrait((string)$node->namespacedName);
-                $this->processUnit($node);
-                return;
-            } else if ($node instanceof NodeType\Property) {
-                $this->processProperty($node);
-                return;
-            } else if ($node instanceof NodeType\ClassMethod) {
-                $this->processMethod($node);
-                return;
-            } elseif ($node instanceof NodeType\ClassConst) {
-                $this->processClassConstant($node);
-            } elseif ($node instanceof NodeType\TraitUse) {
-                $this->processTraitUse($node);
-            }
-        }
+    /**
+     * @var AbstractUnitObject
+     */
+    private $unit;
 
-        /**
-         * @param \PhpParser\Node $node
-         *
-         * @return false|int|null|\PhpParser\Node|\PhpParser\Node[]|void
-         */
-        public function leaveNode(\PhpParser\Node $node) {
-            if ($node instanceof NodeType\Class_
-                || $node instanceof NodeType\Interface_
-                || $node instanceof NodeType\Trait_) {
-                $this->unit = NULL;
-                return;
-            }
-        }
+    private $modifier = [
+        NodeType\Class_::MODIFIER_PUBLIC    => 'public',
+        NodeType\Class_::MODIFIER_PROTECTED => 'protected',
+        NodeType\Class_::MODIFIER_PRIVATE   => 'private',
+    ];
+
+    public function __construct(DocBlockParser $parser, ParseResult $result) {
+        $this->docBlockParser = $parser;
+        $this->result         = $result;
+    }
 
-        /**
-         * @param $node
-         */
-        private function processUnit($node) {
-            $this->unit->setStartLine($node->getAttribute('startLine'));
-            $this->unit->setEndLine($node->getAttribute('endLine'));
-            if ($node instanceof NodeType\Class_) {
-                $this->unit->setAbstract($node->isAbstract());
-                $this->unit->setFinal($node->isFinal());
+    /**
+     * @return null|int|\PhpParser\Node|void
+     */
+    public function enterNode(\PhpParser\Node $node) {
+        if ($node instanceof NodeType\Namespace_ && $node->name != null) {
+            $this->namespace             = \implode('\\', $node->name->parts);
+            $this->aliasMap['::context'] = $this->namespace;
+        } else {
+            if ($node instanceof NodeType\UseUse) {
+                $this->aliasMap[$node->getAlias()->name] = \implode('\\', $node->name->parts);
             } else {
-                $this->unit->setAbstract(FALSE);
-                $this->unit->setFinal(FALSE);
-            }
-
-            $docComment = $node->getDocComment();
-            if ($docComment !== NULL) {
-                $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
-                $this->unit->setDocBlock($block);
-            }
+                if ($node instanceof NodeType\Class_) {
+                    $this->aliasMap['::unit'] = (string)$node->namespacedName;
+                    $this->unit               = $this->result->addClass((string)$node->namespacedName);
+                    $this->processUnit($node);
 
-            if ($node->getType() != 'Stmt_Trait' && $node->extends !== NULL) {
-                if (is_array($node->extends)) {
-                    $extendsArray = $node->extends;
-                    foreach ($extendsArray as $extends) {
-                        $this->unit->addExtends(implode('\\', $extends->parts));
-                    }
-                } else {
-                    $this->unit->addExtends(implode('\\', $node->extends->parts));
+                    return;
                 }
-            }
 
-            if ($node->getType() === 'Stmt_Class') {
-                foreach($node->implements as $implements) {
-                    $this->unit->addImplements(implode('\\', $implements->parts));
+                if ($node instanceof NodeType\Interface_) {
+                    $this->aliasMap['::unit'] = (string)$node->namespacedName;
+                    $this->unit               = $this->result->addInterface((string)$node->namespacedName);
+                    $this->processUnit($node);
+
+                    return;
                 }
-            }
-        }
 
-        private function processTraitUse(NodeType\TraitUse $node) {
-            foreach($node->traits as $trait) {
-                $traitUse = $this->unit->addTrait( (string)$trait );
-                $traitUse->setStartLine($node->getAttribute('startLine'));
-                $traitUse->setEndLine($node->getAttribute('endLine'));
-            }
+                if ($node instanceof NodeType\Trait_) {
+                    $this->aliasMap['::unit'] = (string)$node->namespacedName;
+                    $this->unit               = $this->result->addTrait((string)$node->namespacedName);
+                    $this->processUnit($node);
 
-            foreach($node->adaptations as $adaptation) {
-                if ($adaptation instanceof NodeType\TraitUseAdaptation\Alias) {
-                    if ($adaptation->trait instanceof FullyQualified) {
-                        $traitUse = $this->getTraitUse((string)$adaptation->trait);
-                    } else if (count($node->traits) === 1) {
-                        $traitUse = $this->getTraitUse( (string)$node->traits[0]);
-                    } else {
-                        $traitUse = $this->unit->getAmbiguousTraitUse();
-                    }
+                    return;
+                }
 
-                    $traitUse->addAlias(
-                        $adaptation->method,
-                        $adaptation->newName,
-                        $adaptation->newModifier ? $this->modifier[$adaptation->newModifier] : NULL
-                    );
+                if ($node instanceof NodeType\Property) {
+                    $this->processProperty($node);
 
-                    continue;
+                    return;
                 }
 
-                if ($adaptation instanceof NodeType\TraitUseAdaptation\Precedence) {
-                    $traitUse = $this->getTraitUse((string)$adaptation->insteadof[0]);
-                    $traitUse->addExclude($adaptation->method);
+                if ($node instanceof NodeType\ClassMethod) {
+                    $this->processMethod($node);
 
-                    continue;
+                    return;
                 }
 
-                throw new ParseErrorException(
-                    sprintf('Unexpected adaption type %s', get_class($adaptation)),
-                    ParseErrorException::UnexpectedExpr
-                );
+                if ($node instanceof NodeType\ClassConst) {
+                    $this->processClassConstant($node);
+                } elseif ($node instanceof NodeType\TraitUse) {
+                    $this->processTraitUse($node);
+                }
             }
-
         }
+    }
 
-        private function getTraitUse($traitName) {
-            if (!$this->unit->usesTrait($traitName)) {
-                throw new ParseErrorException(
-                    sprintf('Referenced trait "%s" not used', $traitName),
-                    ParseErrorException::GeneralParseError
-                );
-            }
-            return $this->unit->getTraitUse($traitName);
+    /**
+     * @return null|false|int|\PhpParser\Node|\PhpParser\Node[]|void
+     */
+    public function leaveNode(\PhpParser\Node $node) {
+        if ($node instanceof NodeType\Class_
+            || $node instanceof NodeType\Interface_
+            || $node instanceof NodeType\Trait_) {
+            $this->unit = null;
+
+            return;
         }
+    }
 
-        /**
-         * @param NodeType\ClassMethod $node
-         */
-        private function processMethod(NodeType\ClassMethod $node) {
-
-            /** @var $method \TheSeer\phpDox\Collector\MethodObject */
-            $method = $this->unit->addMethod($node->name);
-            $method->setStartLine($node->getAttribute('startLine'));
-            $method->setEndLine($node->getAttribute('endLine'));
-            $method->setAbstract($node->isAbstract());
-            $method->setFinal($node->isFinal());
-            $method->setStatic($node->isStatic());
-
-            $this->processMethodReturnType($method, $node->getReturnType());
-
-            $visibility = 'public';
-            if ($node->isPrivate()) {
-                $visibility = 'private';
-            } elseif ($node->isProtected()) {
-                $visibility = 'protected';
-            }
-            $method->setVisibility($visibility);
+    /**
+     * @param $node
+     */
+    private function processUnit($node): void {
+        $this->unit->setStartLine($node->getAttribute('startLine'));
+        $this->unit->setEndLine($node->getAttribute('endLine'));
 
-            $docComment = $node->getDocComment();
-            if ($docComment !== NULL) {
-                $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
-                $method->setDocBlock($block);
-            }
+        if ($node instanceof NodeType\Class_) {
+            $this->unit->setAbstract($node->isAbstract());
+            $this->unit->setFinal($node->isFinal());
+        } else {
+            $this->unit->setAbstract(false);
+            $this->unit->setFinal(false);
+        }
 
-            $this->processMethodParams($method, $node->params);
+        $docComment = $node->getDocComment();
 
-            if ($node->stmts) {
-                $this->processInlineComments($method, $node->stmts);
-            }
+        if ($docComment !== null) {
+            $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
+            $this->unit->setDocBlock($block);
         }
 
-        private function processMethodReturnType(MethodObject $method, $returnType) {
-            if ($returnType === null) {
-                return;
-            }
+        if ($node->getType() != 'Stmt_Trait' && $node->extends !== null) {
+            if (\is_array($node->extends)) {
+                $extendsArray = $node->extends;
 
-            if (in_array($returnType, ['void','float','int','string','bool','callable','array'])) {
-                $returnTypeObject = $method->setReturnType($returnType);
-                $returnTypeObject->setNullable(false);
-                return;
+                foreach ($extendsArray as $extends) {
+                    $this->unit->addExtends(\implode('\\', $extends->parts));
+                }
+            } else {
+                $this->unit->addExtends(\implode('\\', $node->extends->parts));
             }
+        }
 
-            if ($returnType instanceof \PhpParser\Node\Name\FullyQualified) {
-                $returnTypeObject = $method->setReturnType($returnType->toString());
-                $returnTypeObject->setNullable(false);
-                return;
+        if ($node->getType() === 'Stmt_Class') {
+            foreach ($node->implements as $implements) {
+                $this->unit->addImplements(\implode('\\', $implements->parts));
             }
+        }
+    }
+
+    private function processTraitUse(NodeType\TraitUse $node): void {
+        foreach ($node->traits as $trait) {
+            $traitUse = $this->unit->addTrait((string)$trait);
+            $traitUse->setStartLine($node->getAttribute('startLine'));
+            $traitUse->setEndLine($node->getAttribute('endLine'));
+        }
 
-            if ($returnType instanceof NullableType) {
-                if ((string)$returnType->type === 'self') {
-                    $returnTypeObject = $method->setReturnType($this->unit->getName());
+        foreach ($node->adaptations as $adaptation) {
+            if ($adaptation instanceof NodeType\TraitUseAdaptation\Alias) {
+                if ($adaptation->trait instanceof FullyQualified) {
+                    $traitUse = $this->getTraitUse((string)$adaptation->trait);
                 } else {
-                    $returnTypeObject = $method->setReturnType($returnType->type);
+                    if (\count($node->traits) === 1) {
+                        $traitUse = $this->getTraitUse((string)$node->traits[0]);
+                    } else {
+                        $traitUse = $this->unit->getAmbiguousTraitUse();
+                    }
                 }
-                $returnTypeObject->setNullable(true);
-                return;
-            }
 
-            if ($returnType instanceof \PhpParser\Node\Name) {
-                $returnTypeObject = $method->setReturnType(
-                    $this->unit->getName()
+                $traitUse->addAlias(
+                    $adaptation->method,
+                    $adaptation->newName,
+                    $adaptation->newModifier ? $this->modifier[$adaptation->newModifier] : null
                 );
-                $returnTypeObject->setNullable(false);
-                return;
+
+                continue;
+            }
+
+            if ($adaptation instanceof NodeType\TraitUseAdaptation\Precedence) {
+                $traitUse = $this->getTraitUse((string)$adaptation->insteadof[0]);
+                $traitUse->addExclude($adaptation->method);
+
+                continue;
             }
 
             throw new ParseErrorException(
-                sprintf("Unexpected return type definition %s",
-                    get_class($returnType)
-                ),ParseErrorException::UnexpectedExpr);
+                \sprintf('Unexpected adaption type %s', \get_class($adaptation)),
+                ParseErrorException::UnexpectedExpr
+            );
+        }
+    }
+
+    private function getTraitUse($traitName) {
+        if (!$this->unit->usesTrait($traitName)) {
+            throw new ParseErrorException(
+                \sprintf('Referenced trait "%s" not used', $traitName),
+                ParseErrorException::GeneralParseError
+            );
+        }
+
+        return $this->unit->getTraitUse($traitName);
+    }
+
+    private function processMethod(NodeType\ClassMethod $node): void {
+
+        /** @var $method \TheSeer\phpDox\Collector\MethodObject */
+        $method = $this->unit->addMethod($node->name);
+        $method->setStartLine($node->getAttribute('startLine'));
+        $method->setEndLine($node->getAttribute('endLine'));
+        $method->setAbstract($node->isAbstract());
+        $method->setFinal($node->isFinal());
+        $method->setStatic($node->isStatic());
+
+        $this->processMethodReturnType($method, $node->getReturnType());
+
+        $visibility = 'public';
+
+        if ($node->isPrivate()) {
+            $visibility = 'private';
+        } elseif ($node->isProtected()) {
+            $visibility = 'protected';
+        }
+        $method->setVisibility($visibility);
+
+        $docComment = $node->getDocComment();
+
+        if ($docComment !== null) {
+            $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
+            $method->setDocBlock($block);
+        }
+
+        $this->processMethodParams($method, $node->params);
+
+        if ($node->stmts) {
+            $this->processInlineComments($method, $node->stmts);
+        }
+    }
+
+    private function processMethodReturnType(MethodObject $method, $returnType): void {
+        if ($returnType === null) {
+            return;
+        }
+
+        if (\in_array($returnType, ['void', 'float', 'int', 'string', 'bool', 'callable', 'array'])) {
+            $returnTypeObject = $method->setReturnType($returnType);
+            $returnTypeObject->setNullable(false);
+
+            return;
+        }
+
+        if ($returnType instanceof \PhpParser\Node\Name\FullyQualified) {
+            $returnTypeObject = $method->setReturnType($returnType->toString());
+            $returnTypeObject->setNullable(false);
+
+            return;
+        }
+
+        if ($returnType instanceof NullableType) {
+            if ((string)$returnType->type === 'self') {
+                $returnTypeObject = $method->setReturnType($this->unit->getName());
+            } else {
+                $returnTypeObject = $method->setReturnType($returnType->type);
+            }
+            $returnTypeObject->setNullable(true);
+
+            return;
         }
 
-        private function processInlineComments(MethodObject $method, array $stmts) {
-            foreach($stmts as $stmt) {
-                if ($stmt->hasAttribute('comments')) {
-                    foreach($stmt->getAttribute('comments') as $comment) {
-                        $inline = new InlineComment($comment->getLine(), $comment->getText());
-                        if ($inline->getCount() != 0) {
-                            $method->addInlineComment($inline);
-                        }
+        if ($returnType instanceof \PhpParser\Node\Name) {
+            $returnTypeObject = $method->setReturnType(
+                $this->unit->getName()
+            );
+            $returnTypeObject->setNullable(false);
+
+            return;
+        }
+
+        throw new ParseErrorException(
+            \sprintf(
+                'Unexpected return type definition %s',
+                \get_class($returnType)
+            ),
+            ParseErrorException::UnexpectedExpr
+        );
+    }
+
+    private function processInlineComments(MethodObject $method, array $stmts): void {
+        foreach ($stmts as $stmt) {
+            if ($stmt->hasAttribute('comments')) {
+                foreach ($stmt->getAttribute('comments') as $comment) {
+                    $inline = new InlineComment($comment->getLine(), $comment->getText());
+
+                    if ($inline->getCount() != 0) {
+                        $method->addInlineComment($inline);
                     }
                 }
             }
         }
+    }
 
-        /**
-         * @param MethodObject $method
-         * @param array                                $params
-         */
-        private function processMethodParams(MethodObject $method, array $params) {
-            foreach($params as $param) {
-                /** @var $param \PhpParser\Node\Param  */
-                $parameter = $method->addParameter($param->name);
-                $parameter->setByReference($param->byRef);
-                $this->setVariableType($parameter, $param->type);
-                $this->setVariableDefaultValue($parameter, $param->default);
-            }
+    private function processMethodParams(MethodObject $method, array $params): void {
+        foreach ($params as $param) {
+            /** @var $param \PhpParser\Node\Param */
+            $parameter = $method->addParameter($param->var->name);
+            $parameter->setByReference($param->byRef);
+            $this->setVariableType($parameter, $param->type);
+            $this->setVariableDefaultValue($parameter, $param->default);
         }
+    }
 
-        private function processClassConstant(NodeType\ClassConst $node) {
-            $constNode = $node->consts[0];
-            $const = $this->unit->addConstant($constNode->name);
-
-            $resolved = $this->resolveExpressionValue($constNode->value);
-
-            $const->setValue($resolved['value']);
-            if (isset($resolved['constant'])) {
-                $const->setConstantReference($resolved['constant']);
-            }
-            if (isset($resolved['type'])) {
-                $const->setType($resolved['type']);
-            }
+    private function processClassConstant(NodeType\ClassConst $node): void {
+        $constNode = $node->consts[0];
+        $const     = $this->unit->addConstant($constNode->name);
 
-            $docComment = $node->getDocComment();
-            if ($docComment !== NULL) {
-                $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
-                $const->setDocBlock($block);
-            }
+        $resolved = $this->resolveExpressionValue($constNode->value);
+
+        $const->setValue($resolved['value']);
+
+        if (isset($resolved['constant'])) {
+            $const->setConstantReference($resolved['constant']);
         }
 
-        private function processProperty(NodeType\Property $node) {
-            $property = $node->props[0];
-            $member = $this->unit->addMember($property->name);
-            if ($node->props[0]->default) {
-                $this->setVariableDefaultValue($member, $node->props[0]->default);
-            }
-            $visibility = 'public';
-            if ($node->isPrivate()) {
-                $visibility = 'private';
-            } elseif ($node->isProtected()) {
-                $visibility = 'protected';
-            }
-            $member->setVisibility($visibility);
-            $member->setStatic($node->isStatic());
-            $docComment = $node->getDocComment();
-            if ($docComment !== NULL) {
-                $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
-                $member->setDocBlock($block);
-            }
-            $member->setLine($node->getLine());
+        if (isset($resolved['type'])) {
+            $const->setType($resolved['type']);
         }
 
-        private function setVariableType(AbstractVariableObject $variable, $type = NULL) {
-            if ($type instanceof NullableType) {
-                $variable->setNullable(true);
-                $type = $type->type;
-            }
+        $docComment = $node->getDocComment();
 
-            if ($type === NULL) {
-                $variable->setType('{unknown}');
-                return;
-            }
+        if ($docComment !== null) {
+            $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
+            $const->setDocBlock($block);
+        }
+    }
 
-            if ($variable->isInternalType($type)) {
-                $variable->setType($type);
-                return;
-            }
+    private function processProperty(NodeType\Property $node): void {
+        $property = $node->props[0];
+        $member   = $this->unit->addMember($property->name);
 
-            if ($type instanceof \PhpParser\Node\Name\FullyQualified) {
-                $variable->setType( (string)$type);
-                return;
-            }
+        if ($node->props[0]->default) {
+            $this->setVariableDefaultValue($member, $node->props[0]->default);
+        }
+        $visibility = 'public';
 
-            $type = (string)$type;
-            if (isset($this->aliasMap[$type])) {
-                $type = $this->aliasMap[$type];
-            } elseif ($type[0]!=='\\') {
-                $type = $this->namespace . '\\' . $type;
-            }
+        if ($node->isPrivate()) {
+            $visibility = 'private';
+        } elseif ($node->isProtected()) {
+            $visibility = 'protected';
+        }
+        $member->setVisibility($visibility);
+        $member->setStatic($node->isStatic());
+        $docComment = $node->getDocComment();
+
+        if ($docComment !== null) {
+            $block = $this->docBlockParser->parse($docComment, $this->aliasMap);
+            $member->setDocBlock($block);
+        }
+        $member->setLine($node->getLine());
+    }
+
+    private function setVariableType(AbstractVariableObject $variable, $type = null): void {
+        if ($type instanceof NullableType) {
+            $variable->setNullable(true);
+            $type = $type->type;
+        }
+
+        if ($type === null) {
+            $variable->setType('{unknown}');
+
+            return;
+        }
+
+        if ($variable->isInternalType($type)) {
             $variable->setType($type);
+
+            return;
         }
 
-        private function resolveExpressionValue(Expr $expr) {
-            if ($expr instanceof String_) {
-                return array(
-                    'type' => 'string',
-                    'value' => $expr->getAttribute('originalValue')
-                );
-            }
+        if ($type instanceof \PhpParser\Node\Name\FullyQualified) {
+            $variable->setType((string)$type);
 
-            if ($expr instanceof LNumber ||
-                $expr instanceof UnaryMinus ||
-                $expr instanceof UnaryPlus) {
-                return array(
-                    'type' => 'integer',
-                    'value' => $expr->getAttribute('originalValue')
-                );
-            }
+            return;
+        }
 
-            if ($expr instanceof DNumber) {
-                return array(
-                    'type' => 'float',
-                    'value' => $expr->getAttribute('originalValue')
-                );
-            }
+        $type = (string)$type;
 
-            if ($expr instanceof Array_) {
-                return array(
-                    'type' => 'array',
-                    'value' => '' // @todo add array2xml?
-                );
-            }
+        if (isset($this->aliasMap[$type])) {
+            $type = $this->aliasMap[$type];
+        } elseif ($type[0] !== '\\') {
+            $type = $this->namespace . '\\' . $type;
+        }
+        $variable->setType($type);
+    }
 
-            if ($expr instanceof ClassConstFetch) {
-                return array(
-                    'type' => '{unknown}',
-                    'value' => '',
-                    'constant' => implode('\\', $expr->class->parts) . '::' . $expr->name
-                );
-            }
+    private function resolveExpressionValue(Expr $expr) {
+        if ($expr instanceof String_) {
+            return [
+                'type'  => 'string',
+                'value' => $expr->getAttribute('originalValue')
+            ];
+        }
 
-            if ($expr instanceof ConstFetch) {
-                $reference = implode('\\', $expr->name->parts);
-                if (strtolower($reference) === 'null') {
-                    return array(
-                        'value' => 'NULL'
-                    );
-                }
-                if (in_array(strtolower($reference), array('true', 'false'))) {
-                    return array(
-                        'type' => 'boolean',
-                        'value' => $reference
-                    );
-                }
-                return array(
-                    'type' => '{unknown}',
-                    'value' => '',
-                    'constant' => implode('\\', $expr->name->parts)
-                );
-            }
+        if ($expr instanceof LNumber ||
+            $expr instanceof UnaryMinus ||
+            $expr instanceof UnaryPlus) {
+            return [
+                'type'  => 'integer',
+                'value' => $expr->getAttribute('originalValue')
+            ];
+        }
 
-            if ($expr instanceof MagicConst\Line) {
-                return array(
-                    'type' => 'integer',
-                    'value' => '',
-                    'constant' => $expr->getName()
-                );
+        if ($expr instanceof DNumber) {
+            return [
+                'type'  => 'float',
+                'value' => $expr->getAttribute('originalValue')
+            ];
+        }
+
+        if ($expr instanceof Array_) {
+            return [
+                'type'  => 'array',
+                'value' => '' // @todo add array2xml?
+            ];
+        }
+
+        if ($expr instanceof ClassConstFetch) {
+            return [
+                'type'     => '{unknown}',
+                'value'    => '',
+                'constant' => \implode('\\', $expr->class->parts) . '::' . $expr->name
+            ];
+        }
+
+        if ($expr instanceof ConstFetch) {
+            $reference = \implode('\\', $expr->name->parts);
+
+            if (\strtolower($reference) === 'null') {
+                return [
+                    'value' => 'NULL'
+                ];
             }
 
-            if ($expr instanceof MagicConst) {
-                return array(
-                    'type' => 'string',
-                    'value' => '',
-                    'constant' => $expr->getName()
-                );
+            if (\in_array(\strtolower($reference), ['true', 'false'])) {
+                return [
+                    'type'  => 'boolean',
+                    'value' => $reference
+                ];
             }
 
-            if ($expr instanceof BinaryOp) {
-                $code = (new \PhpParser\PrettyPrinter\Standard)->prettyPrint([$expr]);
+            return [
+                'type'     => '{unknown}',
+                'value'    => '',
+                'constant' => \implode('\\', $expr->name->parts)
+            ];
+        }
 
-                return array(
-                    'type' => 'expression',
-                    'value' => substr($code,0,-1)
-                );
+        if ($expr instanceof MagicConst\Line) {
+            return [
+                'type'     => 'integer',
+                'value'    => '',
+                'constant' => $expr->getName()
+            ];
+        }
 
-            }
+        if ($expr instanceof MagicConst) {
+            return [
+                'type'     => 'string',
+                'value'    => '',
+                'constant' => $expr->getName()
+            ];
+        }
 
-            $type = get_class($expr);
-            $line = $expr->getLine();
-            $file = $this->result->getFileName();
-            throw new ParseErrorException("Unexpected expression type '$type' for value in line $line of file '$file'", ParseErrorException::UnexpectedExpr);
+        if ($expr instanceof BinaryOp) {
+            $code = (new \PhpParser\PrettyPrinter\Standard)->prettyPrint([$expr]);
 
+            return [
+                'type'  => 'expression',
+                'value' => \substr($code, 0, -1)
+            ];
         }
 
-        /**
-         * @param AbstractVariableObject $variable
-         * @param Expr                   $default
-         *
-         * @throws ParseErrorException
-         */
-        private function setVariableDefaultValue(AbstractVariableObject $variable, Expr $default = NULL) {
-            if ($default === NULL) {
-                return;
-            }
+        $type = \get_class($expr);
+        $line = $expr->getLine();
+        $file = $this->result->getFileName();
 
-            $resolved = $this->resolveExpressionValue($default);
-            $variable->setDefault($resolved['value']);
+        throw new ParseErrorException("Unexpected expression type '$type' for value in line $line of file '$file'", ParseErrorException::UnexpectedExpr);
+    }
 
-            if (isset($resolved['type'])) {
-                $variable->setType($resolved['type']);
-            }
+    /**
+     * @param Expr $default
+     *
+     * @throws ParseErrorException
+     */
+    private function setVariableDefaultValue(AbstractVariableObject $variable, Expr $default = null): void {
+        if ($default === null) {
+            return;
+        }
 
-            if (isset($resolved['constant'])) {
-                $variable->setConstant($resolved['constant']);
-            }
+        $resolved = $this->resolveExpressionValue($default);
+        $variable->setDefault($resolved['value']);
+
+        if (isset($resolved['type'])) {
+            $variable->setType($resolved['type']);
+        }
+
+        if (isset($resolved['constant'])) {
+            $variable->setConstant($resolved['constant']);
         }
     }
 }
diff -Nru phpdox-0.11.2/src/collector/backend/ParseResultException.php phpdox-0.12.0/src/collector/backend/ParseResultException.php
--- phpdox-0.11.2/src/collector/backend/ParseResultException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/ParseResultException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,8 +1,6 @@
-<?php
-namespace TheSeer\phpDox\Collector\Backend {
-
-    class ParseResultException extends \Exception {
-        const NoTokenDom = 1;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
 
+class ParseResultException extends \Exception {
+    public const NoTokenDom = 1;
 }
diff -Nru phpdox-0.11.2/src/collector/backend/ParseResult.php phpdox-0.12.0/src/collector/backend/ParseResult.php
--- phpdox-0.11.2/src/collector/backend/ParseResult.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/ParseResult.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,153 +1,99 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
+
+use TheSeer\phpDox\Collector\ClassObject;
+use TheSeer\phpDox\Collector\InterfaceObject;
+use TheSeer\phpDox\Collector\TraitObject;
+
+class ParseResult {
+    /**
+     * @var \SplFileInfo
+     */
+    private $file;
+
+    /**
+     * @var ClassObject[]
+     */
+    private $classes = [];
+
+    /**
+     * @var InterfaceObject[]
+     */
+    private $interfaces = [];
+
+    /**
+     * @var TraitObject[]
+     */
+    private $traits = [];
+
+    public function __construct(\SplFileInfo $file) {
+        $this->file = $file;
+    }
+
+    public function getFileName() {
+        return $this->file->getRealPath();
+    }
+
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector\Backend {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\Collector\TraitObject;
-    use TheSeer\phpDox\Collector\InterfaceObject;
-    use TheSeer\phpDox\Collector\ClassObject;
-
-    /**
-     *
-     */
-    class ParseResult {
-
-        /**
-         * @var \SplFileInfo
-         */
-        private $file;
-
-        /**
-         * @var ClassObject[]
-         */
-        private $classes = array();
-
-        /**
-         * @var InterfaceObject[]
-         */
-        private $interfaces  = array();
-
-        /**
-         * @var TraitObject[]
-         */
-        private $traits  = array();
-
-        /**
-         * @param \SplFileInfo $file
-         */
-        public function __construct(\SplFileInfo $file) {
-            $this->file = $file;
-        }
-
-        public function getFileName() {
-            return $this->file->getRealPath();
-        }
-
-        /**
-         * @param $name
-         * @return ClassObject
-         */
-        public function addClass($name) {
-            $obj = new ClassObject($name, $this->file);
-            $this->classes[$name] = $obj;
-            return $obj;
-        }
-
-        /**
-         * @param $name
-         * @return InterfaceObject
-         */
-        public function addInterface($name) {
-            $obj = new InterfaceObject($name, $this->file);
-            $this->interfaces[$name] = $obj;
-            return $obj;
-        }
-
-        /**
-         * @param $name
-         * @return TraitObject
-         */
-        public function addTrait($name) {
-            $obj = new TraitObject($name, $this->file);
-            $this->traits[$name] = $obj;
-            return $obj;
-        }
-
-        /**
-         * @return bool
-         */
-        public function hasClasses() {
-            return count($this->classes) > 0;
-        }
-
-        /**
-         * @return bool
-         */
-        public function hasInterfaces() {
-            return count($this->interfaces) > 0;
-        }
-
-        /**
-         * @return bool
-         */
-        public function hasTraits() {
-            return count($this->traits) > 0;
-        }
-
-        /**
-         * @return ClassObject[]
-         */
-        public function getClasses() {
-            return $this->classes;
-        }
-
-        /**
-         * @return InterfaceObject[]
-         */
-        public function getInterfaces() {
-            return $this->interfaces;
-        }
-
-        /**
-         * @return TraitObject[]
-         */
-        public function getTraits() {
-            return $this->traits;
-        }
+     * @param $name
+     */
+    public function addClass($name): ClassObject {
+        $obj                  = new ClassObject($name, $this->file);
+        $this->classes[$name] = $obj;
+
+        return $obj;
     }
 
+    /**
+     * @param $name
+     */
+    public function addInterface($name): InterfaceObject {
+        $obj                     = new InterfaceObject($name, $this->file);
+        $this->interfaces[$name] = $obj;
+
+        return $obj;
+    }
+
+    /**
+     * @param $name
+     */
+    public function addTrait($name): TraitObject {
+        $obj                 = new TraitObject($name, $this->file);
+        $this->traits[$name] = $obj;
+
+        return $obj;
+    }
+
+    public function hasClasses(): bool {
+        return \count($this->classes) > 0;
+    }
+
+    public function hasInterfaces(): bool {
+        return \count($this->interfaces) > 0;
+    }
+
+    public function hasTraits(): bool {
+        return \count($this->traits) > 0;
+    }
+
+    /**
+     * @return ClassObject[]
+     */
+    public function getClasses(): array {
+        return $this->classes;
+    }
+
+    /**
+     * @return InterfaceObject[]
+     */
+    public function getInterfaces(): array {
+        return $this->interfaces;
+    }
+
+    /**
+     * @return TraitObject[]
+     */
+    public function getTraits(): array {
+        return $this->traits;
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/backend/SourceFileException.php phpdox-0.12.0/src/collector/backend/SourceFileException.php
--- phpdox-0.11.2/src/collector/backend/SourceFileException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/backend/SourceFileException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Collector\Backend {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector\Backend;
 
-    class SourceFileException extends \Exception {
-        const BadEncoding = 1;
-        const InvalidDataBytes = 2;
-
-    }
+class SourceFileException extends \Exception {
+    public const BadEncoding = 1;
 
+    public const InvalidDataBytes = 2;
 }
diff -Nru phpdox-0.11.2/src/collector/CollectorException.php phpdox-0.12.0/src/collector/CollectorException.php
--- phpdox-0.11.2/src/collector/CollectorException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/CollectorException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,43 +1,6 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Collector {
-
-    class CollectorException extends \TheSeer\phpDox\HasFileInfoException {
-        const ProcessingError = 1;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
+class CollectorException extends \TheSeer\phpDox\HasFileInfoException {
+    public const ProcessingError = 1;
 }
diff -Nru phpdox-0.11.2/src/collector/Collector.php phpdox-0.12.0/src/collector/Collector.php
--- phpdox-0.11.2/src/collector/Collector.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/Collector.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,183 +1,138 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
+
+use TheSeer\DirectoryScanner\DirectoryScanner;
+use TheSeer\phpDox\Collector\Backend\BackendInterface;
+use TheSeer\phpDox\Collector\Backend\ParseErrorException;
+use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\ProgressLogger;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
+ * Collector processing class
  */
-namespace TheSeer\phpDox\Collector {
+class Collector {
+    /**
+     * @var ProgressLogger
+     */
+    private $logger;
 
-    use TheSeer\DirectoryScanner\DirectoryScanner;
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\ProgressLogger;
-    use TheSeer\phpDox\Collector\Backend\BackendInterface;
-    use TheSeer\phpDox\Collector\Backend\ParseErrorException;
-
-    /**
-     * Collector processing class
-     */
-    class Collector {
-
-        /**
-         * @var ProgressLogger
-         */
-        private $logger;
-
-        /**
-         * @var Project
-         */
-        private $project;
-
-        /**
-         * @var array
-         */
-        private $parseErrors = array();
-
-        /**
-         * @var BackendInterface
-         */
-        private $backend;
-
-        /**
-         * @var string
-         */
-        private $encoding;
-
-        /**
-         * @var bool
-         */
-        private $publicOnly;
-
-        /**
-         * @param ProgressLogger   $logger
-         * @param Project          $project
-         * @param BackendInterface $backend
-         * @param string           $encoding
-         * @param bool             $publicOnly
-         */
-        public function __construct(ProgressLogger $logger, Project $project, BackendInterface $backend, $encoding, $publicOnly) {
-            $this->logger = $logger;
-            $this->project = $project;
-            $this->backend = $backend;
-            $this->encoding = $encoding;
-            $this->publicOnly = $publicOnly;
-        }
+    /**
+     * @var Project
+     */
+    private $project;
 
-        /**
-         * @param DirectoryScanner $scanner
-         *
-         * @return Project
-         */
-        public function run(DirectoryScanner $scanner) {
-
-            $srcDir = $this->project->getSourceDir();
-            $this->logger->log("Scanning directory '{$srcDir}' for files to process\n");
-
-            $iterator = new SourceFileIterator($scanner($srcDir), $srcDir, $this->encoding);
-            foreach($iterator as $file) {
-                $needsProcessing = $this->project->addFile($file);
-                if (!$needsProcessing) {
-                    $this->logger->progress('cached');
-                    continue;
-                }
-                if (!$this->processFile($file)) {
-                    $this->project->removeFile($file);
-                }
+    /**
+     * @var array
+     */
+    private $parseErrors = [];
+
+    /**
+     * @var BackendInterface
+     */
+    private $backend;
+
+    /**
+     * @var string
+     */
+    private $encoding;
+
+    /**
+     * @var bool
+     */
+    private $publicOnly;
+
+    /**
+     * @param string $encoding
+     * @param bool   $publicOnly
+     */
+    public function __construct(ProgressLogger $logger, Project $project, BackendInterface $backend, $encoding, $publicOnly) {
+        $this->logger     = $logger;
+        $this->project    = $project;
+        $this->backend    = $backend;
+        $this->encoding   = $encoding;
+        $this->publicOnly = $publicOnly;
+    }
+
+    public function run(DirectoryScanner $scanner): Project {
+        $srcDir = $this->project->getSourceDir();
+        $this->logger->log("Scanning directory '{$srcDir}' for files to process\n");
+
+        $iterator = new SourceFileIterator($scanner($srcDir), $srcDir, $this->encoding);
+
+        foreach ($iterator as $file) {
+            $needsProcessing = $this->project->addFile($file);
+
+            if (!$needsProcessing) {
+                $this->logger->progress('cached');
+
+                continue;
             }
-            $this->logger->completed();
-            return $this->project;
-        }
 
-        /**
-         * @return bool
-         */
-        public function hasParseErrors() {
-            return count($this->parseErrors) > 0;
+            if (!$this->processFile($file)) {
+                $this->project->removeFile($file);
+            }
         }
+        $this->logger->completed();
 
-        /**
-         * @return array
-         */
-        public function getParseErrors() {
-            return $this->parseErrors;
-        }
+        return $this->project;
+    }
 
-        /**
-         * @param FileInfo $file
-         *
-         * @throws CollectorException
-         * @throws \TheSeer\phpDox\ProgressLoggerException
-         *
-         * @return bool
-         */
-        private function processFile(SourceFile $file) {
-            try {
-                if ($file->getSize() === 0) {
-                    $this->logger->progress('processed');
-                    return true;
-                }
-                $result = $this->backend->parse($file, $this->publicOnly);
+    public function hasParseErrors(): bool {
+        return \count($this->parseErrors) > 0;
+    }
+
+    public function getParseErrors(): array {
+        return $this->parseErrors;
+    }
+
+    /**
+     * @param FileInfo $file
+     *
+     * @throws CollectorException
+     * @throws \TheSeer\phpDox\ProgressLoggerException
+     */
+    private function processFile(SourceFile $file): bool {
+        try {
+            if ($file->getSize() === 0) {
+                $this->logger->progress('processed');
 
-                if ($result->hasClasses()) {
-                    foreach($result->getClasses() as $class) {
-                        $this->project->addClass($class);
-                    }
+                return true;
+            }
+            $result = $this->backend->parse($file, $this->publicOnly);
+
+            if ($result->hasClasses()) {
+                foreach ($result->getClasses() as $class) {
+                    $this->project->addClass($class);
                 }
-                if ($result->hasInterfaces()) {
-                    foreach($result->getInterfaces() as $interface) {
-                        $this->project->addInterface($interface);
-                    }
+            }
+
+            if ($result->hasInterfaces()) {
+                foreach ($result->getInterfaces() as $interface) {
+                    $this->project->addInterface($interface);
                 }
-                if ($result->hasTraits()) {
-                    foreach($result->getTraits() as $trait) {
-                        $this->project->addTrait($trait);
-                    }
+            }
+
+            if ($result->hasTraits()) {
+                foreach ($result->getTraits() as $trait) {
+                    $this->project->addTrait($trait);
                 }
-                $this->logger->progress('processed');
-                return true;
-            } catch (ParseErrorException $e) {
-                $previous = $e->getPrevious();
-                $this->parseErrors[$file->getPathname()] = sprintf(
-                    '%s [%s:%d]',
-                    $previous->getMessage(),
-                    basename($previous->getFile()),
-                    $previous->getLine()
-                );
-                $this->logger->progress('failed');
-                return false;
-            } catch (\Exception $e) {
-                throw new CollectorException('Error while processing source file', CollectorException::ProcessingError, $e, $file);
             }
-        }
+            $this->logger->progress('processed');
 
+            return true;
+        } catch (ParseErrorException $e) {
+            $previous                                = $e->getPrevious();
+            $this->parseErrors[$file->getPathname()] = \sprintf(
+                '%s [%s:%d]',
+                $previous->getMessage(),
+                \basename($previous->getFile()),
+                $previous->getLine()
+            );
+            $this->logger->progress('failed');
+
+            return false;
+        } catch (\Exception $e) {
+            throw new CollectorException('Error while processing source file', CollectorException::ProcessingError, $e, $file);
+        }
     }
 }
diff -Nru phpdox-0.11.2/src/collector/InheritanceResolver.php phpdox-0.12.0/src/collector/InheritanceResolver.php
--- phpdox-0.11.2/src/collector/InheritanceResolver.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/InheritanceResolver.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,224 +1,92 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
+
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\InheritanceConfig;
+use TheSeer\phpDox\ProgressLogger;
+
+/**
+ * Inheritance resolving class
+ */
+class InheritanceResolver {
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
+     * @var ProgressLogger
      */
-namespace TheSeer\phpDox\Collector {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\InheritanceConfig;
-    use TheSeer\phpDox\ProgressLogger;
+    private $logger;
 
     /**
-     * Inheritance resolving class
+     * @var \TheSeer\phpDox\Collector\Project
      */
-    class InheritanceResolver {
-
-        /**
-         * @var ProgressLogger
-         */
-        private $logger;
-
-        /**
-         * @var \TheSeer\phpDox\Collector\Project
-         */
-        private $project;
-
-        /**
-         * @var InheritanceConfig
-         */
-        private $config;
-
-        private $dependencyStack = array();
-
-        /**
-         * @var array
-         */
-        private $unresolved = array();
-
-        /**
-         * @var array
-         */
-        private $errors = array();
-
-        /**
-         * @param ProgressLogger $logger
-         */
-        public function __construct(ProgressLogger $logger) {
-            $this->logger = $logger;
-        }
-
-        /**
-         * @param array             $changed
-         * @param Project           $project
-         * @param InheritanceConfig $config
-         *
-         * @throws ProjectException
-         * @throws UnitObjectException
-         */
-        public function resolve(Array $changed, Project $project, InheritanceConfig $config) {
-            if (count($changed) == 0) {
-                return;
-            }
-            $this->logger->reset();
-            $this->logger->log("Resolving inheritance\n");
-
-            $this->project = $project;
-            $this->config = $config;
-
-            $this->setupDependencies();
-
-            foreach($changed as $unit) {
-                /** @var AbstractUnitObject $unit */
-                if ($unit->hasExtends()) {
-                    foreach($unit->getExtends() as $name) {
-                        try {
-                            $extendedUnit = $this->getUnitByName($name);
-                            $this->processExtends($unit, $extendedUnit);
-                        } catch (ProjectException $e) {
-                            $this->addUnresolved($unit, $name);
-                        }
-                    }
-                }
-                if ($unit->hasImplements()) {
-                    foreach($unit->getImplements() as $implements) {
-                        try {
-                            $implementsUnit = $this->getUnitByName($implements);
-                            $this->processImplements($unit, $implementsUnit);
-                        } catch (ProjectException $e) {
-                            $this->addUnresolved($unit, $implements);
-                        }
-                    }
-                }
-                if ($unit->usesTraits()) {
-                    foreach($unit->getUsedTraits() as $traitName) {
-                        try {
-                            $traitUnit = $this->getUnitByName($traitName);
-                            $this->processTraitUse(
-                                $unit,
-                                $unit->getTraitUse($traitName),
-                                $traitUnit
-                            );
-                        } catch (ProjectException $e) {
-                            $this->addUnresolved($unit, $traitName);
-                        }
-                    }
-                }
+    private $project;
 
-                $unitName = $unit->getName();
-                if (isset($this->unresolved[$unitName])) {
-                    foreach($this->unresolved[$unitName] as $missingUnit) {
-                        $unit->markDependencyAsUnresolved($missingUnit);
-                    }
-                }
-
-                $this->logger->progress('processed');
-            }
-
-            $this->project->save();
-            $this->logger->completed();
-        }
-
-        public function hasUnresolved() {
-            return count($this->unresolved) > 0;
-        }
-
-        public function getUnresolved() {
-            return $this->unresolved;
-        }
-
-        public function hasErrors() {
-            return count($this->errors) > 0;
-        }
-
-        public function getErrors() {
-            return $this->errors;
-        }
+    /**
+     * @var InheritanceConfig
+     */
+    private $config;
 
-        private function addError(AbstractUnitObject $unit, $errorInfo) {
-            $unitName = $unit->getName();
-            if (!isset($this->errors[$unitName])) {
-                $this->errors[$unitName] = array();
-            }
-            $this->errors[$unitName][] = $errorInfo;
-        }
+    private $dependencyStack = [];
 
-        private function addUnresolved(AbstractUnitObject $unit, $missingUnit) {
-            $unitName = $unit->getName();
-            if (!isset($this->unresolved[$unitName])) {
-                $this->unresolved[$unitName] = array();
-            }
-            $this->unresolved[$unitName][] = $missingUnit;
-            $this->project->registerForSaving($unit);
-        }
+    /**
+     * @var array
+     */
+    private $unresolved = [];
 
-        private function processExtends(AbstractUnitObject $unit, AbstractUnitObject $extends) {
-            $this->project->registerForSaving($unit);
-            $this->project->registerForSaving($extends);
+    /**
+     * @var array
+     */
+    private $errors = [];
 
-            $extends->addExtender($unit);
-            $unit->importExports($extends, 'parent');
+    public function __construct(ProgressLogger $logger) {
+        $this->logger = $logger;
+    }
 
-            if ($extends->hasExtends()) {
-                foreach($extends->getExtends() as $name) {
+    /**
+     * @throws ProjectException
+     * @throws UnitObjectException
+     */
+    public function resolve(array $changed, Project $project, InheritanceConfig $config): void {
+        if (\count($changed) == 0) {
+            return;
+        }
+        $this->logger->reset();
+        $this->logger->log("Resolving inheritance\n");
+
+        $this->project = $project;
+        $this->config  = $config;
+
+        $this->setupDependencies();
+
+        foreach ($changed as $unit) {
+            /** @var AbstractUnitObject $unit */
+            if ($unit->hasExtends()) {
+                foreach ($unit->getExtends() as $name) {
                     try {
                         $extendedUnit = $this->getUnitByName($name);
-                        $this->processExtends($unit, $extendedUnit, $extendedUnit);
+                        $this->processExtends($unit, $extendedUnit);
                     } catch (ProjectException $e) {
                         $this->addUnresolved($unit, $name);
                     }
                 }
             }
 
-            if ($extends->hasImplements()) {
-                foreach($extends->getImplements() as $implements) {
+            if ($unit->hasImplements()) {
+                foreach ($unit->getImplements() as $implements) {
                     try {
                         $implementsUnit = $this->getUnitByName($implements);
-                        $this->processImplements($unit, $implementsUnit, $implementsUnit);
+                        $this->processImplements($unit, $implementsUnit);
                     } catch (ProjectException $e) {
                         $this->addUnresolved($unit, $implements);
                     }
                 }
             }
 
-            if ($extends->usesTraits()) {
-                foreach($extends->getUsedTraits() as $traitName) {
+            if ($unit->usesTraits()) {
+                foreach ($unit->getUsedTraits() as $traitName) {
                     try {
                         $traitUnit = $this->getUnitByName($traitName);
                         $this->processTraitUse(
                             $unit,
-                            $extends->getTraitUse($traitName),
+                            $unit->getTraitUse($traitName),
                             $traitUnit
                         );
                     } catch (ProjectException $e) {
@@ -227,106 +95,200 @@
                 }
             }
 
-        }
-
-        private function processImplements(AbstractUnitObject $unit, AbstractUnitObject $implements) {
-            $this->project->registerForSaving($unit);
-            $this->project->registerForSaving($implements);
-
-            if (!$implements instanceof InterfaceObject) {
-                $this->addError(
-                    $unit,
-                    sprintf(
-                        'Trying to implement "%s" which is a %s',
-                        $implements->getName(),
-                        $implements->getType()
-                    )
-                );
-                return;
-            }
-            $implements->addImplementor($unit);
-            $unit->importExports($implements, 'interface');
+            $unitName = $unit->getName();
 
-            if ($implements->hasImplements()) {
-                foreach($implements->getImplements() as $implementing) {
-                    try {
-                        $implementsUnit = $this->getUnitByName($implementing);
-                        $this->processExtends($unit, $implementsUnit, $implementsUnit);
-                    } catch (ProjectException $e) {
-                        $this->addUnresolved($unit, $implementing);
-                    }
+            if (isset($this->unresolved[$unitName])) {
+                foreach ($this->unresolved[$unitName] as $missingUnit) {
+                    $unit->markDependencyAsUnresolved($missingUnit);
                 }
             }
+
+            $this->logger->progress('processed');
         }
 
-        private function processTraitUse(AbstractUnitObject $unit, TraitUseObject $use, AbstractUnitObject $trait) {
-            $this->project->registerForSaving($unit);
-            $this->project->registerForSaving($trait);
+        $this->project->save();
+        $this->logger->completed();
+    }
 
-            $trait->addUser($unit);
-            $unit->importTraitExports($trait, $use);
+    public function hasUnresolved() {
+        return \count($this->unresolved) > 0;
+    }
 
-            if ($trait->hasExtends()) {
-                foreach($trait->getExtends() as $name) {
-                    try {
-                        $extendedUnit = $this->getUnitByName($name);
-                        $this->processExtends($unit, $extendedUnit, $extendedUnit);
-                    } catch (ProjectException $e) {
-                        $this->addUnresolved($unit, $name);
-                    }
+    public function getUnresolved() {
+        return $this->unresolved;
+    }
+
+    public function hasErrors() {
+        return \count($this->errors) > 0;
+    }
+
+    public function getErrors() {
+        return $this->errors;
+    }
+
+    private function addError(AbstractUnitObject $unit, $errorInfo): void {
+        $unitName = $unit->getName();
+
+        if (!isset($this->errors[$unitName])) {
+            $this->errors[$unitName] = [];
+        }
+        $this->errors[$unitName][] = $errorInfo;
+    }
+
+    private function addUnresolved(AbstractUnitObject $unit, $missingUnit): void {
+        $unitName = $unit->getName();
+
+        if (!isset($this->unresolved[$unitName])) {
+            $this->unresolved[$unitName] = [];
+        }
+        $this->unresolved[$unitName][] = $missingUnit;
+        $this->project->registerForSaving($unit);
+    }
+
+    private function processExtends(AbstractUnitObject $unit, AbstractUnitObject $extends): void {
+        $this->project->registerForSaving($unit);
+        $this->project->registerForSaving($extends);
+
+        $extends->addExtender($unit);
+        $unit->importExports($extends, 'parent');
+
+        if ($extends->hasExtends()) {
+            foreach ($extends->getExtends() as $name) {
+                try {
+                    $extendedUnit = $this->getUnitByName($name);
+                    $this->processExtends($unit, $extendedUnit, $extendedUnit);
+                } catch (ProjectException $e) {
+                    $this->addUnresolved($unit, $name);
                 }
             }
+        }
 
-            if ($trait->usesTraits()) {
-                foreach($trait->getUsedTraits() as $traitName) {
-                    try {
-                        $traitUnit = $this->getUnitByName($traitName);
-                        $this->processTraitUse(
-                            $unit,
-                            $trait->getTraitUse($traitName),
-                            $traitUnit
-                        );
-                    } catch (ProjectException $e) {
-                        $this->addUnresolved($unit, $traitName);
-                    }
+        if ($extends->hasImplements()) {
+            foreach ($extends->getImplements() as $implements) {
+                try {
+                    $implementsUnit = $this->getUnitByName($implements);
+                    $this->processImplements($unit, $implementsUnit, $implementsUnit);
+                } catch (ProjectException $e) {
+                    $this->addUnresolved($unit, $implements);
                 }
             }
+        }
 
+        if ($extends->usesTraits()) {
+            foreach ($extends->getUsedTraits() as $traitName) {
+                try {
+                    $traitUnit = $this->getUnitByName($traitName);
+                    $this->processTraitUse(
+                        $unit,
+                        $extends->getTraitUse($traitName),
+                        $traitUnit
+                    );
+                } catch (ProjectException $e) {
+                    $this->addUnresolved($unit, $traitName);
+                }
+            }
         }
+    }
 
-        private function setupDependencies() {
-            $this->dependencyStack = array(
-                $this->project,
+    private function processImplements(AbstractUnitObject $unit, AbstractUnitObject $implements): void {
+        $this->project->registerForSaving($unit);
+        $this->project->registerForSaving($implements);
+
+        if (!$implements instanceof InterfaceObject) {
+            $this->addError(
+                $unit,
+                \sprintf(
+                    'Trying to implement "%s" which is a %s',
+                    $implements->getName(),
+                    $implements->getType()
+                )
             );
 
-            $publicOnlyMode = $this->config->isPublicOnlyMode();
-            foreach($this->config->getDependencyDirectories() as $depDir) {
-                $idxName = $depDir . '/index.xml';
-                if (!file_exists($idxName)) {
-                    $this->logger->log("'$idxName' not found - skipping dependency");
-                    continue;
+            return;
+        }
+        $implements->addImplementor($unit);
+        $unit->importExports($implements, 'interface');
+
+        if ($implements->hasImplements()) {
+            foreach ($implements->getImplements() as $implementing) {
+                try {
+                    $implementsUnit = $this->getUnitByName($implementing);
+                    $this->processExtends($unit, $implementsUnit, $implementsUnit);
+                } catch (ProjectException $e) {
+                    $this->addUnresolved($unit, $implementing);
                 }
-                $dom = new fDOMDocument();
-                $dom->load($idxName);
-                $this->dependencyStack[] = new Dependency($dom, $this->project, $publicOnlyMode);
             }
         }
+    }
+
+    private function processTraitUse(AbstractUnitObject $unit, TraitUseObject $use, AbstractUnitObject $trait): void {
+        $this->project->registerForSaving($unit);
+        $this->project->registerForSaving($trait);
 
-        /**
-         * @param $name
-         *
-         * @return AbstractUnitObject
-         * @throws ProjectException
-         */
-        private function getUnitByName($name) {
-            foreach($this->dependencyStack as $dependency) {
+        $trait->addUser($unit);
+        $unit->importTraitExports($trait, $use);
+
+        if ($trait->hasExtends()) {
+            foreach ($trait->getExtends() as $name) {
                 try {
-                    return $dependency->getUnitByName($name);
-                } catch (\Exception $e) {}
+                    $extendedUnit = $this->getUnitByName($name);
+                    $this->processExtends($unit, $extendedUnit, $extendedUnit);
+                } catch (ProjectException $e) {
+                    $this->addUnresolved($unit, $name);
+                }
             }
-            throw new ProjectException("No unit with name '$name' found");
         }
 
+        if ($trait->usesTraits()) {
+            foreach ($trait->getUsedTraits() as $traitName) {
+                try {
+                    $traitUnit = $this->getUnitByName($traitName);
+                    $this->processTraitUse(
+                        $unit,
+                        $trait->getTraitUse($traitName),
+                        $traitUnit
+                    );
+                } catch (ProjectException $e) {
+                    $this->addUnresolved($unit, $traitName);
+                }
+            }
+        }
     }
 
+    private function setupDependencies(): void {
+        $this->dependencyStack = [
+            $this->project,
+        ];
+
+        $publicOnlyMode = $this->config->isPublicOnlyMode();
+
+        foreach ($this->config->getDependencyDirectories() as $depDir) {
+            $idxName = $depDir . '/index.xml';
+
+            if (!\file_exists($idxName)) {
+                $this->logger->log("'$idxName' not found - skipping dependency");
+
+                continue;
+            }
+            $dom = new fDOMDocument();
+            $dom->load($idxName);
+            $this->dependencyStack[] = new Dependency($dom, $this->project, $publicOnlyMode);
+        }
+    }
+
+    /**
+     * @param $name
+     *
+     * @throws ProjectException
+     */
+    private function getUnitByName($name): AbstractUnitObject {
+        foreach ($this->dependencyStack as $dependency) {
+            try {
+                return $dependency->getUnitByName($name);
+            } catch (\Exception $e) {
+            }
+        }
+
+        throw new ProjectException("No unit with name '$name' found");
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/project/AbstractUnitObject.php phpdox-0.12.0/src/collector/project/AbstractUnitObject.php
--- phpdox-0.11.2/src/collector/project/AbstractUnitObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/AbstractUnitObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,633 +1,570 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Collector {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\DocBlock\DocBlock;
-    use TheSeer\phpDox\FileInfo;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\DocBlock\DocBlock;
+use TheSeer\phpDox\FileInfo;
+
+abstract class AbstractUnitObject {
     /**
-     *
+     * PHPDOX Namespace
      */
-    abstract class AbstractUnitObject {
+    public const XMLNS = 'http://xml.phpdox.net/src';
 
-        /**
-         * PHPDOX Namespace
-         */
-        const XMLNS = 'http://xml.phpdox.net/src';
-
-        /**
-         * @var fDOMDocument
-         */
-        private $dom;
-
-        /**
-         * @var fDOMElement
-         */
-        private $rootNode;
-
-        /**
-         * @var string
-         */
-        protected $rootName = NULL;
-
-        /**
-         * @param string       $name
-         * @param \SplFileInfo $file
-         */
-        public function __construct($name = NULL, SourceFile $file = NULL) {
-            if ($this->rootName === NULL) {
-                throw new UnitObjectException('No or invalid rootname set', UnitObjectException::InvalidRootname);
-            }
-            $this->dom = new fDOMDocument('1.0', 'UTF-8');
-            $this->dom->registerNamespace('phpdox', self::XMLNS);
-            $this->rootNode = $this->dom->createElementNS(self::XMLNS, $this->rootName);
-            $this->dom->appendChild($this->rootNode);
-            if ($name !== NULL) {
-                $this->setName($name, $this->rootNode);
-            }
-            if ($file !== NULL) {
-                $this->rootNode->appendChild($file->asNode($this->rootNode));
-            }
-            $this->setAbstract(FALSE);
-            $this->setFinal(FALSE);
-        }
+    /**
+     * @var string
+     */
+    protected $rootName;
 
-        /**
-         * @param $name
-         */
-        protected function setName($name, fDOMElement $ctx) {
-            $parts = explode('\\', $name);
-            $local = array_pop($parts);
-            $namespace = join('\\', $parts);
-            $ctx->setAttribute('full', $name);
-            $ctx->setAttribute('namespace', $namespace);
-            $ctx->setAttribute('name', $local);
-        }
+    /**
+     * @var fDOMDocument
+     */
+    private $dom;
 
+    /**
+     * @var fDOMElement
+     */
+    private $rootNode;
 
-        protected function getRootNode() {
-            return $this->rootNode;
+    /**
+     * @param string       $name
+     * @param \SplFileInfo $file
+     */
+    public function __construct($name = null, SourceFile $file = null) {
+        if ($this->rootName === null) {
+            throw new UnitObjectException('No or invalid rootname set', UnitObjectException::InvalidRootname);
         }
+        $this->dom = new fDOMDocument('1.0', 'UTF-8');
+        $this->dom->registerNamespace('phpdox', self::XMLNS);
+        $this->rootNode = $this->dom->createElementNS(self::XMLNS, $this->rootName);
+        $this->dom->appendChild($this->rootNode);
 
-        /**
-         * @return \TheSeer\fDOM\fDOMDocument
-         */
-        public function export() {
-            return $this->dom;
+        if ($name !== null) {
+            $this->setName($name, $this->rootNode);
         }
 
-        /**
-         * @param \TheSeer\fDOM\fDOMDocument $dom
-         */
-        public function import(fDOMDocument $dom) {
-            $this->dom = $dom;
-            $this->rootNode = $dom->documentElement;
-            $this->dom->registerNamespace('phpdox', self::XMLNS);
+        if ($file !== null) {
+            $this->rootNode->appendChild($file->asNode($this->rootNode));
         }
+        $this->setAbstract(false);
+        $this->setFinal(false);
+    }
 
-        public function getType() {
-            return $this->rootNode->localName;
-        }
+    public function export(): fDOMDocument {
+        return $this->dom;
+    }
 
-        /**
-         * @return string
-         */
-        public function getLocalName() {
-            return $this->rootNode->getAttribute('name');
-        }
+    public function import(fDOMDocument $dom): void {
+        $this->dom      = $dom;
+        $this->rootNode = $dom->documentElement;
+        $this->dom->registerNamespace('phpdox', self::XMLNS);
+    }
 
-        /**
-         * @return string
-         */
-        public function getName() {
-            return $this->rootNode->getAttribute('full');
-        }
+    public function getType() {
+        return $this->rootNode->localName;
+    }
 
-        /**
-         * @return string
-         */
-        public function getNamespace() {
-            return $this->rootNode->getAttribute('namespace');
-        }
+    public function getLocalName(): string {
+        return $this->rootNode->getAttribute('name');
+    }
 
-        /**
-         * @return FileInfo
-         */
-        public function getSourceFilename() {
-            $file = $this->rootNode->queryOne('phpdox:file');
-            if (!$file) {
-                return '';
-            }
-            return new FileInfo($file->getAttribute('path') . '/' . $file->getAttribute('file'));
-        }
+    public function getName(): string {
+        return $this->rootNode->getAttribute('full');
+    }
 
-        /**
-         * @return string
-         */
-        public function getCompactDescription() {
-            $desc = $this->rootNode->queryOne('phpdox:docblock/phpdox:description');
-            if (!$desc || !$desc->hasAttribute('compact')) {
-                return '';
-            }
-            return $desc->getAttribute('compact');
-        }
+    public function getNamespace(): string {
+        return $this->rootNode->getAttribute('namespace');
+    }
 
-        /**
-         * @param int $endLine
-         */
-        public function setEndLine($endLine) {
-            $this->rootNode->setAttribute('end', $endLine);
-        }
+    public function getSourceFilename(): ?FileInfo {
+        $file = $this->rootNode->queryOne('phpdox:file');
 
-        /**
-         * @param int $startLine
-         */
-        public function setStartLine($startLine) {
-            $this->rootNode->setAttribute('start', $startLine);
+        if (!$file) {
+            return null;
         }
 
-        /**
-         * @param boolean $isAbstract
-         */
-        public function setAbstract($isAbstract) {
-            $this->rootNode->setAttribute('abstract', $isAbstract ? 'true' : 'false');
-        }
+        return new FileInfo($file->getAttribute('path') . '/' . $file->getAttribute('file'));
+    }
 
-        /**
-         * @param boolean $isFinal
-         */
-        public function setFinal($isFinal) {
-            $this->rootNode->setAttribute('final', $isFinal ? 'true' : 'false');
+    public function getCompactDescription(): string {
+        $desc = $this->rootNode->queryOne('phpdox:docblock/phpdox:description');
+
+        if (!$desc || !$desc->hasAttribute('compact')) {
+            return '';
         }
 
-        /**
-         * @param \TheSeer\phpDox\DocBlock\DocBlock $docblock
-         */
-        public function setDocBlock(DocBlock $docblock) {
-            $docNode = $docblock->asDom($this->dom);
-            $this->rootNode->appendChild($docNode);
+        return $desc->getAttribute('compact');
+    }
+
+    /**
+     * @param int $endLine
+     */
+    public function setEndLine($endLine): void {
+        $this->rootNode->setAttribute('end', $endLine);
+    }
+
+    /**
+     * @param int $startLine
+     */
+    public function setStartLine($startLine): void {
+        $this->rootNode->setAttribute('start', $startLine);
+    }
+
+    /**
+     * @param bool $isAbstract
+     */
+    public function setAbstract($isAbstract): void {
+        $this->rootNode->setAttribute('abstract', $isAbstract ? 'true' : 'false');
+    }
+
+    /**
+     * @param bool $isFinal
+     */
+    public function setFinal($isFinal): void {
+        $this->rootNode->setAttribute('final', $isFinal ? 'true' : 'false');
+    }
+
+    public function setDocBlock(DocBlock $docblock): void {
+        $docNode = $docblock->asDom($this->dom);
+        $this->rootNode->appendChild($docNode);
+    }
+
+    /**
+     * @param $name
+     */
+    public function addExtends($name): void {
+        $extends = $this->rootNode->appendElementNS(self::XMLNS, 'extends');
+        $this->setName($name, $extends);
+    }
+
+    public function hasExtends(): bool {
+        return $this->rootNode->queryOne('phpdox:extends') !== null;
+    }
+
+    /**
+     * @throws UnitObjectException
+     */
+    public function getExtends() {
+        if (!$this->hasExtends()) {
+            throw new UnitObjectException('This unit does not extend any unit', UnitObjectException::NoExtends);
         }
+        $result = [];
 
-        /**
-         * @param $name
-         */
-        public function addExtends($name) {
-            $extends = $this->rootNode->appendElementNS(self::XMLNS, 'extends');
-            $this->setName($name, $extends);
+        foreach ($this->rootNode->query('phpdox:extends') as $ext) {
+            $result[] = $ext->getAttribute('full');
         }
 
-        /**
-         * @return bool
-         */
-        public function hasExtends() {
-            return $this->rootNode->queryOne('phpdox:extends') !== NULL;
+        return $result;
+    }
+
+    public function addExtender(self $unit): void {
+        if ($this->rootNode->queryOne(\sprintf('phpdox:extenders/phpdox:*[@full = "%s"]', $unit->getName())) !== null) {
+            return;
         }
+        $extender = $this->addToContainer('extenders', 'extender');
+        $this->setName($unit->getName(), $extender);
+    }
 
-        /**
-         * @return mixed
-         * @throws UnitObjectException
-         */
-        public function getExtends() {
-            if(!$this->hasExtends()) {
-                throw new UnitObjectException('This unit does not extend any unit', UnitObjectException::NoExtends);
-            }
-            $result = array();
-            foreach($this->rootNode->query('phpdox:extends') as $ext) {
-                $result[] = $ext->getAttribute('full');
-            }
-            return $result;
+    /**
+     * @param $name
+     */
+    public function addImplements($name): void {
+        $implements = $this->rootNode->appendElementNS(self::XMLNS, 'implements');
+        $this->setName($name, $implements);
+    }
+
+    public function hasImplements(): bool {
+        return $this->rootNode->query('phpdox:implements')->length > 0;
+    }
+
+    /**
+     * @throws UnitObjectException
+     */
+    public function getImplements(): array {
+        if (!$this->hasImplements()) {
+            throw new UnitObjectException('This unit does not implement any interfaces', UnitObjectException::NoImplements);
         }
+        $result = [];
 
-        /**
-         * @param AbstractUnitObject $unit
-         */
-        public function addExtender(AbstractUnitObject $unit) {
-            if ($this->rootNode->queryOne(sprintf('phpdox:extenders/phpdox:*[@full = "%s"]', $unit->getName())) !== NULL) {
-                return;
-            }
-            $extender = $this->addToContainer('extenders', 'extender');
-            $this->setName($unit->getName(), $extender);
+        foreach ($this->rootNode->query('phpdox:implements') as $impl) {
+            $result[] = $impl->getAttribute('full');
         }
 
-        /**
-         * @param $name
-         */
-        public function addImplements($name) {
-            $implements = $this->rootNode->appendElementNS(self::XMLNS, 'implements');
-            $this->setName($name, $implements);
-        }
-
-        /**
-         * @return bool
-         */
-        public function hasImplements() {
-            return $this->rootNode->query('phpdox:implements')->length > 0;
-        }
-
-        /**
-         * @return array
-         * @throws UnitObjectException
-         */
-        public function getImplements() {
-            if (!$this->hasImplements()) {
-                throw new UnitObjectException('This unit does not implement any interfaces', UnitObjectException::NoImplements);
-            }
-            $result = array();
-            foreach($this->rootNode->query('phpdox:implements') as $impl) {
-                $result[] = $impl->getAttribute('full');
-            }
-            return $result;
+        return $result;
+    }
+
+    public function usesTraits(): bool {
+        return $this->rootNode->query('phpdox:uses')->length > 0;
+    }
+
+    /**
+     * @param $name
+     */
+    public function usesTrait($name): bool {
+        return $this->rootNode->query(\sprintf('phpdox:uses[@full="%s"]', $name))->length > 0;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function addTrait($name): TraitUseObject {
+        $traituse = new TraitUseObject($this->rootNode->appendElementNS(self::XMLNS, 'uses'));
+        $traituse->setName($name);
+
+        return $traituse;
+    }
+
+    /**
+     * @throws UnitObjectException
+     */
+    public function getUsedTraits(): array {
+        if (!$this->usesTraits()) {
+            throw new UnitObjectException('This unit does not use any traits', UnitObjectException::NoTraitsUsed);
         }
+        $result = [];
 
-        /**
-         * @return bool
-         */
-        public function usesTraits() {
-            return $this->rootNode->query('phpdox:uses')->length > 0;
-        }
-
-        /**
-         * @param $name
-         *
-         * @return bool
-         */
-        public function usesTrait($name) {
-            return $this->rootNode->query(sprintf('phpdox:uses[@full="%s"]', $name))->length > 0;
-        }
-
-        /**
-         * @param string $name
-         *
-         * @return TraitUseObject
-         */
-        public function addTrait($name) {
-            $traituse = new TraitUseObject($this->rootNode->appendElementNS(self::XMLNS, 'uses'));
-            $traituse->setName($name);
-            return $traituse;
-        }
-
-        /**
-         * @return array
-         * @throws UnitObjectException
-         */
-        public function getUsedTraits() {
-            if (!$this->usesTraits()) {
-                throw new UnitObjectException('This unit does not use any traits', UnitObjectException::NoTraitsUsed);
-            }
-            $result = array();
-            foreach($this->rootNode->query('phpdox:uses') as $trait) {
-                $result[] = $trait->getAttribute('full');
-            }
-            return $result;
+        foreach ($this->rootNode->query('phpdox:uses') as $trait) {
+            $result[] = $trait->getAttribute('full');
         }
 
-        /**
-         * @param $name
-         *
-         * @return TraitUseObject
-         * @throws UnitObjectException
-         */
-        public function getTraitUse($name) {
-            $node = $this->rootNode->queryOne(
-                sprintf('phpdox:uses[@full="%s"]', $name)
+        return $result;
+    }
+
+    /**
+     * @param $name
+     *
+     * @throws UnitObjectException
+     */
+    public function getTraitUse($name): TraitUseObject {
+        $node = $this->rootNode->queryOne(
+            \sprintf('phpdox:uses[@full="%s"]', $name)
+        );
+
+        if (!$node) {
+            throw new UnitObjectException(
+                \sprintf('Trait "%s" not used', $name),
+                UnitObjectException::NoSuchTrait
             );
-            if (!$node) {
-                throw new UnitObjectException(
-                    sprintf('Trait "%s" not used', $name),
-                    UnitObjectException::NoSuchTrait
-                );
-            }
-            return new TraitUseObject($node);
         }
 
-        public function getAmbiguousTraitUse() {
-            $node = $this->rootNode->queryOne('phpdox:ambiguous[@type="trait-alias"]');
-            if (!$node) {
-                $node = $this->rootNode->appendElementNS(self::XMLNS, 'ambiguous');
-                $node->setAttribute('type','trait-alias');
-            }
-            return new TraitUseObject($node);
+        return new TraitUseObject($node);
+    }
+
+    public function getAmbiguousTraitUse() {
+        $node = $this->rootNode->queryOne('phpdox:ambiguous[@type="trait-alias"]');
+
+        if (!$node) {
+            $node = $this->rootNode->appendElementNS(self::XMLNS, 'ambiguous');
+            $node->setAttribute('type', 'trait-alias');
         }
 
-        /**
-         * @param string $dependency
-         */
-        public function markDependencyAsUnresolved($dependency) {
-            $depNode = $this->rootNode->queryOne(
-                sprintf('//phpdox:implements[@full="%1$s"]|//phpdox:extends[@full="%1$s"]|//phpdox:uses[@full="%1$s"]', $dependency)
+        return new TraitUseObject($node);
+    }
+
+    /**
+     * @param string $dependency
+     */
+    public function markDependencyAsUnresolved($dependency): void {
+        $depNode = $this->rootNode->queryOne(
+            \sprintf('//phpdox:implements[@full="%1$s"]|//phpdox:extends[@full="%1$s"]|//phpdox:uses[@full="%1$s"]', $dependency)
+        );
+
+        if (!$depNode) {
+            throw new UnitObjectException(
+                \sprintf('No dependency "%s" found in unit %s', $dependency, $this->getName()),
+                UnitObjectException::NoSuchDependency
             );
-            if (!$depNode) {
-                throw new UnitObjectException(
-                    sprintf('No dependency "%s" found in unit %s', $dependency, $this->getName()),
-                    UnitObjectException::NoSuchDependency
-                );
-            }
-            $depNode->setAttribute('unresolved', 'true');
         }
+        $depNode->setAttribute('unresolved', 'true');
+    }
 
-        /**
-         *
-         */
-        public function addMethod($name) {
-            switch ($name) {
-                case '__construct':
+    public function addMethod($name) {
+        switch ($name) {
+            case '__construct':
                 {
                     $nodeName = 'constructor';
+
                     break;
                 }
-                case '__destruct':
+            case '__destruct':
                 {
                     $nodeName = 'destructor';
+
                     break;
                 }
-                default:
-                    $nodeName = 'method';
-            }
-            $method = new MethodObject($this, $this->rootNode->appendElementNS(self::XMLNS, $nodeName));
-            $method->setName($name);
-            return $method;
+            default:
+                $nodeName = 'method';
         }
+        $method = new MethodObject($this, $this->rootNode->appendElementNS(self::XMLNS, $nodeName));
+        $method->setName($name);
 
-        /**
-         * @return MethodObject[]
-         */
-        public function getExportedMethods() {
-            $result = array();
-            $xpath = '(phpdox:constructor|phpdox:destructor|phpdox:method)[@visibility="public" or @visibility="protected"]';
-            foreach($this->rootNode->query($xpath) as $node) {
-                $result[] = new MethodObject($this, $node);
-            }
-            return $result;
+        return $method;
+    }
+
+    /**
+     * @return MethodObject[]
+     */
+    public function getExportedMethods(): array {
+        $result = [];
+        $xpath  = '(phpdox:constructor|phpdox:destructor|phpdox:method)[@visibility="public" or @visibility="protected"]';
+
+        foreach ($this->rootNode->query($xpath) as $node) {
+            $result[] = new MethodObject($this, $node);
         }
 
-        /**
-         * @param $name
-         *
-         * @return MemberObject
-         */
-        public function addMember($name) {
-            $member = new MemberObject($this->rootNode->appendElementNS(self::XMLNS, 'member'));
-            $member->setName($name);
-            return $member;
-        }
-
-        /**
-         * @return array
-         */
-        public function getExportedMembers() {
-            $result = array();
-            $xpath = 'phpdox:member[@visibility="public" or @visibility="protected"]';
-            foreach($this->rootNode->query($xpath) as $node) {
-                $result[] = new MemberObject($node);
-            }
-            return $result;
+        return $result;
+    }
+
+    /**
+     * @param $name
+     */
+    public function addMember($name): MemberObject {
+        $member = new MemberObject($this->rootNode->appendElementNS(self::XMLNS, 'member'));
+        $member->setName($name);
+
+        return $member;
+    }
+
+    public function getExportedMembers(): array {
+        $result = [];
+        $xpath  = 'phpdox:member[@visibility="public" or @visibility="protected"]';
+
+        foreach ($this->rootNode->query($xpath) as $node) {
+            $result[] = new MemberObject($node);
         }
 
-        /**
-         * @param $name
-         *
-         * @return ConstantObject
-         */
-        public function addConstant($name) {
-            $const = new ConstantObject($this->rootNode->appendElementNS(self::XMLNS, 'constant'));
-            $const->setName($name);
-            return $const;
-        }
-
-        /**
-         * @return array
-         */
-        public function getConstants() {
-            $result = array();
-            $xpath = 'phpdox:constant';
-            foreach($this->rootNode->query($xpath) as $node) {
-                $result[] = new ConstantObject($node);
-            }
-            return $result;
+        return $result;
+    }
+
+    /**
+     * @param $name
+     */
+    public function addConstant($name): ConstantObject {
+        $const = new ConstantObject($this->rootNode->appendElementNS(self::XMLNS, 'constant'));
+        $const->setName($name);
+
+        return $const;
+    }
+
+    public function getConstants(): array {
+        $result = [];
+        $xpath  = 'phpdox:constant';
+
+        foreach ($this->rootNode->query($xpath) as $node) {
+            $result[] = new ConstantObject($node);
         }
 
-        /**
-         * @param AbstractUnitObject $unit
-         */
-        public function importExports(AbstractUnitObject $unit, $container = 'parent') {
+        return $result;
+    }
 
-            $parent = $this->rootNode->queryOne(sprintf('//phpdox:%s[@full="%s"]', $container, $unit->getName()));
-            if ($parent instanceof fDOMElement) {
-                $parent->parentNode->removeChild($parent);
-            }
+    public function importExports(self $unit, $container = 'parent'): void {
+        $parent = $this->rootNode->queryOne(\sprintf('//phpdox:%s[@full="%s"]', $container, $unit->getName()));
 
-            $parent = $this->rootNode->appendElementNS( self::XMLNS, $container);
-            $parent->setAttribute('full', $unit->getName());
-            $parent->setAttribute('namespace', $unit->getNamespace());
-            $parent->setAttribute('name', $unit->getLocalName());
-
-            if ($unit->hasExtends()) {
-                foreach($unit->getExtends() as $name) {
-                    $extends = $parent->appendElementNS( self::XMLNS, 'extends');
-                    $this->setName($name, $extends);
-                }
-            }
+        if ($parent instanceof fDOMElement) {
+            $parent->parentNode->removeChild($parent);
+        }
 
-            if ($unit->hasImplements()) {
-                foreach($unit->getImplements() as $name) {
-                    $implements = $parent->appendElementNS( self::XMLNS, 'implements');
-                    $this->setName($name, $implements);
-                }
-            }
+        $parent = $this->rootNode->appendElementNS(self::XMLNS, $container);
+        $parent->setAttribute('full', $unit->getName());
+        $parent->setAttribute('namespace', $unit->getNamespace());
+        $parent->setAttribute('name', $unit->getLocalName());
 
-            if ($unit->usesTraits()) {
-                foreach($unit->getUsedTraits() as $name) {
-                    $uses = $parent->appendElementNS( self::XMLNS, 'uses');
-                    $this->setName($name, $uses);
-                }
+        if ($unit->hasExtends()) {
+            foreach ($unit->getExtends() as $name) {
+                $extends = $parent->appendElementNS(self::XMLNS, 'extends');
+                $this->setName($name, $extends);
             }
+        }
 
-            foreach($unit->getConstants() as $constant) {
-                $parent->appendChild( $this->dom->importNode($constant->export(), TRUE) );
+        if ($unit->hasImplements()) {
+            foreach ($unit->getImplements() as $name) {
+                $implements = $parent->appendElementNS(self::XMLNS, 'implements');
+                $this->setName($name, $implements);
             }
+        }
 
-            foreach($unit->getExportedMembers() as $member) {
-                $memberNode = $this->dom->importNode($member->export(), TRUE);
-                $this->adjustStaticResolution($memberNode);
-                $parent->appendChild($memberNode);
+        if ($unit->usesTraits()) {
+            foreach ($unit->getUsedTraits() as $name) {
+                $uses = $parent->appendElementNS(self::XMLNS, 'uses');
+                $this->setName($name, $uses);
             }
+        }
 
-            foreach($unit->getExportedMethods() as $method) {
-                $methodNode = $this->dom->importNode($method->export(), TRUE);
-                $this->adjustStaticResolution($methodNode);
-                $parent->appendChild( $methodNode );
-                if ($this->hasMethod($method->getName())) {
-                    $unitMethod = $this->getMethod($method->getName());
-                    if ($unitMethod->hasInheritDoc()) {
-                        $unitMethod->inhertDocBlock($method);
-                    }
-                }
-            }
+        foreach ($unit->getConstants() as $constant) {
+            $parent->appendChild($this->dom->importNode($constant->export(), true));
         }
 
-        public function importTraitExports(AbstractUnitObject $trait, TraitUseObject $use) {
+        foreach ($unit->getExportedMembers() as $member) {
+            $memberNode = $this->dom->importNode($member->export(), true);
+            $this->adjustStaticResolution($memberNode);
+            $parent->appendChild($memberNode);
+        }
 
-            $container = $this->rootNode->queryOne(
-                sprintf(
-                    'phpdox:trait[@full="%s"]',
-                    $trait->getName()
-                )
-            );
-            if ($container instanceof fDOMElement) {
-                $container->parentNode->removeChild($container);
-            }
+        foreach ($unit->getExportedMethods() as $method) {
+            $methodNode = $this->dom->importNode($method->export(), true);
+            $this->adjustStaticResolution($methodNode);
+            $parent->appendChild($methodNode);
 
-            $container = $this->rootNode->appendElementNS( self::XMLNS, 'trait');
-            $this->setName($trait->getName(), $container);
+            if ($this->hasMethod($method->getName())) {
+                $unitMethod = $this->getMethod($method->getName());
 
-            if ($trait->hasExtends()) {
-                foreach($trait->getExtends() as $name) {
-                    $extends = $container->appendElementNS( self::XMLNS, 'extends');
-                    $this->setName($name, $extends);
+                if ($unitMethod->hasInheritDoc()) {
+                    $unitMethod->inhertDocBlock($method);
                 }
             }
+        }
+    }
 
-            if ($trait->usesTraits()) {
-                foreach($trait->getUsedTraits() as $name) {
-                    $used = $container->appendElementNS( self::XMLNS, 'uses');
-                    $this->setName($name, $used);
-                }
-            }
+    public function importTraitExports(self $trait, TraitUseObject $use): void {
+        $container = $this->rootNode->queryOne(
+            \sprintf(
+                'phpdox:trait[@full="%s"]',
+                $trait->getName()
+            )
+        );
 
-            foreach($trait->getConstants() as $constant) {
-                $container->appendChild( $this->dom->importNode($constant->export(), TRUE) );
+        if ($container instanceof fDOMElement) {
+            $container->parentNode->removeChild($container);
+        }
+
+        $container = $this->rootNode->appendElementNS(self::XMLNS, 'trait');
+        $this->setName($trait->getName(), $container);
+
+        if ($trait->hasExtends()) {
+            foreach ($trait->getExtends() as $name) {
+                $extends = $container->appendElementNS(self::XMLNS, 'extends');
+                $this->setName($name, $extends);
             }
+        }
 
-            foreach($trait->getExportedMembers() as $member) {
-                $memberNode = $this->dom->importNode($member->export(), TRUE);
-                $this->adjustStaticResolution($memberNode);
-                $container->appendChild($memberNode);
+        if ($trait->usesTraits()) {
+            foreach ($trait->getUsedTraits() as $name) {
+                $used = $container->appendElementNS(self::XMLNS, 'uses');
+                $this->setName($name, $used);
             }
+        }
 
-            $ambiguousContainer = $this->dom->queryOne('//phpdox:ambiguous[@type="trait-alias"]');
-            foreach($trait->getExportedMethods() as $method) {
-                $methodName = $method->getName();
-                $methodNode = $this->dom->importNode($method->export(), TRUE);
+        foreach ($trait->getConstants() as $constant) {
+            $container->appendChild($this->dom->importNode($constant->export(), true));
+        }
 
-                if (!$use->isExcluded($methodName)) {
-                    $container->appendChild($methodNode);
-                }
+        foreach ($trait->getExportedMembers() as $member) {
+            $memberNode = $this->dom->importNode($member->export(), true);
+            $this->adjustStaticResolution($memberNode);
+            $container->appendChild($memberNode);
+        }
+
+        $ambiguousContainer = $this->dom->queryOne('//phpdox:ambiguous[@type="trait-alias"]');
 
-                $this->adjustStaticResolution($methodNode);
+        foreach ($trait->getExportedMethods() as $method) {
+            $methodName = $method->getName();
+            $methodNode = $this->dom->importNode($method->export(), true);
+
+            if (!$use->isExcluded($methodName)) {
+                $container->appendChild($methodNode);
+            }
+
+            $this->adjustStaticResolution($methodNode);
+
+            if ($ambiguousContainer !== null) {
+                $ambiguousMethod = $ambiguousContainer->queryOne(
+                    \sprintf('phpdox:alias[@method="%s"]', $methodName)
+                );
 
-                if ($ambiguousContainer !== NULL) {
-                    $ambiguousMethod = $ambiguousContainer->queryOne(
-                        sprintf('phpdox:alias[@method="%s"]', $methodName)
+                if ($ambiguousMethod !== null) {
+                    $usesNode = $this->dom->queryOne(
+                        \sprintf('//phpdox:uses[@full="%s"]', $trait->getName())
                     );
-                    if ($ambiguousMethod !== null) {
-                        $usesNode = $this->dom->queryOne(
-                            sprintf('//phpdox:uses[@full="%s"]', $trait->getName())
-                        );
-                        $usesNode->appendChild($ambiguousMethod);
-                        if ($ambiguousContainer->query('phpdox:alias')->length === 0) {
-                            $ambiguousContainer->parentNode->removeChild($ambiguousContainer);
-                            $ambiguousContainer = NULL;
-                        }
+                    $usesNode->appendChild($ambiguousMethod);
+
+                    if ($ambiguousContainer->query('phpdox:alias')->length === 0) {
+                        $ambiguousContainer->parentNode->removeChild($ambiguousContainer);
+                        $ambiguousContainer = null;
                     }
                 }
+            }
 
-                $aliasNode = NULL;
-                if ($use->isAliased($methodName)) {
-                    $aliasNode = $methodNode->cloneNode(true);
-                    $aliasNode->setAttribute('original', $aliasNode->getAttribute('name'));
-                    $aliasNode->setAttribute('name', $use->getAliasedName($methodName));
-                    if ($use->hasAliasedModifier($methodName)) {
-                        $aliasNode->setAttribute('visibility', $use->getAliasedModifier($methodName));
-                    }
-                    $container->appendChild($aliasNode);
+            $aliasNode = null;
+
+            if ($use->isAliased($methodName)) {
+                $aliasNode = $methodNode->cloneNode(true);
+                $aliasNode->setAttribute('original', $aliasNode->getAttribute('name'));
+                $aliasNode->setAttribute('name', $use->getAliasedName($methodName));
+
+                if ($use->hasAliasedModifier($methodName)) {
+                    $aliasNode->setAttribute('visibility', $use->getAliasedModifier($methodName));
                 }
+                $container->appendChild($aliasNode);
             }
+        }
+    }
+
+    /**
+     * @param $name
+     */
+    protected function setName($name, fDOMElement $ctx): void {
+        $parts     = \explode('\\', $name);
+        $local     = \array_pop($parts);
+        $namespace = \implode('\\', $parts);
+        $ctx->setAttribute('full', $name);
+        $ctx->setAttribute('namespace', $namespace);
+        $ctx->setAttribute('name', $local);
+    }
+
+    protected function getRootNode() {
+        return $this->rootNode;
+    }
 
+    /**
+     * @param $containerName
+     * @param $elementName
+     */
+    protected function addToContainer($containerName, $elementName): fDOMElement {
+        $container = $this->rootNode->queryOne('phpdox:' . $containerName);
+
+        if (!$container) {
+            $container = $this->rootNode->appendElementNS(self::XMLNS, $containerName);
         }
 
-        private function hasMethod($name) {
-            return $this->dom->query(
-                sprintf('phpdox:method[@name="%s"]', $name)
+        return $container->appendElementNS(self::XMLNS, $elementName);
+    }
+
+    private function hasMethod($name) {
+        return $this->dom->query(
+                \sprintf('phpdox:method[@name="%s"]', $name)
             )->length > 0;
-        }
+    }
 
-        private function getMethod($name) {
-            $ctx = $this->dom->queryOne(
-                sprintf('phpdox:method[@name="%s"]', $name)
+    private function getMethod($name) {
+        $ctx = $this->dom->queryOne(
+            \sprintf('phpdox:method[@name="%s"]', $name)
+        );
+
+        if (!$ctx) {
+            throw new UnitObjectException(
+                \sprintf('Method "%s" not found', $name),
+                UnitObjectException::NoSuchMethod
             );
-            if (!$ctx) {
-                throw new UnitObjectException(
-                    sprintf('Method "%s" not found', $name),
-                    UnitObjectException::NoSuchMethod
-                );
-            }
-            return new MethodObject($this, $ctx);
         }
 
-        private function adjustStaticResolution(fDOMElement $ctx) {
-            $container = $ctx->queryOne('.//phpdox:docblock/phpdox:return|.//phpdox:docblock/phpdox:var');
-            if (!$container || $container->getAttribute('resolution') !== 'static') {
-                return;
-            }
-            $type = $container->queryOne('phpdox:type');
-            if (!$type) {
-                return;
-            }
-            foreach(array('full','namespace','name') as $attribute) {
-                $type->setAttribute($attribute, $this->rootNode->getAttribute($attribute));
-            }
+        return new MethodObject($this, $ctx);
+    }
+
+    private function adjustStaticResolution(fDOMElement $ctx): void {
+        $container = $ctx->queryOne('.//phpdox:docblock/phpdox:return|.//phpdox:docblock/phpdox:var');
+
+        if (!$container || $container->getAttribute('resolution') !== 'static') {
+            return;
         }
+        $type = $container->queryOne('phpdox:type');
 
-        /**
-         * @param $containerName
-         * @param $elementName
-         *
-         * @return fDOMElement
-         */
-        protected function addToContainer($containerName, $elementName) {
-            $container = $this->rootNode->queryOne('phpdox:' . $containerName);
-            if (!$container) {
-                $container = $this->rootNode->appendElementNS(self::XMLNS, $containerName);
-            }
-            return $container->appendElementNS(self::XMLNS, $elementName);
+        if (!$type) {
+            return;
         }
 
+        foreach (['full', 'namespace', 'name'] as $attribute) {
+            $type->setAttribute($attribute, $this->rootNode->getAttribute($attribute));
+        }
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/AbstractVariableObject.php phpdox-0.12.0/src/collector/project/AbstractVariableObject.php
--- phpdox-0.11.2/src/collector/project/AbstractVariableObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/AbstractVariableObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,150 +1,96 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
+
+use TheSeer\fDOM\fDOMElement;
+
+/**
+ * Class AbstractVariableObject
+ */
+abstract class AbstractVariableObject {
+    public const XMLNS = 'http://xml.phpdox.net/src';
+
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
-
-    use TheSeer\fDOM\fDOMElement;
-
-    /**
-     * Class AbstractVariableObject
-     *
-     * @package TheSeer\phpDox\Collector
-     */
-    abstract class AbstractVariableObject {
-
-        const XMLNS = 'http://xml.phpdox.net/src';
-
-        /**
-         * @var \TheSeer\fDOM\fDOMElement
-         */
-        protected $ctx;
-
-        /**
-         * @var array
-         */
-        private $types = array('{unknown}', 'object', 'array', 'int', 'integer','float','string','bool','boolean','resource','callable');
-
-        /**
-         * @param fDOMElement $ctx
-         */
-        public function __construct(fDOMElement $ctx) {
-            $this->ctx = $ctx;
-        }
+     * @var \TheSeer\fDOM\fDOMElement
+     */
+    protected $ctx;
 
-        /**
-         * @return fDOMElement
-         */
-        public function export() {
-            return $this->ctx;
-        }
+    /**
+     * @var array
+     */
+    private $types = ['{unknown}', 'object', 'array', 'int', 'integer', 'float', 'string', 'bool', 'boolean', 'resource', 'callable'];
 
-        /**
-         * @param $line
-         */
-        public function setLine($line) {
-            $this->ctx->setAttribute('line', $line);
-        }
+    public function __construct(fDOMElement $ctx) {
+        $this->ctx = $ctx;
+    }
 
-        /**
-         * @return string
-         */
-        public function getLine() {
-            return $this->ctx->getAttribute('line');
-        }
+    public function export(): fDOMElement {
+        return $this->ctx;
+    }
 
-        /**
-         * @param $name
-         */
-        public function setName($name) {
-            $this->ctx->setAttribute('name', $name);
-        }
+    /**
+     * @param $line
+     */
+    public function setLine($line): void {
+        $this->ctx->setAttribute('line', $line);
+    }
 
-        /**
-         * @return \DOMAttr
-         */
-        public function getName() {
-            return $this->ctx->getAttributeNode('name');
-        }
+    public function getLine(): string {
+        return $this->ctx->getAttribute('line');
+    }
 
-        /**
-         * @param $value
-         */
-        public function setDefault($value) {
-            $this->ctx->setAttribute('default', $value);
-        }
+    /**
+     * @param $name
+     */
+    public function setName($name): void {
+        $this->ctx->setAttribute('name', $name);
+    }
 
-        public function setConstant($const) {
-            $this->ctx->setAttribute('constant', $const);
-        }
+    public function getName(): \DOMAttr {
+        return $this->ctx->getAttributeNode('name');
+    }
 
-        public function isInternalType($type) {
-            return in_array(mb_strtolower($type), $this->types);
-        }
+    /**
+     * @param $value
+     */
+    public function setDefault($value): void {
+        $this->ctx->setAttribute('default', $value);
+    }
 
-        /**
-         * @param $type
-         */
-        public function setType($type) {
-            if (!$this->isInternalType($type)) {
-                $parts = explode('\\', $type);
-                $local = array_pop($parts);
-                $namespace = join('\\', $parts);
-
-                $unit = $this->ctx->appendElementNS(self::XMLNS, 'type');
-                $unit->setAttribute('full', $type);
-                $unit->setAttribute('namespace', $namespace);
-                $unit->setAttribute('name', $local);
-                $type = 'object';
-            }
-            $this->ctx->setAttribute('type', $type);
-        }
+    public function setConstant($const): void {
+        $this->ctx->setAttribute('constant', $const);
+    }
 
-        /**
-         * @return string
-         */
-        public function getType() {
-            return $this->ctx->getAttribute('type');
-        }
+    public function isInternalType($type) {
+        return \in_array(\mb_strtolower((string)$type), $this->types);
+    }
 
-        public function setNullable($isNullable) {
-            $this->ctx->setAttribute('nullable', $isNullable ? 'true' : 'false');
+    /**
+     * @param $type
+     */
+    public function setType($type): void {
+        if (!$this->isInternalType($type)) {
+            $parts     = \explode('\\', (string)$type);
+            $local     = \array_pop($parts);
+            $namespace = \implode('\\', $parts);
+
+            $unit = $this->ctx->appendElementNS(self::XMLNS, 'type');
+            $unit->setAttribute('full', $type);
+            $unit->setAttribute('namespace', $namespace);
+            $unit->setAttribute('name', $local);
+            $type = 'object';
         }
+        $this->ctx->setAttribute('type', $type);
+    }
 
-        protected function addInternalType($type) {
-            $this->types[] = $type;
-        }
+    public function getType(): string {
+        return $this->ctx->getAttribute('type');
+    }
+
+    public function setNullable($isNullable): void {
+        $this->ctx->setAttribute('nullable', $isNullable ? 'true' : 'false');
+    }
+
+    protected function addInternalType($type): void {
+        $this->types[] = $type;
     }
 }
diff -Nru phpdox-0.11.2/src/collector/project/ClassObject.php phpdox-0.12.0/src/collector/project/ClassObject.php
--- phpdox-0.11.2/src/collector/project/ClassObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/ClassObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,43 +1,6 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
-
-    class ClassObject extends AbstractUnitObject {
-        protected $rootName = 'class';
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
+class ClassObject extends AbstractUnitObject {
+    protected $rootName = 'class';
 }
diff -Nru phpdox-0.11.2/src/collector/project/ConstantObject.php phpdox-0.12.0/src/collector/project/ConstantObject.php
--- phpdox-0.11.2/src/collector/project/ConstantObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/ConstantObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,81 +1,45 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
-
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\DocBlock\DocBlock;
-
-    class ConstantObject {
-
-        protected  $ctx;
-
-        public function __construct(fDOMElement $ctx) {
-            $this->ctx = $ctx;
-            $this->setType('{unknown}');
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-        public function export() {
-            return $this->ctx;
-        }
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\DocBlock\DocBlock;
 
-        public function setName($name) {
-            $this->ctx->setAttribute('name', $name);
-        }
+class ConstantObject {
+    protected $ctx;
 
-        public function setValue($value) {
-            $this->ctx->setAttribute('value', $value);
-        }
+    public function __construct(fDOMElement $ctx) {
+        $this->ctx = $ctx;
+        $this->setType('{unknown}');
+    }
 
-        public function setType($type) {
-            $this->ctx->setAttribute('type', $type);
-        }
+    public function export() {
+        return $this->ctx;
+    }
 
-        public function setConstantReference($const) {
-            $this->ctx->setAttribute('constant', $const);
-        }
+    public function setName($name): void {
+        $this->ctx->setAttribute('name', $name);
+    }
 
-        public function setDocBlock(DocBlock $docblock) {
-            $docNode = $docblock->asDom($this->ctx->ownerDocument);
-            if ($this->ctx->hasChildNodes()) {
-                $this->ctx->insertBefore($docblock, $this->ctx->firstChild);
-                return;
-            }
-            $this->ctx->appendChild($docNode);
-        }
+    public function setValue($value): void {
+        $this->ctx->setAttribute('value', $value);
+    }
 
+    public function setType($type): void {
+        $this->ctx->setAttribute('type', $type);
+    }
+
+    public function setConstantReference($const): void {
+        $this->ctx->setAttribute('constant', $const);
+    }
+
+    public function setDocBlock(DocBlock $docblock): void {
+        $docNode = $docblock->asDom($this->ctx->ownerDocument);
+
+        if ($this->ctx->hasChildNodes()) {
+            $this->ctx->insertBefore($docblock, $this->ctx->firstChild);
+
+            return;
+        }
+        $this->ctx->appendChild($docNode);
     }
 }
diff -Nru phpdox-0.11.2/src/collector/project/DependencyException.php phpdox-0.12.0/src/collector/project/DependencyException.php
--- phpdox-0.11.2/src/collector/project/DependencyException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/DependencyException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    class DependencyException extends \Exception {
-
-        const UnitNotFound = 1;
-        const InvalidUnitType = 2;
-    }
+class DependencyException extends \Exception {
+    public const UnitNotFound = 1;
 
+    public const InvalidUnitType = 2;
 }
diff -Nru phpdox-0.11.2/src/collector/project/Dependency.php phpdox-0.12.0/src/collector/project/Dependency.php
--- phpdox-0.11.2/src/collector/project/Dependency.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/Dependency.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,92 +1,95 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-namespace TheSeer\phpDox\Collector {
+use TheSeer\fDOM\fDOMDocument;
 
-    use TheSeer\fDOM\fDOMDocument;
-
-    class Dependency {
+class Dependency {
+    /**
+     * @var fDOMDocument
+     */
+    private $index;
+
+    /**
+     * @var Project
+     */
+    private $project;
+
+    /**
+     * @var string
+     */
+    private $baseDir;
+
+    /**
+     * @var bool
+     */
+    private $publicOnlyMode;
+
+    public function __construct(fDOMDocument $dom, Project $project, $publicOnlyMode) {
+        $this->index   = $dom;
+        $this->baseDir = \dirname(\str_replace('file:/', '', \urldecode($dom->documentURI)));
+        $this->index->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+        $this->project        = $project;
+        $this->publicOnlyMode = $publicOnlyMode;
+    }
 
-        /**
-         * @var fDOMDocument
-         */
-        private $index;
-
-        /**
-         * @var Project
-         */
-        private $project;
-
-        /**
-         * @var string
-         */
-        private $baseDir;
-
-        /**
-         * @var bool
-         */
-        private $publicOnlyMode;
-
-        public function __construct(fDOMDocument $dom, Project $project, $publicOnlyMode) {
-            $this->index = $dom;
-            $this->baseDir = dirname(urldecode($dom->documentURI));
-            $this->index->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-            $this->project = $project;
-            $this->publicOnlyMode = $publicOnlyMode;
+    public function getUnitByName($name) {
+        $parts     = \explode('\\', $name);
+        $local     = \array_pop($parts);
+        $namespace = \implode('\\', $parts);
+        $indexNode = $this->index->queryOne(
+            \sprintf('//phpdox:namespace[@name="%s"]/*[@name="%s"]', $namespace, $local)
+        );
+
+        if (!$indexNode) {
+            throw new DependencyException(
+                \sprintf("Unit '%s' not found", $name),
+                DependencyException::UnitNotFound
+            );
         }
 
-        public function getUnitByName($name) {
-            $parts = explode('\\', $name);
-            $local = array_pop($parts);
-            $namespace = join('\\', $parts);
-            $indexNode = $this->index->queryOne(
-                    sprintf('//phpdox:namespace[@name="%s"]/*[@name="%s"]', $namespace, $local));
-
-            if (!$indexNode) {
-                throw new DependencyException(
-                    sprintf("Unit '%s' not found", $name),
-                    DependencyException::UnitNotFound
-                );
-            }
-
-            $dom = new fDOMDocument();
-            $dom->load( $this->baseDir . '/' . $indexNode->getAttribute('xml'));
+        $dom = new fDOMDocument();
+        $dom->load($this->baseDir . '/' . $indexNode->getAttribute('xml'));
 
-            if ($this->publicOnlyMode) {
-                foreach($dom->query('//*[@visibility and not(@visibility = "public")]') as $node) {
-                    $node->parentNode->removeChild($node);
-                }
+        if ($this->publicOnlyMode) {
+            foreach ($dom->query('//*[@visibility and not(@visibility = "public")]') as $node) {
+                $node->parentNode->removeChild($node);
             }
+        }
 
-            switch ($indexNode->localName) {
-                case 'interface': {
+        switch ($indexNode->localName) {
+            case 'interface':
+                {
                     $unit = new InterfaceObject();
                     $unit->import($dom);
                     $this->project->addInterface($unit);
+
                     break;
                 }
-                case 'trait': {
+            case 'trait':
+                {
                     $unit = new TraitObject();
                     $unit->import($dom);
                     $this->project->addTrait($unit);
+
                     break;
                 }
-                case 'class': {
+            case 'class':
+                {
                     $unit = new ClassObject();
                     $unit->import($dom);
                     $this->project->addClass($unit);
+
                     break;
                 }
-                default: {
+            default:
+                {
                     throw new DependencyException(
-                        sprintf("Invalid unit type '%s'", $indexNode->localName),
+                        \sprintf("Invalid unit type '%s'", $indexNode->localName),
                         DependencyException::InvalidUnitType
                     );
                 }
-            }
-
-            return $unit;
         }
 
+        return $unit;
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/IndexCollection.php phpdox-0.12.0/src/collector/project/IndexCollection.php
--- phpdox-0.11.2/src/collector/project/IndexCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/IndexCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,170 +1,109 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
+
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\FileInfo;
+
+class IndexCollection {
+    private $dom;
+
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
+     * @var FileInfo
      */
-namespace TheSeer\phpDox\Collector {
+    private $srcDir;
+
+    public function __construct(FileInfo $srcDir) {
+        $this->srcDir = $srcDir;
+    }
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\FileInfo;
+    public function import(fDOMDocument $dom): void {
+        $this->dom = $dom;
+        $this->dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+    }
 
     /**
-     *
+     * This method exports all newly registered units into their respective files
+     * and updates the collection file accordingly
      */
-    class IndexCollection {
+    public function export(): fDOMDocument {
+        if (!$this->dom instanceof fDOMDocument) {
+            $this->initDomDocument();
+        }
 
-        private $dom;
+        return $this->dom;
+    }
 
-        /**
-         * @var FileInfo
-         */
-        private $srcDir;
+    public function addClass(ClassObject $class): void {
+        $this->addUnit($class, 'class');
+    }
 
-        public function __construct(FileInfo $srcDir) {
-            $this->srcDir = $srcDir;
-        }
+    public function addInterface(InterfaceObject $interface): void {
+        $this->addUnit($interface, 'interface');
+    }
 
-        private function getRootElement() {
-            if (!$this->dom instanceof fDOMDocument) {
-                $this->initDomDocument();
-            }
-            return $this->dom->documentElement;
-        }
+    public function addTrait(TraitObject $trait): void {
+        $this->addUnit($trait, 'trait');
+    }
 
-        private function initDomDocument() {
-            $this->dom = new fDOMDocument('1.0', 'UTF-8');
-            $this->dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-            $index = $this->dom->appendElementNS('http://xml.phpdox.net/src', 'index');
-            $index->setAttribute('basedir', $this->srcDir->getRealPath());
-        }
+    public function findUnitNodesBySrcFile(string $path): \DOMNodeList {
+        $src = \mb_substr($path, \mb_strlen((string)$this->srcDir) + 1);
 
-        /**
-         * @param \TheSeer\fDOM\fDOMDocument $dom
-         * @return void
-         */
-        public function import(fDOMDocument $dom) {
-            $this->dom = $dom;
-            $this->dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-        }
+        return $this->getRootElement()->query(\sprintf('//*[@src="%s"]', $src));
+    }
 
-        /**
-         * This method exports all newly registered units into their respective files
-         * and updates the collection file accordingly
-         *
-         * @param string $xmlDir
-         *
-         * @return \TheSeer\fDOM\fDOMDocument
-         */
-        public function export() {
-            if (!$this->dom instanceof fDOMDocument) {
-                $this->initDomDocument();
-            }
-            return $this->dom;
-        }
+    /**
+     * @param $namespace
+     * @param $name
+     */
+    public function findUnitNodeByName($namespace, $name): ?fDOMElement {
+        return $this->getRootElement()->queryOne(
+            \sprintf('//phpdox:namespace[@name="%s"]/*[@name="%s"]', $namespace, $name)
+        );
+    }
 
-        /**
-         * @param ClassObject $class
-         */
-        public function addClass(ClassObject $class) {
-            $this->addUnit($class, 'class');
+    private function getRootElement() {
+        if (!$this->dom instanceof fDOMDocument) {
+            $this->initDomDocument();
         }
 
-        /**
-         * @param InterfaceObject $interface
-         */
-        public function addInterface(InterfaceObject $interface) {
-            $this->addUnit($interface, 'interface');
-        }
+        return $this->dom->documentElement;
+    }
 
-        /**
-         * @param TraitObject $trait
-         */
-        public function addTrait(TraitObject $trait) {
-            $this->addUnit($trait, 'trait');
-        }
+    private function initDomDocument(): void {
+        $this->dom = new fDOMDocument('1.0', 'UTF-8');
+        $this->dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+        $index = $this->dom->appendElementNS('http://xml.phpdox.net/src', 'index');
+        $index->setAttribute('basedir', $this->srcDir->getRealPath());
+    }
 
-        /**
-         * @param $path
-         * @return \DOMNodeList
-         */
-        public function findUnitNodesBySrcFile($path) {
-            $src = mb_substr($path, mb_strlen($this->srcDir) + 1);
-            return $this->getRootElement()->query(sprintf('//*[@src="%s"]', $src));
-        }
+    private function addUnit(AbstractUnitObject $unit, $type): void {
+        $root = $this->getRootElement();
 
-        /**
-         * @param $namespace
-         * @param $name
-         *
-         * @return fDOMElement
-         */
-        public function findUnitNodeByName($namespace, $name) {
-            return $this->getRootElement()->queryOne(
-                sprintf('//phpdox:namespace[@name="%s"]/*[@name="%s"]', $namespace, $name));
-        }
+        if (!$this->findUnitNodeByName($unit->getNamespace(), $unit->getLocalName())) {
+            $unitNode = $root->appendElementNS('http://xml.phpdox.net/src', $type);
+            $unitNode->setAttribute('name', $unit->getLocalName());
 
-        /**
-         * @param AbstractUnitObject $unit
-         */
-        private function addUnit(AbstractUnitObject $unit, $type) {
-            $root = $this->getRootElement();
-
-            if (!$this->findUnitNodeByName($unit->getNamespace(), $unit->getLocalName())) {
-                $unitNode = $root->appendElementNS('http://xml.phpdox.net/src', $type);
-                $unitNode->setAttribute('name', $unit->getLocalName());
-
-                $src = $unit->getSourceFilename();
-                if ($src != '') {
-                    $unitNode->setAttribute('src', $src->getRelative($this->srcDir, FALSE));
-                }
-
-                $desc = $unit->getCompactDescription();
-                if ($desc != '') {
-                    $unitNode->setAttribute('description', $desc);
-                }
-
-                $xpath = 'phpdox:namespace[@name="' . $unit->getNamespace() . '"]';
-                $ctx = $root->queryOne($xpath);
-                if (!$ctx) {
-                    $ctx = $root->appendElementNS('http://xml.phpdox.net/src', 'namespace');
-                    $ctx->setAttribute('name', $unit->getNamespace());
-                }
-                $ctx->appendChild($unitNode);
+            $src = $unit->getSourceFilename();
+
+            if ($src !== null) {
+                $unitNode->setAttribute('src', $src->getRelative($this->srcDir, false));
             }
-        }
 
-    }
+            $desc = $unit->getCompactDescription();
+
+            if ($desc != '') {
+                $unitNode->setAttribute('description', $desc);
+            }
 
+            $xpath = 'phpdox:namespace[@name="' . $unit->getNamespace() . '"]';
+            $ctx   = $root->queryOne($xpath);
+
+            if (!$ctx) {
+                $ctx = $root->appendElementNS('http://xml.phpdox.net/src', 'namespace');
+                $ctx->setAttribute('name', $unit->getNamespace());
+            }
+            $ctx->appendChild($unitNode);
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/project/InlineComment.php phpdox-0.12.0/src/collector/project/InlineComment.php
--- phpdox-0.11.2/src/collector/project/InlineComment.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/InlineComment.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,78 +1,82 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
 
-    class InlineComment {
+class InlineComment {
+    public const XMLNS = 'http://xml.phpdox.net/src';
 
-        const XMLNS = 'http://xml.phpdox.net/src';
+    private $fragment;
 
-        private $fragment;
-        private $startLine;
+    private $startLine;
 
-        public function __construct($line, $comment) {
-            $this->startLine = $line;
+    public function __construct($line, $comment) {
+        $this->startLine = $line;
 
-            $dom = new fDOMDocument();
-            $this->fragment = $dom->createDocumentFragment();
-            $this->parse(
-                $this->normalizeSplit($comment)
-            );
-        }
+        $this->fragment = (new fDOMDocument())->createDocumentFragment();
+        $this->parse(
+            $this->normalizeSplit($comment)
+        );
+    }
 
-        public function getCount() {
-            return $this->fragment->childNodes->length;
-        }
+    public function getCount() {
+        return $this->fragment->childNodes->length;
+    }
 
-        public function asDom(fDOMDocument $dom) {
-            return $dom->importNode($this->fragment, true);
-        }
+    public function asDom(fDOMDocument $dom) {
+        return $dom->importNode($this->fragment, true);
+    }
 
-        private function normalizeSplit($comment) {
-            $comment = str_replace(array("\r\n", "\n"), "\n", $comment);
-            $res = array();
-            foreach(explode("\n", trim($comment)) as $line) {
-                $line = trim($line);
-                preg_match('=//(.*)$|/\*{1,}(.*)\*/$|/\*{1,}(.*)$|^(.*)\*/$|#(.*)$|\*{1}(.*)$|^(.*)$=', $line, $matches);
-                $normalized = trim(end($matches));
-                if ($normalized != '') {
-                    $res[] = $normalized;
-                }
+    private function normalizeSplit($comment) {
+        $comment = \str_replace(["\r\n", "\n"], "\n", $comment);
+        $res     = [];
+
+        foreach (\explode("\n", \trim($comment)) as $line) {
+            $line = \trim($line);
+            \preg_match('=//(.*)$|/\*{1,}(.*)\*/$|/\*{1,}(.*)$|^(.*)\*/$|#(.*)$|\*{1}(.*)$|^(.*)$=', $line, $matches);
+            $normalized = \trim(\end($matches));
+
+            if ($normalized != '') {
+                $res[] = $normalized;
             }
-            return $res;
         }
 
-        private function parse(array $comments) {
-            foreach($comments as $pos => $comment) {
-                preg_match('=^@{0,1}(todo|var|fixme):{0,1}(.*)=i', $comment, $matches);
-                if (count($matches) != 0) {
-                    switch(mb_strtolower($matches[1])) {
-                        case 'var': {
+        return $res;
+    }
+
+    private function parse(array $comments): void {
+        foreach ($comments as $pos => $comment) {
+            \preg_match('=^@{0,1}(todo|var|fixme):{0,1}(.*)=i', $comment, $matches);
+
+            if (\count($matches) != 0) {
+                switch (\mb_strtolower($matches[1])) {
+                    case 'var':
+                        {
                             // we ignore @var comments as they are IDE support only
-                            continue;
+                            continue 2;
                         }
-                        case 'fixme':
-                        case 'todo': {
+                    case 'fixme':
+                    case 'todo':
+                        {
                             $node = $this->fragment->appendChild(
-                                $this->fragment->ownerDocument->createElementNS(self::XMLNS, mb_strtolower($matches[1]))
+                                $this->fragment->ownerDocument->createElementNS(self::XMLNS, \mb_strtolower($matches[1]))
                             );
-                            $node->setAttribute('value', trim($matches[2]));
+                            $node->setAttribute('value', \trim($matches[2]));
+
                             break;
                         }
-                    }
-                } else {
-                    $node = $this->fragment->appendChild(
-                        $this->fragment->ownerDocument->createElementNS(self::XMLNS, 'comment')
-                    );
-                    $node->setAttribute('value', trim($comment));
-                }
-                if (isset($node) && $node instanceof fDOMElement) {
-                    $node->setAttribute('line', $this->startLine + $pos);
                 }
+            } else {
+                $node = $this->fragment->appendChild(
+                    $this->fragment->ownerDocument->createElementNS(self::XMLNS, 'comment')
+                );
+                $node->setAttribute('value', \trim($comment));
             }
-        }
 
+            if (isset($node) && $node instanceof fDOMElement) {
+                $node->setAttribute('line', $this->startLine + $pos);
+            }
+        }
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/InterfaceObject.php phpdox-0.12.0/src/collector/project/InterfaceObject.php
--- phpdox-0.11.2/src/collector/project/InterfaceObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/InterfaceObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,52 +1,14 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    class InterfaceObject extends AbstractUnitObject {
-        protected $rootName = 'interface';
-
-        public function addImplementor(AbstractUnitObject $unit) {
-            if ($this->getRootNode()->queryOne(sprintf('phpdox:implementor[@full = "%s"]', $unit->getName())) !== NULL) {
-                return;
-            }
-            $implementor = $this->addToContainer('implementors', $unit->getType());
-            $this->setName($unit->getName(), $implementor);
+class InterfaceObject extends AbstractUnitObject {
+    protected $rootName = 'interface';
 
+    public function addImplementor(AbstractUnitObject $unit): void {
+        if ($this->getRootNode()->queryOne(\sprintf('phpdox:implementor[@full = "%s"]', $unit->getName())) !== null) {
+            return;
         }
+        $implementor = $this->addToContainer('implementors', $unit->getType());
+        $this->setName($unit->getName(), $implementor);
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/MemberObject.php phpdox-0.12.0/src/collector/project/MemberObject.php
--- phpdox-0.11.2/src/collector/project/MemberObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/MemberObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,70 +1,34 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\phpDox\DocBlock\DocBlock;
+use TheSeer\phpDox\DocBlock\DocBlock;
 
-    class MemberObject extends AbstractVariableObject {
+class MemberObject extends AbstractVariableObject {
+    /**
+     * @param bool $isStatic
+     */
+    public function setStatic($isStatic): void {
+        $this->ctx->setAttribute('static', $isStatic ? 'true' : 'false');
+    }
 
-        /**
-         * @param boolean $isStatic
-         */
-        public function setStatic($isStatic) {
-            $this->ctx->setAttribute('static', $isStatic ? 'true' : 'false');
+    /**
+     * @param string $visibility
+     */
+    public function setVisibility($visibility): void {
+        if (!\in_array($visibility, ['public', 'private', 'protected'])) {
+            throw new MethodObjectException("'$visibility' is not valid'", MethodObjectException::InvalidVisibility);
         }
+        $this->ctx->setAttribute('visibility', $visibility);
+    }
 
-        /**
-         * @param string $visibility
-         */
-        public function setVisibility($visibility) {
-            if (!in_array($visibility, array('public','private','protected'))) {
-                throw new MethodObjectException("'$visibility' is not valid'", MethodObjectException::InvalidVisibility);
-            }
-            $this->ctx->setAttribute('visibility', $visibility);
-        }
+    public function setDocBlock(DocBlock $docblock): void {
+        $docNode = $docblock->asDom($this->ctx->ownerDocument);
 
-        public function setDocBlock(DocBlock $docblock) {
-            $docNode = $docblock->asDom($this->ctx->ownerDocument);
-            if ($this->ctx->hasChildNodes()) {
-                $this->ctx->insertBefore($docNode, $this->ctx->firstChild);
-                return;
-            }
-            $this->ctx->appendChild($docNode);
-        }
+        if ($this->ctx->hasChildNodes()) {
+            $this->ctx->insertBefore($docNode, $this->ctx->firstChild);
 
+            return;
+        }
+        $this->ctx->appendChild($docNode);
     }
 }
diff -Nru phpdox-0.11.2/src/collector/project/MethodObjectException.php phpdox-0.12.0/src/collector/project/MethodObjectException.php
--- phpdox-0.11.2/src/collector/project/MethodObjectException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/MethodObjectException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,9 +1,6 @@
-<?php
-namespace TheSeer\phpDox\Collector {
-
-    class MethodObjectException extends \Exception {
-
-        const InvalidVisibility = 1;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
+class MethodObjectException extends \Exception {
+    public const InvalidVisibility = 1;
 }
diff -Nru phpdox-0.11.2/src/collector/project/MethodObject.php phpdox-0.12.0/src/collector/project/MethodObject.php
--- phpdox-0.11.2/src/collector/project/MethodObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/MethodObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,212 +1,160 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
+
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\DocBlock\DocBlock;
+
+class MethodObject {
+    public const XMLNS = 'http://xml.phpdox.net/src';
+
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
-
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\DocBlock\DocBlock;
-
-    /**
-     *
-     */
-    class MethodObject {
-
-        const XMLNS = 'http://xml.phpdox.net/src';
-
-        /**
-         * @var \TheSeer\fDOM\fDOMElement
-         */
-        private $ctx;
-
-        /**
-         * @var AbstractUnitObject
-         */
-        private $unit;
-
-        /**
-         * @param AbstractUnitObject $unit
-         * @param fDOMElement        $ctx
-         */
-        public function __construct(AbstractUnitObject $unit, fDOMElement $ctx) {
-            $this->unit = $unit;
-            $this->ctx = $ctx;
-        }
+     * @var \TheSeer\fDOM\fDOMElement
+     */
+    private $ctx;
 
-        public function getOwner() {
-            return $this->unit;
-        }
+    /**
+     * @var AbstractUnitObject
+     */
+    private $unit;
 
-        public function export() {
-            return $this->ctx;
-        }
+    public function __construct(AbstractUnitObject $unit, fDOMElement $ctx) {
+        $this->unit = $unit;
+        $this->ctx  = $ctx;
+    }
 
-        /**
-         * @param string $name
-         */
-        public function setName($name) {
-            $this->ctx->setAttribute('name', $name);
-        }
+    public function getOwner() {
+        return $this->unit;
+    }
 
-        public function getName() {
-            return $this->ctx->getAttribute('name');
-        }
-        /**
-         * @param int $startLine
-         */
-        public function setStartLine($startLine) {
-            $this->ctx->setAttribute('start', $startLine);
-        }
+    public function export() {
+        return $this->ctx;
+    }
 
-        /**
-         * @param int $endLine
-         */
-        public function setEndLine($endLine) {
-            $this->ctx->setAttribute('end', $endLine);
-        }
+    /**
+     * @param string $name
+     */
+    public function setName($name): void {
+        $this->ctx->setAttribute('name', $name);
+    }
 
-        /**
-         * @param boolean $isFinal
-         */
-        public function setFinal($isFinal) {
-            $this->ctx->setAttribute('final', $isFinal ? 'true' : 'false');
-        }
+    public function getName() {
+        return $this->ctx->getAttribute('name');
+    }
 
-        /**
-         * @param boolean $isAbstract
-         */
-        public function setAbstract($isAbstract) {
-            $this->ctx->setAttribute('abstract', $isAbstract ? 'true' : 'false');
-        }
+    /**
+     * @param int $startLine
+     */
+    public function setStartLine($startLine): void {
+        $this->ctx->setAttribute('start', $startLine);
+    }
 
-        /**
-         * @param boolean $isStatic
-         */
-        public function setStatic($isStatic) {
-            $this->ctx->setAttribute('static', $isStatic ? 'true' : 'false');
-        }
+    /**
+     * @param int $endLine
+     */
+    public function setEndLine($endLine): void {
+        $this->ctx->setAttribute('end', $endLine);
+    }
 
-        /**
-         * @param string $visibility
-         */
-        public function setVisibility($visibility) {
-            if (!in_array($visibility, array('public','private','protected'))) {
-                throw new MethodObjectException("'$visibility' is not valid'", MethodObjectException::InvalidVisibility);
-            }
-            $this->ctx->setAttribute('visibility', $visibility);
-        }
+    /**
+     * @param bool $isFinal
+     */
+    public function setFinal($isFinal): void {
+        $this->ctx->setAttribute('final', $isFinal ? 'true' : 'false');
+    }
 
-        /**
-         * @param DocBlock $docblock
-         */
-        public function setDocBlock(DocBlock $docblock) {
-            $docNode = $docblock->asDom($this->ctx->ownerDocument);
-
-            if ($this->ctx->hasChildNodes()) {
-                $this->ctx->insertBefore($docNode, $this->ctx->firstChild);
-                return;
-            }
-            $this->ctx->appendChild($docNode);
-        }
+    /**
+     * @param bool $isAbstract
+     */
+    public function setAbstract($isAbstract): void {
+        $this->ctx->setAttribute('abstract', $isAbstract ? 'true' : 'false');
+    }
 
-        public function hasInheritDoc() {
-            return $this->ctx->query('phpdox:docblock[@inherit="true"]')->length > 0;
+    /**
+     * @param bool $isStatic
+     */
+    public function setStatic($isStatic): void {
+        $this->ctx->setAttribute('static', $isStatic ? 'true' : 'false');
+    }
+
+    /**
+     * @param string $visibility
+     */
+    public function setVisibility($visibility): void {
+        if (!\in_array($visibility, ['public', 'private', 'protected'])) {
+            throw new MethodObjectException("'$visibility' is not valid'", MethodObjectException::InvalidVisibility);
         }
+        $this->ctx->setAttribute('visibility', $visibility);
+    }
 
-        public function inhertDocBlock(MethodObject $method) {
-            $inherit = $method->export()->queryOne('phpdox:docblock');
-            if (!$inherit) { // no docblock, no work ;)
-                return;
-            }
-            $docNode = $this->ctx->queryOne('phpdox:docblock');
-            if (!$docNode) {
-                $this->setDocBlock(new DocBlock());
-                $docNode = $this->ctx->queryOne('phpdox:docblock');
-            }
-
-            $container = $docNode->appendElementNS(self::XMLNS, 'inherited');
-            $container->setAttribute(
-                $method->getOwner()->getType(),
-                $method->getOwner()->getName()
-            );
-            $container->appendChild($this->ctx->ownerDocument->importNode($inherit, true));
+    public function setDocBlock(DocBlock $docblock): void {
+        $docNode = $docblock->asDom($this->ctx->ownerDocument);
 
-        }
+        if ($this->ctx->hasChildNodes()) {
+            $this->ctx->insertBefore($docNode, $this->ctx->firstChild);
 
-        /**
-         * @param string $name
-         *
-         * @return ReturnTypeObject
-         */
-        public function setReturnType($name) {
-            $returnType = new ReturnTypeObject($this->ctx->appendElementNS(self::XMLNS, 'return'));
-            $returnType->setType($name);
-            return $returnType;
+            return;
         }
+        $this->ctx->appendChild($docNode);
+    }
 
-        /**
-         * @param string $name
-         *
-         * @return ParameterObject
-         */
-        public function addParameter($name) {
-            $parameter = new ParameterObject($this->ctx->appendElementNS(self::XMLNS, 'parameter'));
-            $parameter->setName($name);
-            return $parameter;
-        }
+    public function hasInheritDoc() {
+        return $this->ctx->query('phpdox:docblock[@inherit="true"]')->length > 0;
+    }
 
-        /**
-         * @param InlineComment $InlineComment
-         */
-        public function addInlineComment(InlineComment $InlineComment) {
-            $this->getInlineContainer()->appendChild(
-                $InlineComment->asDom($this->ctx->ownerDocument)
-            );
+    public function inhertDocBlock(self $method): void {
+        $inherit = $method->export()->queryOne('phpdox:docblock');
+
+        if (!$inherit) { // no docblock, no work ;)
+            return;
         }
+        $docNode = $this->ctx->queryOne('phpdox:docblock');
 
-        /**
-         * @return fDOMElement
-         */
-        private function getInlineContainer() {
-            $node = $this->ctx->queryOne('phpdox:inline');
-            if ($node !== NULL) {
-                return $node;
-            }
-            return $this->ctx->appendElementNS(self::XMLNS, 'inline');
+        if (!$docNode) {
+            $this->setDocBlock(new DocBlock());
+            $docNode = $this->ctx->queryOne('phpdox:docblock');
         }
 
+        $container = $docNode->appendElementNS(self::XMLNS, 'inherited');
+        $container->setAttribute(
+            $method->getOwner()->getType(),
+            $method->getOwner()->getName()
+        );
+        $container->appendChild($this->ctx->ownerDocument->importNode($inherit, true));
     }
 
+    /**
+     * @param string $name
+     */
+    public function setReturnType($name): ReturnTypeObject {
+        $returnType = new ReturnTypeObject($this->ctx->appendElementNS(self::XMLNS, 'return'));
+        $returnType->setType($name);
+
+        return $returnType;
+    }
+
+    /**
+     * @param string $name
+     */
+    public function addParameter($name): ParameterObject {
+        $parameter = new ParameterObject($this->ctx->appendElementNS(self::XMLNS, 'parameter'));
+        $parameter->setName($name);
+
+        return $parameter;
+    }
+
+    public function addInlineComment(InlineComment $InlineComment): void {
+        $this->getInlineContainer()->appendChild(
+            $InlineComment->asDom($this->ctx->ownerDocument)
+        );
+    }
+
+    private function getInlineContainer(): fDOMElement {
+        $node = $this->ctx->queryOne('phpdox:inline');
+
+        if ($node !== null) {
+            return $node;
+        }
+
+        return $this->ctx->appendElementNS(self::XMLNS, 'inline');
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/project/ParameterObject.php phpdox-0.12.0/src/collector/project/ParameterObject.php
--- phpdox-0.11.2/src/collector/project/ParameterObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/ParameterObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,49 +1,8 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    /**
-     *
-     */
-    class ParameterObject extends AbstractVariableObject {
-
-        public function setByReference($isRef) {
-            $this->ctx->setAttribute('byreference', $isRef ? 'true' : 'false');
-        }
+class ParameterObject extends AbstractVariableObject {
+    public function setByReference($isRef): void {
+        $this->ctx->setAttribute('byreference', $isRef ? 'true' : 'false');
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/ProjectException.php phpdox-0.12.0/src/collector/project/ProjectException.php
--- phpdox-0.11.2/src/collector/project/ProjectException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/ProjectException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,13 +1,12 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    class ProjectException extends \Exception {
+class ProjectException extends \Exception {
+    public const UnitNotFoundInIndex = 1;
 
-        const UnitNotFoundInIndex = 1;
-        const UnitCouldNotBeSaved = 2;
-        const UnexpectedType = 3;
-        const ErrorWhileSaving = 4;
+    public const UnitCouldNotBeSaved = 2;
 
-    }
+    public const UnexpectedType = 3;
 
+    public const ErrorWhileSaving = 4;
 }
diff -Nru phpdox-0.11.2/src/collector/project/Project.php phpdox-0.12.0/src/collector/project/Project.php
--- phpdox-0.11.2/src/collector/project/Project.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/Project.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,410 +1,353 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Collector {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\fDOM\fDOMException;
-    use TheSeer\phpDox\FileInfo;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMException;
+use TheSeer\phpDox\FileInfo;
+
+class Project {
     /**
-     *
+     * @var FileInfo
      */
-    class Project {
+    private $xmlDir;
 
-        /**
-         * @var FileInfo
-         */
-        private $xmlDir;
-
-        /**
-         * @var FileInfo
-         */
-        private $srcDir;
-
-        /**
-         * @var SourceCollection
-         */
-        private $source = NULL;
-
-        /**
-         * @var IndexCollection
-         */
-        private $index = NULL;
-
-        /**
-         * @var SourceFile[]
-         */
-        private $files  = array();
-
-        private $saveUnits = array();
-        private $loadedUnits = array();
-
-        /**
-         * @param $srcDir
-         * @param $xmlDir
-         */
-        public function __construct(FileInfo $srcDir, FileInfo $xmlDir) {
-            $this->xmlDir = $xmlDir;
-            $this->srcDir = $srcDir;
-            $this->initCollections();
-        }
-
-        /**
-         * @return FileInfo
-         */
-        public function getSourceDir() {
-            return $this->srcDir;
-        }
-
-        /**
-         * @return FileInfo
-         */
-        public function getXmlDir() {
-            return $this->xmlDir;
-        }
-
-        /**
-         * @param FileInfo $file
-         * @return bool
-         */
-        public function addFile(SourceFile $file) {
-            $isNew = $this->source->addFile($file);
-            if ($isNew) {
-                $this->removeFileReferences($file->getPathname());
-                $this->files[$file->getPathname()] = $file;
-            }
-            return $isNew;
-        }
+    /**
+     * @var FileInfo
+     */
+    private $srcDir;
+
+    /**
+     * @var SourceCollection
+     */
+    private $source;
+
+    /**
+     * @var IndexCollection
+     */
+    private $index;
+
+    /**
+     * @var SourceFile[]
+     */
+    private $files = [];
+
+    private $saveUnits = [];
+
+    private $loadedUnits = [];
 
-        /**
-         * @param FileInfo $file
-         */
-        public function removeFile(FileInfo $file) {
+    /**
+     * @param $srcDir
+     * @param $xmlDir
+     */
+    public function __construct(FileInfo $srcDir, FileInfo $xmlDir) {
+        $this->xmlDir = $xmlDir;
+        $this->srcDir = $srcDir;
+        $this->initCollections();
+    }
+
+    public function getSourceDir(): FileInfo {
+        return $this->srcDir;
+    }
+
+    public function getXmlDir(): FileInfo {
+        return $this->xmlDir;
+    }
+
+    /**
+     * @param FileInfo $file
+     */
+    public function addFile(SourceFile $file): bool {
+        $isNew = $this->source->addFile($file);
+
+        if ($isNew) {
             $this->removeFileReferences($file->getPathname());
-            unset($this->files[$file->getPathname()]);
-            $this->source->removeFile($file);
+            $this->files[$file->getPathname()] = $file;
         }
 
-        /**
-         * @param ClassObject $class
-         */
-        public function addClass(ClassObject $class) {
-            $this->loadedUnits[$class->getName()] = $class;
-            $this->registerForSaving($class);
-            $this->index->addClass($class);
-        }
-
-        /**
-         *
-         */
-        public function addInterface(InterfaceObject $interface) {
-            $this->loadedUnits[$interface->getName()] = $interface;
-            $this->registerForSaving($interface);
-            $this->index->addInterface($interface);
-        }
-
-        /**
-         *
-         */
-        public function addTrait(TraitObject $trait) {
-            $this->loadedUnits[$trait->getName()] = $trait;
-            $this->registerForSaving($trait);
-            $this->index->addTrait($trait);
-        }
-
-        /**
-         * @return fDOMDocument
-         */
-        public function getIndex() {
-            return $this->index->export();
-        }
-
-        /**
-         * @return fDOMDocument
-         */
-        public function getSourceTree() {
-            return $this->source->export();
-        }
-
-        /**
-         * @return bool
-         */
-        public function hasNamespaces() {
-            return $this->index->export()->query('count(//phpdox:namespace[not(@name="/")])') > 0;
-        }
-
-        /**
-         * @param $namespace
-         * @param $name
-         * @return fDOMElement
-         */
-        public function getUnitByName($name) {
-            if (isset($this->loadedUnits[$name])) {
-                return $this->loadedUnits[$name];
-            }
+        return $isNew;
+    }
 
-            $parts = explode('\\', $name);
-            $local = array_pop($parts);
-            $namespace = join('\\', $parts);
-            $indexNode = $this->index->findUnitNodeByName($namespace, $local);
-            if (!$indexNode) {
-                throw new ProjectException("No unit with name '$name' found");
-            }
+    public function removeFile(FileInfo $file): void {
+        $this->removeFileReferences($file->getPathname());
+        unset($this->files[$file->getPathname()]);
+        $this->source->removeFile($file);
+    }
+
+    public function addClass(ClassObject $class): void {
+        $this->loadedUnits[$class->getName()] = $class;
+        $this->registerForSaving($class);
+        $this->index->addClass($class);
+    }
+
+    public function addInterface(InterfaceObject $interface): void {
+        $this->loadedUnits[$interface->getName()] = $interface;
+        $this->registerForSaving($interface);
+        $this->index->addInterface($interface);
+    }
+
+    public function addTrait(TraitObject $trait): void {
+        $this->loadedUnits[$trait->getName()] = $trait;
+        $this->registerForSaving($trait);
+        $this->index->addTrait($trait);
+    }
+
+    public function getIndex(): fDOMDocument {
+        return $this->index->export();
+    }
+
+    public function getSourceTree(): fDOMDocument {
+        return $this->source->export();
+    }
+
+    public function hasNamespaces(): bool {
+        return $this->index->export()->query('count(//phpdox:namespace[not(@name="/")])') > 0;
+    }
+
+    public function getUnitByName(string $name) {
+        if (isset($this->loadedUnits[$name])) {
+            return $this->loadedUnits[$name];
+        }
+
+        $parts     = \explode('\\', $name);
+        $local     = \array_pop($parts);
+        $namespace = \implode('\\', $parts);
+        $indexNode = $this->index->findUnitNodeByName($namespace, $local);
+
+        if (!$indexNode) {
+            throw new ProjectException("No unit with name '$name' found");
+        }
 
-            switch ($indexNode->localName) {
-                case 'interface': {
+        switch ($indexNode->localName) {
+            case 'interface':
+                {
                     $unit = new InterfaceObject();
+
                     break;
                 }
-                case 'trait': {
+            case 'trait':
+                {
                     $unit = new TraitObject();
+
                     break;
                 }
-                case 'class': {
+            case 'class':
+                {
                     $unit = new ClassObject();
+
                     break;
                 }
-                default: {
+            default:
+                {
                     throw new ProjectException(
-                        sprintf('Unexpected type "%s"', $indexNode->localName),
+                        \sprintf('Unexpected type "%s"', $indexNode->localName),
                         ProjectException::UnexpectedType
                     );
                 }
-            }
-
-            $dom = new fDOMDocument();
-            $dom->load($this->xmlDir . '/' . $indexNode->getAttribute('xml'));
-            $unit->import($dom);
-
-            return $unit;
         }
 
-        /**
-         * @return array
-         */
-        public function cleanVanishedFiles() {
-            $files = $this->source->getVanishedFiles();
-            foreach ($files as $path) {
-                $this->removeFileReferences($path);
-            }
-            return $files;
-        }
+        $dom = new fDOMDocument();
+        $dom->load($this->xmlDir . '/' . $indexNode->getAttribute('xml'));
+        $unit->import($dom);
+
+        return $unit;
+    }
 
+    public function cleanVanishedFiles(): array {
+        $files = $this->source->getVanishedFiles();
 
-        public function registerForSaving(AbstractUnitObject $unit) {
-            $this->saveUnits[$unit->getName()] = $unit;
+        foreach ($files as $path) {
+            $this->removeFileReferences($path);
         }
 
-        /**
-         * @return array
-         */
-        public function save() {
-            try {
-                $map = $this->initDirectories();
+        return $files;
+    }
 
-                $indexDom = $this->index->export();
-                $reportUnits = $this->saveUnits;
-                foreach($this->saveUnits as $unit) {
-                    $reportUnits = $this->saveUnit($map, $reportUnits, $unit);
-                }
-                $indexDom->formatOutput = TRUE;
-                $indexDom->preserveWhiteSpace = FALSE;
-                $indexDom->save($this->xmlDir . '/index.xml');
+    public function registerForSaving(AbstractUnitObject $unit): void {
+        $this->saveUnits[$unit->getName()] = $unit;
+    }
 
-                $this->saveSources();
+    public function save(): array {
+        try {
+            $map = $this->initDirectories();
 
-                $this->saveUnits = array();
-                $this->files = array();
+            $indexDom    = $this->index->export();
+            $reportUnits = $this->saveUnits;
 
-                return $reportUnits;
-            } catch (\Exception $e) {
-                throw new ProjectException(
-                    sprintf('An error occured while saving the collected data: %s', $e->getMessage()),
-                    ProjectException::ErrorWhileSaving,
-                    $e
-                );
+            foreach ($this->saveUnits as $unit) {
+                $reportUnits = $this->saveUnit($map, $reportUnits, $unit);
             }
+            $indexDom->formatOutput       = true;
+            $indexDom->preserveWhiteSpace = false;
+            $indexDom->save($this->xmlDir . '/index.xml');
+
+            $this->saveSources();
+
+            $this->saveUnits = [];
+            $this->files     = [];
+
+            return $reportUnits;
+        } catch (\Exception $e) {
+            throw new ProjectException(
+                \sprintf('An error occured while saving the collected data: %s', $e->getMessage()),
+                ProjectException::ErrorWhileSaving,
+                $e
+            );
         }
+    }
 
-        /**
-         * @param $fname
-         *
-         * @return array
-         */
-        private function findAffectedUnits($fname) {
-            $affected = array();
-            $dom = new fDOMDocument();
-            $dom->load($this->xmlDir . '/' . $fname);
-            $dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-            $extends = $dom->queryOne('//phpdox:extends');
-            if ($extends instanceof fDOMElement) {
-                try {
-                    $affected[$extends->getAttribute('full')] = $this->getUnitByName($extends->getAttribute('full'));
-                } catch (ProjectException $e) {}
-            }
-            $implements = $dom->query('//phpdox:implements');
-            foreach($implements as $implement) {
-                try {
-                    $affected[$implement->getAttribute('full')] = $this->getUnitByName($implement->getAttribute('full'));
-                } catch (ProjectException $e) {}
+    /**
+     * @param $fname
+     */
+    private function findAffectedUnits($fname): array {
+        $affected = [];
+        $dom      = new fDOMDocument();
+        $dom->load($this->xmlDir . '/' . $fname);
+        $dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+        $extends = $dom->queryOne('//phpdox:extends');
+
+        if ($extends instanceof fDOMElement) {
+            try {
+                $affected[$extends->getAttribute('full')] = $this->getUnitByName($extends->getAttribute('full'));
+            } catch (ProjectException $e) {
             }
-            return $affected;
         }
+        $implements = $dom->query('//phpdox:implements');
 
-        private function saveUnit(array $map, array $reportUnits, AbstractUnitObject $unit) {
-            $indexNode = $this->index->findUnitNodeByName($unit->getNamespace(), $unit->getLocalName());
-            if (!$indexNode) {
-                throw new ProjectException(
-                    sprintf(
-                        "Internal Error: Unit '%s' not found in index (ns: %s, n: %s).",
-                        $unit->getName(),
-                        $unit->getNamespace(),
-                        $unit->getLocalName()
-                    ),
-                    ProjectException::UnitNotFoundInIndex
-                );
-            }
-            $name = str_replace('\\', '_', $unit->getName());
-            $dom = $unit->export();
-            $dom->formatOutput = TRUE;
-            $dom->preserveWhiteSpace = FALSE;
-            $fname = $map[$dom->documentElement->localName] . '/' . $name . '.xml';
+        foreach ($implements as $implement) {
             try {
-                $dom->save($this->xmlDir . '/' . $fname);
-            } catch (fDOMException $e) {
-                throw new ProjectException(
-                    sprintf(
-                        "Internal Error: Unit '%s' could not be saved (ns: %s, n: %s).",
-                        $unit->getName(),
-                        $unit->getNamespace(),
-                        $unit->getLocalName()
-                    ),
-                    ProjectException::UnitCouldNotBeSaved,
-                    $e
-                );
-            }
-            if ($indexNode->hasAttribute('xml')) {
-                $reportUnits = array_merge($reportUnits, $this->findAffectedUnits($fname));
-            } else {
-                $indexNode->setAttribute('xml', $fname);
+                $affected[$implement->getAttribute('full')] = $this->getUnitByName($implement->getAttribute('full'));
+            } catch (ProjectException $e) {
             }
+        }
 
-            return $reportUnits;
+        return $affected;
+    }
+
+    private function saveUnit(array $map, array $reportUnits, AbstractUnitObject $unit) {
+        $indexNode = $this->index->findUnitNodeByName($unit->getNamespace(), $unit->getLocalName());
+
+        if (!$indexNode) {
+            throw new ProjectException(
+                \sprintf(
+                    "Internal Error: Unit '%s' not found in index (ns: %s, n: %s).",
+                    $unit->getName(),
+                    $unit->getNamespace(),
+                    $unit->getLocalName()
+                ),
+                ProjectException::UnitNotFoundInIndex
+            );
+        }
+        $name                    = \str_replace('\\', '_', $unit->getName());
+        $dom                     = $unit->export();
+        $dom->formatOutput       = true;
+        $dom->preserveWhiteSpace = false;
+        $fname                   = $map[$dom->documentElement->localName] . '/' . $name . '.xml';
+
+        try {
+            $dom->save($this->xmlDir . '/' . $fname);
+        } catch (fDOMException $e) {
+            throw new ProjectException(
+                \sprintf(
+                    "Internal Error: Unit '%s' could not be saved (ns: %s, n: %s).",
+                    $unit->getName(),
+                    $unit->getNamespace(),
+                    $unit->getLocalName()
+                ),
+                ProjectException::UnitCouldNotBeSaved,
+                $e
+            );
+        }
+
+        if ($indexNode->hasAttribute('xml')) {
+            $reportUnits = \array_merge($reportUnits, $this->findAffectedUnits($fname));
+        } else {
+            $indexNode->setAttribute('xml', $fname);
         }
 
-        private function initDirectories() {
-            $map = array('class' => 'classes', 'trait' => 'traits', 'interface' => 'interfaces');
-            foreach ($map as $col) {
-                $path = $this->xmlDir . '/' . $col;
-                if (!file_exists($path)) {
-                    mkdir($path, 0777, TRUE);
-                }
+        return $reportUnits;
+    }
+
+    private function initDirectories() {
+        $map = ['class' => 'classes', 'trait' => 'traits', 'interface' => 'interfaces'];
+
+        foreach ($map as $col) {
+            $path = $this->xmlDir . '/' . $col;
+
+            if (!\file_exists($path)) {
+                \mkdir($path, 0777, true);
             }
-            return $map;
         }
-        /**
-         * @return void
-         */
-        private function initCollections() {
-            $this->source = new SourceCollection($this->srcDir);
-            $srcFile = $this->xmlDir . '/source.xml';
-            if (file_exists($srcFile)) {
-                $dom = new fDOMDocument();
-                $dom->load($srcFile);
-                $this->source->import($dom);
-            }
 
-            $this->index = new IndexCollection($this->srcDir);
-            $srcFile = $this->xmlDir . '/index.xml';
-            if (file_exists($srcFile)) {
-                $dom = new fDOMDocument();
-                $dom->load($srcFile);
-                $this->index->import($dom);
-            }
+        return $map;
+    }
+
+    private function initCollections(): void {
+        $this->source = new SourceCollection($this->srcDir);
+        $srcFile      = $this->xmlDir . '/source.xml';
 
+        if (\file_exists($srcFile)) {
+            $dom = new fDOMDocument();
+            $dom->load($srcFile);
+            $this->source->import($dom);
         }
 
-        /**
-         * @param string $path
-         */
-        private function removeFileReferences($path) {
-            foreach($this->index->findUnitNodesBySrcFile($path) as $node) {
-                /** @var $node \DOMElement */
-                $fname = $this->xmlDir . '/' . $node->getAttribute('xml');
-                if (file_exists($fname)) {
-                    unlink($fname);
-                }
-                $node->parentNode->removeChild($node);
+        $this->index = new IndexCollection($this->srcDir);
+        $srcFile     = $this->xmlDir . '/index.xml';
+
+        if (\file_exists($srcFile)) {
+            $dom = new fDOMDocument();
+            $dom->load($srcFile);
+            $this->index->import($dom);
+        }
+    }
+
+    /**
+     * @param string $path
+     */
+    private function removeFileReferences($path): void {
+        foreach ($this->index->findUnitNodesBySrcFile($path) as $node) {
+            /** @var $node \DOMElement */
+            $fname = $this->xmlDir . '/' . $node->getAttribute('xml');
+
+            if (\file_exists($fname)) {
+                \unlink($fname);
             }
+            $node->parentNode->removeChild($node);
         }
+    }
 
-        private function saveSources() {
-            foreach($this->files as $file) {
-                $tokenDom = $file->getTokens();
-                $tokenDom->formatOutput = TRUE;
-                $tokenDom->preserveWhiteSpace = FALSE;
-                $relName = 'tokens/' . $file->getRelative($this->srcDir, FALSE) . '.xml';
-                $fname = $this->xmlDir . '/' . $relName;
-                $dir = dirname($fname);
-                if (!file_exists($dir)) {
-                    mkdir($dir, 0777, true);
-                }
-                try {
-                    $tokenDom->save($fname);
-                } catch (fDOMException $e) {
-                    throw new ProjectException(
-                        sprintf(
-                            "Internal Error: Token xml file '%s' could not be saved.",
-                            $fname
-                        ),
-                        ProjectException::UnitCouldNotBeSaved,
-                        $e
-                    );
-                }
-                $this->source->setTokenFileReference($file, $relName);
+    private function saveSources(): void {
+        foreach ($this->files as $file) {
+            $tokenDom                     = $file->getTokens();
+            $tokenDom->formatOutput       = true;
+            $tokenDom->preserveWhiteSpace = false;
+            $relName                      = 'tokens/' . $file->getRelative($this->srcDir, false) . '.xml';
+            $fname                        = $this->xmlDir . '/' . $relName;
+            $dir                          = \dirname($fname);
+
+            if (!\file_exists($dir)) {
+                \mkdir($dir, 0777, true);
             }
 
-            $sourceDom = $this->source->export();
-            $sourceDom->formatOutput = TRUE;
-            $sourceDom->preserveWhiteSpace = FALSE;
-            $sourceDom->save($this->xmlDir . '/source.xml');
+            try {
+                $tokenDom->save($fname);
+            } catch (fDOMException $e) {
+                throw new ProjectException(
+                    \sprintf(
+                        "Internal Error: Token xml file '%s' could not be saved.",
+                        $fname
+                    ),
+                    ProjectException::UnitCouldNotBeSaved,
+                    $e
+                );
+            }
+            $this->source->setTokenFileReference($file, $relName);
         }
 
+        $sourceDom                     = $this->source->export();
+        $sourceDom->formatOutput       = true;
+        $sourceDom->preserveWhiteSpace = false;
+        $sourceDom->save($this->xmlDir . '/source.xml');
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/ReturnTypeObject.php phpdox-0.12.0/src/collector/project/ReturnTypeObject.php
--- phpdox-0.11.2/src/collector/project/ReturnTypeObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/ReturnTypeObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,50 +1,11 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\fDOM\fDOMElement;
-
-    class ReturnTypeObject extends AbstractVariableObject {
-
-        public function __construct(fDOMElement $ctx) {
-            parent::__construct($ctx);
-            $this->addInternalType('void');
-        }
+use TheSeer\fDOM\fDOMElement;
 
+class ReturnTypeObject extends AbstractVariableObject {
+    public function __construct(fDOMElement $ctx) {
+        parent::__construct($ctx);
+        $this->addInternalType('void');
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/SourceCollectionException.php phpdox-0.12.0/src/collector/project/SourceCollectionException.php
--- phpdox-0.11.2/src/collector/project/SourceCollectionException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/SourceCollectionException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,9 +1,6 @@
-<?php
-namespace TheSeer\phpDox\Collector {
-
-    class SourceCollectionException extends \Exception {
-
-        const SourceNotFound = 1;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
+class SourceCollectionException extends \Exception {
+    public const SourceNotFound = 1;
 }
diff -Nru phpdox-0.11.2/src/collector/project/SourceCollection.php phpdox-0.12.0/src/collector/project/SourceCollection.php
--- phpdox-0.11.2/src/collector/project/SourceCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/SourceCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,195 +1,170 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
+
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\FileInfo;
+
+class SourceCollection {
     /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     *
+     * @var FileInfo
      */
-namespace TheSeer\phpDox\Collector {
+    private $srcDir;
 
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-
-    class SourceCollection {
-
-        /**
-         * @var FileInfo
-         */
-        private $srcDir;
-
-        /**
-         * @var fDOMElement[]
-         */
-        private $original = array();
-
-        /**
-         * @var fDOMElement[]
-         */
-        private $collection = array();
-
-        private $workDom;
-
-        public function __construct(FileInfo $srcDir) {
-            $this->srcDir = $srcDir;
-            $this->workDom = new fDOMDocument();
-            $this->workDom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-            $this->workDom->appendElementNS('http://xml.phpdox.net/src', 'source');
-        }
-
-        public function import(fDOMDocument $dom) {
-            $dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-            $dir = $dom->queryOne('/phpdox:source/phpdox:dir');
-            if (!$dir)  {
-                return;
-            }
-            $this->importDirNode($dir, '');
+    /**
+     * @var fDOMElement[]
+     */
+    private $original = [];
+
+    /**
+     * @var fDOMElement[]
+     */
+    private $collection = [];
+
+    private $workDom;
+
+    public function __construct(FileInfo $srcDir) {
+        $this->srcDir  = $srcDir;
+        $this->workDom = new fDOMDocument();
+        $this->workDom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+        $this->workDom->appendElementNS('http://xml.phpdox.net/src', 'source');
+    }
+
+    public function import(fDOMDocument $dom): void {
+        $dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+        $dir = $dom->queryOne('/phpdox:source/phpdox:dir');
+
+        if (!$dir) {
+            return;
         }
+        $this->importDirNode($dir, '');
+    }
 
-        public function addFile(SourceFile $file) {
-            $path = $file->getRealPath();
-            $node = $this->workDom->createElementNS('http://xml.phpdox.net/src', 'file');
-            $node->setAttribute('name', basename($file->getBasename()));
-            $node->setAttribute('size', $file->getSize());
-            $node->setAttribute('time', date('c', $file->getMTime()));
-            $node->setAttribute('unixtime', $file->getMTime());
-            $node->setAttribute('sha1', sha1_file($file->getPathname()));
-            $this->collection[$path] = $node;
-            $changed = $this->isChanged($path);
-            if (!$changed) {
-                $node->setAttribute('xml', $this->original[$path]->getAttribute('xml'));
-            }
-            return $changed;
+    public function addFile(SourceFile $file) {
+        $path = $file->getRealPath();
+        $node = $this->workDom->createElementNS('http://xml.phpdox.net/src', 'file');
+        $node->setAttribute('name', \basename($file->getBasename()));
+        $node->setAttribute('size', $file->getSize());
+        $node->setAttribute('time', \date('c', $file->getMTime()));
+        $node->setAttribute('unixtime', $file->getMTime());
+        $node->setAttribute('sha1', \sha1_file($file->getPathname()));
+        $this->collection[$path] = $node;
+        $changed                 = $this->isChanged($path);
+
+        if (!$changed) {
+            $node->setAttribute('xml', $this->original[$path]->getAttribute('xml'));
+        }
+
+        return $changed;
+    }
+
+    public function setTokenFileReference(SourceFile $file, $tokenPath): void {
+        $path = $file->getRealPath();
+
+        if (!isset($this->collection[$path])) {
+            throw new SourceCollectionException(
+                \sprintf('File %s not found in collection', $path),
+                SourceCollectionException::SourceNotFound
+            );
+        }
+        $this->collection[$path]->setAttribute('xml', $tokenPath);
+    }
+
+    public function removeFile(FileInfo $file): void {
+        if (!isset($this->collection[$file->getRealPath()])) {
+            throw new SourceCollectionException(
+                \sprintf('File %s not found in collection', $file->getRealPath()),
+                SourceCollectionException::SourceNotFound
+            );
         }
+        unset($this->collection[$file->getRealPath()]);
+    }
 
-        public function setTokenFileReference(SourceFile $file, $tokenPath) {
-            $path = $file->getRealPath();
+    public function getVanishedFiles() {
+        $list = [];
+
+        foreach (\array_keys($this->original) as $path) {
             if (!isset($this->collection[$path])) {
-                throw new SourceCollectionException(
-                    sprintf("File %s not found in collection", $path),
-                    SourceCollectionException::SourceNotFound
-                );
+                $list[] = $path;
             }
-            $this->collection[$path]->setAttribute('xml', $tokenPath);
         }
 
-        public function removeFile(FileInfo $file) {
-            if (!isset($this->collection[$file->getRealPath()])) {
-                throw new SourceCollectionException(
-                    sprintf("File %s not found in collection", $file->getRealPath()),
-                    SourceCollectionException::SourceNotFound
-                );
-            }
-            unset($this->collection[$file->getRealPath()]);
+        return $list;
+    }
+
+    public function export($collapse = false) {
+        if (\count($this->collection) == 0) {
+            return $this->workDom;
         }
 
-        public function getVanishedFiles() {
-            $list = array();
-            foreach(array_keys($this->original) as $path) {
-                if (!isset($this->collection[$path])) {
-                    $list[] = $path;
-                }
-            }
-            return $list;
+        $root = $this->workDom->documentElement;
+
+        while ($root->hasChildNodes()) {
+            $root->nodeValue = null;
         }
 
-        public function export($collapse = false) {
-            if (count($this->collection) == 0) {
-                return $this->workDom;
-            }
+        foreach ($this->collection as $path => $file) {
+            $pathInfo = new FileInfo($path);
+            $dirs     = \explode('/', \dirname((string)$pathInfo->getRelative($this->srcDir)));
+            $dirs[0]  = $this->srcDir->getRealPath();
+            $ctx      = $root;
 
-            $root = $this->workDom->documentElement;
-            while($root->hasChildNodes()) {
-                $root->nodeValue = null;
-            }
+            foreach ($dirs as $dir) {
+                $node = $ctx->queryOne('phpdox:dir[@name="' . $dir . '"]');
 
-            foreach ($this->collection as $path => $file) {
-                $pathInfo = new FileInfo($path);
-                $dirs = explode('/', dirname($pathInfo->getRelative($this->srcDir)));
-                $dirs[0] = $this->srcDir->getRealPath();
-                $ctx = $root;
-                foreach ($dirs as $dir) {
-                    $node = $ctx->queryOne('phpdox:dir[@name="' . $dir . '"]');
-                    if (!$node) {
-                        $node = $ctx->appendElementNS('http://xml.phpdox.net/src', 'dir');
-                        $node->setAttribute('name', $dir);
-                    }
-                    $ctx = $node;
+                if (!$node) {
+                    $node = $ctx->appendElementNS('http://xml.phpdox.net/src', 'dir');
+                    $node->setAttribute('name', $dir);
                 }
-                $ctx->appendChild($this->workDom->importNode($file, TRUE));
+                $ctx = $node;
             }
+            $ctx->appendChild($this->workDom->importNode($file, true));
+        }
 
-            $this->collection = array();
+        $this->collection = [];
 
-            if ($collapse) {
-                $this->collapseDirectory();
-            }
-            return $this->workDom;
+        if ($collapse) {
+            $this->collapseDirectory();
         }
 
-        private function importDirNode(fDOMElement $dir, $path) {
-            $path .=  $dir->getAttribute('name');
-            foreach($dir->query('phpdox:file') as $file) {
-                $this->original[ $path . '/' . $file->getAttribute('name')] = $file;
-            }
-            foreach($dir->query('phpdox:dir') as $child) {
-                $this->importDirNode($child, $path . '/');
-            }
+        return $this->workDom;
+    }
+
+    private function importDirNode(fDOMElement $dir, $path): void {
+        $path .= $dir->getAttribute('name');
+
+        foreach ($dir->query('phpdox:file') as $file) {
+            $this->original[$path . '/' . $file->getAttribute('name')] = $file;
         }
 
-        private function isChanged($path) {
-            if (!isset($this->original[$path])) {
-                return true;
-            }
-            $org = $this->original[$path];
-            $new = $this->collection[$path];
-            return $org->getAttribute('sha1') != $new->getAttribute('sha1');
+        foreach ($dir->query('phpdox:dir') as $child) {
+            $this->importDirNode($child, $path . '/');
         }
+    }
 
-        private function collapseDirectory() {
-            $first = $this->workDom->queryOne('/phpdox:source/phpdox:dir');
-            if ($first->query('phpdox:file')->length == 0 &&
-                $first->query('phpdox:dir')->length == 1) {
-                $dir = $first->queryOne('phpdox:dir');
-                foreach($dir->query('*') as $child) {
-                    $first->appendChild($child);
-                }
-                $first->setAttribute('name', $first->getAttribute('name') . '/' . $dir->getAttribute('name'));
-                $first->removeChild($dir);
-                $this->collapseDirectory();
-            }
+    private function isChanged($path) {
+        if (!isset($this->original[$path])) {
+            return true;
         }
+        $org = $this->original[$path];
+        $new = $this->collection[$path];
 
+        return $org->getAttribute('sha1') != $new->getAttribute('sha1');
     }
 
+    private function collapseDirectory(): void {
+        $first = $this->workDom->queryOne('/phpdox:source/phpdox:dir');
+
+        if ($first->query('phpdox:file')->length == 0 &&
+            $first->query('phpdox:dir')->length == 1) {
+            $dir = $first->queryOne('phpdox:dir');
+
+            foreach ($dir->query('*') as $child) {
+                $first->appendChild($child);
+            }
+            $first->setAttribute('name', $first->getAttribute('name') . '/' . $dir->getAttribute('name'));
+            $first->removeChild($dir);
+            $this->collapseDirectory();
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/project/SourceFile.php phpdox-0.12.0/src/collector/project/SourceFile.php
--- phpdox-0.11.2/src/collector/project/SourceFile.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/SourceFile.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,111 +1,108 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\Collector\Backend\SourceFileException;
-    use TheSeer\phpDox\FileInfo;
-
-    class SourceFile extends FileInfo {
-
-        /**
-         * PHPDOX Namespace
-         */
-        const XMLNS = 'http://xml.phpdox.net/src';
-
-        /**
-         * @var string
-         */
-        private $src;
-
-        /**
-         * @var FileInfo
-         */
-        private $srcDir;
-
-        /**
-         * @var
-         */
-        private $encoding;
-
-        public function __construct($file_name, FileInfo $srcDir = NULL, $encoding = 'auto') {
-            parent::__construct($file_name);
-            $this->srcDir = $srcDir;
-            $this->encoding = $encoding;
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\Collector\Backend\SourceFileException;
+use TheSeer\phpDox\FileInfo;
+
+class SourceFile extends FileInfo {
+    /**
+     * PHPDOX Namespace
+     */
+    public const XMLNS = 'http://xml.phpdox.net/src';
+
+    /**
+     * @var string
+     */
+    private $src;
+
+    /**
+     * @var FileInfo
+     */
+    private $srcDir;
+
+    /**
+     * @var
+     */
+    private $encoding;
+
+    public function __construct($file_name, FileInfo $srcDir = null, $encoding = 'auto') {
+        parent::__construct($file_name);
+        $this->srcDir   = $srcDir;
+        $this->encoding = $encoding;
+    }
+
+    /**
+     * @throws Backend\SourceFileException
+     */
+    public function getSource(): string {
+        if ($this->src !== null) {
+            return $this->src;
         }
 
-        /**
-         * @return string
-         *
-         * @throws Backend\SourceFileException
-         */
-        public function getSource() {
-            if ($this->src !== NULL) {
-                return $this->src;
-            }
-
-            $source = file_get_contents($this->getPathname());
-            if ($source == '') {
-                $this->src = '';
-                return '';
-            }
-
-            if ($this->encoding == 'auto') {
-                $info = new \finfo();
-                $this->encoding = $info->file((string)$this, FILEINFO_MIME_ENCODING);
-            }
-            try {
-                $source = iconv($this->encoding, 'UTF-8//TRANSLIT', $source);
-            } catch (\ErrorException $e) {
-                throw new SourceFileException('Encoding error - conversion to UTF-8 failed', SourceFileException::BadEncoding, $e);
-            }
-
-            // Replace xml relevant control characters by surrogates
-            $this->src = preg_replace_callback(
-                '/(?![\x{000d}\x{000a}\x{0009}])\p{C}/u',
-                function(array $matches) {
-                    $unicodeChar = '\u' . (2400 + ord($matches[0]));
-                    return json_decode('"'.$unicodeChar.'"');
-                },
-                $source
-            );
+        $source = \file_get_contents($this->getPathname());
 
-            return $this->src;
+        if ($source == '') {
+            $this->src = '';
+
+            return '';
         }
 
-        /**
-         * @return \TheSeer\fDOM\fDOMDocument
-         *
-         * @throws Backend\SourceFileException
-         */
-        public function getTokens() {
-            $tokenizer = new Tokenizer();
-            $dom = $tokenizer->toXML($this->getSource());
-            $root = $dom->documentElement;
-            $root->insertBefore($this->asNode($dom->documentElement), $root->firstChild);
-            return $dom;
+        if ($this->encoding == 'auto') {
+            $info           = new \finfo();
+            $this->encoding = $info->file((string)$this, \FILEINFO_MIME_ENCODING);
         }
 
-        /**
-         * @param fDOMDocument $ctx
-         *
-         * @return \TheSeer\fDOM\fDOMElement
-           */
-        public function asNode(fDOMElement $ctx) {
-            $fileNode = $ctx->ownerDocument->createElementNS(self::XMLNS, 'file');
-            $fileNode->setAttribute('path', $this->getPath());
-            $fileNode->setAttribute('file', $this->getBasename());
-            $fileNode->setAttribute('realpath', $this->getRealPath());
-            $fileNode->setAttribute('size', $this->getSize());
-            $fileNode->setAttribute('time', date('c', $this->getMTime()));
-            $fileNode->setAttribute('unixtime', $this->getMTime());
-            $fileNode->setAttribute('sha1', sha1_file($this->getRealPath()));
-            if ($this->srcDir instanceof FileInfo) {
-                $fileNode->setAttribute('relative', $this->getRelative($this->srcDir, FALSE));
-            }
-            return $fileNode;
+        try {
+            $source = \iconv($this->encoding, 'UTF-8//TRANSLIT', $source);
+        } catch (\ErrorException $e) {
+            throw new SourceFileException('Encoding error - conversion to UTF-8 failed', SourceFileException::BadEncoding, $e);
         }
 
+        // Replace xml relevant control characters by surrogates
+        $this->src = \preg_replace_callback(
+            '/(?![\x{000d}\x{000a}\x{0009}])\p{C}/u',
+            function (array $matches) {
+                $unicodeChar = '\u' . (2400 + \ord($matches[0]));
+
+                return \json_decode('"' . $unicodeChar . '"');
+            },
+            $source
+        );
+
+        return $this->src;
     }
 
+    /**
+     * @throws Backend\SourceFileException
+     */
+    public function getTokens(): fDOMDocument {
+        $tokenizer = new Tokenizer();
+        $dom       = $tokenizer->toXML($this->getSource());
+        $root      = $dom->documentElement;
+        $root->insertBefore($this->asNode($dom->documentElement), $root->firstChild);
+
+        return $dom;
+    }
+
+    /**
+     * @param fDOMDocument $ctx
+     */
+    public function asNode(fDOMElement $ctx): fDOMElement {
+        $fileNode = $ctx->ownerDocument->createElementNS(self::XMLNS, 'file');
+        $fileNode->setAttribute('path', $this->getPath());
+        $fileNode->setAttribute('file', $this->getBasename());
+        $fileNode->setAttribute('realpath', $this->getRealPath());
+        $fileNode->setAttribute('size', $this->getSize());
+        $fileNode->setAttribute('time', \date('c', $this->getMTime()));
+        $fileNode->setAttribute('unixtime', $this->getMTime());
+        $fileNode->setAttribute('sha1', \sha1_file($this->getRealPath()));
+
+        if ($this->srcDir instanceof FileInfo) {
+            $fileNode->setAttribute('relative', $this->getRelative($this->srcDir, false));
+        }
+
+        return $fileNode;
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/project/Tokenizer.php phpdox-0.12.0/src/collector/project/Tokenizer.php
--- phpdox-0.11.2/src/collector/project/Tokenizer.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/Tokenizer.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,144 +1,142 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMDocument;
 
-    class Tokenizer {
+class Tokenizer {
+    /**
+     * @var \XMLWriter
+     */
+    private $writer;
+
+    /**
+     * @var int
+     */
+    private $lastLine = 1;
+
+    /**
+     * Token Map for "non-tokens"
+     *
+     * @var array
+     */
+    private $map = [
+        '(' => 'T_PHPDOX_OPEN_BRACKET',
+        ')' => 'T_PHPDOX_CLOSE_BRACKET',
+        '[' => 'T_PHPDOX_OPEN_SQUARE',
+        ']' => 'T_PHPDOX_CLOSE_SQUARE',
+        '{' => 'T_PHPDOX_OPEN_CURLY',
+        '}' => 'T_PHPDOX_CLOSE_CURLY',
+        ';' => 'T_PHPDOX_SEMICOLON',
+        '.' => 'T_PHPDOX_DOT',
+        ',' => 'T_PHPDOX_COMMA',
+        '=' => 'T_PHPDOX_EQUAL',
+        '<' => 'T_PHPDOX_LT',
+        '>' => 'T_PHPDOX_GT',
+        '+' => 'T_PHPDOX_PLUS',
+        '-' => 'T_PHPDOX_MINUS',
+        '*' => 'T_PHPDOX_MULT',
+        '/' => 'T_PHPDOX_DIV',
+        '?' => 'T_PHPDOX_QUESTION_MARK',
+        '!' => 'T_PHPDOX_EXCLAMATION_MARK',
+        ':' => 'T_PHPDOX_COLON',
+        '"' => 'T_PHPDOX_DOUBLE_QUOTES',
+        '@' => 'T_PHPDOX_AT',
+        '&' => 'T_PHPDOX_AMPERSAND',
+        '%' => 'T_PHPDOX_PERCENT',
+        '|' => 'T_PHPDOX_PIPE',
+        '$' => 'T_PHPDOX_DOLLAR',
+        '^' => 'T_PHPDOX_CARET',
+        '~' => 'T_PHPDOX_TILDE',
+        '`' => 'T_PHPDOX_BACKTICK'
+    ];
+
+    /**
+     * @param string $source
+     *
+     * @throws \TheSeer\fDOM\fDOMException
+     */
+    public function toXML($source): fDOMDocument {
+        $this->writer = new \XMLWriter();
+        $this->writer->openMemory();
+        $this->writer->setIndent(true);
+        $this->writer->startDocument();
+        $this->writer->startElement('source');
+        $this->writer->writeAttribute('xmlns', 'http://xml.phpdox.net/token');
+        $this->writer->startElement('line');
+        $this->writer->writeAttribute('no', '1');
+
+        $this->lastLine = 1;
+        $tokens         = \token_get_all($source);
+
+        foreach ($tokens as $pos => $tok) {
+            if (\is_string($tok)) {
+                $line = 1;
+                $step = 1;
 
-        /**
-         * @var \XMLWriter
-         */
-        private $writer;
-
-        /**
-         * @var int
-         */
-        private $lastLine = 1;
-
-        /**
-         * Token Map for "non-tokens"
-         *
-         * @var array
-         */
-        private $map = array(
-            '(' => 'T_PHPDOX_OPEN_BRACKET',
-            ')' => 'T_PHPDOX_CLOSE_BRACKET',
-            '[' => 'T_PHPDOX_OPEN_SQUARE',
-            ']' => 'T_PHPDOX_CLOSE_SQUARE',
-            '{' => 'T_PHPDOX_OPEN_CURLY',
-            '}' => 'T_PHPDOX_CLOSE_CURLY',
-            ';' => 'T_PHPDOX_SEMICOLON',
-            '.' => 'T_PHPDOX_DOT',
-            ',' => 'T_PHPDOX_COMMA',
-            '=' => 'T_PHPDOX_EQUAL',
-            '<' => 'T_PHPDOX_LT',
-            '>' => 'T_PHPDOX_GT',
-            '+' => 'T_PHPDOX_PLUS',
-            '-' => 'T_PHPDOX_MINUS',
-            '*' => 'T_PHPDOX_MULT',
-            '/' => 'T_PHPDOX_DIV',
-            '?' => 'T_PHPDOX_QUESTION_MARK',
-            '!' => 'T_PHPDOX_EXCLAMATION_MARK',
-            ':' => 'T_PHPDOX_COLON',
-            '"' => 'T_PHPDOX_DOUBLE_QUOTES',
-            '@' => 'T_PHPDOX_AT',
-            '&' => 'T_PHPDOX_AMPERSAND',
-            '%' => 'T_PHPDOX_PERCENT',
-            '|' => 'T_PHPDOX_PIPE',
-            '$' => 'T_PHPDOX_DOLLAR',
-            '^' => 'T_PHPDOX_CARET',
-            '~' => 'T_PHPDOX_TILDE',
-            '`' => 'T_PHPDOX_BACKTICK'
-        );
-
-        /**
-         * @param string $source
-         *
-         * @return fDOMDocument
-         *
-         * @throws \TheSeer\fDOM\fDOMException
-         */
-        public function toXML($source) {
-
-            $this->writer = new \XMLWriter();
-            $this->writer->openMemory();
-            $this->writer->setIndent(true);
-            $this->writer->startDocument();
-            $this->writer->startElement('source');
-            $this->writer->writeAttribute('xmlns', 'http://xml.phpdox.net/token');
-            $this->writer->startElement('line');
-            $this->writer->writeAttribute('no', 1);
-
-            $this->lastLine = 1;
-            $tokens = token_get_all($source);
+                while (!\is_array($tokens[$pos - $step])) {
+                    $step++;
 
-            foreach($tokens as $pos => $tok) {
-                if (is_string($tok)) {
-                    $line = 1;
-                    $step = 1;
-                    while (!is_array($tokens[$pos - $step])) {
-                        $step++;
-                        if (($pos - $step) == -1) {
-                            break;
-                        }
-                    }
-                    if ($pos - $step != -1) {
-                        $line = $tokens[$pos - $step][2];
-                        $line += count(preg_split('/\R+/', $tokens[$pos - $step][1])) - 1;
+                    if (($pos - $step) == -1) {
+                        break;
                     }
-                    $token = array(
-                        'name' => $this->map[$tok],
-                        'value' => $tok,
-                        'line' => $line
-                    );
+                }
+
+                if ($pos - $step != -1) {
+                    $line = $tokens[$pos - $step][2];
+                    $line += \count(\preg_split('/\R+/', $tokens[$pos - $step][1])) - 1;
+                }
+                $token = [
+                    'name'  => $this->map[$tok],
+                    'value' => $tok,
+                    'line'  => $line
+                ];
+                $this->addToken($token);
+            } else {
+                $line   = $tok[2];
+                $values = \preg_split('/\R+/Uu', $tok[1]);
+
+                foreach ($values as $v) {
+                    $token = [
+                        'name'  => \token_name($tok[0]),
+                        'value' => $v,
+                        'line'  => $line
+                    ];
                     $this->addToken($token);
-                } else {
-                    $line = $tok[2];
-                    $values = preg_split('/\R+/Uu', $tok[1]);
-
-                    foreach($values as $v) {
-                        $token = array(
-                            'name' => token_name($tok[0]),
-                            'value' => $v,
-                            'line' => $line
-                        );
-                        $this->addToken($token);
-                        $line++;
-                    }
+                    $line++;
                 }
             }
+        }
 
-            $this->writer->endElement();
-            $this->writer->endElement();
-            $this->writer->endDocument();
+        $this->writer->endElement();
+        $this->writer->endElement();
+        $this->writer->endDocument();
+
+        $dom                     = new fDOMDocument();
+        $dom->preserveWhiteSpace = false;
+        $dom->loadXML($this->writer->outputMemory());
 
-            $dom = new fDOMDocument();
-            $dom->preserveWhiteSpace = false;
-            $dom->loadXML($this->writer->outputMemory());
-            return $dom;
-        }
+        return $dom;
+    }
 
-        private function addToken(array $token) {
-            if ($this->lastLine < $token['line']) {
-                $this->writer->endElement();
+    private function addToken(array $token): void {
+        if ($this->lastLine < $token['line']) {
+            $this->writer->endElement();
 
-                for($t=$this->lastLine + 1; $t<$token['line']; $t++) {
-                    $this->writer->startElement('line');
-                    $this->writer->writeAttribute('no', $t);
-                    $this->writer->endElement();
-                }
+            for ($t = $this->lastLine + 1; $t < $token['line']; $t++) {
                 $this->writer->startElement('line');
-                $this->writer->writeAttribute('no', $token['line']);
-                $this->lastLine = $token['line'];
-            }
-
-            if ($token['value'] != '') {
-                $this->writer->startElement('token');
-                $this->writer->writeAttribute('name', $token['name']);
-                $this->writer->writeRaw( htmlspecialchars($token['value'], ENT_NOQUOTES | ENT_DISALLOWED | ENT_XML1) );
+                $this->writer->writeAttribute('no', (string)$t);
                 $this->writer->endElement();
             }
+            $this->writer->startElement('line');
+            $this->writer->writeAttribute('no', (string)$token['line']);
+            $this->lastLine = $token['line'];
         }
-    }
 
+        if ($token['value'] != '') {
+            $this->writer->startElement('token');
+            $this->writer->writeAttribute('name', $token['name']);
+            $this->writer->writeRaw(\htmlspecialchars($token['value'], \ENT_NOQUOTES | \ENT_DISALLOWED | \ENT_XML1));
+            $this->writer->endElement();
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/collector/project/TraitObject.php phpdox-0.12.0/src/collector/project/TraitObject.php
--- phpdox-0.11.2/src/collector/project/TraitObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/TraitObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,52 +1,14 @@
-<?php
-    /**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    class TraitObject extends AbstractUnitObject {
-        protected $rootName = 'trait';
+class TraitObject extends AbstractUnitObject {
+    protected $rootName = 'trait';
 
-        public function addUser(AbstractUnitObject $unit) {
-            if ($this->getRootNode()->queryOne(sprintf('phpdox:users/phpdox:%s[@full = "%s"]', $unit->getType(), $unit->getName())) !== NULL) {
-                return;
-            }
-            $user = $this->addToContainer('users', $unit->getType());
-            $this->setName($unit->getName(), $user);
+    public function addUser(AbstractUnitObject $unit): void {
+        if ($this->getRootNode()->queryOne(\sprintf('phpdox:users/phpdox:%s[@full = "%s"]', $unit->getType(), $unit->getName())) !== null) {
+            return;
         }
-
+        $user = $this->addToContainer('users', $unit->getType());
+        $this->setName($unit->getName(), $user);
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/TraitUseException.php phpdox-0.12.0/src/collector/project/TraitUseException.php
--- phpdox-0.11.2/src/collector/project/TraitUseException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/TraitUseException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,7 +1,6 @@
-<?php
+<?php declare(strict_types = 1);
 namespace TheSeer\phpDox\Collector;
 
 class TraitUseException extends \Exception {
-
-    const NotAliased = 1;
+    public const NotAliased = 1;
 }
diff -Nru phpdox-0.11.2/src/collector/project/TraitUseObject.php phpdox-0.12.0/src/collector/project/TraitUseObject.php
--- phpdox-0.11.2/src/collector/project/TraitUseObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/TraitUseObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,119 +1,110 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
+
+class TraitUseObject {
+    public const XMLNS = 'http://xml.phpdox.net/src';
 
     /**
-     *
+     * @var fDOMElement
      */
-    class TraitUseObject {
+    private $ctx;
 
-        const XMLNS = 'http://xml.phpdox.net/src';
+    public function __construct(fDOMElement $ctx) {
+        $this->ctx = $ctx;
+    }
 
-        /**
-         * @var fDOMElement
-         *
-         */
-        private $ctx;
-
-        /**
-         * @param fDOMElement $ctx
-         */
-        public function __construct(fDOMElement $ctx) {
-            $this->ctx = $ctx;
-        }
+    public function export() {
+        return $this->ctx;
+    }
 
-        public function export() {
-            return $this->ctx;
-        }
+    /**
+     * @param string $name
+     */
+    public function setName($name): void {
+        $parts     = \explode('\\', $name);
+        $local     = \array_pop($parts);
+        $namespace = \implode('\\', $parts);
+        $this->ctx->setAttribute('full', $name);
+        $this->ctx->setAttribute('namespace', $namespace);
+        $this->ctx->setAttribute('name', $local);
+    }
 
-        /**
-         * @param string $name
-         */
-        public function setName($name) {
-            $parts = explode('\\', $name);
-            $local = array_pop($parts);
-            $namespace = join('\\', $parts);
-            $this->ctx->setAttribute('full', $name);
-            $this->ctx->setAttribute('namespace', $namespace);
-            $this->ctx->setAttribute('name', $local);
-        }
+    public function getName() {
+        return $this->ctx->getAttribute('full');
+    }
 
-        public function getName() {
-            return $this->ctx->getAttribute('full');
-        }
-        /**
-         * @param int $startLine
-         */
-        public function setStartLine($startLine) {
-            $this->ctx->setAttribute('start', $startLine);
-        }
+    /**
+     * @param int $startLine
+     */
+    public function setStartLine($startLine): void {
+        $this->ctx->setAttribute('start', $startLine);
+    }
 
-        /**
-         * @param int $endLine
-         */
-        public function setEndLine($endLine) {
-            $this->ctx->setAttribute('end', $endLine);
-        }
+    /**
+     * @param int $endLine
+     */
+    public function setEndLine($endLine): void {
+        $this->ctx->setAttribute('end', $endLine);
+    }
 
+    public function addAlias($originalName, $newName, $newModifier = null): void {
+        $alias = $this->ctx->appendElementNS(self::XMLNS, 'alias');
+        $alias->setAttribute('method', $originalName);
+        $alias->setAttribute('as', $newName);
 
-        public function addAlias($originalName, $newName, $newModifier = NULL) {
-            $alias = $this->ctx->appendElementNS(self::XMLNS, 'alias');
-            $alias->setAttribute('method', $originalName);
-            $alias->setAttribute('as', $newName);
-            if ($newModifier !== NULL) {
-                $alias->setAttribute('modifier', $newModifier);
-            }
+        if ($newModifier !== null) {
+            $alias->setAttribute('modifier', $newModifier);
         }
+    }
 
-        public function addExclude($methodName) {
-            $exclude = $this->ctx->appendElementNS(self::XMLNS, 'exclude');
-            $exclude->setAttribute('method', $methodName);
-        }
+    public function addExclude($methodName): void {
+        $exclude = $this->ctx->appendElementNS(self::XMLNS, 'exclude');
+        $exclude->setAttribute('method', $methodName);
+    }
 
-        public function isExcluded($methodName) {
-            return $this->ctx->query(
-                sprintf('phpdox:exclude[@method = "%s"]', $methodName)
+    public function isExcluded($methodName) {
+        return $this->ctx->query(
+                \sprintf('phpdox:exclude[@method = "%s"]', $methodName)
             )->length > 0;
-        }
+    }
 
-        public function isAliased($methodName) {
-            return $this->ctx->query(
-                sprintf('phpdox:alias[@method = "%s"]', $methodName)
+    public function isAliased($methodName) {
+        return $this->ctx->query(
+                \sprintf('phpdox:alias[@method = "%s"]', $methodName)
             )->length > 0;
-        }
+    }
 
-        public function getAliasedName($methodName) {
-            return $this->getAliasNode($methodName)->getAttribute('as');
-        }
+    public function getAliasedName($methodName) {
+        return $this->getAliasNode($methodName)->getAttribute('as');
+    }
 
-        public function hasAliasedModifier($methodName) {
-            return $this->getAliasNode($methodName)->hasAttribute('modifier');
-        }
+    public function hasAliasedModifier($methodName) {
+        return $this->getAliasNode($methodName)->hasAttribute('modifier');
+    }
 
-        public function getAliasedModifier($methodName) {
-            return $this->getAliasNode($methodName)->getAttribute('modifier');
-        }
+    public function getAliasedModifier($methodName) {
+        return $this->getAliasNode($methodName)->getAttribute('modifier');
+    }
 
-        /**
-         * @param $methodName
-         *
-         * @return mixed
-         * @throws TraitUseException
-         */
-        private function getAliasNode($methodName) {
-            $node = $this->ctx->queryOne(
-                sprintf('phpdox:alias[@method = "%s"]', $methodName)
+    /**
+     * @param $methodName
+     *
+     * @throws TraitUseException
+     */
+    private function getAliasNode($methodName) {
+        $node = $this->ctx->queryOne(
+            \sprintf('phpdox:alias[@method = "%s"]', $methodName)
+        );
+
+        if (!$node) {
+            throw new TraitUseException(
+                \sprintf('Method %s not aliased', $methodName),
+                TraitUseException::NotAliased
             );
-            if (!$node) {
-                throw new TraitUseException(
-                    sprintf("Method %s not aliased", $methodName),
-                    TraitUseException::NotAliased
-                );
-            }
-            return $node;
         }
 
+        return $node;
     }
-
 }
diff -Nru phpdox-0.11.2/src/collector/project/UnitObjectException.php phpdox-0.12.0/src/collector/project/UnitObjectException.php
--- phpdox-0.11.2/src/collector/project/UnitObjectException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/project/UnitObjectException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,46 +1,18 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    /**
-     *
-     */
-    class UnitObjectException extends \Exception {
-
-        /**
-         *
-         */
-        const InvalidRootname = 1;
-
-        /**
-         *
-         */
-        const NoExtends = 2;
-
-        /**
-         *
-         */
-        const NoImplements = 3;
-
-        /**
-         *
-         */
-        const NoTraitsUsed = 4;
-
-        /**
-         *
-         */
-        const NoSuchMethod = 5;
-
-        /**
-         *
-         */
-        const NoSuchTrait = 6;
-
-        /**
-         *
-         */
-        const NoSuchDependency = 7;
+class UnitObjectException extends \Exception {
+    public const InvalidRootname = 1;
 
-    }
+    public const NoExtends = 2;
 
+    public const NoImplements = 3;
+
+    public const NoTraitsUsed = 4;
+
+    public const NoSuchMethod = 5;
+
+    public const NoSuchTrait = 6;
+
+    public const NoSuchDependency = 7;
 }
diff -Nru phpdox-0.11.2/src/collector/SourceFileIterator.php phpdox-0.12.0/src/collector/SourceFileIterator.php
--- phpdox-0.11.2/src/collector/SourceFileIterator.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/collector/SourceFileIterator.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,77 +1,70 @@
-<?php
-namespace TheSeer\phpDox\Collector {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Collector;
 
-    use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\FileInfo;
 
-    class SourceFileIterator implements \Iterator {
+class SourceFileIterator implements \Iterator {
+    private $iterator;
 
-        private $iterator;
-        private $srcDir;
-        private $encoding;
-
-        /**
-         * @param \Iterator $iterator
-         * @param FileInfo  $srcDir
-         * @param string    $encoding
-         */
-        public function __construct(\Iterator $iterator, FileInfo $srcDir, $encoding) {
-            $this->iterator = $iterator;
-            $this->srcDir = $srcDir;
-            $this->encoding = $encoding;
-        }
-
-        /**
-         * @return SourceFile
-         */
-        public function current() {
-            return new SourceFile($this->iterator->current()->getPathname(), $this->srcDir, $this->encoding);
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Move forward to next element
-         *
-         * @link http://php.net/manual/en/iterator.next.php
-         * @return void Any returned value is ignored.
-         */
-        public function next() {
-            $this->iterator->next();
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Return the key of the current element
-         *
-         * @link http://php.net/manual/en/iterator.key.php
-         * @return mixed scalar on success, or null on failure.
-         */
-        public function key() {
-            return $this->iterator->key();
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Checks if current position is valid
-         *
-         * @link http://php.net/manual/en/iterator.valid.php
-         * @return boolean The return value will be casted to boolean and then evaluated.
-         *       Returns true on success or false on failure.
-         */
-        public function valid() {
-            return $this->iterator->valid();
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Rewind the Iterator to the first element
-         *
-         * @link http://php.net/manual/en/iterator.rewind.php
-         * @return void Any returned value is ignored.
-         */
-        public function rewind() {
-            $this->iterator->rewind();
-        }
+    private $srcDir;
 
+    private $encoding;
+
+    /**
+     * @param string $encoding
+     */
+    public function __construct(\Iterator $iterator, FileInfo $srcDir, $encoding) {
+        $this->iterator = $iterator;
+        $this->srcDir   = $srcDir;
+        $this->encoding = $encoding;
+    }
+
+    public function current(): SourceFile {
+        return new SourceFile($this->iterator->current()->getPathname(), $this->srcDir, $this->encoding);
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Move forward to next element
+     *
+     * @link http://php.net/manual/en/iterator.next.php
+     */
+    public function next(): void {
+        $this->iterator->next();
     }
 
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Return the key of the current element
+     *
+     * @link http://php.net/manual/en/iterator.key.php
+     *
+     * @return mixed scalar on success, or null on failure
+     */
+    public function key() {
+        return $this->iterator->key();
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Checks if current position is valid
+     *
+     * @link http://php.net/manual/en/iterator.valid.php
+     *
+     * @return bool The return value will be casted to boolean and then evaluated.
+     *              Returns true on success or false on failure.
+     */
+    public function valid(): bool {
+        return $this->iterator->valid();
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Rewind the Iterator to the first element
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     */
+    public function rewind(): void {
+        $this->iterator->rewind();
+    }
 }
diff -Nru phpdox-0.11.2/src/config/BuildConfig.php phpdox-0.12.0/src/config/BuildConfig.php
--- phpdox-0.11.2/src/config/BuildConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/BuildConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,99 +1,64 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\fDOM\fDOMElement;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
  * @author     Arne Blankerts <arne@blankerts.de>
  * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
  * @license    BSD License
- *
  */
+class BuildConfig {
+    protected $ctx;
 
-namespace TheSeer\phpDox {
+    protected $generator;
 
-    use TheSeer\fDOM\fDOMElement;
+    protected $project;
 
-    /**
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     */
-    class BuildConfig {
-
-        protected $ctx;
-        protected $generator;
-        protected $project;
-
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->generator = $generator;
-            $this->project = $generator->getProjectConfig();
-            $this->ctx = $ctx;
-        }
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->generator = $generator;
+        $this->project   = $generator->getProjectConfig();
+        $this->ctx       = $ctx;
+    }
 
-        public function getGeneratorConfig() {
-            return $this->generator;
-        }
+    public function getGeneratorConfig() {
+        return $this->generator;
+    }
 
-        public function getBuildNode() {
-            return $this->ctx;
-        }
+    public function getBuildNode() {
+        return $this->ctx;
+    }
 
-        public function getProjectNode() {
-            return $this->ctx->parentNode->parentNode;
-        }
+    public function getProjectNode() {
+        return $this->ctx->parentNode->parentNode;
+    }
 
-        public function getEngine() {
-            return $this->ctx->getAttribute('engine');
-        }
+    public function getEngine() {
+        return $this->ctx->getAttribute('engine');
+    }
 
-        public function getWorkDirectory() {
-            return $this->project->getWorkDirectory();
-        }
+    public function getWorkDirectory() {
+        return $this->project->getWorkDirectory();
+    }
 
-        public function getOutputDirectory() {
-            $path = '';
-            if ($this->ctx->parentNode->hasAttribute('output')) {
-                $path = $this->ctx->parentNode->getAttribute('output', 'docs');
-            }
-            if ($this->ctx->hasAttribute('output')) {
-                if ($path != '') { $path .= '/'; }
-                $path .= $this->ctx->getAttribute('output');
-            }
-            return new FileInfo($path);
+    public function getOutputDirectory() {
+        $path = '';
+
+        if ($this->ctx->parentNode->hasAttribute('output')) {
+            $path = $this->ctx->parentNode->getAttribute('output', 'docs');
         }
 
-        public function getSourceDirectory() {
-            return $this->project->getSourceDirectory();
+        if ($this->ctx->hasAttribute('output')) {
+            if ($path != '') {
+                $path .= '/';
+            }
+            $path .= $this->ctx->getAttribute('output');
         }
 
+        return new FileInfo($path);
     }
 
+    public function getSourceDirectory() {
+        return $this->project->getSourceDirectory();
+    }
 }
diff -Nru phpdox-0.11.2/src/config/CollectorConfig.php phpdox-0.12.0/src/config/CollectorConfig.php
--- phpdox-0.11.2/src/config/CollectorConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/CollectorConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,121 +1,79 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMElement;
-
-    class CollectorConfig {
-
-        protected $ctx;
-        protected $project;
-
-        public function __construct(ProjectConfig $project, fDOMElement $ctx) {
-            $this->project = $project;
-            $this->ctx = $ctx;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-        public function getProjectConfig() {
-            return $this->project;
-        }
+use TheSeer\fDOM\fDOMElement;
 
-        public function getBackend() {
-            if ($this->ctx->hasAttribute('backend')) {
-                return $this->ctx->getAttribute('backend', 'parser');
-            }
-            return 'parser';
-        }
+class CollectorConfig {
+    protected $ctx;
 
-        /**
-         * @return FileInfo
-         */
-        public function getWorkDirectory() {
-            return $this->project->getWorkDirectory();
-        }
+    protected $project;
 
-        /**
-         * @return FileInfo
-         */
-        public function getSourceDirectory() {
-            return $this->project->getSourceDirectory();
-        }
+    public function __construct(ProjectConfig $project, fDOMElement $ctx) {
+        $this->project = $project;
+        $this->ctx     = $ctx;
+    }
 
-        /**
-         * @return string
-         */
-        public function getFileEncoding() {
-            return $this->ctx->getAttribute('encoding', 'auto');
-        }
+    public function getProjectConfig() {
+        return $this->project;
+    }
 
-        public function isPublicOnlyMode() {
-            if ($this->ctx->hasAttribute('publiconly')) {
-                return $this->ctx->getAttribute('publiconly', 'false') === 'true';
-            }
-            return $this->project->isPublicOnlyMode();
+    public function getBackend() {
+        if ($this->ctx->hasAttribute('backend')) {
+            return $this->ctx->getAttribute('backend', 'parser');
         }
 
-        public function getIncludeMasks() {
-            return $this->getMasks('include') ?: '*.php';
-        }
+        return 'parser';
+    }
 
-        public function getExcludeMasks() {
-            return $this->getMasks('exclude');
-        }
+    public function getWorkDirectory(): FileInfo {
+        return $this->project->getWorkDirectory();
+    }
 
-        public function doResolveInheritance() {
-            $inNode = $this->ctx->queryOne('cfg:inheritance');
-            if (!$inNode) {
-                return true;
-            }
-            return $inNode->getAttribute('resolve', 'true')=='true';
-        }
+    public function getSourceDirectory(): FileInfo {
+        return $this->project->getSourceDirectory();
+    }
+
+    public function getFileEncoding(): string {
+        return $this->ctx->getAttribute('encoding', 'auto');
+    }
 
-        public function getInheritanceConfig() {
-            return new InheritanceConfig($this, $this->ctx->queryOne('cfg:inheritance'));
+    public function isPublicOnlyMode() {
+        if ($this->ctx->hasAttribute('publiconly')) {
+            return $this->ctx->getAttribute('publiconly', 'false') === 'true';
         }
 
-        protected function getMasks($nodename) {
-            $list = array();
-            foreach($this->ctx->query('cfg:'.$nodename) as $node) {
-                $list[] = $node->getAttribute('mask');
-            }
-            return $list;
+        return $this->project->isPublicOnlyMode();
+    }
+
+    public function getIncludeMasks() {
+        return $this->getMasks('include') ?: '*.php';
+    }
+
+    public function getExcludeMasks() {
+        return $this->getMasks('exclude');
+    }
+
+    public function doResolveInheritance() {
+        $inNode = $this->ctx->queryOne('cfg:inheritance');
+
+        if (!$inNode) {
+            return true;
         }
+
+        return $inNode->getAttribute('resolve', 'true') == 'true';
+    }
+
+    public function getInheritanceConfig() {
+        return new InheritanceConfig($this, $this->ctx->queryOne('cfg:inheritance'));
     }
 
+    protected function getMasks($nodename) {
+        $list = [];
+
+        foreach ($this->ctx->query('cfg:' . $nodename) as $node) {
+            $list[] = $node->getAttribute('mask');
+        }
+
+        return $list;
+    }
 }
diff -Nru phpdox-0.11.2/src/config/ConfigException.php phpdox-0.12.0/src/config/ConfigException.php
--- phpdox-0.11.2/src/config/ConfigException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/ConfigException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,15 +1,16 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class ConfigException extends \Exception {
+class ConfigException extends \Exception {
+    public const InvalidDataStructure = 1;
 
-        const InvalidDataStructure = 1;
-        const ProjectNotFound = 2;
-        const NoCollectorSection = 3;
-        const NoGeneratorSection = 4;
-        const OverrideNotAllowed = 5;
-        const PropertyNotFound = 6;
+    public const ProjectNotFound = 2;
 
-    }
+    public const NoCollectorSection = 3;
 
+    public const NoGeneratorSection = 4;
+
+    public const OverrideNotAllowed = 5;
+
+    public const PropertyNotFound = 6;
 }
diff -Nru phpdox-0.11.2/src/config/ConfigLoaderException.php phpdox-0.12.0/src/config/ConfigLoaderException.php
--- phpdox-0.11.2/src/config/ConfigLoaderException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/ConfigLoaderException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,13 +1,14 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class ConfigLoaderException extends \Exception {
+class ConfigLoaderException extends \Exception {
+    public const NotFound = 1;
 
-        const NotFound = 1;
-        const ParseError = 2;
-        const NeitherCandidateExists = 3;
-        const WrongNamespace = 4;
-        const WrongType = 5;
-    }
+    public const ParseError = 2;
 
+    public const NeitherCandidateExists = 3;
+
+    public const WrongNamespace = 4;
+
+    public const WrongType = 5;
 }
diff -Nru phpdox-0.11.2/src/config/ConfigLoader.php phpdox-0.12.0/src/config/ConfigLoader.php
--- phpdox-0.11.2/src/config/ConfigLoader.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/ConfigLoader.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,166 +1,122 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMException;
-
-    class ConfigLoader {
-
-        const XMLNS = 'http://xml.phpdox.net/config';
-
-        /**
-         * @var FileInfo
-         */
-        private $homeDir;
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        /**
-         * @param FileInfo $homeDir
-         */
-        public function __construct(Version $version, FileInfo $homeDir) {
-            $this->version = $version;
-            $this->homeDir = $homeDir;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-        /**
-         * @param $fname
-         *
-         * @return GlobalConfig
-         * @throws ConfigLoaderException
-         */
-        public function load($fname) {
-           if (!file_exists($fname)) {
-               throw new ConfigLoaderException("Config file '$fname' not found", ConfigLoaderException::NotFound);
-           }
-           return $this->createInstanceFor($fname);
-        }
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMException;
 
-        /**
-         * @return GlobalConfig
-         * @throws ConfigLoaderException
-         */
-        public function autodetect() {
-            $candidates = array(
-                    './phpdox.xml',
-                    './phpdox.xml.dist'
-            );
-            foreach($candidates as $fname) {
-                if (!file_exists($fname)) {
-                    continue;
-                }
-                return $this->createInstanceFor($fname);
-            }
-            throw new ConfigLoaderException("None of the candidate files found", ConfigLoaderException::NeitherCandidateExists);
-        }
+class ConfigLoader {
+    public const XMLNS = 'http://xml.phpdox.net/config';
 
-        /**
-         * @param $fname
-         *
-         * @return GlobalConfig
-         * @throws ConfigLoaderException
-         */
-        private function createInstanceFor($fname) {
-            $dom = $this->loadFile($fname);
-            $this->ensureCorrectNamespace($dom);
-            $this->ensureCorrectRootNodeName($dom);
-            return new GlobalConfig($this->version, $this->homeDir, $dom, new FileInfo($fname));
-        }
+    /**
+     * @var FileInfo
+     */
+    private $homeDir;
+
+    /**
+     * @var Version
+     */
+    private $version;
+
+    public function __construct(Version $version, FileInfo $homeDir) {
+        $this->version = $version;
+        $this->homeDir = $homeDir;
+    }
 
-        /**
-         * @param $fname
-         *
-         * @return fDOMDocument
-         * @throws ConfigLoaderException
-         */
-        private function loadFile($fname) {
-            try {
-                $dom = new fDOMDocument();
-                $dom->load($fname);
-                $dom->registerNamespace('cfg', self::XMLNS);
-                return $dom;
-            } catch (fDOMException $e) {
-                throw new ConfigLoaderException(
-                    "Parsing config file '$fname' failed.",
-                    ConfigLoaderException::ParseError,
-                    $e
-                );
-            }
+    /**
+     * @param $fname
+     *
+     * @throws ConfigLoaderException
+     */
+    public function load($fname): GlobalConfig {
+        if (!\file_exists($fname)) {
+            throw new ConfigLoaderException("Config file '$fname' not found", ConfigLoaderException::NotFound);
         }
 
-        /**
-         * @param fDOMDocument $dom
-         *
-         * @throws ConfigLoaderException
-         */
-        private function ensureCorrectNamespace(fDOMDocument $dom) {
-            if ($dom->documentElement->namespaceURI != self::XMLNS) {
-                throw new ConfigLoaderException(
-                    sprintf(
-                        "The configuratin file '%s' uses a wrong or outdated xml namespace.\n" .
-                        "Please ensure it uses 'http://xml.phpdox.net/config'",
-                        $dom->documentURI
-                    ), ConfigLoaderException::WrongNamespace
-                );
+        return $this->createInstanceFor($fname);
+    }
+
+    /**
+     * @throws ConfigLoaderException
+     */
+    public function autodetect(): GlobalConfig {
+        $candidates = [
+            './phpdox.xml',
+            './phpdox.xml.dist'
+        ];
+
+        foreach ($candidates as $fname) {
+            if (!\file_exists($fname)) {
+                continue;
             }
+
+            return $this->createInstanceFor($fname);
         }
 
-        /**
-         * @param fDOMDocument $dom
-         *
-         * @throws ConfigLoaderException
-         */
-        private function ensureCorrectRootNodeName(fDOMDocument $dom) {
-            if ($dom->documentElement->localName != 'phpdox') {
-                throw new ConfigLoaderException(
-                    sprintf(
-                        "The file '%s' does not seem to be a phpdox configration file.",
-                        $dom->documentURI
-                    ), ConfigLoaderException::WrongType
-                );
-            }
+        throw new ConfigLoaderException('None of the candidate files found', ConfigLoaderException::NeitherCandidateExists);
+    }
+
+    /**
+     * @param $fname
+     *
+     * @throws ConfigLoaderException
+     */
+    private function createInstanceFor($fname): GlobalConfig {
+        $dom = $this->loadFile($fname);
+        $this->ensureCorrectNamespace($dom);
+        $this->ensureCorrectRootNodeName($dom);
+
+        return new GlobalConfig($this->version, $this->homeDir, $dom, new FileInfo($fname));
+    }
+
+    /**
+     * @param $fname
+     *
+     * @throws ConfigLoaderException
+     */
+    private function loadFile($fname): fDOMDocument {
+        try {
+            $dom = new fDOMDocument();
+            $dom->load($fname);
+            $dom->registerNamespace('cfg', self::XMLNS);
+
+            return $dom;
+        } catch (fDOMException $e) {
+            throw new ConfigLoaderException(
+                "Parsing config file '$fname' failed.",
+                ConfigLoaderException::ParseError,
+                $e
+            );
         }
+    }
 
+    /**
+     * @throws ConfigLoaderException
+     */
+    private function ensureCorrectNamespace(fDOMDocument $dom): void {
+        if ($dom->documentElement->namespaceURI != self::XMLNS) {
+            throw new ConfigLoaderException(
+                \sprintf(
+                    "The configuratin file '%s' uses a wrong or outdated xml namespace.\n" .
+                    "Please ensure it uses 'http://xml.phpdox.net/config'",
+                    $dom->documentURI
+                ),
+                ConfigLoaderException::WrongNamespace
+            );
+        }
     }
 
+    /**
+     * @throws ConfigLoaderException
+     */
+    private function ensureCorrectRootNodeName(fDOMDocument $dom): void {
+        if ($dom->documentElement->localName != 'phpdox') {
+            throw new ConfigLoaderException(
+                \sprintf(
+                    "The file '%s' does not seem to be a phpdox configration file.",
+                    $dom->documentURI
+                ),
+                ConfigLoaderException::WrongType
+            );
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/config/ConfigSkeleton.php phpdox-0.12.0/src/config/ConfigSkeleton.php
--- phpdox-0.11.2/src/config/ConfigSkeleton.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/ConfigSkeleton.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,45 +1,34 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMDocument;
 
-    class ConfigSkeleton {
+class ConfigSkeleton {
+    /**
+     * @var FileInfo
+     */
+    private $file;
 
-        /**
-         * @var FileInfo
-         */
-        private $file;
-
-        /**
-         * @param FileInfo $file
-         */
-        public function __construct(FileInfo $file) {
-            $this->file = $file;
-        }
+    public function __construct(FileInfo $file) {
+        $this->file = $file;
+    }
 
-        /**
-         * @return string
-         */
-        public function render() {
-            return file_get_contents($this->file->getPathname());
-        }
+    public function render(): string {
+        return \file_get_contents($this->file->getPathname());
+    }
+
+    public function renderStripped(): string {
+        $dom                     = new fDOMDocument();
+        $dom->preserveWhiteSpace = false;
+        $dom->loadXML(
+            \preg_replace("/\s{2,}/u", ' ', $this->render())
+        );
 
-        /**
-         * @return string
-         */
-        public function renderStripped() {
-            $dom = new fDOMDocument();
-            $dom->preserveWhiteSpace = FALSE;
-            $dom->loadXML(
-                preg_replace("/\s{2,}/u", " ", $this->render())
-            );
-            foreach($dom->query('//comment()') as $c) {
-                $c->parentNode->removeChild($c);
-            }
-            $dom->formatOutput = TRUE;
-            return $dom->saveXML();
+        foreach ($dom->query('//comment()') as $c) {
+            $c->parentNode->removeChild($c);
         }
+        $dom->formatOutput = true;
 
+        return $dom->saveXML();
     }
-
 }
diff -Nru phpdox-0.11.2/src/config/EnrichConfig.php phpdox-0.12.0/src/config/EnrichConfig.php
--- phpdox-0.11.2/src/config/EnrichConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/EnrichConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,88 +1,46 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\fDOM\fDOMElement;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
  * @author     Arne Blankerts <arne@blankerts.de>
  * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
  * @license    BSD License
- *
  */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMElement;
+class EnrichConfig {
+    /**
+     * @var fDOMElement
+     */
+    private $ctx;
 
     /**
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
+     * @var GeneratorConfig
      */
-    class EnrichConfig {
+    private $generator;
+
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->generator = $generator;
+        $this->ctx       = $ctx;
+    }
+
+    public function getGeneratorConfig() {
+        return $this->generator;
+    }
 
-        /**
-         * @var fDOMElement
-         */
-        private $ctx;
-
-        /**
-         * @var GeneratorConfig
-         */
-        private $generator;
-
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->generator = $generator;
-            $this->ctx = $ctx;
-        }
-
-        public function getGeneratorConfig() {
-            return $this->generator;
-        }
-
-        public function getEnrichNode() {
-            return $this->ctx;
-        }
-
-        public function getProjectNode() {
-            return $this->ctx->parentNode->parentNode;
-        }
-
-        public function getType() {
-            return $this->ctx->getAttribute('type');
-        }
-
-        public function getVersion() {
-            return $this->getGeneratorConfig()->getProjectConfig()->getVersion();
-        }
+    public function getEnrichNode() {
+        return $this->ctx;
+    }
 
+    public function getProjectNode() {
+        return $this->ctx->parentNode->parentNode;
     }
 
+    public function getType() {
+        return $this->ctx->getAttribute('type');
+    }
+
+    public function getVersion() {
+        return $this->getGeneratorConfig()->getProjectConfig()->getVersion();
+    }
 }
diff -Nru phpdox-0.11.2/src/config/GeneratorConfigException.php phpdox-0.12.0/src/config/GeneratorConfigException.php
--- phpdox-0.11.2/src/config/GeneratorConfigException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/GeneratorConfigException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,6 @@
-<?php
-namespace TheSeer\phpDox {
-
-    class GeneratorConfigException extends ConfigException {
-
-        const BuilderNotFound = 1;
-
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+class GeneratorConfigException extends ConfigException {
+    public const BuilderNotFound = 1;
 }
diff -Nru phpdox-0.11.2/src/config/GeneratorConfig.php phpdox-0.12.0/src/config/GeneratorConfig.php
--- phpdox-0.11.2/src/config/GeneratorConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/GeneratorConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,116 +1,85 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMElement;
-
-    class GeneratorConfig {
-
-        /**
-         * @var array
-         */
-        private $builds;
-
-        /**
-         * @var array
-         */
-        private $enrichers;
-
-        /**
-         * @var fDOMElement
-         */
-        private $ctx;
-
-        /**
-         * @var ProjectConfig
-         */
-        private $project;
-
-        public function __construct(ProjectConfig $project, fDOMElement $ctx) {
-            $this->project = $project;
-            $this->ctx = $ctx;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-        public function getProjectConfig() {
-            return $this->project;
-        }
+use TheSeer\fDOM\fDOMElement;
+
+class GeneratorConfig {
+    /**
+     * @var array
+     */
+    private $builds;
+
+    /**
+     * @var array
+     */
+    private $enrichers;
+
+    /**
+     * @var fDOMElement
+     */
+    private $ctx;
+
+    /**
+     * @var ProjectConfig
+     */
+    private $project;
+
+    public function __construct(ProjectConfig $project, fDOMElement $ctx) {
+        $this->project = $project;
+        $this->ctx     = $ctx;
+    }
+
+    public function getProjectConfig() {
+        return $this->project;
+    }
 
-        public function getActiveBuilds() {
-            if (!is_array($this->builds)) {
-                $this->builds = array();
-                foreach($this->ctx->query('cfg:build[@engine and (not(@enabled) or @enabled="true")]') as $ctx) {
-                    $this->builds[] = new BuildConfig($this, $ctx);
-                }
+    public function getActiveBuilds() {
+        if (!\is_array($this->builds)) {
+            $this->builds = [];
+
+            foreach ($this->ctx->query('cfg:build[@engine and (not(@enabled) or @enabled="true")]') as $ctx) {
+                $this->builds[] = new BuildConfig($this, $ctx);
             }
-            return $this->builds;
         }
 
-        public function getRequiredEngines() {
-            $engines = array();
-            foreach($this->getActiveBuilds() as $build) {
-                $engines[] = $build->getEngine();
-            }
-            return array_unique($engines);
+        return $this->builds;
+    }
+
+    public function getRequiredEngines() {
+        $engines = [];
+
+        foreach ($this->getActiveBuilds() as $build) {
+            $engines[] = $build->getEngine();
         }
 
-        public function getRequiredEnrichers() {
-            $enrichers = array();
-            foreach($this->getActiveEnrichSources() as $source) {
-                $enrichers[] = $source->getType();
-            }
-            return array_unique($enrichers);
+        return \array_unique($engines);
+    }
+
+    public function getRequiredEnrichers() {
+        $enrichers = [];
+
+        foreach ($this->getActiveEnrichSources() as $source) {
+            $enrichers[] = $source->getType();
         }
 
-        public function getActiveEnrichSources() {
-            if (!is_array($this->enrichers)) {
-                $this->enrichers = array();
-                foreach($this->ctx->query('cfg:enrich/cfg:source[@type and (not(@enabled) or @enabled="true")]') as $ctx) {
-                    $this->enrichers[$ctx->getAttribute('type')] = new EnrichConfig($this, $ctx);
-                }
-                if (!isset($this->enrichers['build'])) {
-                    $ctx = $this->ctx->ownerDocument->createElementNS('http://xml.phpdox.net/config', 'source');
-                    $ctx->setAttribute('type', 'build');
-                    $this->enrichers['build'] = new EnrichConfig($this, $ctx);
-                }
+        return \array_unique($enrichers);
+    }
+
+    public function getActiveEnrichSources() {
+        if (!\is_array($this->enrichers)) {
+            $this->enrichers = [];
+
+            foreach ($this->ctx->query('cfg:enrich/cfg:source[@type and (not(@enabled) or @enabled="true")]') as $ctx) {
+                $this->enrichers[$ctx->getAttribute('type')] = new EnrichConfig($this, $ctx);
+            }
+
+            if (!isset($this->enrichers['build'])) {
+                $ctx = $this->ctx->ownerDocument->createElementNS('http://xml.phpdox.net/config', 'source');
+                $ctx->setAttribute('type', 'build');
+                $this->enrichers['build'] = new EnrichConfig($this, $ctx);
             }
-            return $this->enrichers;
         }
-    }
 
+        return $this->enrichers;
+    }
 }
diff -Nru phpdox-0.11.2/src/config/GlobalConfig.php phpdox-0.12.0/src/config/GlobalConfig.php
--- phpdox-0.11.2/src/config/GlobalConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/GlobalConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,192 +1,148 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMDocument;
-
-    class GlobalConfig {
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        /**
-         * Directory of phpDox home
-         * @var Fileinfo
-         */
-        private $homeDir;
-
-        /**
-         * @var fDOMDocument
-         */
-        private $cfg;
-
-        /**
-         * File this config is based on
-         * @var FileInfo
-         */
-        private $file;
-
-        /**
-         * Constructor for global config
-         *
-         * @param Version      $version
-         * @param FileInfo     $home
-         * @param fDOMDocument $cfg  A configuration dom
-         * @param FileInfo     $file FileInfo of the cfg file
-         *
-         * @throws ConfigException
-         */
-        public function __construct(Version $version, FileInfo $home, fDOMDocument $cfg, FileInfo $file) {
-            if ($cfg->documentElement->nodeName != 'phpdox' ||
-                $cfg->documentElement->namespaceURI != 'http://xml.phpdox.net/config') {
-                throw new ConfigException("Not a valid phpDox configuration", ConfigException::InvalidDataStructure);
-            }
-            $this->homeDir = $home;
-            $this->version = $version;
-            $this->cfg = $cfg;
-            $this->file = $file;
-        }
-
-        /**
-         * @return FileInfo
-         */
-        public function getConfigFile() {
-            return $this->file;
-        }
-
-        /**
-         * @return bool
-         */
-        public function isSilentMode() {
-            $root = $this->cfg->queryOne('/cfg:phpdox');
-            return $root->getAttribute('silent', 'false') === 'true';
-        }
-
-        /**
-         * @return FileInfoCollection
-         */
-        public function getCustomBootstrapFiles() {
-            $files = new FileInfoCollection();
-            foreach($this->cfg->query('//cfg:bootstrap/cfg:require[@file]') as $require) {
-                $files->add(new FileInfo($require->getAttribute('file'))) ;
-            }
-            return $files;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\fDOM\fDOMDocument;
+
+class GlobalConfig {
+    /**
+     * @var Version
+     */
+    private $version;
+
+    /**
+     * Directory of phpDox home
+     *
+     * @var Fileinfo
+     */
+    private $homeDir;
+
+    /**
+     * @var fDOMDocument
+     */
+    private $cfg;
+
+    /**
+     * File this config is based on
+     *
+     * @var FileInfo
+     */
+    private $file;
+
+    /**
+     * Constructor for global config
+     *
+     * @param fDOMDocument $cfg  A configuration dom
+     * @param FileInfo     $file FileInfo of the cfg file
+     *
+     * @throws ConfigException
+     */
+    public function __construct(Version $version, FileInfo $home, fDOMDocument $cfg, FileInfo $file) {
+        if ($cfg->documentElement->nodeName != 'phpdox' ||
+            $cfg->documentElement->namespaceURI != 'http://xml.phpdox.net/config') {
+            throw new ConfigException('Not a valid phpDox configuration', ConfigException::InvalidDataStructure);
+        }
+        $this->homeDir = $home;
+        $this->version = $version;
+        $this->cfg     = $cfg;
+        $this->file    = $file;
+    }
+
+    public function getConfigFile(): FileInfo {
+        return $this->file;
+    }
+
+    public function isSilentMode(): bool {
+        $root = $this->cfg->queryOne('/cfg:phpdox');
+
+        return $root->getAttribute('silent', 'false') === 'true';
+    }
+
+    public function getCustomBootstrapFiles(): FileInfoCollection {
+        $files = new FileInfoCollection();
+
+        foreach ($this->cfg->query('//cfg:bootstrap/cfg:require[@file]') as $require) {
+            $files->add(new FileInfo($require->getAttribute('file')));
         }
 
-        /**
-         * @return array
-         */
-        public function getProjects() {
-            $list = array();
-            foreach ($this->cfg->query('//cfg:project[@enabled="true" or not(@enabled)]') as $pos => $project) {
-                $list[$project->getAttribute('name', $pos)] = new ProjectConfig($this->version, $this->homeDir, $this->runResolver($project));
-            }
-            return $list;
+        return $files;
+    }
+
+    public function getProjects(): array {
+        $list = [];
+
+        foreach ($this->cfg->query('//cfg:project[@enabled="true" or not(@enabled)]') as $pos => $project) {
+            $list[$project->getAttribute('name', $pos)] = new ProjectConfig($this->version, $this->homeDir, $this->runResolver($project));
         }
 
-        /**
-         * @param $ctx
-         *
-         * @return mixed
-         * @throws ConfigException
-         */
-        private function runResolver($ctx) {
-            $vars = array(
-                'basedir' => $ctx->getAttribute('basedir', dirname($this->file->getRealPath())),
-
-                'phpDox.home' => $this->homeDir->getPathname(),
-                'phpDox.file' => $this->file->getPathname(),
-                'phpDox.version' => $this->version->getVersion(),
-
-                'phpDox.project.name' => $ctx->getAttribute('name', 'unnamed'),
-                'phpDox.project.source' => $ctx->getAttribute('source', 'src'),
-                'phpDox.project.workdir' => $ctx->getAttribute('workdir', 'xml'),
-
-                'phpDox.php.version' => PHP_VERSION,
-
-            );
-            $protected = array_keys($vars);
-
-            foreach($ctx->query('cfg:property|/cfg:phpdox/cfg:property') as $property) {
-                /** @var $property \DOMElement */
-                $name = $property->getAttribute('name');
-                $line = $property->getLineNo();
+        return $list;
+    }
 
-                if (in_array($name, $protected)) {
-                    throw new ConfigException("Cannot overwrite system property in line $line", ConfigException::OverrideNotAllowed);
-                }
-                if (isset($vars[$name])) {
-                    throw new ConfigException("Cannot overwrite existing property '$name' in line $line", ConfigException::OverrideNotAllowed);
-                }
-                $vars[$name] =  $this->resolveValue($property->getAttribute('value'), $vars, $line);
-            }
+    /**
+     * @param $ctx
+     *
+     * @throws ConfigException
+     */
+    private function runResolver($ctx) {
+        $vars = [
+            'basedir' => $ctx->getAttribute('basedir', \dirname($this->file->getRealPath())),
+
+            'phpDox.home'    => $this->homeDir->getPathname(),
+            'phpDox.file'    => $this->file->getPathname(),
+            'phpDox.version' => $this->version->getVersion(),
+
+            'phpDox.project.name'    => $ctx->getAttribute('name', 'unnamed'),
+            'phpDox.project.source'  => $ctx->getAttribute('source', 'src'),
+            'phpDox.project.workdir' => $ctx->getAttribute('workdir', 'xml'),
+
+            'phpDox.php.version' => \PHP_VERSION,
+
+        ];
+        $protected = \array_keys($vars);
+
+        foreach ($ctx->query('cfg:property|/cfg:phpdox/cfg:property') as $property) {
+            /** @var $property \DOMElement */
+            $name = $property->getAttribute('name');
+            $line = $property->getLineNo();
 
-            foreach($ctx->query('.//*[not(name()="property")]/@*|@*') as $attr) {
-                $attr->nodeValue = $this->resolveValue($attr->nodeValue, $vars, $attr->getLineNo());
+            if (\in_array($name, $protected)) {
+                throw new ConfigException("Cannot overwrite system property in line $line", ConfigException::OverrideNotAllowed);
             }
 
-            return $ctx;
+            if (isset($vars[$name])) {
+                throw new ConfigException("Cannot overwrite existing property '$name' in line $line", ConfigException::OverrideNotAllowed);
+            }
+            $vars[$name] = $this->resolveValue($property->getAttribute('value'), $vars, $line);
         }
 
-        /**
-         * @param string   $value
-         * @param string[] $vars
-         * @param int      $line
-         *
-         * @return string
-         */
-        private function resolveValue($value, Array $vars, $line) {
-            $result = preg_replace_callback('/\${(.*?)}/',
-                function($matches) use ($vars, $line) {
-                    if (!isset($vars[$matches[1]])) {
-                        throw new ConfigException("No value for property '{$matches[1]}' found in line $line", ConfigException::PropertyNotFound);
-                    }
-                    return $vars[$matches[1]];
-                }, $value);
-            if (preg_match('/\${(.*?)}/', $result)) {
-                $result = $this->resolveValue($result, $vars, $line);
-            }
-            return $result;
+        foreach ($ctx->query('.//*[not(name()="property")]/@*|@*') as $attr) {
+            $attr->nodeValue = $this->resolveValue($attr->nodeValue, $vars, $attr->getLineNo());
         }
 
+        return $ctx;
     }
 
+    /**
+     * @param string   $value
+     * @param string[] $vars
+     * @param int      $line
+     */
+    private function resolveValue($value, array $vars, $line): string {
+        $result = \preg_replace_callback(
+            '/\${(.*?)}/',
+            function ($matches) use ($vars, $line) {
+                if (!isset($vars[$matches[1]])) {
+                    throw new ConfigException("No value for property '{$matches[1]}' found in line $line", ConfigException::PropertyNotFound);
+                }
+
+                return $vars[$matches[1]];
+            },
+            $value
+        );
+
+        if (\preg_match('/\${(.*?)}/', $result)) {
+            $result = $this->resolveValue($result, $vars, $line);
+        }
+
+        return $result;
+    }
 }
diff -Nru phpdox-0.11.2/src/config/InheritanceConfig.php phpdox-0.12.0/src/config/InheritanceConfig.php
--- phpdox-0.11.2/src/config/InheritanceConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/InheritanceConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,77 +1,37 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMElement;
-
-    class InheritanceConfig {
-
-        protected $ctx;
-        protected $config;
-
-        public function __construct(CollectorConfig $config, fDOMElement $ctx = NULL) {
-            $this->config = $config;
-            $this->ctx = $ctx;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\fDOM\fDOMElement;
+
+class InheritanceConfig {
+    protected $ctx;
+
+    protected $config;
 
-        public function isPublicOnlyMode() {
-            return $this->config->isPublicOnlyMode();
+    public function __construct(CollectorConfig $config, fDOMElement $ctx = null) {
+        $this->config = $config;
+        $this->ctx    = $ctx;
+    }
+
+    public function isPublicOnlyMode() {
+        return $this->config->isPublicOnlyMode();
+    }
+
+    public function getDependencyDirectories(): array {
+        $home    = $this->config->getProjectConfig()->getHomeDirectory();
+        $default = new FileInfo($home->getPathname() . '/dependencies/php');
+        $list    = [$default];
+
+        if (!$this->ctx) {
+            return $list;
         }
 
-        /**
-         * @return array
-         */
-        public function getDependencyDirectories() {
-            $home = $this->config->getProjectConfig()->getHomeDirectory();
-            $default = new FileInfo($home->getPathname() . '/dependencies/php');
-            $list = array($default);
-            if (!$this->ctx) {
-                return $list;
+        foreach ($this->ctx->query('cfg:dependency') as $dep) {
+            if ($dep->hasAttribute('path')) {
+                $list[] = new FileInfo($dep->getAttribute('path'));
             }
-            foreach($this->ctx->query('cfg:dependency') as $dep) {
-                if ($dep->hasAttribute('path')) {
-                    $list[] = new FileInfo($dep->getAttribute('path'));
-                }
-            }
-            return $list;
         }
 
+        return $list;
     }
-
 }
diff -Nru phpdox-0.11.2/src/config/ProjectConfig.php phpdox-0.12.0/src/config/ProjectConfig.php
--- phpdox-0.11.2/src/config/ProjectConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/ProjectConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,132 +1,78 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox {
-
-    use TheSeer\fDOM\fDOMElement;
-
-    class ProjectConfig {
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        /**
-         * @var fDOMElement;
-         */
-        private $ctx;
-
-        /**
-         * @var FileInfo
-         */
-        private $homeDir;
-
-        /**
-         * Constructor for global config
-         *
-         * @param fDOMElement $ctx   Reference to <project> node
-         */
-        public function __construct(Version $version, FileInfo $homeDir, fDOMElement $ctx) {
-            $this->version = $version;
-            $this->homeDir = $homeDir;
-            $this->ctx = $ctx;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-        /**
-         * @return Version
-         */
-        public function getVersion() {
-            return $this->version;
-        }
+use TheSeer\fDOM\fDOMElement;
 
-        /**
-         * @return Fileinfo
-         */
-        public function getHomeDirectory() {
-            return $this->homeDir;
-        }
+class ProjectConfig {
+    /**
+     * @var Version
+     */
+    private $version;
+
+    /**
+     * @var fDOMElement;
+     */
+    private $ctx;
+
+    /**
+     * @var FileInfo
+     */
+    private $homeDir;
+
+    /**
+     * Constructor for global config
+     *
+     * @param fDOMElement $ctx Reference to <project> node
+     */
+    public function __construct(Version $version, FileInfo $homeDir, fDOMElement $ctx) {
+        $this->version = $version;
+        $this->homeDir = $homeDir;
+        $this->ctx     = $ctx;
+    }
 
-        /**
-         * @return FileInfo
-         */
-        public function getWorkDirectory() {
-            return new FileInfo($this->ctx->getAttribute('workdir', 'xml'));
-        }
+    public function getVersion(): Version {
+        return $this->version;
+    }
 
-        /**
-         * @return FileInfo
-         */
-        public function getSourceDirectory() {
-            return new FileInfo($this->ctx->getAttribute('source', 'src'));
-        }
+    public function getHomeDirectory(): Fileinfo {
+        return $this->homeDir;
+    }
 
-        /**
-         * @return bool
-         */
-        public function isPublicOnlyMode() {
-            return $this->ctx->getAttribute('publiconly', 'false') === 'true';
-        }
+    public function getWorkDirectory(): FileInfo {
+        return new FileInfo($this->ctx->getAttribute('workdir', 'xml'));
+    }
 
-        /**
-         * @return CollectorConfig
-         * @throws ConfigException
-         */
-        public function getCollectorConfig() {
-            $colNode = $this->ctx->queryOne('cfg:collector');
-            if (!$colNode) {
-                throw new ConfigException("Project does not have a collector section", ConfigException::NoCollectorSection);
-            }
-            return new CollectorConfig($this, $colNode);
-        }
+    public function getSourceDirectory(): FileInfo {
+        return new FileInfo($this->ctx->getAttribute('source', 'src'));
+    }
+
+    public function isPublicOnlyMode(): bool {
+        return $this->ctx->getAttribute('publiconly', 'false') === 'true';
+    }
+
+    /**
+     * @throws ConfigException
+     */
+    public function getCollectorConfig(): CollectorConfig {
+        $colNode = $this->ctx->queryOne('cfg:collector');
 
-        /**
-         * @return GeneratorConfig
-         * @throws ConfigException
-         */
-        public function getGeneratorConfig() {
-            $genNode = $this->ctx->queryOne('cfg:generator');
-            if (!$genNode) {
-                throw new ConfigException("Project does not have a generator section", ConfigException::NoGeneratorSection);
-            }
-            return new GeneratorConfig($this, $genNode);
+        if (!$colNode) {
+            throw new ConfigException('Project does not have a collector section', ConfigException::NoCollectorSection);
         }
 
+        return new CollectorConfig($this, $colNode);
     }
 
+    /**
+     * @throws ConfigException
+     */
+    public function getGeneratorConfig(): GeneratorConfig {
+        $genNode = $this->ctx->queryOne('cfg:generator');
+
+        if (!$genNode) {
+            throw new ConfigException('Project does not have a generator section', ConfigException::NoGeneratorSection);
+        }
+
+        return new GeneratorConfig($this, $genNode);
+    }
 }
diff -Nru phpdox-0.11.2/src/config/skeleton.xml phpdox-0.12.0/src/config/skeleton.xml
--- phpdox-0.11.2/src/config/skeleton.xml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/config/skeleton.xml	2019-03-13 09:34:17.000000000 +0000
@@ -6,7 +6,7 @@
     <!-- Additional bootstrap files to load for additional parsers, enrichers and/or engines -->
     <!-- Place as many require nodes as you feel like in this container -->
     <!-- syntax: <require file="/path/to/file.php" /> -->
-    <bootstrap />
+    <bootstrap/>
 
     <!-- A phpDox project to process, you can have multiple projects in one config file -->
     <project name="phpdox" source="${basedir}/src" workdir="${basedir}/build/phpdox/xml">
@@ -42,8 +42,8 @@
 
             <!--  <include / exclude filter for filelist generator, mask must follow fnmatch() requirements  -->
             <!--  Multiple elements can be added to define more than one mask per filter -->
-            <include mask="*.php" />
-            <exclude mask="" />
+            <include mask="*.php"/>
+            <exclude mask=""/>
 
             <!--  How to handle inheritance -->
             <inheritance resolve="true">
@@ -102,8 +102,8 @@
 
                 <!-- PHPUnit Coverage XML -->
                 <!-- <source type="phpunit">  -->
-                    <!-- <coverage path="" /> -->
-                    <!--           @path - the directory where the xml code coverage report can be found -->
+                <!-- <coverage path="" /> -->
+                <!--           @path - the directory where the xml code coverage report can be found -->
                 <!--</source>-->
                 <!--
                 <source type="phpunit">
@@ -122,8 +122,8 @@
 
             <!--  default engine "html" -->
             <build engine="html" enabled="true" output="html">
-                <template dir="${phpDox.home}/templates/html" />
-                <file extension="xhtml" />
+                <template dir="${phpDox.home}/templates/html"/>
+                <file extension="xhtml"/>
             </build>
 
         </generator>
diff -Nru phpdox-0.11.2/src/docblock/DocBlockException.php phpdox-0.12.0/src/docblock/DocBlockException.php
--- phpdox-0.11.2/src/docblock/DocBlockException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/DocBlockException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,9 +1,6 @@
-<?php
-namespace TheSeer\phpDox\DocBlock {
-
-    class DocBlockException extends \Exception {
-
-        const NotFound = 404;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
+class DocBlockException extends \Exception {
+    public const NotFound = 404;
 }
diff -Nru phpdox-0.11.2/src/docblock/DocBlock.php phpdox-0.12.0/src/docblock/DocBlock.php
--- phpdox-0.11.2/src/docblock/DocBlock.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/DocBlock.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,88 +1,49 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-    class DocBlock {
-
-        protected $elements = array();
-
-        public function appendElement(GenericElement $element) {
-            $name = $element->getAnnotationName();
-            if (isset($this->elements[$name])) {
-                if (!is_array($this->elements[$name])) {
-                    $this->elements[$name] = array($this->elements[$name]);
-                }
-                $this->elements[$name][] = $element;
-                return;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
+
+class DocBlock {
+    protected $elements = [];
+
+    public function appendElement(GenericElement $element): void {
+        $name = $element->getAnnotationName();
+
+        if (isset($this->elements[$name])) {
+            if (!\is_array($this->elements[$name])) {
+                $this->elements[$name] = [$this->elements[$name]];
             }
-            $this->elements[$name] = $element;
-        }
+            $this->elements[$name][] = $element;
 
-        public function hasElementByName($name) {
-            return isset($this->elements[$name]);
+            return;
         }
+        $this->elements[$name] = $element;
+    }
 
-        public function getElementByName($name) {
-            if (!isset($this->elements[$name])) {
-                throw new DocBlockException("No element with name '$name'", DocBlockException::NotFound);
-            }
-            return $this->elements[$name];
+    public function hasElementByName($name) {
+        return isset($this->elements[$name]);
+    }
+
+    public function getElementByName($name) {
+        if (!isset($this->elements[$name])) {
+            throw new DocBlockException("No element with name '$name'", DocBlockException::NotFound);
         }
 
-        /**
-         * @param \TheSeer\fDOM\fDOMDocument $doc
-         * @return \TheSeer\fDOM\fDOMElement
-         */
-        public function asDom(\TheSeer\fDOM\fDOMDocument $doc) {
-            $node = $doc->createElementNS('http://xml.phpdox.net/src', 'docblock');
-            // add lines and such?
-            foreach($this->elements as $element) {
-                if (is_array($element)) {
-                    foreach($element as $el) {
-                        $node->appendChild($el->asDom($doc));
-                    }
-                    continue;
+        return $this->elements[$name];
+    }
+
+    public function asDom(\TheSeer\fDOM\fDOMDocument $doc): \TheSeer\fDOM\fDOMElement {
+        $node = $doc->createElementNS('http://xml.phpdox.net/src', 'docblock');
+        // add lines and such?
+        foreach ($this->elements as $element) {
+            if (\is_array($element)) {
+                foreach ($element as $el) {
+                    $node->appendChild($el->asDom($doc));
                 }
-                $node->appendChild($element->asDom($doc));
+
+                continue;
             }
-            return $node;
+            $node->appendChild($element->asDom($doc));
         }
 
+        return $node;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/elements/GenericElementException.php phpdox-0.12.0/src/docblock/elements/GenericElementException.php
--- phpdox-0.11.2/src/docblock/elements/GenericElementException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/elements/GenericElementException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,8 @@
-<?php
-namespace TheSeer\phpDox\DocBlock {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-    class GenericElementException extends \Exception {
-
-        const MethodNotDefined = 1;
-        const PropertyNotDefined = 2;
-    }
+class GenericElementException extends \Exception {
+    public const MethodNotDefined = 1;
 
+    public const PropertyNotDefined = 2;
 }
diff -Nru phpdox-0.11.2/src/docblock/elements/GenericElement.php phpdox-0.12.0/src/docblock/elements/GenericElement.php
--- phpdox-0.11.2/src/docblock/elements/GenericElement.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/elements/GenericElement.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,90 +1,55 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-    class GenericElement {
-
-        protected $factory;
-
-        protected $name;
-        protected $body;
-        protected $attributes = array();
-
-        public function __construct(Factory $factory, $name) {
-            $this->factory = $factory;
-            $this->name = $name;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-        public function getAnnotationName() {
-            return $this->name;
-        }
+class GenericElement {
+    protected $factory;
 
-        public function getBody() {
-            return $this->body;
-        }
+    protected $name;
 
-        public function __call($method, $value) {
-            if (!preg_match('/^set/', $method)) {
-                throw new GenericElementException("Method '$method' not defined", GenericElementException::MethodNotDefined);
-            }
-            // extract attribute name (remove 'set' or 'get' from string)
-            $attribute = mb_strtolower(mb_substr($method, 3));
-            $this->attributes[$attribute] = $value[0];
-        }
+    protected $body;
 
-        public function setBody($body) {
-            $this->body = $body;
-        }
+    protected $attributes = [];
 
-        public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
-            $node = $ctx->createElementNS('http://xml.phpdox.net/src', mb_strtolower($this->name));
-            foreach($this->attributes as $attribute => $value) {
-                if ($value != '') {
-                    $node->setAttribute($attribute, $value);
-                }
-            }
-            if ($this->body !== null && $this->body !== '') {
-                $parser = $this->factory->getInlineProcessor($ctx);
-                $node->appendChild($parser->transformToDom($this->body));
+    public function __construct(Factory $factory, $name) {
+        $this->factory = $factory;
+        $this->name    = $name;
+    }
+
+    public function __call($method, $value): void {
+        if (!\preg_match('/^set/', $method)) {
+            throw new GenericElementException("Method '$method' not defined", GenericElementException::MethodNotDefined);
+        }
+        // extract attribute name (remove 'set' or 'get' from string)
+        $attribute                    = \mb_strtolower(\mb_substr($method, 3));
+        $this->attributes[$attribute] = $value[0];
+    }
+
+    public function getAnnotationName() {
+        return $this->name;
+    }
+
+    public function getBody() {
+        return $this->body;
+    }
+
+    public function setBody($body): void {
+        $this->body = $body;
+    }
+
+    public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
+        $node = $ctx->createElementNS('http://xml.phpdox.net/src', \mb_strtolower($this->name));
+
+        foreach ($this->attributes as $attribute => $value) {
+            if ($value != '') {
+                $node->setAttribute($attribute, $value);
             }
-            return $node;
         }
 
-    }
+        if ($this->body !== null && $this->body !== '') {
+            $parser = $this->factory->getInlineProcessor($ctx);
+            $node->appendChild($parser->transformToDom($this->body));
+        }
 
+        return $node;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/elements/InheritdocAttribute.php phpdox-0.12.0/src/docblock/elements/InheritdocAttribute.php
--- phpdox-0.11.2/src/docblock/elements/InheritdocAttribute.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/elements/InheritdocAttribute.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,50 +1,11 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
-
-    class InheritdocAttribute extends GenericElement {
-
-        public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
-            $node = $ctx->createAttribute('inherit');
-            $node->appendChild($ctx->createTextNode('true'));
-            return $node;
-        }
+class InheritdocAttribute extends GenericElement {
+    public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
+        $node = $ctx->createAttribute('inherit');
+        $node->appendChild($ctx->createTextNode('true'));
 
+        return $node;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/elements/InvalidElement.php phpdox-0.12.0/src/docblock/elements/InvalidElement.php
--- phpdox-0.11.2/src/docblock/elements/InvalidElement.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/elements/InvalidElement.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,56 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
+class InvalidElement extends GenericElement {
+    public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
+        $node = $ctx->createElementNS('http://xml.phpdox.net/src', 'invalid');
+        $node->setAttribute('annotation', $this->name);
 
-    class InvalidElement extends GenericElement {
+        foreach ($this->attributes as $attribute => $value) {
+            $node->setAttribute($attribute, $value);
+        }
 
-        public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
-            $node = $ctx->createElementNS('http://xml.phpdox.net/src', 'invalid');
-            $node->setAttribute('annotation', $this->name);
-            foreach($this->attributes as $attribute => $value) {
-                $node->setAttribute($attribute, $value);
-            }
-            if ($this->body !== null && $this->body !== '') {
-                $node->appendChild($ctx->createTextnode($this->body));
-            }
-            return $node;
+        if ($this->body !== null && $this->body !== '') {
+            $node->appendChild($ctx->createTextnode($this->body));
         }
 
+        return $node;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/elements/VarElement.php phpdox-0.12.0/src/docblock/elements/VarElement.php
--- phpdox-0.11.2/src/docblock/elements/VarElement.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/elements/VarElement.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,82 +1,43 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-    class VarElement extends GenericElement {
-
-        const XMLNS = 'http://xml.phpdox.net/src';
-
-        /**
-         * @var string[]
-         */
-        private $types = array(
-            '', 'null', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int',
-            'float', 'string', 'boolean', 'resource'
-        );
-
-        public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
-            $node = parent::asDom($ctx);
-            $type = $node->getAttribute('type');
-
-            if (strpos($type, '[]')) {
-                $type = mb_substr($type, 0, -2);
-                $node->setAttribute('type', 'array');
-                $node->setAttribute('of', $type);
-            }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
+
+class VarElement extends GenericElement {
+    public const XMLNS = 'http://xml.phpdox.net/src';
 
-            if (!in_array($type, $this->types)) {
-                if (!$node->hasAttribute('of')) {
-                    $node->setAttribute('type', 'object');
-                } else {
-                    $node->setAttribute('of', 'object');
-                }
-                $parts = explode('\\', $type);
-                $local = array_pop($parts);
-                $namespace = join('\\', $parts);
-
-                $class = $node->appendElementNS(self::XMLNS, 'type');
-                $class->setAttribute('full', $type);
-                $class->setAttribute('namespace', $namespace);
-                $class->setAttribute('name', $local);
+    /**
+     * @var string[]
+     */
+    private $types = [
+        '', 'null', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int',
+        'float', 'string', 'boolean', 'resource'
+    ];
+
+    public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {
+        $node = parent::asDom($ctx);
+        $type = $node->getAttribute('type');
+
+        if (\strpos($type, '[]')) {
+            $type = \mb_substr($type, 0, -2);
+            $node->setAttribute('type', 'array');
+            $node->setAttribute('of', $type);
+        }
 
+        if (!\in_array($type, $this->types)) {
+            if (!$node->hasAttribute('of')) {
+                $node->setAttribute('type', 'object');
+            } else {
+                $node->setAttribute('of', 'object');
             }
-            return $node;
+            $parts     = \explode('\\', $type);
+            $local     = \array_pop($parts);
+            $namespace = \implode('\\', $parts);
+
+            $class = $node->appendElementNS(self::XMLNS, 'type');
+            $class->setAttribute('full', $type);
+            $class->setAttribute('namespace', $namespace);
+            $class->setAttribute('name', $local);
         }
-    }
 
+        return $node;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/FactoryException.php phpdox-0.12.0/src/docblock/FactoryException.php
--- phpdox-0.11.2/src/docblock/FactoryException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/FactoryException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,8 @@
-<?php
-namespace TheSeer\phpDox\DocBlock {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-    class FactoryException extends \Exception {
-
-        const InvalidType = 1;
-        const UnknownType = 2;
-    }
+class FactoryException extends \Exception {
+    public const InvalidType = 1;
 
+    public const UnknownType = 2;
 }
diff -Nru phpdox-0.11.2/src/docblock/Factory.php phpdox-0.12.0/src/docblock/Factory.php
--- phpdox-0.11.2/src/docblock/Factory.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/Factory.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,154 +1,119 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\DocBlock {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\FactoryInterface;
-
-    class Factory {
-
-        private $parserMap = array(
-            'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidParser',
-            'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericParser',
-
-            'description' => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
-            'param' => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
-            'var' => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-            'return' => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-            'throws' => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-            'license' => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
-
-            'internal' => 'TheSeer\\phpDox\\DocBlock\\InternalParser',
-            'inheritdoc' => 'TheSeer\\phpDox\\DocBlock\\InheritdocParser'
-        );
-
-        private $elementMap = array(
-            'inheritdoc' => 'TheSeer\\phpDox\\DocBlock\\InheritdocAttribute',
-            'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidElement',
-            'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericElement',
-            'var' => 'TheSeer\\phpDox\\DocBlock\\VarElement'
-        );
-
-        /**
-         * Register a parser factory.
-         *
-         * @param string $annotation Identifier of the parser within the registry.
-         * @param \TheSeer\phpDox\FactoryInterface|string $factory Instance of FactoryInterface to be registered or FQCN
-         *        of the object to be created.
-         *
-         * @throws FactoryException in case $annotation is not a string.
-         */
-        public function addParserFactory($annotation, $factory) {
-            $this->verifyType($annotation);
-            $this->parserMap[$annotation] = $factory;
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-        /**
-         * Register a parser by its classname.
-         *
-         * @param string $annotation Identifier of the parser within the registry.
-         * @param string $classname  Name of the class representing the parser.
-         */
-        public function addParserClass($annotation, $classname) {
-            $this->verifyType($annotation);
-            $this->verifyType($classname);
-            $this->parserMap[$annotation] = $classname;
-        }
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\FactoryInterface;
 
-        public function getDocBlock() {
-            return new DocBlock();
-        }
+class Factory {
+    private $parserMap = [
+        'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidParser',
+        'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericParser',
+
+        'description' => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
+        'param'       => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+        'var'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+        'return'      => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+        'throws'      => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+        'license'     => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
+
+        'internal'   => 'TheSeer\\phpDox\\DocBlock\\InternalParser',
+        'inheritdoc' => 'TheSeer\\phpDox\\DocBlock\\InheritdocParser'
+    ];
+
+    private $elementMap = [
+        'inheritdoc' => 'TheSeer\\phpDox\\DocBlock\\InheritdocAttribute',
+        'invalid'    => 'TheSeer\\phpDox\\DocBlock\\InvalidElement',
+        'generic'    => 'TheSeer\\phpDox\\DocBlock\\GenericElement',
+        'var'        => 'TheSeer\\phpDox\\DocBlock\\VarElement'
+    ];
+
+    /**
+     * Register a parser factory.
+     *
+     * @param string                                  $annotation identifier of the parser within the registry
+     * @param string|\TheSeer\phpDox\FactoryInterface $factory    instance of FactoryInterface to be registered or FQCN
+     *                                                            of the object to be created
+     *
+     * @throws FactoryException in case $annotation is not a string
+     */
+    public function addParserFactory($annotation, $factory): void {
+        $this->verifyType($annotation);
+        $this->parserMap[$annotation] = $factory;
+    }
 
-        public function getInlineProcessor(fDOMDocument $dom) {
-            return new InlineProcessor($this, $dom);
-        }
+    /**
+     * Register a parser by its classname.
+     *
+     * @param string $annotation identifier of the parser within the registry
+     * @param string $classname  name of the class representing the parser
+     */
+    public function addParserClass($annotation, $classname): void {
+        $this->verifyType($annotation);
+        $this->verifyType($classname);
+        $this->parserMap[$annotation] = $classname;
+    }
 
-        public function getElementInstanceFor($name, $annotation = null) {
-            return $this->getInstanceByMap($this->elementMap, $name, $annotation);
-        }
+    public function getDocBlock() {
+        return new DocBlock();
+    }
 
-        public function getParserInstanceFor($name, $annotation = null) {
-            return $this->getInstanceByMap($this->parserMap, $name, $annotation);
-        }
+    public function getInlineProcessor(fDOMDocument $dom) {
+        return new InlineProcessor($this, $dom);
+    }
 
-        protected function getInstanceByMap($map, $name, $annotation = null) {
+    public function getElementInstanceFor($name, $annotation = null) {
+        return $this->getInstanceByMap($this->elementMap, $name, $annotation);
+    }
 
-            if ($annotation === null) {
-                $annotation = $name;
-            }
-
-            if (!isset($map[$name])) {
-                $name = 'generic';
-            }
-
-            if ($map[$name] instanceof FactoryInterface) {
-                return $map[$name]->getInstanceFor($name, $this, $annotation);
-            }
-            return new $map[$name]($this, $annotation);
+    public function getParserInstanceFor($name, $annotation = null) {
+        return $this->getInstanceByMap($this->parserMap, $name, $annotation);
+    }
 
+    protected function getInstanceByMap($map, $name, $annotation = null) {
+        if ($annotation === null) {
+            $annotation = $name;
         }
 
-        /**
-         * Verify the type of the given item matches the expected one.
-         *
-         * @param mixed $item
-         * @param string $type
-         * @throws FactoryException in case the item type and the expected type do not match.
-         */
-        protected function verifyType($item, $type = 'string') {
-            $match = true;
-            switch (mb_strtolower($type)) {
-                case 'string': {
-                    if (!is_string($item)) {
+        if (!isset($map[$name])) {
+            $name = 'generic';
+        }
+
+        if ($map[$name] instanceof FactoryInterface) {
+            return $map[$name]->getInstanceFor($name, $this, $annotation);
+        }
+
+        return new $map[$name]($this, $annotation);
+    }
+
+    /**
+     * Verify the type of the given item matches the expected one.
+     *
+     * @param string $type
+     *
+     * @throws FactoryException in case the item type and the expected type do not match
+     */
+    protected function verifyType($item, $type = 'string'): void {
+        $match = true;
+
+        switch (\mb_strtolower($type)) {
+            case 'string':
+                {
+                    if (!\is_string($item)) {
                         $match = false;
                     }
+
                     break;
                 }
-                default: {
+            default:
+                {
                     throw new FactoryException('Unknown type chosen for verification', FactoryException::UnknownType);
+
                     break;
                 }
-            }
-
-            if (!$match) {
-                throw new FactoryException('Argument must be a string.', FactoryException::InvalidType);
-            }
         }
 
+        if (!$match) {
+            throw new FactoryException('Argument must be a string.', FactoryException::InvalidType);
+        }
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/InlineProcessor.php phpdox-0.12.0/src/docblock/InlineProcessor.php
--- phpdox-0.11.2/src/docblock/InlineProcessor.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/InlineProcessor.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,110 +1,78 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * You can also {@internal let's {@do something}} about it.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-    class InlineProcessor {
-
-        protected $dom;
-        protected $factory;
-
-        protected $regex = '/(.*?)\{(\@(?>[^{}]+|(?R))*)\}|(.*)/m';
-
-        public function __construct(Factory $factory, \TheSeer\fDOM\fDOMDocument $ctx) {
-            $this->factory = $factory;
-            $this->dom = $ctx;
-        }
-
-        public function transformToDom($text) {
-            return $this->doParse($text);
-        }
-
-        protected function doParse($text) {
-            $count = preg_match_all($this->regex, $text, $matches);
-            if (join('', $matches[1]) == '') {
-                return $this->dom->createTextNode($text);
-            }
-            $fragment = $this->dom->createDocumentFragment();
-            for($x=0; $x<$count; $x++) {
-                for($t=1; $t<=3; $t++) {
-                    if ($matches[$t][$x] == '') {
-                        continue;
-                    }
-                    if ($t==2) {
-                        $fragment->appendChild($this->processMatch($matches[$t][$x]));
-                        continue;
-                    }
-                    $part = $matches[$t][$x];
-                    if ($t==3 && $part != '') {
-                        $part .= "\n";
-                    }
-                    $fragment->appendChild($this->dom->createTextNode($part));
-                }
-            }
-            return $fragment;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
+
+class InlineProcessor {
+    protected $dom;
+
+    protected $factory;
+
+    protected $regex = '/(.*?)\{(\@(?>[^{}]+|(?R))*)\}|(.*)/m';
+
+    public function __construct(Factory $factory, \TheSeer\fDOM\fDOMDocument $ctx) {
+        $this->factory = $factory;
+        $this->dom     = $ctx;
+    }
+
+    public function transformToDom($text) {
+        return $this->doParse($text);
+    }
+
+    protected function doParse($text) {
+        $count = \preg_match_all($this->regex, $text, $matches);
+
+        if (\implode('', $matches[1]) == '') {
+            return $this->dom->createTextNode($text);
         }
+        $fragment = $this->dom->createDocumentFragment();
 
-        protected function processMatch($match) {
-            if ($match === '@') {
-                return $this->dom->createTextNode('{');
-            }
-            $parts = preg_split("/[\s,]+/", $match, 2, PREG_SPLIT_NO_EMPTY);
-            $annotation = mb_substr($parts[0], 1);
-            if (preg_match('=^[a-zA-Z0-9]*$=', $annotation)) {
-                $parser = $this->factory->getParserInstanceFor($annotation);
-            } else {
-                $parser = $this->factory->getParserInstanceFor('invalid', $annotation);
-            }
-            if (isset($parts[1])) {
-                $parser->setPayload($parts[1]);
-            }
+        for ($x = 0; $x < $count; $x++) {
+            for ($t = 1; $t <= 3; $t++) {
+                if ($matches[$t][$x] == '') {
+                    continue;
+                }
 
-            $node = $parser->getObject(array())->asDom($this->dom);
-            foreach($node->childNodes as $child) {
-                if ($child instanceof \DOMText) {
-                    $node->replaceChild($this->doParse($child->wholeText), $child);
+                if ($t == 2) {
+                    $fragment->appendChild($this->processMatch($matches[$t][$x]));
+
+                    continue;
                 }
-            }
-            return $node;
+                $part = $matches[$t][$x];
 
+                if ($t == 3 && $part != '') {
+                    $part .= "\n";
+                }
+                $fragment->appendChild($this->dom->createTextNode($part));
+            }
         }
 
+        return $fragment;
     }
 
+    protected function processMatch($match) {
+        if ($match === '@') {
+            return $this->dom->createTextNode('{');
+        }
+        $parts      = \preg_split("/[\s,]+/", $match, 2, \PREG_SPLIT_NO_EMPTY);
+        $annotation = \mb_substr($parts[0], 1);
+
+        if (\preg_match('=^[a-zA-Z0-9]*$=', $annotation)) {
+            $parser = $this->factory->getParserInstanceFor($annotation);
+        } else {
+            $parser = $this->factory->getParserInstanceFor('invalid', $annotation);
+        }
+
+        if (isset($parts[1])) {
+            $parser->setPayload($parts[1]);
+        }
+
+        $node = $parser->getObject([])->asDom($this->dom);
+
+        foreach ($node->childNodes as $child) {
+            if ($child instanceof \DOMText) {
+                $node->replaceChild($this->doParse($child->wholeText), $child);
+            }
+        }
+
+        return $node;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/DescriptionParser.php phpdox-0.12.0/src/docblock/parser/DescriptionParser.php
--- phpdox-0.11.2/src/docblock/parser/DescriptionParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/DescriptionParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,57 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
+class DescriptionParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $compact = '';
 
-    class DescriptionParser extends GenericParser {
-
-        public function getObject(array $buffer) {
-            $compact = '';
-            if (count($buffer)) {
-                do {
-                    $line = array_shift($buffer);
-                    $compact .= ' ' . $line;
-                } while ($line != '' && mb_substr($line, -1) != '.');
-            }
-            $obj = $this->buildObject('generic', $buffer);
-            $obj->setCompact(trim($compact, " *\t"));
-            return $obj;
+        if (\count($buffer)) {
+            do {
+                $line = \array_shift($buffer);
+                $compact .= ' ' . $line;
+            } while ($line != '' && \mb_substr($line, -1) != '.');
         }
+        $obj = $this->buildObject('generic', $buffer);
+        $obj->setCompact(\trim($compact, " *\t"));
 
+        return $obj;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/GenericParser.php phpdox-0.12.0/src/docblock/parser/GenericParser.php
--- phpdox-0.11.2/src/docblock/parser/GenericParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/GenericParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,111 +1,77 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-    class GenericParser {
-
-        protected $factory;
-        protected $aliasMap;
-        protected $name;
-        protected $payload;
-
-        private $types = array(
-            '', 'null', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int',
-            'float', 'string', 'boolean', 'resource'
-        );
-
-        public function __construct(Factory $factory, $name) {
-            $this->factory = $factory;
-            $this->name = $name;
-        }
-
-        public function setAliasMap(array $map) {
-            $this->aliasMap = $map;
-        }
-
-        public function setPayload($payload) {
-            $this->payload = trim($payload);
-        }
-
-        public function getObject(array $buffer) {
-            $this->payload .= ' ' . implode(' ', array_map('trim', $buffer));
-            $obj = $this->buildObject('generic', []);
-            $obj->setValue(trim($this->payload));
-            return $obj;
-        }
-
-        protected function buildObject($classname, array $buffer) {
-            $obj = $this->factory->getElementInstanceFor($classname, $this->name);
-            if (count($buffer)) {
-                $obj->setBody(trim(join("\n", $buffer)));
-            }
-            return $obj;
-        }
-
-        protected function lookupType($type) {
-            if ($type === 'self' || $type === 'static') {
-                return $this->aliasMap['::unit'];
-            }
-
-            // Do not mess with scalar and fixed types
-            if (in_array($type, $this->types)) {
-                return $type;
-            }
-
-            // absolute definition?
-            if ($type[0] == '\\') {
-                return $type;
-            }
-
-            // alias?
-            if (isset($this->aliasMap[$type])) {
-                return $this->aliasMap[$type];
-            }
-
-            // relative to local namespace?
-            if (isset($this->aliasMap['::context'])) {
-                return $this->aliasMap['::context'] . '\\' . $type;
-            }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-            // don't know any better ..
-            return  $type;
+class GenericParser {
+    protected $factory;
+
+    protected $aliasMap;
+
+    protected $name;
+
+    protected $payload;
+
+    private $types = [
+        '', 'null', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int',
+        'float', 'string', 'boolean', 'resource'
+    ];
+
+    public function __construct(Factory $factory, $name) {
+        $this->factory = $factory;
+        $this->name    = $name;
+    }
+
+    public function setAliasMap(array $map): void {
+        $this->aliasMap = $map;
+    }
+
+    public function setPayload($payload): void {
+        $this->payload = \trim($payload);
+    }
+
+    public function getObject(array $buffer) {
+        $this->payload .= ' ' . \implode(' ', \array_map('trim', $buffer));
+        $obj = $this->buildObject('generic', []);
+        $obj->setValue(\trim($this->payload));
+
+        return $obj;
+    }
+
+    protected function buildObject($classname, array $buffer) {
+        $obj = $this->factory->getElementInstanceFor($classname, $this->name);
+
+        if (\count($buffer)) {
+            $obj->setBody(\trim(\implode("\n", $buffer)));
         }
 
+        return $obj;
     }
 
+    protected function lookupType($type) {
+        if ($type === 'self' || $type === 'static') {
+            return $this->aliasMap['::unit'];
+        }
+
+        // Do not mess with scalar and fixed types
+        if (\in_array($type, $this->types)) {
+            return $type;
+        }
+
+        // absolute definition?
+        if ($type[0] == '\\') {
+            return $type;
+        }
+
+        // alias?
+        if (isset($this->aliasMap[$type])) {
+            return $this->aliasMap[$type];
+        }
+
+        // relative to local namespace?
+        if (isset($this->aliasMap['::context'])) {
+            return $this->aliasMap['::context'] . '\\' . $type;
+        }
+
+        // don't know any better ..
+        return $type;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/InheritdocParser.php phpdox-0.12.0/src/docblock/parser/InheritdocParser.php
--- phpdox-0.11.2/src/docblock/parser/InheritdocParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/InheritdocParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,48 +1,8 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-   class InheritdocParser extends GenericParser {
-
-      public function getObject(array $buffer) {
-         return $this->buildObject('inheritdoc', $buffer);
-      }
-
-   }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
+class InheritdocParser extends GenericParser {
+    public function getObject(array $buffer) {
+        return $this->buildObject('inheritdoc', $buffer);
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/InternalParser.php phpdox-0.12.0/src/docblock/parser/InternalParser.php
--- phpdox-0.11.2/src/docblock/parser/InternalParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/InternalParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,50 +1,11 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
-
-   class InternalParser extends GenericParser {
-
-      public function getObject(array $buffer) {
-         $obj = $this->buildObject('generic', $buffer);
-         $obj->setBody($this->payload);
-         return $obj;
-      }
-
-   }
+class InternalParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $obj = $this->buildObject('generic', $buffer);
+        $obj->setBody($this->payload);
 
+        return $obj;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/InvalidParser.php phpdox-0.12.0/src/docblock/parser/InvalidParser.php
--- phpdox-0.11.2/src/docblock/parser/InvalidParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/InvalidParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,50 +1,11 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
-
-    class InvalidParser extends GenericParser {
-
-        public function getObject(array $buffer) {
-            $obj = $this->buildObject('invalid', $buffer);
-            $obj->setValue($this->payload);
-            return $obj;
-        }
+class InvalidParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $obj = $this->buildObject('invalid', $buffer);
+        $obj->setValue($this->payload);
 
+        return $obj;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/LicenseParser.php phpdox-0.12.0/src/docblock/parser/LicenseParser.php
--- phpdox-0.11.2/src/docblock/parser/LicenseParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/LicenseParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,50 +1,11 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
-
-   class LicenseParser extends GenericParser {
-
-      public function getObject(array $buffer) {
-          $obj = $this->buildObject('generic', $buffer);
-          $obj->setName($this->payload);
-          return $obj;
-      }
-
-   }
+class LicenseParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $obj = $this->buildObject('generic', $buffer);
+        $obj->setName($this->payload);
 
+        return $obj;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/LinkParser.php phpdox-0.12.0/src/docblock/parser/LinkParser.php
--- phpdox-0.11.2/src/docblock/parser/LinkParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/LinkParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,54 +1,15 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
+class LinkParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $obj   = $this->buildObject('link', $buffer);
+        $parts = \preg_split("/[\s,]+/", $this->payload, 2, \PREG_SPLIT_NO_EMPTY);
 
-    class LinkParser extends GenericParser {
-
-        public function getObject(array $buffer) {
-            $obj = $this->buildObject('link', $buffer);
-            $parts = preg_split("/[\s,]+/", $this->payload, 2, PREG_SPLIT_NO_EMPTY);
-            if (count($parts) == 1) {
-
-            }
-            $obj->setValue($this->payload);
-            return $obj;
+        if (\count($parts) == 1) {
         }
+        $obj->setValue($this->payload);
 
+        return $obj;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/ParamParser.php phpdox-0.12.0/src/docblock/parser/ParamParser.php
--- phpdox-0.11.2/src/docblock/parser/ParamParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/ParamParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,82 +1,49 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\DocBlock {
-
-    class ParamParser extends GenericParser {
-
-        public function getObject(array $buffer) {
-            $obj = $this->buildObject('var', $buffer);
-
-            $param = preg_split("/[\s,]+/", $this->payload, 3, PREG_SPLIT_NO_EMPTY);
-            switch(count($param)) {
-                case 3: {
-                    if ($param[0][0]=='$' || $param[1][0]=='$') {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
+
+class ParamParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $obj = $this->buildObject('var', $buffer);
+
+        $param = \preg_split("/[\s,]+/", $this->payload, 3, \PREG_SPLIT_NO_EMPTY);
+
+        switch (\count($param)) {
+            case 3:
+                {
+                    if ($param[0][0] == '$' || $param[1][0] == '$') {
                         $obj->setDescription($param[2]);
-                        // no break!
+                    // no break!
                     } else {
                         $obj->setDescription($param[1] . ' ' . $param[2]);
                         $obj->setType($this->lookupType($param[0]));
+
                         break;
                     }
                 }
-                case 2: {
-                    if ($param[0][0]=='$') {
+            case 2:
+                {
+                    if ($param[0][0] == '$') {
                         $obj->setVariable($param[0]);
                         $obj->setType($this->lookupType($param[1]));
                     } else {
                         $obj->setType($this->lookupType($param[0]));
                         $obj->setVariable($param[1]);
                     }
+
                     break;
                 }
-                case 1: {
-                    if ($param[0][0]=='$') {
+            case 1:
+                {
+                    if ($param[0][0] == '$') {
                         $obj->setVariable($param[0]);
                     } else {
                         $obj->setType($this->lookupType($param[0]));
                     }
+
                     break;
                 }
-            }
-
-            return $obj;
         }
 
+        return $obj;
     }
-
 }
diff -Nru phpdox-0.11.2/src/docblock/parser/VarParser.php phpdox-0.12.0/src/docblock/parser/VarParser.php
--- phpdox-0.11.2/src/docblock/parser/VarParser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/parser/VarParser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,23 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
 
-namespace TheSeer\phpDox\DocBlock {
+class VarParser extends GenericParser {
+    public function getObject(array $buffer) {
+        $obj = $this->buildObject('var', $buffer);
 
-    class VarParser extends GenericParser {
+        if ($this->payload != '') {
+            $parts = \preg_split("/[\s,]+/", $this->payload, 2, \PREG_SPLIT_NO_EMPTY);
 
-        public function getObject(array $buffer) {
-            $obj = $this->buildObject('var', $buffer);
-            if ($this->payload != '') {
-                $parts = preg_split("/[\s,]+/", $this->payload, 2, PREG_SPLIT_NO_EMPTY);
-                if (isset($parts[1])) {
-                    $obj->setDescription($parts[1]);
-                }
-                if (in_array($parts[0], array('self', 'static'))) {
-                    $obj->setResolution($parts[0]);
-                }
-                $obj->setType($this->lookupType($parts[0]));
+            if (isset($parts[1])) {
+                $obj->setDescription($parts[1]);
             }
-            return $obj;
+
+            if (\in_array($parts[0], ['self', 'static'])) {
+                $obj->setResolution($parts[0]);
+            }
+            $obj->setType($this->lookupType($parts[0]));
         }
-    }
 
+        return $obj;
+    }
 }
diff -Nru phpdox-0.11.2/src/docblock/Parser.php phpdox-0.12.0/src/docblock/Parser.php
--- phpdox-0.11.2/src/docblock/Parser.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/docblock/Parser.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,119 +1,91 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\DocBlock {
-
-    class Parser {
-
-        protected $factory;
-        protected $current = null;
-        protected $aliasMap = array();
-
-        public function __construct(Factory $factory) {
-            $this->factory = $factory;
-        }
-
-        public function parse($block, array $aliasMap) {
-            $this->aliasMap = $aliasMap;
-            $this->current = null;
-
-            $docBlock = $this->factory->getDocBlock();
-            $lines = $this->prepare($block);
-            if (count($lines)>1) {
-                $this->startParser('description');
-            }
-            $buffer = array();
-            foreach($lines as $line) {
-                if ($line == '' || $line == '/') {
-                    if (count($buffer)) {
-                        $buffer[] = '';
-                    }
-                    continue;
-                }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
+
+class Parser {
+    protected $factory;
+
+    protected $current;
+
+    protected $aliasMap = [];
+
+    public function __construct(Factory $factory) {
+        $this->factory = $factory;
+    }
 
-                if ($line[0]=='@') {
-                    if ($this->current !== null) {
-                        $docBlock->appendElement(
-                            $this->current->getObject($buffer)
-                        );
-                    }
-                    $buffer = array();
-
-                    preg_match('/^\@([a-zA-Z0-9_]+)(.*)$/', $line, $lineParts);
-                    $name      = ( isset( $lineParts[1] ) ? $lineParts[1] : '(undefined)');
-                    $payload   = ( isset( $lineParts[2] ) ? trim($lineParts[2]) : '' );
+    public function parse($block, array $aliasMap) {
+        $this->aliasMap = $aliasMap;
+        $this->current  = null;
 
-                    $this->startParser($name, $payload);
-                    continue;
+        $docBlock = $this->factory->getDocBlock();
+        $lines    = $this->prepare((string)$block);
+
+        if (\count($lines) > 1) {
+            $this->startParser('description');
+        }
+        $buffer = [];
+
+        foreach ($lines as $line) {
+            if ($line == '' || $line == '/') {
+                if (\count($buffer)) {
+                    $buffer[] = '';
                 }
-                $buffer[] = $line;
+
+                continue;
             }
-            if (!$this->current) {
-                // A Single line docblock with no @ annotation is considered a description
-                $this->startParser('description');
+
+            if ($line[0] == '@') {
+                if ($this->current !== null) {
+                    $docBlock->appendElement(
+                        $this->current->getObject($buffer)
+                    );
+                }
+                $buffer = [];
+
+                \preg_match('/^\@([a-zA-Z0-9_]+)(.*)$/', $line, $lineParts);
+                $name    = ($lineParts[1] ?? '(undefined)');
+                $payload = (isset($lineParts[2]) ? \trim($lineParts[2]) : '');
+
+                $this->startParser($name, $payload);
+
+                continue;
             }
-            $docBlock->appendElement(
-                $this->current->getObject($buffer)
-            );
-            return $docBlock;
+            $buffer[] = $line;
         }
 
-        protected function prepare($block) {
-            $block = str_replace(array("\r\n", "\r"), "\n", mb_substr($block, 3, -2));
-            $raw = array();
-            foreach(explode("\n", $block) as $line) {
-                $line = preg_replace('/^\s*\*? ?/', '', $line);
-                $raw[] = rtrim($line, " \n\t*");
-            }
-            return $raw;
+        if (!$this->current) {
+            // A Single line docblock with no @ annotation is considered a description
+            $this->startParser('description');
         }
+        $docBlock->appendElement(
+            $this->current->getObject($buffer)
+        );
 
-        protected function startParser($name, $payload = NULL) {
-            if (!preg_match('/^[a-zA-Z0-9-_\.]*$/', $name) || empty($name)) {
-                // TODO: errorlog
-                $this->current = $this->factory->getParserInstanceFor('invalid', $name);
-            } else {
-                $this->current = $this->factory->getParserInstanceFor($name);
-            }
-            $this->current->setAliasMap($this->aliasMap);
-            if ($payload !== NULL) {
-                $this->current->setPayload($payload);
-            }
+        return $docBlock;
+    }
+
+    protected function prepare($block) {
+        $block = \str_replace(["\r\n", "\r"], "\n", \mb_substr($block, 3, -2));
+        $raw   = [];
+
+        foreach (\explode("\n", $block) as $line) {
+            $line  = \preg_replace('/^\s*\*? ?/', '', $line);
+            $raw[] = \rtrim($line, " \n\t*");
         }
 
+        return $raw;
     }
 
+    protected function startParser($name, $payload = null): void {
+        if (!\preg_match('/^[a-zA-Z0-9-_\.]*$/', $name) || empty($name)) {
+            // TODO: errorlog
+            $this->current = $this->factory->getParserInstanceFor('invalid', $name);
+        } else {
+            $this->current = $this->factory->getParserInstanceFor($name);
+        }
+        $this->current->setAliasMap($this->aliasMap);
+
+        if ($payload !== null) {
+            $this->current->setPayload($payload);
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/AbstractEvent.php phpdox-0.12.0/src/generator/AbstractEvent.php
--- phpdox-0.11.2/src/generator/AbstractEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/AbstractEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,52 +1,13 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
+ * Class AbstractEvent
  */
-namespace TheSeer\phpDox\Generator {
-
-    /**
-     * Class AbstractEvent
-     */
-    abstract class AbstractEvent {
-
-        public function getType() {
-            return $this->getEventName();
-        }
-
-        abstract protected function getEventName();
+abstract class AbstractEvent {
+    public function getType() {
+        return $this->getEventName();
     }
 
+    abstract protected function getEventName();
 }
diff -Nru phpdox-0.11.2/src/generator/engine/AbstractEngine.php phpdox-0.12.0/src/generator/engine/AbstractEngine.php
--- phpdox-0.11.2/src/generator/engine/AbstractEngine.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/AbstractEngine.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,126 +1,96 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Generator\Engine {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fXSL\fXSLTProcessor;
-    use TheSeer\phpDox\DirectoryCleaner;
-    use TheSeer\phpDox\FileInfo;
-
-    abstract class AbstractEngine implements EngineInterface {
-
-        protected function getXSLTProcessor($template) {
-            $tpl = new fDomDocument();
-            $tpl->load($template);
-            if (stripos(PHP_OS, 'Linux') !== 0) {
-                $this->resolveImports($tpl);
-            }
-            return new fXSLTProcessor($tpl);
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
+
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fXSL\fXSLTProcessor;
+use TheSeer\phpDox\DirectoryCleaner;
+use TheSeer\phpDox\FileInfo;
+
+abstract class AbstractEngine implements EngineInterface {
+    protected function getXSLTProcessor($template) {
+        $tpl = new fDomDocument();
+        $tpl->load($template);
+
+        if (\stripos(\PHP_OS, 'Linux') !== 0) {
+            $this->resolveImports($tpl);
         }
 
-        protected function clearDirectory($path) {
-            $cleaner = new DirectoryCleaner();
-            $cleaner->process(new FileInfo($path));
+        return new fXSLTProcessor($tpl);
+    }
+
+    protected function clearDirectory($path): void {
+        $cleaner = new DirectoryCleaner();
+        $cleaner->process(new FileInfo((string)$path));
+    }
+
+    protected function saveDomDocument(\DOMDocument $dom, $filename, $format = true) {
+        $path = \dirname($filename);
+        \clearstatcache();
+
+        if (!\file_exists($path)) {
+            \mkdir($path, 0777, true);
         }
+        $dom->formatOutput = $format;
 
-        protected function saveDomDocument(\DOMDocument $dom, $filename, $format = true) {
-            $path = dirname($filename);
-            clearstatcache();
-            if (!file_exists($path)) {
-                mkdir($path, 0777, true);
-            }
-            $dom->formatOutput = $format;
-            return $dom->save($filename);
+        return $dom->save($filename);
+    }
+
+    protected function saveFile($content, $filename) {
+        $path = \dirname($filename);
+        \clearstatcache();
+
+        if (!\file_exists($path)) {
+            \mkdir($path, 0777, true);
         }
 
-        protected function saveFile($content, $filename) {
-            $path = dirname($filename);
-            clearstatcache();
-            if (!file_exists($path)) {
-                mkdir($path, 0777, true);
-            }
-            return file_put_contents($filename, $content);
+        return \file_put_contents($filename, $content);
+    }
+
+    protected function copyStatic($path, $dest, $recursive = true): void {
+        $len = \mb_strlen($path);
+
+        if ($recursive) {
+            $worker = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
+        } else {
+            $worker = new \DirectoryIterator($path);
         }
 
-        protected function copyStatic($path, $dest, $recursive = true) {
-            $len  = mb_strlen($path);
-            if ($recursive) {
-                $worker = new \RecursiveIteratorIterator(new \RecursiveDirectoryIterator($path));
-            } else {
-                $worker = new \DirectoryIterator($path);
+        foreach ($worker as $x) {
+            if ($x->isDir() && ($x->getFilename() == '.' || $x->getFilename() == '..')) {
+                continue;
             }
-            foreach($worker as $x) {
-                if($x->isDir() && ($x->getFilename() == "." || $x->getFilename() == "..")) {
-                    continue;
-                }
-                $target = $dest . mb_substr($x->getPathname(), $len);
-                if (!file_exists(dirname($target))) {
-                    mkdir(dirname($target), 0777, true);
-                }
-                copy($x->getPathname(), $target);
+            $target = $dest . \mb_substr($x->getPathname(), $len);
+
+            if (!\file_exists(\dirname($target))) {
+                \mkdir(\dirname($target), 0777, true);
             }
+            \copy($x->getPathname(), $target);
         }
+    }
 
-        private function resolveImports(fDOMDocument $doc) {
-            $doc->registerNamespace('xsl', 'http://www.w3.org/1999/XSL/Transform');
-            $baseDir = dirname($doc->documentURI);
-            $baseElement = $doc->documentElement;
-            foreach($doc->query('/xsl:stylesheet/xsl:import') as $importNode) {
-                /** @var $importNode \DOMElement */
-                $import = new fDOMDocument();
-                $import->load($baseDir . '/' . $importNode->getAttribute('href'));
-
-                $newParent = $importNode->parentNode;
-                foreach ($import->documentElement->childNodes as $child) {
-                    if ($child->localName === 'output') {
-                        continue;
-                    }
-                    $importedChild = $doc->importNode($child, true);
-                    $newParent->insertBefore($importedChild, $importNode);
+    private function resolveImports(fDOMDocument $doc): void {
+        $doc->registerNamespace('xsl', 'http://www.w3.org/1999/XSL/Transform');
+        $baseDir = \dirname($doc->documentURI);
+
+        foreach ($doc->query('/xsl:stylesheet/xsl:import') as $importNode) {
+            /** @var $importNode \DOMElement */
+            $import = new fDOMDocument();
+            $import->load($baseDir . '/' . $importNode->getAttribute('href'));
+
+            $newParent = $importNode->parentNode;
+
+            foreach ($import->documentElement->childNodes as $child) {
+                if ($child->localName === 'output') {
+                    continue;
                 }
-                $newParent->removeChild($importNode);
+                $importedChild = $doc->importNode($child, true);
+                $newParent->insertBefore($importedChild, $importNode);
             }
+            $newParent->removeChild($importNode);
         }
-
-    }
-
-    class EngineException extends \Exception {
-        const UnexpectedError = 1;
     }
+}
 
+class EngineException extends \Exception {
+    public const UnexpectedError = 1;
 }
diff -Nru phpdox-0.11.2/src/generator/engine/EngineInterface.php phpdox-0.12.0/src/generator/engine/EngineInterface.php
--- phpdox-0.11.2/src/generator/engine/EngineInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/EngineInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,45 +1,6 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator\Engine {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
 
-    interface EngineInterface {
-
-        public function registerEventHandlers(EventHandlerRegistry $registry);
-
-    }
+interface EngineInterface {
+    public function registerEventHandlers(EventHandlerRegistry $registry);
 }
diff -Nru phpdox-0.11.2/src/generator/engine/EventHandlerRegistry.php phpdox-0.12.0/src/generator/engine/EventHandlerRegistry.php
--- phpdox-0.11.2/src/generator/engine/EventHandlerRegistry.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/EventHandlerRegistry.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,82 +1,83 @@
-<?php
-namespace TheSeer\phpDox\Generator\Engine {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
 
-    class EventHandlerRegistry {
+class EventHandlerRegistry {
+    private $events = [
+        'phpdox.start' => [],
+        'phpdox.end'   => [],
+
+        'phpdox.namespaces.start' => [],
+        'phpdox.namespaces.end'   => [],
+
+        'phpdox.classes.start'    => [],
+        'phpdox.classes.end'      => [],
+        'phpdox.traits.start'     => [],
+        'phpdox.traits.end'       => [],
+        'phpdox.interfaces.start' => [],
+        'phpdox.interfaces.end'   => [],
+
+        'namespace.start'            => [],
+        'namespace.classes.start'    => [],
+        'namespace.classes.end'      => [],
+        'namespace.traits.start'     => [],
+        'namespace.traits.end'       => [],
+        'namespace.interfaces.start' => [],
+        'namespace.interfaces.end'   => [],
+        'namespace.end'              => [],
+
+        'class.start'    => [],
+        'class.constant' => [],
+        'class.member'   => [],
+        'class.method'   => [],
+        'class.end'      => [],
+
+        'trait.start'    => [],
+        'trait.constant' => [],
+        'trait.member'   => [],
+        'trait.method'   => [],
+        'trait.end'      => [],
+
+        'interface.start'    => [],
+        'interface.constant' => [],
+        'interface.method'   => [],
+        'interface.end'      => [],
+
+        'token.file.start' => [],
+        'token.line.start' => [],
+        'token.token'      => [],
+        'token.line.end'   => [],
+        'token.file.end'   => []
+    ];
+
+    public function addHandler($eventType, $instance, $method): void {
+        if (!\method_exists($instance, $method)) {
+            throw new EventHandlerRegistryException("Handler '$method' not defined", EventHandlerRegistryException::MethodNotDefined);
+        }
 
-        private $events = array(
-            'phpdox.start' => array(),
-            'phpdox.end' => array(),
-
-            'phpdox.namespaces.start' => array(),
-            'phpdox.namespaces.end' => array(),
-
-            'phpdox.classes.start' => array(),
-            'phpdox.classes.end' => array(),
-            'phpdox.traits.start' => array(),
-            'phpdox.traits.end' => array(),
-            'phpdox.interfaces.start' => array(),
-            'phpdox.interfaces.end' => array(),
-
-            'namespace.start' => array(),
-            'namespace.classes.start' => array(),
-            'namespace.classes.end' => array(),
-            'namespace.traits.start' => array(),
-            'namespace.traits.end' => array(),
-            'namespace.interfaces.start' => array(),
-            'namespace.interfaces.end' => array(),
-            'namespace.end' => array(),
-
-            'class.start' => array(),
-            'class.constant' => array(),
-            'class.member' => array(),
-            'class.method' => array(),
-            'class.end' => array(),
-
-            'trait.start' => array(),
-            'trait.constant' => array(),
-            'trait.member' => array(),
-            'trait.method' => array(),
-            'trait.end' => array(),
-
-            'interface.start' => array(),
-            'interface.constant' => array(),
-            'interface.method' => array(),
-            'interface.end' => array(),
-
-            'token.file.start' => array(),
-            'token.line.start' => array(),
-            'token.token' => array(),
-            'token.line.end' => array(),
-            'token.file.end' => array()
-        );
-
-        public function addHandler($eventType, $instance, $method) {
-            if (!method_exists($instance, $method)) {
-                throw new EventHandlerRegistryException("Handler '$method' not defined", EventHandlerRegistryException::MethodNotDefined);
-            }
-            if (!isset($this->events[$eventType])) {
-                throw new EventHandlerRegistryException("Event '$eventType' is not defined", EventHandlerRegistryException::EventNotDefined);
-            }
-            $key = spl_object_hash($instance) . '::' . $method;
-            if (isset($this->events[$eventType][$key])) {
-                throw new EventHandlerRegistryException("Handler already registered for this event", EventHandlerRegistryException::AlreadyRegistered);
-            }
-            $this->events[$eventType][$key] = array($instance, $method);
+        if (!isset($this->events[$eventType])) {
+            throw new EventHandlerRegistryException("Event '$eventType' is not defined", EventHandlerRegistryException::EventNotDefined);
         }
+        $key = \spl_object_hash($instance) . '::' . $method;
 
-        public function getHandlersForEvent($eventType) {
-            if (!isset($this->events[$eventType])) {
-                throw new EventHandlerRegistryException("Event '$eventType' is not defined", EventHandlerRegistryException::EventNotDefined);
-            }
-            return array_values($this->events[$eventType]);
+        if (isset($this->events[$eventType][$key])) {
+            throw new EventHandlerRegistryException('Handler already registered for this event', EventHandlerRegistryException::AlreadyRegistered);
         }
+        $this->events[$eventType][$key] = [$instance, $method];
     }
 
-    class EventHandlerRegistryException extends \Exception {
+    public function getHandlersForEvent($eventType) {
+        if (!isset($this->events[$eventType])) {
+            throw new EventHandlerRegistryException("Event '$eventType' is not defined", EventHandlerRegistryException::EventNotDefined);
+        }
 
-        const MethodNotDefined  = 1;
-        const EventNotDefined   = 2;
-        const AlreadyRegistered = 4;
+        return \array_values($this->events[$eventType]);
     }
+}
+
+class EventHandlerRegistryException extends \Exception {
+    public const MethodNotDefined = 1;
+
+    public const EventNotDefined = 2;
 
+    public const AlreadyRegistered = 4;
 }
diff -Nru phpdox-0.11.2/src/generator/engine/Factory.php phpdox-0.12.0/src/generator/engine/Factory.php
--- phpdox-0.11.2/src/generator/engine/Factory.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/Factory.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,87 +1,51 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator\Engine {
-
-    use TheSeer\phpDox\BuildConfig;
-    use TheSeer\phpDox\FactoryInterface;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
 
-    class Factory {
+use TheSeer\phpDox\BuildConfig;
+use TheSeer\phpDox\FactoryInterface;
 
-        protected $engines = array();
-        protected $configs = array();
+class Factory {
+    protected $engines = [];
 
-        public function addEngineClass($name, $class) {
-            $this->engines[$name] = $class;
-        }
+    protected $configs = [];
 
-        public function addEngineFactory($name, FactoryInterface $factory) {
-            $this->engines[$name] = $factory;
-        }
+    public function addEngineClass($name, $class): void {
+        $this->engines[$name] = $class;
+    }
+
+    public function addEngineFactory($name, FactoryInterface $factory): void {
+        $this->engines[$name] = $factory;
+    }
+
+    public function getEngineList() {
+        return \array_keys($this->engines);
+    }
+
+    public function setConfigClass($name, $class): void {
+        $this->configs[$name] = $class;
+    }
 
-        public function getEngineList() {
-            return array_keys($this->engines);
+    public function getInstanceFor(BuildConfig $buildCfg) {
+        $name = $buildCfg->getEngine();
+
+        if (!isset($this->engines[$name])) {
+            throw new FactoryException("Engine '$name' is not registered.", FactoryException::UnknownEngine);
         }
 
-        public function setConfigClass($name, $class) {
-            $this->configs[$name] = $class;
+        if (isset($this->configs[$name])) {
+            $cfg = new $this->configs[$name]($buildCfg->getGeneratorConfig(), $buildCfg->getBuildNode());
+        } else {
+            $cfg = $buildCfg;
         }
 
-        public function getInstanceFor(BuildConfig $buildCfg) {
-            $name = $buildCfg->getEngine();
-            if (!isset($this->engines[$name])) {
-                throw new FactoryException("Engine '$name' is not registered.", FactoryException::UnknownEngine);
-            }
-
-            if (isset($this->configs[$name])) {
-                $cfg = new $this->configs[$name]($buildCfg->getGeneratorConfig(), $buildCfg->getBuildNode());
-            } else {
-                $cfg = $buildCfg;
-            }
-
-            if ($this->engines[$name] instanceof FactoryInterface) {
-                return $this->engines[$name]->getInstanceFor($name, $cfg);
-            }
-            return new $this->engines[$name]($cfg);
+        if ($this->engines[$name] instanceof FactoryInterface) {
+            return $this->engines[$name]->getInstanceFor($name, $cfg);
         }
 
+        return new $this->engines[$name]($cfg);
     }
+}
 
-    class FactoryException extends \Exception {
-        const UnknownEngine = 1;
-    }
+class FactoryException extends \Exception {
+    public const UnknownEngine = 1;
 }
diff -Nru phpdox-0.11.2/src/generator/engine/html/HtmlConfig.php phpdox-0.12.0/src/generator/engine/html/HtmlConfig.php
--- phpdox-0.11.2/src/generator/engine/html/HtmlConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/html/HtmlConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,68 +1,37 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Generator\Engine {
-
-    class HtmlConfig extends \TheSeer\phpDox\BuildConfig {
-
-        public function getTemplateDirectory() {
-            $default = $this->getGeneratorConfig()->getProjectConfig()->getHomeDirectory()->getPathname();
-            $default .= '/templates/html';
-            $node = $this->ctx->queryOne('cfg:template');
-            if (!$node) {
-                return $default;
-            }
-            if ($node->hasAttribute('path')) {
-                return $node->getAttribute('path', $default);
-            }
-            return $node->getAttribute('dir', $default);
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
+
+class HtmlConfig extends \TheSeer\phpDox\BuildConfig {
+    public function getTemplateDirectory() {
+        $default = $this->getGeneratorConfig()->getProjectConfig()->getHomeDirectory()->getPathname();
+        $default .= '/templates/html';
+        $node = $this->ctx->queryOne('cfg:template');
+
+        if (!$node) {
+            return $default;
         }
 
-        public function getResourceDirectory() {
-            $default = $this->getTemplateDirectory() . '/static';
-            $node = $this->ctx->queryOne('cfg:resource');
-            if (!$node) {
-                return $default;
-            }
+        if ($node->hasAttribute('path')) {
             return $node->getAttribute('path', $default);
         }
 
-        public function getFileExtension() {
-            $res = $this->ctx->queryOne('cfg:file/@extension');
-            return $res === NULL ? 'xhtml' : $res->nodeValue;
+        return $node->getAttribute('dir', $default);
+    }
+
+    public function getResourceDirectory() {
+        $default = $this->getTemplateDirectory() . '/static';
+        $node    = $this->ctx->queryOne('cfg:resource');
+
+        if (!$node) {
+            return $default;
         }
+
+        return $node->getAttribute('path', $default);
+    }
+
+    public function getFileExtension() {
+        $res = $this->ctx->queryOne('cfg:file/@extension');
+
+        return $res === null ? 'xhtml' : $res->nodeValue;
     }
 }
diff -Nru phpdox-0.11.2/src/generator/engine/html/Html.php phpdox-0.12.0/src/generator/engine/html/Html.php
--- phpdox-0.11.2/src/generator/engine/html/Html.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/html/Html.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,291 +1,267 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Generator\Engine {
-
-    use TheSeer\fDom\fDomDocument;
-    use TheSeer\fXSL\fXSLTProcessor;
-
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\Generator\AbstractEvent;
-    use TheSeer\phpDox\Generator\ClassMethodEvent;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\InterfaceMethodEvent;
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-    use TheSeer\phpDox\Generator\PHPDoxEndEvent;
-    use TheSeer\phpDox\Generator\PHPDoxStartEvent;
-    use TheSeer\phpDox\Generator\TokenFileStartEvent;
-    use TheSeer\phpDox\Generator\TraitMethodEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
-
-    class Html extends AbstractEngine {
-
-        /**
-         * @var fXSLTProcessor
-         */
-        private $xslClass;
-
-        /**
-         * @var fXSLTProcessor
-         */
-        private $xslInterface;
-
-        /**
-         * @var fXSLTProcessor
-         */
-        private $xslMethod;
-
-        /**
-         * @var fXSLTProcessor
-         */
-        private $xslSource;
-
-        private $templateDir;
-        private $resourceDir;
-        private $outputDir;
-        private $projectNode;
-        private $extension;
-        private $workDir;
-        private $sourceDir;
-
-        private $hasNamespaces = false;
-        private $hasInterfaces = false;
-        private $hasTraits = false;
-        private $hasClasses = false;
-        private $hasReports;
-
-        public function __construct(HtmlConfig $config) {
-            $this->templateDir = $config->getTemplateDirectory();
-            $this->resourceDir = $config->getResourceDirectory();
-            $this->outputDir = $config->getOutputDirectory();
-            $this->projectNode = $config->getProjectNode();
-            $this->extension = $config->getFileExtension();
-            $this->workDir = $config->getWorkDirectory();
-            $this->sourceDir = $config->getSourceDirectory();
-            $this->hasReports = false; // $config->getReports()->count() ?
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
 
-        public function registerEventHandlers(EventHandlerRegistry $registry) {
-            $registry->addHandler('phpdox.start', $this, 'buildStart');
-            $registry->addHandler('class.start', $this, 'buildClass');
-            $registry->addHandler('trait.start', $this, 'buildTrait');
-            $registry->addHandler('interface.start', $this, 'buildInterface');
-            $registry->addHandler('class.method', $this, 'buildClassMethod');
-            $registry->addHandler('trait.method', $this, 'buildTraitMethod');
-            $registry->addHandler('interface.method', $this, 'buildInterfaceMethod');
-            $registry->addHandler('token.file.start', $this, 'buildSource');
-            $registry->addHandler('phpdox.end', $this, 'buildFinish');
-        }
+use TheSeer\fDom\fDomDocument;
+use TheSeer\fXSL\fXSLTProcessor;
+use TheSeer\phpDox\Generator\ClassMethodEvent;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\InterfaceMethodEvent;
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
+use TheSeer\phpDox\Generator\PHPDoxEndEvent;
+use TheSeer\phpDox\Generator\PHPDoxStartEvent;
+use TheSeer\phpDox\Generator\TokenFileStartEvent;
+use TheSeer\phpDox\Generator\TraitMethodEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
 
-        protected function getXSLTProcessor($template) {
-            $xsl = parent::getXSLTProcessor($this->templateDir . '/' . $template);
-            $xsl->setParameter('', 'extension', $this->extension);
-            $xsl->setParameter('', 'xml', $this->workDir->asFileUri() . '/');
-
-            $xsl->setParameter('', 'hasNamespaces', $this->hasNamespaces ? 'Y' : 'N');
-            $xsl->setParameter('', 'hasInterfaces', $this->hasInterfaces ? 'Y' : 'N');
-            $xsl->setParameter('', 'hasTraits', $this->hasTraits ? 'Y' : 'N');
-            $xsl->setParameter('', 'hasClasses', $this->hasClasses ? 'Y' : 'N');
-            $xsl->setParameter('', 'hasReports', $this->hasReports ? 'Y' : 'N');
+class Html extends AbstractEngine {
+    /**
+     * @var fXSLTProcessor
+     */
+    private $xslClass;
 
-            if ($this->projectNode->hasAttribute('name')) {
-                $xsl->setParameter('', 'project', $this->projectNode->getAttribute('name'));
-            }
+    /**
+     * @var fXSLTProcessor
+     */
+    private $xslInterface;
 
-            return $xsl;
-        }
+    /**
+     * @var fXSLTProcessor
+     */
+    private $xslMethod;
 
-        public function buildStart(PHPDoxStartEvent $event) {
-            $this->clearDirectory($this->outputDir);
+    /**
+     * @var fXSLTProcessor
+     */
+    private $xslSource;
 
-            $index = $event->getIndex();
-            $this->hasNamespaces = $index->hasNamespaces();
-            $this->hasInterfaces = $index->hasInterfaces();
-            $this->hasTraits = $index->hasTraits();
-            $this->hasClasses = $index->hasClasses();
+    private $templateDir;
 
-            $this->xslClass = $this->getXSLTProcessor('class.xsl');
-            $this->xslClass->setParameter('', 'base', '../');
+    private $resourceDir;
 
-            $this->xslInterface = $this->getXSLTProcessor('interface.xsl');
-            $this->xslInterface->setParameter('', 'base', '../');
+    private $outputDir;
 
-            $this->xslMethod = $this->getXSLTProcessor('method.xsl');
-            $this->xslMethod->setParameter('', 'base', '../../');
+    private $projectNode;
 
-            $this->xslSource = $this->getXSLTProcessor('source.xsl');
-        }
+    private $extension;
 
-        private function renderIndexPages(fDOMDocument $indexDom) {
-            $proc = $this->getXSLTProcessor('index.xsl');
-            $proc->setParameter('', 'project', $this->projectNode->getAttribute('name'));
-            $html = $proc->transformToDoc($indexDom);
-            $this->saveDomDocument($html, $this->outputDir . '/index.' . $this->extension);
-
-            $proc = $this->getXSLTProcessor('namespaces.xsl');
-            $html = $proc->transformToDoc($indexDom);
-            $this->saveDomDocument($html, $this->outputDir . '/namespaces.' . $this->extension);
-
-            $proc = $this->getXSLTProcessor('units.xsl');
-            $html = $proc->transformToDoc($indexDom);
-            $this->saveDomDocument($html, $this->outputDir . '/classes.' . $this->extension);
-
-            $proc->setParameter('', 'mode', 'interface');
-            $proc->setParameter('', 'title', 'Interfaces');
-            $html = $proc->transformToDoc($indexDom);
-            $this->saveDomDocument($html, $this->outputDir . '/interfaces.' . $this->extension);
-
-            $proc->setParameter('', 'mode', 'trait');
-            $proc->setParameter('', 'title', 'Traits');
-            $html = $proc->transformToDoc($indexDom);
-            $this->saveDomDocument($html, $this->outputDir . '/traits.' . $this->extension);
-        }
+    private $workDir;
 
-        private function renderSourceIndexes(fDOMDocument $treeDom) {
-            $proc = $this->getXSLTProcessor('directory.xsl');
-            $dirList = $treeDom->query('/phpdox:source//phpdox:dir');
-            foreach($dirList as $dirNode) {
-                $dirNode->setAttributeNS('ctx://engine/html', 'ctx:engine', 'current');
-
-                $parents = $dirNode->query('ancestor-or-self::phpdox:dir');
-                $elements = array();
-                foreach($parents as $parent) {
-                    $elements[] = $parent->getAttribute('name');
-                }
-                $elements[0] = $this->outputDir . '/source';
-                $elements[] = 'index.' . $this->extension;
+    private $sourceDir;
 
-                $proc->setParameter('', 'base', str_repeat('../', count($elements) - 1));
-                $this->saveDomDocument( $proc->transformToDoc($treeDom), join('/', $elements));
+    private $hasNamespaces = false;
 
-                $dirNode->removeAttributeNS('ctx://engine/html', 'engine');
-            }
-        }
+    private $hasInterfaces = false;
 
-        public function buildFinish(PHPDoxEndEvent $event) {
-            $this->renderIndexPages($event->getIndex()->asDom());
-            $this->renderSourceIndexes($event->getTree()->asDom());
-            $this->copyStatic($this->resourceDir, $this->outputDir, TRUE);
-        }
+    private $hasTraits = false;
 
-        public function buildClass(ClassStartEvent $event) {
-            $this->xslClass->setParameter('', 'type', 'classes');
-            $this->xslClass->setParameter('', 'title', 'Classes');
-            $html = $this->xslClass->transformToDoc($event->getClass()->asDom());
-            $this->saveDomDocument($html, $this->outputDir . '/classes/' .
-                $this->classNameToFileName($event->getClass()->getFullName())
-            );
-        }
+    private $hasClasses = false;
 
-        public function buildTrait(TraitStartEvent $event) {
-            $this->xslClass->setParameter('', 'type', 'traits');
-            $this->xslClass->setParameter('', 'title', 'Traits');
-            $html = $this->xslClass->transformToDoc($event->getTrait()->asDom());
-            $this->saveDomDocument($html, $this->outputDir . '/traits/' .
-                $this->classNameToFileName($event->getTrait()->getFullName())
-            );
-        }
+    private $hasReports;
 
-        public function buildInterface(InterfaceStartEvent $event) {
-            $html = $this->xslInterface->transformToDoc($event->getInterface()->asDom());
-            $this->saveDomDocument($html, $this->outputDir . '/interfaces/' .
-                $this->classNameToFileName($event->getInterface()->getFullName())
-            );
-        }
+    public function __construct(HtmlConfig $config) {
+        $this->templateDir = $config->getTemplateDirectory();
+        $this->resourceDir = $config->getResourceDirectory();
+        $this->outputDir   = $config->getOutputDirectory();
+        $this->projectNode = $config->getProjectNode();
+        $this->extension   = $config->getFileExtension();
+        $this->workDir     = $config->getWorkDirectory();
+        $this->sourceDir   = $config->getSourceDirectory();
+        $this->hasReports  = false; // $config->getReports()->count() ?
+    }
 
-        public function buildClassMethod(ClassMethodEvent $event) {
-            $this->genericMethodBuild(
-                $event->getClass()->asDom(),
-                'classes',
-                $event->getClass()->getFullName(),
-                $event->getMethod()->getName()
-            );
-        }
+    public function registerEventHandlers(EventHandlerRegistry $registry): void {
+        $registry->addHandler('phpdox.start', $this, 'buildStart');
+        $registry->addHandler('class.start', $this, 'buildClass');
+        $registry->addHandler('trait.start', $this, 'buildTrait');
+        $registry->addHandler('interface.start', $this, 'buildInterface');
+        $registry->addHandler('class.method', $this, 'buildClassMethod');
+        $registry->addHandler('trait.method', $this, 'buildTraitMethod');
+        $registry->addHandler('interface.method', $this, 'buildInterfaceMethod');
+        $registry->addHandler('token.file.start', $this, 'buildSource');
+        $registry->addHandler('phpdox.end', $this, 'buildFinish');
+    }
 
-        public function buildTraitMethod(TraitMethodEvent $event) {
-            $this->genericMethodBuild(
-                $event->getTrait()->asDom(),
-                'traits',
-                $event->getTrait()->getFullName(),
-                $event->getMethod()->getName()
-            );
-        }
+    public function buildStart(PHPDoxStartEvent $event): void {
+        $this->clearDirectory($this->outputDir);
 
-        public function buildInterfaceMethod(InterfaceMethodEvent $event) {
-            $this->genericMethodBuild(
-                $event->getInterface()->asDom(),
-                'interfaces',
-                $event->getInterface()->getFullName(),
-                $event->getMethod()->getName()
-            );
-        }
+        $index               = $event->getIndex();
+        $this->hasNamespaces = $index->hasNamespaces();
+        $this->hasInterfaces = $index->hasInterfaces();
+        $this->hasTraits     = $index->hasTraits();
+        $this->hasClasses    = $index->hasClasses();
 
-        public function buildSource(TokenFileStartEvent $event) {
-            $path = $event->getTokenFile()->getRelativeName($this->sourceDir);
-            $base = str_repeat('../', count(explode('/', $path)));
-            $this->xslSource->setParameter('', 'base', $base);
-
-            $html = $this->xslSource->transformToDoc($event->getTokenFile()->asDom());
-            $this->saveDomDocument(
-                $html,
-                $this->outputDir . '/source/' . $path . '.' . $this->extension,
-                FALSE
-            );
+        $this->xslClass = $this->getXSLTProcessor('class.xsl');
+        $this->xslClass->setParameter('', 'base', '../');
 
-        }
+        $this->xslInterface = $this->getXSLTProcessor('interface.xsl');
+        $this->xslInterface->setParameter('', 'base', '../');
+
+        $this->xslMethod = $this->getXSLTProcessor('method.xsl');
+        $this->xslMethod->setParameter('', 'base', '../../');
+
+        $this->xslSource = $this->getXSLTProcessor('source.xsl');
+    }
+
+    public function buildFinish(PHPDoxEndEvent $event): void {
+        $this->renderIndexPages($event->getIndex()->asDom());
+        $this->renderSourceIndexes($event->getTree()->asDom());
+        $this->copyStatic($this->resourceDir, $this->outputDir, true);
+    }
+
+    public function buildClass(ClassStartEvent $event): void {
+        $this->xslClass->setParameter('', 'type', 'classes');
+        $this->xslClass->setParameter('', 'title', 'Classes');
+        $html = $this->xslClass->transformToDoc($event->getClass()->asDom());
+        $this->saveDomDocument(
+            $html,
+            $this->outputDir . '/classes/' .
+            $this->classNameToFileName($event->getClass()->getFullName())
+        );
+    }
+
+    public function buildTrait(TraitStartEvent $event): void {
+        $this->xslClass->setParameter('', 'type', 'traits');
+        $this->xslClass->setParameter('', 'title', 'Traits');
+        $html = $this->xslClass->transformToDoc($event->getTrait()->asDom());
+        $this->saveDomDocument(
+            $html,
+            $this->outputDir . '/traits/' .
+            $this->classNameToFileName($event->getTrait()->getFullName())
+        );
+    }
+
+    public function buildInterface(InterfaceStartEvent $event): void {
+        $html = $this->xslInterface->transformToDoc($event->getInterface()->asDom());
+        $this->saveDomDocument(
+            $html,
+            $this->outputDir . '/interfaces/' .
+            $this->classNameToFileName($event->getInterface()->getFullName())
+        );
+    }
 
-        private function genericMethodBuild(fDOMDocument $ctx, $target, $unitName, $method) {
-            $this->xslMethod->setParameter('', 'methodName', $method);
-            $html = $this->xslMethod->transformToDoc($ctx);
+    public function buildClassMethod(ClassMethodEvent $event): void {
+        $this->genericMethodBuild(
+            $event->getClass()->asDom(),
+            'classes',
+            $event->getClass()->getFullName(),
+            $event->getMethod()->getName()
+        );
+    }
 
-            $filename = $this->outputDir . '/' . $target . '/' .
-                $this->classNameToFileName($unitName, $method);
+    public function buildTraitMethod(TraitMethodEvent $event): void {
+        $this->genericMethodBuild(
+            $event->getTrait()->asDom(),
+            'traits',
+            $event->getTrait()->getFullName(),
+            $event->getMethod()->getName()
+        );
+    }
+
+    public function buildInterfaceMethod(InterfaceMethodEvent $event): void {
+        $this->genericMethodBuild(
+            $event->getInterface()->asDom(),
+            'interfaces',
+            $event->getInterface()->getFullName(),
+            $event->getMethod()->getName()
+        );
+    }
 
-            $this->saveDomDocument($html, $filename);
+    public function buildSource(TokenFileStartEvent $event): void {
+        $path = $event->getTokenFile()->getRelativeName($this->sourceDir);
+        $base = \str_repeat('../', \count(\explode('/', $path->getPathname())));
+        $this->xslSource->setParameter('', 'base', $base);
+
+        $html = $this->xslSource->transformToDoc($event->getTokenFile()->asDom());
+        $this->saveDomDocument(
+            $html,
+            $this->outputDir . '/source/' . $path . '.' . $this->extension,
+            false
+        );
+    }
+
+    protected function getXSLTProcessor($template) {
+        $xsl = parent::getXSLTProcessor($this->templateDir . '/' . $template);
+        $xsl->setParameter('', 'extension', $this->extension);
+        $xsl->setParameter('', 'xml', $this->workDir->asFileUri() . '/');
+
+        $xsl->setParameter('', 'hasNamespaces', $this->hasNamespaces ? 'Y' : 'N');
+        $xsl->setParameter('', 'hasInterfaces', $this->hasInterfaces ? 'Y' : 'N');
+        $xsl->setParameter('', 'hasTraits', $this->hasTraits ? 'Y' : 'N');
+        $xsl->setParameter('', 'hasClasses', $this->hasClasses ? 'Y' : 'N');
+        $xsl->setParameter('', 'hasReports', $this->hasReports ? 'Y' : 'N');
+
+        if ($this->projectNode->hasAttribute('name')) {
+            $xsl->setParameter('', 'project', $this->projectNode->getAttribute('name'));
         }
 
-        private function classNameToFileName($class, $method = NULL) {
-            $name = str_replace('\\', '_', $class);
-            if ($method !== NULL) {
-                $name .= '/' . $method;
+        return $xsl;
+    }
+
+    private function renderIndexPages(fDOMDocument $indexDom): void {
+        $proc = $this->getXSLTProcessor('index.xsl');
+        $proc->setParameter('', 'project', $this->projectNode->getAttribute('name'));
+        $html = $proc->transformToDoc($indexDom);
+        $this->saveDomDocument($html, $this->outputDir . '/index.' . $this->extension);
+
+        $proc = $this->getXSLTProcessor('namespaces.xsl');
+        $html = $proc->transformToDoc($indexDom);
+        $this->saveDomDocument($html, $this->outputDir . '/namespaces.' . $this->extension);
+
+        $proc = $this->getXSLTProcessor('units.xsl');
+        $html = $proc->transformToDoc($indexDom);
+        $this->saveDomDocument($html, $this->outputDir . '/classes.' . $this->extension);
+
+        $proc->setParameter('', 'mode', 'interface');
+        $proc->setParameter('', 'title', 'Interfaces');
+        $html = $proc->transformToDoc($indexDom);
+        $this->saveDomDocument($html, $this->outputDir . '/interfaces.' . $this->extension);
+
+        $proc->setParameter('', 'mode', 'trait');
+        $proc->setParameter('', 'title', 'Traits');
+        $html = $proc->transformToDoc($indexDom);
+        $this->saveDomDocument($html, $this->outputDir . '/traits.' . $this->extension);
+    }
+
+    private function renderSourceIndexes(fDOMDocument $treeDom): void {
+        $proc    = $this->getXSLTProcessor('directory.xsl');
+        $dirList = $treeDom->query('/phpdox:source//phpdox:dir');
+
+        foreach ($dirList as $dirNode) {
+            $dirNode->setAttributeNS('ctx://engine/html', 'ctx:engine', 'current');
+
+            $parents  = $dirNode->query('ancestor-or-self::phpdox:dir');
+            $elements = [];
+
+            foreach ($parents as $parent) {
+                $elements[] = $parent->getAttribute('name');
             }
-            return $name . '.' . $this->extension;
+            $elements[0] = $this->outputDir . '/source';
+            $elements[]  = 'index.' . $this->extension;
+
+            $proc->setParameter('', 'base', \str_repeat('../', \count($elements) - 1));
+            $this->saveDomDocument($proc->transformToDoc($treeDom), \implode('/', $elements));
+
+            $dirNode->removeAttributeNS('ctx://engine/html', 'engine');
         }
+    }
 
+    private function genericMethodBuild(fDOMDocument $ctx, $target, $unitName, $method): void {
+        $this->xslMethod->setParameter('', 'methodName', $method);
+        $html = $this->xslMethod->transformToDoc($ctx);
+
+        $filename = $this->outputDir . '/' . $target . '/' .
+            $this->classNameToFileName($unitName, $method);
+
+        $this->saveDomDocument($html, $filename);
     }
 
+    private function classNameToFileName($class, $method = null) {
+        $name = \str_replace('\\', '_', $class);
+
+        if ($method !== null) {
+            $name .= '/' . $method;
+        }
+
+        return $name . '.' . $this->extension;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/engine/xml/Xml.php phpdox-0.12.0/src/generator/engine/xml/Xml.php
--- phpdox-0.11.2/src/generator/engine/xml/Xml.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/engine/xml/Xml.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,104 +1,70 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Generator\Engine {
-
-    use TheSeer\phpDox\BuildConfig;
-    use TheSeer\phpDox\Generator\AbstractEvent;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-    use TheSeer\phpDox\Generator\PHPDoxEndEvent;
-    use TheSeer\phpDox\Generator\TokenFileStartEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Engine;
 
-    class Xml extends AbstractEngine {
+use TheSeer\phpDox\BuildConfig;
+use TheSeer\phpDox\Generator\AbstractEvent;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
+use TheSeer\phpDox\Generator\PHPDoxEndEvent;
+use TheSeer\phpDox\Generator\TokenFileStartEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
 
-        private $outputDir;
+class Xml extends AbstractEngine {
+    private $outputDir;
 
-        public function __construct(BuildConfig $config) {
-            $this->outputDir = $config->getOutputDirectory();
-        }
+    public function __construct(BuildConfig $config) {
+        $this->outputDir = $config->getOutputDirectory();
+    }
 
-        public function registerEventHandlers(EventHandlerRegistry $registry) {
-            $registry->addHandler('phpdox.end', $this, 'handleIndex');
-            $registry->addHandler('class.start', $this, 'handle');
-            $registry->addHandler('trait.start', $this, 'handle');
-            $registry->addHandler('interface.start', $this, 'handle');
-            $registry->addHandler('token.file.start', $this, 'handleToken');
-        }
+    public function registerEventHandlers(EventHandlerRegistry $registry): void {
+        $registry->addHandler('phpdox.end', $this, 'handleIndex');
+        $registry->addHandler('class.start', $this, 'handle');
+        $registry->addHandler('trait.start', $this, 'handle');
+        $registry->addHandler('interface.start', $this, 'handle');
+        $registry->addHandler('token.file.start', $this, 'handleToken');
+    }
 
-        public function handle(AbstractEvent $event) {
-            if ($event instanceof ClassStartEvent) {
-                $ctx = $event->getClass();
-                $path = 'classes';
-            } else if ($event instanceof TraitStartEvent) {
-                $ctx = $event->getTrait();
+    public function handle(AbstractEvent $event): void {
+        if ($event instanceof ClassStartEvent) {
+            $ctx  = $event->getClass();
+            $path = 'classes';
+        } else {
+            if ($event instanceof TraitStartEvent) {
+                $ctx  = $event->getTrait();
                 $path = 'traits';
-            } else if ($event instanceof InterfaceStartEvent) {
-                $ctx = $event->getInterface();
-                $path = 'interfaces';
             } else {
-                throw new EngineException(
-                    'Unexpected Event of type ' . get_class($event),
-                    XMLEngineException::UnexpectedType
-                );
+                if ($event instanceof InterfaceStartEvent) {
+                    $ctx  = $event->getInterface();
+                    $path = 'interfaces';
+                } else {
+                    throw new EngineException(
+                        'Unexpected Event of type ' . \get_class($event),
+                        XMLEngineException::UnexpectedType
+                    );
+                }
             }
-            $dom = $ctx->asDom();
-            $this->saveDomDocument($dom,
-                $this->outputDir . '/' . $path . '/' . str_replace('\\', '_', $dom->documentElement->getAttribute('full')) . '.xml'
-            );
-        }
-
-        public function handleIndex(PHPDoxEndEvent $event) {
-            $dom = $event->getIndex()->asDom();
-            $this->saveDomDocument($dom, $this->outputDir . '/index.xml');
         }
+        $dom = $ctx->asDom();
+        $this->saveDomDocument(
+            $dom,
+            $this->outputDir . '/' . $path . '/' . \str_replace('\\', '_', $dom->documentElement->getAttribute('full')) . '.xml'
+        );
+    }
 
-        public function handleToken(TokenFileStartEvent $event) {
-            $dom = $event->getTokenFile()->asDom();
-            $this->saveDomDocument($dom,
-                $this->outputDir . '/tokens/' . $dom->queryOne('//phpdox:file')->getAttribute('relative') . '.xml'
-            );
-
-        }
+    public function handleIndex(PHPDoxEndEvent $event): void {
+        $dom = $event->getIndex()->asDom();
+        $this->saveDomDocument($dom, $this->outputDir . '/index.xml');
     }
 
-    class XMLEngineException extends EngineException {
-        const UnexpectedType = 2;
+    public function handleToken(TokenFileStartEvent $event): void {
+        $dom = $event->getTokenFile()->asDom();
+        $this->saveDomDocument(
+            $dom,
+            $this->outputDir . '/tokens/' . $dom->queryOne('//phpdox:file')->getAttribute('relative') . '.xml'
+        );
     }
+}
 
+class XMLEngineException extends EngineException {
+    public const UnexpectedType = 2;
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/AbstractEnricher.php phpdox-0.12.0/src/generator/enricher/AbstractEnricher.php
--- phpdox-0.11.2/src/generator/enricher/AbstractEnricher.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/AbstractEnricher.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,38 +1,33 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
 
-    class AbstractEnricher {
+class AbstractEnricher {
+    public const XMLNS = 'http://xml.phpdox.net/src';
 
-        const XMLNS = 'http://xml.phpdox.net/src';
-
-        /**
-         * @param fDOMElement $node
-         * @param             $type
-         *
-         * @return fDOMElement
-         */
-        protected function getEnrichtmentContainer(fDOMElement $node, $type) {
-            $dom = $node->ownerDocument;
-            $container = $node->queryOne('phpdox:enrichments');
-            if(!$container) {
-                $container = $dom->createElementNS(self::XMLNS, 'enrichments');
-                $node->appendChild($container);
-            }
-
-            $enrichment = $container->queryOne(
-                $dom->prepareQuery('phpdox:enrichment[@type=:type]', array('type' => $type))
-            );
-
-            if (!$enrichment) {
-                $enrichment = $dom->createElementNS(self::XMLNS, 'enrichment');
-                $enrichment->setAttribute('type', $type);
-                $container->appendChild($enrichment);
-            }
+    /**
+     * @param $type
+     */
+    protected function getEnrichtmentContainer(fDOMElement $node, $type): fDOMElement {
+        $dom       = $node->ownerDocument;
+        $container = $node->queryOne('phpdox:enrichments');
+
+        if (!$container) {
+            $container = $dom->createElementNS(self::XMLNS, 'enrichments');
+            $node->appendChild($container);
+        }
 
-            return $enrichment;
+        $enrichment = $container->queryOne(
+            $dom->prepareQuery('phpdox:enrichment[@type=:type]', ['type' => $type])
+        );
+
+        if (!$enrichment) {
+            $enrichment = $dom->createElementNS(self::XMLNS, 'enrichment');
+            $enrichment->setAttribute('type', $type);
+            $container->appendChild($enrichment);
         }
-    }
 
+        return $enrichment;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/build/Build.php phpdox-0.12.0/src/generator/enricher/build/Build.php
--- phpdox-0.11.2/src/generator/enricher/build/Build.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/build/Build.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,124 +1,118 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\EnrichConfig;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-    use TheSeer\phpDox\Generator\PHPDoxStartEvent;
-    use TheSeer\phpDox\Generator\TokenFileStartEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
-    use TheSeer\phpDox\Version;
-
-    class Build extends AbstractEnricher implements StartEnricherInterface,
-        ClassEnricherInterface, TraitEnricherInterface, InterfaceEnricherInterface, TokenFileEnricherInterface {
-
-        /**
-         * @var array
-         */
-        private $enrichers;
-
-        /**
-         * @var fDOMElement
-         */
-        private $buildInfo;
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        public function __construct(EnrichConfig $config) {
-            $this->enrichers = array_keys($config->getGeneratorConfig()->getActiveEnrichSources());
-            $this->version = $config->getVersion();
-        }
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\EnrichConfig;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
+use TheSeer\phpDox\Generator\PHPDoxStartEvent;
+use TheSeer\phpDox\Generator\TokenFileStartEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
+use TheSeer\phpDox\Version;
+
+class Build extends AbstractEnricher implements StartEnricherInterface,
+    ClassEnricherInterface, TraitEnricherInterface, InterfaceEnricherInterface, TokenFileEnricherInterface {
+    /**
+     * @var array
+     */
+    private $enrichers;
+
+    /**
+     * @var fDOMElement
+     */
+    private $buildInfo;
+
+    /**
+     * @var Version
+     */
+    private $version;
+
+    public function __construct(EnrichConfig $config) {
+        $this->enrichers = \array_keys($config->getGeneratorConfig()->getActiveEnrichSources());
+        $this->version   = $config->getVersion();
+    }
 
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'Build Information';
-        }
+    public function getName(): string {
+        return 'Build Information';
+    }
 
-        public function enrichStart(PHPDoxStartEvent $event) {
-            $this->genericProcess($event->getIndex()->asDom());
-        }
+    public function enrichStart(PHPDoxStartEvent $event): void {
+        $this->genericProcess($event->getIndex()->asDom());
+    }
 
-        public function enrichClass(ClassStartEvent $event) {
-            $this->genericProcess($event->getClass()->asDom());
-        }
+    public function enrichClass(ClassStartEvent $event): void {
+        $this->genericProcess($event->getClass()->asDom());
+    }
 
-        public function enrichInterface(InterfaceStartEvent $event) {
-            $this->genericProcess($event->getInterface()->asDom());
-        }
+    public function enrichInterface(InterfaceStartEvent $event): void {
+        $this->genericProcess($event->getInterface()->asDom());
+    }
 
-        public function enrichTrait(TraitStartEvent $event) {
-            $this->genericProcess($event->getTrait()->asDom());
-        }
+    public function enrichTrait(TraitStartEvent $event): void {
+        $this->genericProcess($event->getTrait()->asDom());
+    }
+
+    public function enrichTokenFile(TokenFileStartEvent $event): void {
+        $this->genericProcess($event->getTokenFile()->asDom());
+    }
 
-        public function enrichTokenFile(TokenFileStartEvent $event) {
-            $this->genericProcess($event->getTokenFile()->asDom());
+    private function genericProcess(fDOMDocument $dom): void {
+        $enrichment = $this->getEnrichtmentContainer($dom->documentElement, 'build');
+        $enrichment->appendChild(
+            $dom->importNode($this->getGeneralBuildInfo(), true)
+        );
+    }
+
+    private function getGeneralBuildInfo() {
+        if ($this->buildInfo != null) {
+            return $this->buildInfo;
         }
 
-        private function genericProcess(fDOMDocument $dom) {
-            $enrichment = $this->getEnrichtmentContainer($dom->documentElement, 'build');
-            $enrichment->appendChild(
-                $dom->importNode($this->getGeneralBuildInfo(), true)
-            );
+        $dom             = new fDOMDocument();
+        $this->buildInfo = $dom->createDocumentFragment();
+
+        $dateNode = $dom->createElementNS(self::XMLNS, 'date');
+        $this->buildInfo->appendChild($dateNode);
+
+        $date = new \DateTimeImmutable('now');
+        $dateNode->setAttribute('unix', $date->getTimestamp());
+        $dateNode->setAttribute('date', $date->format('d-m-Y'));
+        $dateNode->setAttribute('time', $date->format('H:i:s'));
+        $dateNode->setAttribute('iso', $date->format('c'));
+        $dateNode->setAttribute('rfc', $date->format('r'));
+
+        $phpdoxNode = $dom->createElementNS(self::XMLNS, 'phpdox');
+        $this->buildInfo->appendChild($phpdoxNode);
+
+        $phpdoxNode->setAttribute('version', $this->version->getVersion());
+        $phpdoxNode->setAttribute('info', $this->version->getInfoString());
+        $phpdoxNode->setAttribute('generated', $this->version->getGeneratedByString());
+        $phpdoxNode->setAttribute('phar', \defined('PHPDOX_PHAR') ? 'yes' : 'no');
+
+        foreach ($this->enrichers as $enricher) {
+            $enricherNode = $phpdoxNode->appendElementNS(self::XMLNS, 'enricher');
+            $enricherNode->setAttribute('type', $enricher);
         }
 
-        private function getGeneralBuildInfo() {
-            if ($this->buildInfo != NULL) {
-                return $this->buildInfo;
-            }
-
-            $dom = new fDOMDocument();
-            $this->buildInfo = $dom->createDocumentFragment();
-
-            $dateNode = $dom->createElementNS(self::XMLNS, 'date');
-            $this->buildInfo->appendChild($dateNode);
-
-            $date = new \DateTime('now');
-            $dateNode->setAttribute('unix', $date->getTimestamp());
-            $dateNode->setAttribute('date', $date->format('d-m-Y'));
-            $dateNode->setAttribute('time', $date->format('H:i:s'));
-            $dateNode->setAttribute('iso', $date->format('c'));
-            $dateNode->setAttribute('rfc', $date->format('r'));
-
-            $phpdoxNode = $dom->createElementNS(self::XMLNS, 'phpdox');
-            $this->buildInfo->appendChild($phpdoxNode);
-
-            $phpdoxNode->setAttribute('version', $this->version->getVersion());
-            $phpdoxNode->setAttribute('info', $this->version->getInfoString());
-            $phpdoxNode->setAttribute('generated', $this->version->getGeneratedByString());
-            $phpdoxNode->setAttribute('phar', defined('PHPDOX_PHAR') ? 'yes' : 'no');
-
-            foreach($this->enrichers as $enricher) {
-                $enricherNode = $phpdoxNode->appendElementNS(self::XMLNS, 'enricher');
-                $enricherNode->setAttribute('type', $enricher);
-            }
-
-            $phpNode = $dom->createElementNS(self::XMLNS, 'php');
-            $this->buildInfo->appendChild($phpNode);
-
-            $phpNode->setAttribute('version', PHP_VERSION);
-            $phpNode->setAttribute('os', PHP_OS);
-
-            foreach(get_loaded_extensions(true) as $extension) {
-                $extNode = $dom->createElementNS(self::XMLNS, 'zendextension');
-                $extNode->setAttribute('name', $extension);
-                $phpNode->appendChild($extNode);
-            }
-            foreach(get_loaded_extensions(false) as $extension) {
-                $extNode = $dom->createElementNS(self::XMLNS, 'extension');
-                $extNode->setAttribute('name', $extension);
-                $phpNode->appendChild($extNode);
-            }
+        $phpNode = $dom->createElementNS(self::XMLNS, 'php');
+        $this->buildInfo->appendChild($phpNode);
 
-            return $this->buildInfo;
+        $phpNode->setAttribute('version', \PHP_VERSION);
+        $phpNode->setAttribute('os', \PHP_OS);
+
+        foreach (\get_loaded_extensions(true) as $extension) {
+            $extNode = $dom->createElementNS(self::XMLNS, 'zendextension');
+            $extNode->setAttribute('name', $extension);
+            $phpNode->appendChild($extNode);
         }
 
-    }
+        foreach (\get_loaded_extensions(false) as $extension) {
+            $extNode = $dom->createElementNS(self::XMLNS, 'extension');
+            $extNode->setAttribute('name', $extension);
+            $phpNode->appendChild($extNode);
+        }
 
+        return $this->buildInfo;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/checkstyle/CheckStyleConfig.php phpdox-0.12.0/src/generator/enricher/checkstyle/CheckStyleConfig.php
--- phpdox-0.11.2/src/generator/enricher/checkstyle/CheckStyleConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/checkstyle/CheckStyleConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,45 +1,46 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\GeneratorConfig;
 
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\GeneratorConfig;
+class CheckStyleConfig {
+    protected $defaultFileName = 'checkstyle.xml';
 
-    class CheckStyleConfig {
-
-        /**
-         * @var GeneratorConfig
-         */
-        private $generator;
-
-        /**
-         * @var fDOMElement
-         */
-        private $context;
+    /**
+     * @var GeneratorConfig
+     */
+    private $generator;
+
+    /**
+     * @var fDOMElement
+     */
+    private $context;
+
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->context   = $ctx;
+        $this->generator = $generator;
+    }
 
+    public function getLogFilePath() {
+        $basedirDefault = \dirname($this->context->ownerDocument->baseURI);
+        $path           = $basedirDefault . '/build/logs';
 
-        protected $defaultFileName = 'checkstyle.xml';
+        if ($this->context->parentNode->hasAttribute('base')) {
+            $path = $this->context->parentNode->getAttribute('base');
+        }
 
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->context = $ctx;
-            $this->generator = $generator;
+        if ($path != '') {
+            $path .= '/';
         }
+        $file = $this->context->queryOne('cfg:file');
 
-        public function getLogFilePath() {
-            $basedirDefault = dirname($this->context->ownerDocument->baseURI);
-            $path = $basedirDefault . '/build/logs';
-            if ($this->context->parentNode->hasAttribute('base')) {
-                $path = $this->context->parentNode->getAttribute('base');
-            }
-            if ($path != '') { $path .= '/'; }
-            $file = $this->context->queryOne('cfg:file');
-            if ($file && $file->hasAttribute('name')) {
-                $path .= $file->getAttribute('name');
-            } else {
-                $path .= $this->defaultFileName;
-            }
-            return $path;
+        if ($file && $file->hasAttribute('name')) {
+            $path .= $file->getAttribute('name');
+        } else {
+            $path .= $this->defaultFileName;
         }
-    }
 
+        return $path;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/checkstyle/CheckStyle.php phpdox-0.12.0/src/generator/enricher/checkstyle/CheckStyle.php
--- phpdox-0.11.2/src/generator/enricher/checkstyle/CheckStyle.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/checkstyle/CheckStyle.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,105 +1,104 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMException;
+use TheSeer\phpDox\Generator\AbstractUnitObject;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\fDOM\fDOMException;
-    use TheSeer\phpDox\Generator\AbstractUnitObject;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
+class CheckStyle extends AbstractEnricher implements ClassEnricherInterface, TraitEnricherInterface, InterfaceEnricherInterface {
+    public const FINDINGS_XPATH = '/checkstyle/file';
 
-    class CheckStyle extends AbstractEnricher implements ClassEnricherInterface, TraitEnricherInterface, InterfaceEnricherInterface {
+    public const XML_STYLE = 'checkstyle';
 
-        protected $config;
-        protected $findings = NULL;
+    protected $config;
 
-        const FINDINGS_XPATH = '/checkstyle/file';
-        const XML_STYLE = 'checkstyle';
+    protected $findings;
 
-        public function __construct(CheckStyleConfig $config) {
-            $this->config = $config;
-            $this->loadFindings($config->getLogFilePath());
-        }
+    public function __construct(CheckStyleConfig $config) {
+        $this->config = $config;
+        $this->loadFindings($config->getLogFilePath());
+    }
 
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'CheckStyle XML';
-        }
+    public function getName(): string {
+        return 'CheckStyle XML';
+    }
 
-        public function enrichClass(ClassStartEvent $event) {
-            $this->enrichUnit($event->getClass());
-        }
+    public function enrichClass(ClassStartEvent $event): void {
+        $this->enrichUnit($event->getClass());
+    }
 
-        public function enrichInterface(InterfaceStartEvent $event) {
-            $this->enrichUnit($event->getInterface());
-        }
+    public function enrichInterface(InterfaceStartEvent $event): void {
+        $this->enrichUnit($event->getInterface());
+    }
 
-        public function enrichTrait(TraitStartEvent $event) {
-            $this->enrichUnit($event->getTrait());
-        }
+    public function enrichTrait(TraitStartEvent $event): void {
+        $this->enrichUnit($event->getTrait());
+    }
 
-        private function enrichUnit(AbstractUnitObject $ctx) {
-            $file = $ctx->getSourceFile();
-            if (isset($this->findings[$file])) {
-                $this->processFindings($ctx->asDom(), $this->findings[$file]);
+    protected function processFinding(fDOMDocument $dom, $ref, \DOMElement $finding, $elementName = null) {
+        $enrichment    = $this->getEnrichtmentContainer($ref, 'checkstyle');
+        $enrichFinding = $dom->createElementNS(static::XMLNS, ($elementName ?: $finding->getAttribute('severity', 'error')));
+        $enrichment->appendChild($enrichFinding);
+
+        foreach ($finding->attributes as $attr) {
+            if ($attr->localName == 'severity') {
+                continue;
             }
+            $enrichFinding->setAttributeNode($dom->importNode($attr, true));
+        }
+
+        return $enrichFinding;
+    }
+
+    private function enrichUnit(AbstractUnitObject $ctx): void {
+        $file = $ctx->getSourceFile();
+
+        if (isset($this->findings[$file])) {
+            $this->processFindings($ctx->asDom(), $this->findings[$file]);
         }
+    }
+
+    private function loadFindings($xmlFile): void {
+        $this->findings = [];
 
-        private function loadFindings($xmlFile) {
-            $this->findings = array();
-            try {
-                if (!file_exists($xmlFile)) {
-                    throw new EnricherException(
-                        sprintf('Logfile "%s" not found.', $xmlFile),
-                        EnricherException::LoadError
-                    );
-                }
-                $dom = new fDOMDocument();
-                $dom->load($xmlFile);
-                foreach($dom->query(static::FINDINGS_XPATH) as $file) {
-                    $this->findings[$file->getAttribute('name')] = $file->query('*');
-                }
-            } catch (fDOMException $e) {
+        try {
+            if (!\file_exists($xmlFile)) {
                 throw new EnricherException(
-                    sprintf('Parsing %s logfile failed: %s', static::XML_STYLE, $e->getMessage()),
+                    \sprintf('Logfile "%s" not found.', $xmlFile),
                     EnricherException::LoadError
                 );
             }
-        }
-
-        private function processFindings(fDOMDocument $dom, \DOMNodeList $findings) {
+            $dom = new fDOMDocument();
+            $dom->load($xmlFile);
 
-            foreach($findings as $finding) {
-                /** @var fDOMElement $finding */
-                $line = $finding->getAttribute('line');
-                $ref = $dom->queryOne(sprintf('//phpdox:*/*[@line = %d or (@start <= %d and @end >= %d)]', $line, $line, $line));
-                if (!$ref) {
-                    // One src file may contain multiple classes/traits/interfaces, so the
-                    // finding might not apply to the current object since findings are based on filenames
-                    // but we have individual objects - so we just ignore the finding for this context
-                    continue;
-                }
-                $this->processFinding($dom, $ref, $finding);
+            foreach ($dom->query(static::FINDINGS_XPATH) as $file) {
+                $this->findings[$file->getAttribute('name')] = $file->query('*');
             }
-
+        } catch (fDOMException $e) {
+            throw new EnricherException(
+                \sprintf('Parsing %s logfile failed: %s', static::XML_STYLE, $e->getMessage()),
+                EnricherException::LoadError
+            );
         }
+    }
 
-        protected function processFinding(fDOMDocument $dom, $ref, \DOMElement $finding, $elementName = null) {
-            $enrichment    = $this->getEnrichtmentContainer($ref, 'checkstyle');
-            $enrichFinding = $dom->createElementNS(static::XMLNS, ($elementName ?: $finding->getAttribute('severity', 'error')));
-            $enrichment->appendChild($enrichFinding);
-            foreach($finding->attributes as $attr) {
-                if ($attr->localName == 'severity') {
-                    continue;
-                }
-                $enrichFinding->setAttributeNode($dom->importNode($attr, true));
+    private function processFindings(fDOMDocument $dom, \DOMNodeList $findings): void {
+        foreach ($findings as $finding) {
+            /** @var fDOMElement $finding */
+            $line = $finding->getAttribute('line');
+            $ref  = $dom->queryOne(\sprintf('//phpdox:*/*[@line = %d or (@start <= %d and @end >= %d)]', $line, $line, $line));
+
+            if (!$ref) {
+                // One src file may contain multiple classes/traits/interfaces, so the
+                // finding might not apply to the current object since findings are based on filenames
+                // but we have individual objects - so we just ignore the finding for this context
+                continue;
             }
-            return $enrichFinding;
+            $this->processFinding($dom, $ref, $finding);
         }
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/ClassEnricherInterface.php phpdox-0.12.0/src/generator/enricher/ClassEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/ClassEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/ClassEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-
-    interface ClassEnricherInterface extends EnricherInterface {
-
-        public function enrichClass(ClassStartEvent $event);
-
-    }
+use TheSeer\phpDox\Generator\ClassStartEvent;
 
+interface ClassEnricherInterface extends EnricherInterface {
+    public function enrichClass(ClassStartEvent $event);
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/EndEnricherInterface.php phpdox-0.12.0/src/generator/enricher/EndEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/EndEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/EndEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\phpDox\Generator\PHPDoxEndEvent;
-
-    interface EndEnricherInterface extends EnricherInterface {
-
-        public function enrichEnd(PHPDoxEndEvent $event);
-
-    }
+use TheSeer\phpDox\Generator\PHPDoxEndEvent;
 
+interface EndEnricherInterface extends EnricherInterface {
+    public function enrichEnd(PHPDoxEndEvent $event);
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/EnricherException.php phpdox-0.12.0/src/generator/enricher/EnricherException.php
--- phpdox-0.11.2/src/generator/enricher/EnricherException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/EnricherException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,45 +1,6 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator\Enricher {
-
-    class EnricherException extends \Exception {
-
-        const LoadError = 1;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
+class EnricherException extends \Exception {
+    public const LoadError = 1;
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/EnricherInterface.php phpdox-0.12.0/src/generator/enricher/EnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/EnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/EnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,49 +1,6 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator\Enricher {
-
-    interface EnricherInterface {
-
-        /**
-         * @return string
-         */
-        public function getName();
-
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
+interface EnricherInterface {
+    public function getName(): string;
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/Factory.php phpdox-0.12.0/src/generator/enricher/Factory.php
--- phpdox-0.11.2/src/generator/enricher/Factory.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/Factory.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,60 +1,57 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\phpDox\EnrichConfig;
+use TheSeer\phpDox\FactoryInterface;
 
-    use TheSeer\phpDox\EnrichConfig;
-    use TheSeer\phpDox\FactoryInterface;
+class Factory {
+    /**
+     * @var array
+     */
+    private $enrichers = [];
+
+    /**
+     * @var array
+     */
+    private $configs = [];
 
-    class Factory {
+    public function addEnricherClass($name, $class): void {
+        $this->enrichers[$name] = $class;
+    }
 
-        /**
-         * @var array
-         */
-        private $enrichers = array();
+    public function addEnricherFactory($name, FactoryInterface $factory): void {
+        $this->enrichers[$name] = $factory;
+    }
 
-        /**
-         * @var array
-         */
-        private $configs = array();
+    public function getEnricherList() {
+        return \array_keys($this->enrichers);
+    }
 
-        public function addEnricherClass($name, $class) {
-            $this->enrichers[$name] = $class;
-        }
+    public function setConfigClass($name, $class): void {
+        $this->configs[$name] = $class;
+    }
 
-        public function addEnricherFactory($name, FactoryInterface $factory) {
-            $this->enrichers[$name] = $factory;
-        }
+    public function getInstanceFor(EnrichConfig $enrichCfg) {
+        $name = $enrichCfg->getType();
 
-        public function getEnricherList() {
-            return array_keys($this->enrichers);
+        if (!isset($this->enrichers[$name])) {
+            throw new FactoryException("Enricher '$name' is not registered.", FactoryException::UnknownEnricher);
         }
 
-        public function setConfigClass($name, $class) {
-            $this->configs[$name] = $class;
+        if (isset($this->configs[$name])) {
+            $cfg = new $this->configs[$name]($enrichCfg->getGeneratorConfig(), $enrichCfg->getEnrichNode());
+        } else {
+            $cfg = $enrichCfg;
         }
 
-        public function getInstanceFor(EnrichConfig $enrichCfg) {
-            $name = $enrichCfg->getType();
-            if (!isset($this->enrichers[$name])) {
-                throw new FactoryException("Enricher '$name' is not registered.", FactoryException::UnknownEnricher);
-            }
-
-            if (isset($this->configs[$name])) {
-                $cfg = new $this->configs[$name]($enrichCfg->getGeneratorConfig(), $enrichCfg->getEnrichNode());
-            } else {
-                $cfg = $enrichCfg;
-            }
-
-            if ($this->enrichers[$name] instanceof FactoryInterface) {
-                return $this->enrichers[$name]->getInstanceFor($name, $cfg);
-            }
-            return new $this->enrichers[$name]($cfg);
+        if ($this->enrichers[$name] instanceof FactoryInterface) {
+            return $this->enrichers[$name]->getInstanceFor($name, $cfg);
         }
 
+        return new $this->enrichers[$name]($cfg);
     }
+}
 
-    class FactoryException extends \Exception {
-        const UnknownEnricher = 1;
-    }
-
+class FactoryException extends \Exception {
+    public const UnknownEnricher = 1;
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/FullEnricherInterface.php phpdox-0.12.0/src/generator/enricher/FullEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/FullEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/FullEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,13 +1,10 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
-
-    interface FullEnricherInterface extends
-        StartEnricherInterface,
-        InterfaceEnricherInterface,
-        TraitEnricherInterface,
-        ClassEnricherInterface,
-        EndEnricherInterface
-    {
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
+interface FullEnricherInterface extends
+    StartEnricherInterface,
+    InterfaceEnricherInterface,
+    TraitEnricherInterface,
+    ClassEnricherInterface,
+    EndEnricherInterface {
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/git/GitConfig.php phpdox-0.12.0/src/generator/enricher/git/GitConfig.php
--- phpdox-0.11.2/src/generator/enricher/git/GitConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/git/GitConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,76 +1,67 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\GeneratorConfig;
+
+class GitConfig {
+    /**
+     * @var GeneratorConfig
+     */
+    private $generator;
+
+    /**
+     * @var fDOMElement
+     */
+    private $context;
+
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->context   = $ctx;
+        $this->generator = $generator;
+    }
 
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\GeneratorConfig;
+    public function getSourceDirectory(): FileInfo {
+        return $this->generator->getProjectConfig()->getSourceDirectory();
+    }
 
-    class GitConfig {
+    public function getGitBinary(): string {
+        $git = $this->context->queryOne('cfg:git');
 
-        /**
-         * @var GeneratorConfig
-         */
-        private $generator;
+        if (!$git) {
+            return 'git';
+        }
 
-        /**
-         * @var fDOMElement
-         */
-        private $context;
+        return $git->getAttribute('binary', 'git');
+    }
 
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->context = $ctx;
-            $this->generator = $generator;
-        }
+    public function doLogProcessing(): bool {
+        $history = $this->context->queryOne('cfg:history');
 
-        /**
-         * @return FileInfo
-         */
-        public function getSourceDirectory() {
-            return $this->generator->getProjectConfig()->getSourceDirectory();
+        if (!$history) {
+            return true;
         }
 
-        /**
-         * @return string
-         */
-        public function getGitBinary() {
-            $git = $this->context->queryOne('cfg:git');
-            if (!$git) {
-                return 'git';
-            }
-            return $git->getAttribute('binary', 'git');
-        }
+        return $history->getAttribute('enabled', 'true') == 'true';
+    }
 
-        /**
-         * @return bool
-         */
-        public function doLogProcessing() {
-            $history = $this->context->queryOne('cfg:history');
-            if (!$history) {
-                return true;
-            }
-            return $history->getAttribute('enabled', 'true') == 'true';
-        }
+    public function getLogLimit(): int {
+        $history = $this->context->queryOne('cfg:history');
 
-        /**
-         * @return int
-         */
-        public function getLogLimit() {
-            $history = $this->context->queryOne('cfg:history');
-            if (!$history) {
-                return 100;
-            }
-            return (int)$history->getAttribute('limit', 100);
+        if (!$history) {
+            return 100;
         }
 
-        public function getLogfilePath() {
-            $history = $this->context->queryOne('cfg:history');
-            if (!$history || $history->getAttribute('cache') == '') {
-                return $this->generator->getProjectConfig()->getWorkDirectory() . '/gitlog.xml';
-            }
-            return $history->getAttribute('cache');
+        return (int)$history->getAttribute('limit', 100);
+    }
+
+    public function getLogfilePath() {
+        $history = $this->context->queryOne('cfg:history');
+
+        if (!$history || $history->getAttribute('cache') == '') {
+            return $this->generator->getProjectConfig()->getWorkDirectory() . '/gitlog.xml';
         }
 
+        return $history->getAttribute('cache');
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/git/GitEnricherException.php phpdox-0.12.0/src/generator/enricher/git/GitEnricherException.php
--- phpdox-0.11.2/src/generator/enricher/git/GitEnricherException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/git/GitEnricherException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,11 +1,10 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    class GitEnricherException extends EnricherException {
+class GitEnricherException extends EnricherException {
+    public const ExecDisabled = 1;
 
-        const ExecDisabled = 1;
-        const FetchingHistoryFailed = 2;
-        const GitVersionTooOld = 3;
-    }
+    public const FetchingHistoryFailed = 2;
 
+    public const GitVersionTooOld = 3;
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/git/Git.php phpdox-0.12.0/src/generator/enricher/git/Git.php
--- phpdox-0.11.2/src/generator/enricher/git/Git.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/git/Git.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,343 +1,358 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-    use TheSeer\phpDox\Generator\PHPDoxEndEvent;
-    use TheSeer\phpDox\Generator\PHPDoxStartEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
-
-    class Git extends AbstractEnricher implements FullEnricherInterface {
-
-        const GITNS = 'http://xml.phpdox.net/gitlog';
-        /**
-         * @var bool
-         */
-        private $noGitAvailable = false;
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
+use TheSeer\phpDox\Generator\PHPDoxEndEvent;
+use TheSeer\phpDox\Generator\PHPDoxStartEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
+
+class Git extends AbstractEnricher implements FullEnricherInterface {
+    public const GITNS = 'http://xml.phpdox.net/gitlog';
+
+    /**
+     * @var bool
+     */
+    private $noGitAvailable = false;
+
+    /**
+     * Array of tokens for git log
+     * see git log --help for more details
+     *
+     * @var array
+     */
+    private $tokens = ['H', 'aE', 'aN', 'cE', 'cN', 'at', 'ct'];
+
+    /**
+     * @var GitConfig
+     */
+    private $config;
+
+    /**
+     * @var fDOMDocument
+     */
+    private $cacheDom;
+
+    /**
+     * @var bool
+     */
+    private $cacheDirty = false;
+
+    /**
+     * @var string
+     */
+    private $commitSha1;
+
+    public function __construct(GitConfig $config) {
+        $this->ensureExecFunctionEnabled();
+        $this->ensureGitVersionSupported($config->getGitBinary());
+        $this->config = $config;
+    }
 
-        /**
-         * Array of tokens for git log
-         * see git log --help for more details
-         *
-         * @var array
-         */
-        private $tokens = array('H','aE','aN','cE','cN','at','ct');
+    public function getName(): string {
+        return 'GIT information';
+    }
 
-        /**
-         * @var GitConfig
-         */
-        private $config;
+    public function enrichStart(PHPDoxStartEvent $event): void {
+        $dom = $event->getIndex()->asDom();
+        /** @var fDOMElement $enrichtment */
+        $enrichtment = $this->getEnrichtmentContainer($dom->documentElement, 'git');
+
+        $binary = $this->config->getGitBinary();
+
+        $devNull = \mb_strtolower(\mb_substr(\PHP_OS, 0, 3)) == 'win' ? 'nul' : '/dev/null';
+
+        $cwd = \getcwd();
+        \chdir($this->config->getSourceDirectory()->getPathname());
+        $describe = \exec($binary . ' describe --always --dirty 2>' . $devNull, $foo, $rc);
+
+        if ($rc !== 0) {
+            $enrichtment->appendChild(
+                $dom->createComment('Not a git repository or no git binary available')
+            );
+            \chdir($cwd);
+            $this->noGitAvailable = true;
 
-        /**
-         * @var fDOMDocument
-         */
-        private $cacheDom;
+            return;
+        }
 
-        /**
-         * @var bool
-         */
-        private $cacheDirty = false;
+        \exec($binary . ' tag 2>' . $devNull, $tags, $rc);
 
-        /**
-         * @var string
-         */
-        private $commitSha1;
+        if (\count($tags)) {
+            $tagsNode = $enrichtment->appendElementNS(self::GITNS, 'tags');
 
-        public function __construct(GitConfig $config) {
-            $this->ensureExecFunctionEnabled();
-            $this->ensureGitVersionSupported($config->getGitBinary());
-            $this->config = $config;
+            foreach ($tags as $tagName) {
+                $tag = $tagsNode->appendElementNS(self::GITNS, 'tag');
+                $tag->setAttribute('name', $tagName);
+            }
         }
 
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'GIT information';
-        }
+        $currentBranch = 'master';
+        \exec($binary . ' branch --no-color 2>' . $devNull, $branches, $rc);
 
-        public function enrichStart(PHPDoxStartEvent $event) {
-            $dom = $event->getIndex()->asDom();
-            /** @var fDOMElement $enrichtment */
-            $enrichtment = $this->getEnrichtmentContainer($dom->documentElement, 'git');
-
-            $binary = $this->config->getGitBinary();
-
-            $devNull = mb_strtolower(mb_substr(PHP_OS, 0, 3)) == 'win' ? 'nul' : '/dev/null';
-
-            $cwd = getcwd();
-            chdir($this->config->getSourceDirectory());
-            $describe = exec($binary . ' describe --always --dirty 2>'.$devNull, $foo, $rc);
-            if ($rc !== 0) {
-                $enrichtment->appendChild(
-                    $dom->createComment('Not a git repository or no git binary available')
-                );
-                chdir($cwd);
-                $this->noGitAvailable = true;
-                return;
-            }
+        if (\count($branches)) {
+            $branchesNode = $enrichtment->appendElementNS(self::GITNS, 'branches');
 
-            exec($binary . ' tag 2>'.$devNull, $tags, $rc);
-            if (count($tags)) {
-                $tagsNode = $enrichtment->appendElementNS(self::GITNS, 'tags');
-                foreach($tags as $tagName) {
-                    $tag = $tagsNode->appendElementNS(self::GITNS, 'tag');
-                    $tag->setAttribute('name', $tagName);
-                }
-            }
+            foreach ($branches as $branchName) {
+                $branch = $branchesNode->appendElementNS(self::GITNS, 'branch');
 
-            $currentBranch = 'master';
-            exec($binary . ' branch --no-color 2>'.$devNull, $branches, $rc);
-            if (count($branches)) {
-                $branchesNode = $enrichtment->appendElementNS(self::GITNS, 'branches');
-                foreach($branches as $branchName) {
-                    $branch = $branchesNode->appendElementNS(self::GITNS, 'branch');
-                    if ($branchName[0] == '*') {
-                        $branchName = trim(mb_substr($branchName, 1));
-                        $currentBranch = $branchName;
-                    } else {
-                        $branchName = trim($branchName);
-                    }
-                    $branch->setAttribute('name', $branchName);
+                if ($branchName[0] == '*') {
+                    $branchName    = \trim(\mb_substr($branchName, 1));
+                    $currentBranch = $branchName;
+                } else {
+                    $branchName = \trim($branchName);
                 }
+                $branch->setAttribute('name', $branchName);
             }
+        }
 
-            $current = $enrichtment->appendElementNS(self::GITNS, 'current');
-            $current->setAttribute('describe', $describe);
-            $current->setAttribute('branch', $currentBranch);
+        $current = $enrichtment->appendElementNS(self::GITNS, 'current');
+        $current->setAttribute('describe', $describe);
+        $current->setAttribute('branch', $currentBranch);
 
-            $this->commitSha1 = exec($binary . " rev-parse HEAD 2>".$devNull);
-            $current->setAttribute('commit', $this->commitSha1);
+        $this->commitSha1 = \exec($binary . ' rev-parse HEAD 2>' . $devNull);
+        $current->setAttribute('commit', $this->commitSha1);
 
-            chdir($cwd);
-        }
+        \chdir($cwd);
+    }
+
+    public function enrichClass(ClassStartEvent $event): void {
+        $this->enrichByFile($event->getClass()->asDom());
+    }
 
-        public function enrichClass(ClassStartEvent $event) {
-            $this->enrichByFile($event->getClass()->asDom());
+    public function enrichInterface(InterfaceStartEvent $event): void {
+        $this->enrichByFile($event->getInterface()->asDom());
+    }
+
+    public function enrichTrait(TraitStartEvent $event): void {
+        $this->enrichByFile($event->getTrait()->asDom());
+    }
+
+    public function enrichEnd(PHPDoxEndEvent $event): void {
+        if ($this->cacheDirty) {
+            $path = \dirname($this->config->getLogfilePath());
+
+            if (!\file_exists($path)) {
+                \mkdir($path, 0777, true);
+            }
+            $this->cacheDom->save($this->config->getLogfilePath());
         }
+    }
 
-        public function enrichInterface(InterfaceStartEvent $event) {
-            $this->enrichByFile($event->getInterface()->asDom());
+    private function enrichByFile(fDOMDocument $dom): void {
+        if ($this->noGitAvailable) {
+            return;
         }
+        $fileNode = $dom->queryOne('//phpdox:file');
 
-        public function enrichTrait(TraitStartEvent $event) {
-            $this->enrichByFile($event->getTrait()->asDom());
+        if (!$fileNode) {
+            return;
         }
 
-        public function enrichEnd(PHPDoxEndEvent $event) {
-            if ($this->cacheDirty) {
-                $path = dirname($this->config->getLogfilePath());
-                if (!file_exists($path)) {
-                    mkdir($path, 0777, true);
-                }
-                $this->cacheDom->save($this->config->getLogfilePath());
-            }
+        /** @var fDOMElement $enrichtment */
+        $enrichtment = $this->getEnrichtmentContainer($dom->documentElement, 'git');
+
+        if (!$this->config->doLogProcessing()) {
+            $enrichtment->appendChild(
+                $dom->createComment('GitEnricher: Log processing disabled in configuration ')
+            );
+
+            return;
         }
 
-        private function enrichByFile(fDOMDocument $dom) {
-            if ($this->noGitAvailable) {
-                return;
-            }
-            $fileNode = $dom->queryOne('//phpdox:file');
-            if (!$fileNode) {
-                return;
-            }
+        if ($this->loadFromCache($fileNode, $enrichtment)) {
+            return;
+        }
 
-            /** @var fDOMElement $enrichtment */
-            $enrichtment = $this->getEnrichtmentContainer($dom->documentElement, 'git');
-            if (!$this->config->doLogProcessing()) {
-                $enrichtment->appendChild(
-                    $dom->createComment('GitEnricher: Log processing disabled in configuration ')
-                );
-                return;
-            }
+        try {
+            $count = 0;
+            $limit = $this->config->getLogLimit();
+            $log   = $this->getLogHistory($fileNode->getAttribute('realpath'));
+            $block = [];
 
-            if ($this->loadFromCache($fileNode, $enrichtment)) {
-                return;
-            }
+            foreach ($log as $line) {
+                if ($line == '[EOF]') {
+                    $this->addCommit($enrichtment, $this->tokens, $block);
+                    $block = [];
+                    $count++;
 
-            try {
-                $count = 0;
-                $limit = $this->config->getLogLimit();
-                $log = $this->getLogHistory($fileNode->getAttribute('realpath'));
-                $block = array();
-
-                foreach($log as $line) {
-                    if ($line == '[EOF]') {
-                        $this->addCommit($enrichtment, $this->tokens, $block);
-                        $block = array();
-                        $count++;
-                        if ($count > $limit) {
-                            break;
-                        }
-                        continue;
+                    if ($count > $limit) {
+                        break;
                     }
-                    $block[] = $line;
-                }
-
-                $this->addToCache($fileNode, $enrichtment);
 
-            } catch (GitEnricherException $e) {
-                $enrichtment->appendChild(
-                    $dom->createComment('GitEnricher Error: ' . $e->getMessage())
-                );
+                    continue;
+                }
+                $block[] = $line;
             }
 
+            $this->addToCache($fileNode, $enrichtment);
+        } catch (GitEnricherException $e) {
+            $enrichtment->appendChild(
+                $dom->createComment('GitEnricher Error: ' . $e->getMessage())
+            );
         }
+    }
+
+    private function addCommit(fDOMElement $enrichment, array $tokens, array $block): void {
+        [$data, $text] = \array_chunk($block, \count($tokens));
 
-        private function addCommit(fDOMElement $enrichment, array $tokens, array $block) {
-            list($data, $text) = array_chunk($block, count($tokens));
+        $data = \array_combine($tokens, $data);
 
-            $data = array_combine($tokens, $data);
+        $commit = $enrichment->appendElementNS(self::GITNS, 'commit');
+        $commit->setAttribute('sha1', $data['H']);
 
-            $commit = $enrichment->appendElementNS(self::GITNS, 'commit');
-            $commit->setAttribute('sha1', $data['H']);
+        $author = $commit->appendElementNS(self::GITNS, 'author');
+        $author->setAttribute('email', $data['aE']);
+        $author->setAttribute('name', $data['aN']);
+        $author->setAttribute('time', \date('c', (int)$data['at']));
+        $author->setAttribute('unixtime', $data['at']);
+
+        $commiter = $commit->appendElementNS(self::GITNS, 'commiter');
+        $commiter->setAttribute('email', $data['cE']);
+        $commiter->setAttribute('name', $data['cN']);
+        $commiter->setAttribute('time', \date('c', (int)$data['ct']));
+        $commiter->setAttribute('unixtime', $data['ct']);
 
-            $author = $commit->appendElementNS(self::GITNS, 'author');
-            $author->setAttribute('email', $data['aE']);
-            $author->setAttribute('name', $data['aN']);
-            $author->setAttribute('time', date('c', $data['at']));
-            $author->setAttribute('unixtime', $data['at']);
-
-            $commiter = $commit->appendElementNS(self::GITNS, 'commiter');
-            $commiter->setAttribute('email', $data['cE']);
-            $commiter->setAttribute('name', $data['cN']);
-            $commiter->setAttribute('time', date('c', $data['ct']));
-            $commiter->setAttribute('unixtime', $data['ct']);
-
-            $message = $commit->appendElementNS(self::GITNS, 'message');
-            $message->appendTextNode(trim(join("\n", $text)));
+        $message = $commit->appendElementNS(self::GITNS, 'message');
+        $message->appendTextNode(\trim(\implode("\n", $text)));
+    }
+
+    private function getLogHistory($filename) {
+        /*
+         * H:8283723b40725a91c684e27c0c0449b959a48740
+         * aE:Arne@Blankerts.de
+         * aN:Arne Blankerts
+         * cE:Arne@Blankerts.de
+         * cN:Arne Blankerts
+         * at:1375611883
+         * ct:1375836305
+         * {commit message text}
+         * [EOF]
+         *
+         * see git log --help for more details
+         *
+         * The logic of addCommit assumes the commit message to be last
+         */
+        $format = '%' . \implode('%n%', $this->tokens) . '%n%B%n[EOF]';
+
+        $cwd = \getcwd();
+
+        if (!\file_exists($filename)) {
+            throw new GitEnricherException('Error getting log history for file ' . $filename . ' (file not found)', GitEnricherException::FetchingHistoryFailed);
         }
+        \chdir(\dirname($filename));
+        $fname = \escapeshellarg(\basename($filename));
+        \exec(\sprintf($this->config->getGitBinary() . ' log --no-color --follow --pretty=format:"%s" %s', $format, $fname), $log, $rc);
+        \chdir($cwd);
 
+        if ($rc !== 0) {
+            throw new GitEnricherException('Error getting log history for file ' . $filename, GitEnricherException::FetchingHistoryFailed);
+        }
 
-        private function getLogHistory($filename) {
-            /*
-             * H:8283723b40725a91c684e27c0c0449b959a48740
-             * aE:Arne@Blankerts.de
-             * aN:Arne Blankerts
-             * cE:Arne@Blankerts.de
-             * cN:Arne Blankerts
-             * at:1375611883
-             * ct:1375836305
-             * {commit message text}
-             * [EOF]
-             *
-             * see git log --help for more details
-             *
-             * The logic of addCommit assumes the commit message to be last
-             */
-            $format = '%' . join('%n%', $this->tokens) . '%n%B%n[EOF]';
-
-            $cwd = getcwd();
-            if (!file_exists($filename)) {
-                throw new GitEnricherException('Error getting log history for file ' . $filename . ' (file not found)', GitEnricherException::FetchingHistoryFailed);
-            }
-            chdir(dirname($filename));
-            $fname = escapeshellarg(basename($filename));
-            exec(sprintf($this->config->getGitBinary() . ' log --no-color --follow --pretty=format:"%s" %s', $format, $fname), $log, $rc);
-            chdir($cwd);
-            if ($rc !== 0) {
-                throw new GitEnricherException('Error getting log history for file ' . $filename, GitEnricherException::FetchingHistoryFailed);
-            }
-            return $log;
+        return $log;
+    }
+
+    private function loadFromCache(fDOMElement $fileNode, fDOMElement $enrichment) {
+        $dom    = $this->getCacheDom();
+        $fields = [
+            'path' => $fileNode->getAttribute('path'),
+            'file' => $fileNode->getAttribute('file')
+        ];
+        $query     = $dom->prepareQuery('//*[@path = :path and @file = :file]', $fields);
+        $cacheNode = $dom->queryOne($query);
+
+        if (!$cacheNode) {
+            return false;
+        }
+
+        foreach ($cacheNode->childNodes as $child) {
+            $enrichment->appendChild(
+                $enrichment->ownerDocument->importNode($child, true)
+            );
         }
 
-        private function loadFromCache(fDOMElement $fileNode, fDOMElement $enrichment) {
-            $dom = $this->getCacheDom();
-            $fields = array(
-                'path' => $fileNode->getAttribute('path'),
-                'file' => $fileNode->getAttribute('file')
+        return true;
+    }
+
+    private function addToCache(fDOMElement $fileNode, fDOMElement $enrichment): void {
+        $dom    = $this->getCacheDom();
+        $import = $dom->createElementNS(self::GITNS, 'file');
+
+        foreach ($fileNode->attributes as $attr) {
+            $import->appendChild(
+                $dom->importNode($attr)
             );
-            $query = $dom->prepareQuery('//*[@path = :path and @file = :file]', $fields);
-            $cacheNode = $dom->queryOne($query);
-            if (!$cacheNode) {
-                return false;
-            }
-            foreach($cacheNode->childNodes as $child) {
-                $enrichment->appendChild(
-                    $enrichment->ownerDocument->importNode($child, true)
-                );
-            }
-            return true;
         }
 
-        private function addToCache(fDOMElement $fileNode, fDOMElement $enrichment) {
-            $dom = $this->getCacheDom();
-            $import = $dom->createElementNS(self::GITNS, 'file');
-            foreach($fileNode->attributes as $attr) {
-                $import->appendChild(
-                    $dom->importNode($attr)
-                );
-            }
-            foreach($enrichment->childNodes as $node) {
-                $import->appendChild(
-                    $dom->importNode($node, true)
-                );
-            }
-            $dom->documentElement->appendChild($import);
-            $this->cacheDirty = true;
+        foreach ($enrichment->childNodes as $node) {
+            $import->appendChild(
+                $dom->importNode($node, true)
+            );
         }
+        $dom->documentElement->appendChild($import);
+        $this->cacheDirty = true;
+    }
+
+    private function getCacheDom() {
+        if ($this->cacheDom === null) {
+            $this->cacheDom = new fDOMDocument();
+            $cacheFile      = $this->config->getLogfilePath();
+
+            if (\file_exists($cacheFile)) {
+                $this->cacheDom->load($cacheFile);
+
+                $sha1 = $this->cacheDom->documentElement->getAttribute('sha1');
+                $cwd  = \getcwd();
+                \chdir($this->config->getSourceDirectory()->getPathname());
+                \exec($this->config->getGitBinary() . ' diff --name-only ' . $sha1, $files, $rc);
+
+                foreach ($files as $file) {
+                    $fields = [
+                        'path' => \dirname($file),
+                        'file' => \basename($file)
+                    ];
+                    $query = $this->cacheDom->prepareQuery('//*[@path = :path and @file = :file]', $fields);
+                    $node  = $this->cacheDom->queryOne($query);
 
-        private function getCacheDom() {
-            if ($this->cacheDom === NULL) {
-                $this->cacheDom = new fDOMDocument();
-                $cacheFile = $this->config->getLogfilePath();
-                if (file_exists($cacheFile)) {
-                    $this->cacheDom->load($cacheFile);
-
-                    $sha1 = $this->cacheDom->documentElement->getAttribute('sha1');
-                    $cwd = getcwd();
-                    chdir($this->config->getSourceDirectory());
-                    exec($this->config->getGitBinary() . ' diff --name-only ' . $sha1, $files, $rc);
-                    foreach($files as $file) {
-                        $fields = array(
-                            'path' => dirname($file),
-                            'file' => basename($file)
-                        );
-                        $query = $this->cacheDom->prepareQuery('//*[@path = :path and @file = :file]', $fields);
-                        $node = $this->cacheDom->queryOne($query);
-                        if (!$node) {
-                            continue;
-                        }
-                        $node->parentNode->removeChild($node);
+                    if (!$node) {
+                        continue;
                     }
-                    chdir($cwd);
-                } else {
-                    $this->cacheDom->loadXML('<?xml version="1.0" ?><gitlog xmlns="' . self::GITNS . '" />');
-                    $this->cacheDom->documentElement->setAttribute('sha1', $this->commitSha1);
+                    $node->parentNode->removeChild($node);
                 }
+                \chdir($cwd);
+            } else {
+                $this->cacheDom->loadXML('<?xml version="1.0" ?><gitlog xmlns="' . self::GITNS . '" />');
+                $this->cacheDom->documentElement->setAttribute('sha1', $this->commitSha1);
             }
-            return $this->cacheDom;
         }
 
-        /**
-         * @throws GitEnricherException
-         */
-        private function ensureExecFunctionEnabled() {
-            if (strpos(ini_get('disable_functions'), 'exec') !== FALSE) {
-                throw new GitEnricherException(
-                    'The use of "exec" has been disabled in php.ini but is required for this enricher',
-                    GitEnricherException::ExecDisabled
-                );
-            }
-        }
-
-        private function ensureGitVersionSupported($binary) {
-            $output = exec(sprintf('%s --version', $binary));
-            $parts = explode(' ', $output);
-            $version = array_pop($parts);
-
-            if (version_compare($version, '1.7.2', '<')) {
-                throw new GitEnricherException(
-                    sprintf('Your version of GIT is too old. Please upgrade to at least version 1.7.2 (Found: %s)', $version),
-                    GitEnricherException::GitVersionTooOld
-                );
+        return $this->cacheDom;
+    }
 
-            }
+    /**
+     * @throws GitEnricherException
+     */
+    private function ensureExecFunctionEnabled(): void {
+        if (\strpos(\ini_get('disable_functions'), 'exec') !== false) {
+            throw new GitEnricherException(
+                'The use of "exec" has been disabled in php.ini but is required for this enricher',
+                GitEnricherException::ExecDisabled
+            );
         }
-
     }
 
+    private function ensureGitVersionSupported($binary): void {
+        $output  = \exec(\sprintf('%s --version', $binary));
+        $parts   = \explode(' ', $output);
+        $version = \array_pop($parts);
+
+        if (\version_compare($version, '1.7.2', '<')) {
+            throw new GitEnricherException(
+                \sprintf('Your version of GIT is too old. Please upgrade to at least version 1.7.2 (Found: %s)', $version),
+                GitEnricherException::GitVersionTooOld
+            );
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/InterfaceEnricherInterface.php phpdox-0.12.0/src/generator/enricher/InterfaceEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/InterfaceEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/InterfaceEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-
-    interface InterfaceEnricherInterface extends EnricherInterface {
-
-        public function enrichInterface(InterfaceStartEvent $event);
-
-    }
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
 
+interface InterfaceEnricherInterface extends EnricherInterface {
+    public function enrichInterface(InterfaceStartEvent $event);
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/phpcs/PHPCsConfig.php phpdox-0.12.0/src/generator/enricher/phpcs/PHPCsConfig.php
--- phpdox-0.11.2/src/generator/enricher/phpcs/PHPCsConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/phpcs/PHPCsConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,14 +1,6 @@
-<?php
-
-namespace TheSeer\phpDox\Generator\Enricher {
-
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\GeneratorConfig;
-
-    class PHPCsConfig extends CheckStyleConfig{
-
-        protected $defaultFileName = 'phpcs.xml';
-
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
+class PHPCsConfig extends CheckStyleConfig {
+    protected $defaultFileName = 'phpcs.xml';
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/phpcs/PHPCs.php phpdox-0.12.0/src/generator/enricher/phpcs/PHPCs.php
--- phpdox-0.11.2/src/generator/enricher/phpcs/PHPCs.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/phpcs/PHPCs.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,26 +1,21 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMDocument;
 
-    use TheSeer\fDOM\fDOMDocument;
+class PHPCs extends CheckStyle {
+    public const XMLNS = 'http://xml.phpdox.net/src';
 
-    class PHPCs extends CheckStyle {
+    public const FINDINGS_XPATH = '/phpcs/file';
 
-        const XMLNS = 'http://xml.phpdox.net/src';
-        const FINDINGS_XPATH = '/phpcs/file';
+    public function getName(): string {
+        return 'PHPCS XML';
+    }
 
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'PHPCS XML';
-        }
+    protected function processFinding(fDOMDocument $dom, $ref, \DOMElement $finding, $elementName = null) {
+        $enrichFinding = parent::processFinding($dom, $ref, $finding, $finding->tagName);
+        $enrichFinding->setAttribute('message', $finding->nodeValue);
 
-        protected function processFinding(fDOMDocument $dom, $ref, \DOMElement $finding, $elementName = null) {
-            $enrichFinding = parent::processFinding($dom, $ref, $finding, $finding->tagName);
-            $enrichFinding->setAttribute('message', $finding->nodeValue);
-            return $enrichFinding;
-        }
+        return $enrichFinding;
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/phploc/PHPLocConfig.php phpdox-0.12.0/src/generator/enricher/phploc/PHPLocConfig.php
--- phpdox-0.11.2/src/generator/enricher/phploc/PHPLocConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/phploc/PHPLocConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,43 +1,44 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\GeneratorConfig;
 
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\GeneratorConfig;
-
-    class PHPLocConfig {
+class PHPLocConfig {
+    /**
+     * @var GeneratorConfig
+     */
+    private $generator;
+
+    /**
+     * @var fDOMElement
+     */
+    private $context;
+
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->context   = $ctx;
+        $this->generator = $generator;
+    }
 
-        /**
-         * @var GeneratorConfig
-         */
-        private $generator;
+    public function getLogFilePath() {
+        $basedirDefault = \dirname($this->context->ownerDocument->baseURI);
+        $path           = $basedirDefault . '/build/logs';
 
-        /**
-         * @var fDOMElement
-         */
-        private $context;
+        if ($this->context->parentNode->hasAttribute('base')) {
+            $path = $this->context->parentNode->getAttribute('base');
+        }
 
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->context = $ctx;
-            $this->generator = $generator;
+        if ($path != '') {
+            $path .= '/';
         }
+        $file = $this->context->queryOne('cfg:file');
 
-        public function getLogFilePath() {
-            $basedirDefault = dirname($this->context->ownerDocument->baseURI);
-            $path = $basedirDefault . '/build/logs';
-            if ($this->context->parentNode->hasAttribute('base')) {
-                $path = $this->context->parentNode->getAttribute('base');
-            }
-            if ($path != '') { $path .= '/'; }
-            $file = $this->context->queryOne('cfg:file');
-            if ($file && $file->hasAttribute('name')) {
-                $path .= $file->getAttribute('name');
-            } else {
-                $path .= 'phploc.xml';
-            }
-            return $path;
+        if ($file && $file->hasAttribute('name')) {
+            $path .= $file->getAttribute('name');
+        } else {
+            $path .= 'phploc.xml';
         }
 
+        return $path;
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/phploc/PHPLoc.php phpdox-0.12.0/src/generator/enricher/phploc/PHPLoc.php
--- phpdox-0.11.2/src/generator/enricher/phploc/PHPLoc.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/phploc/PHPLoc.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,65 +1,58 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMException;
-    use TheSeer\phpDox\Generator\PHPDoxStartEvent;
-
-    class PHPLoc extends  AbstractEnricher implements StartEnricherInterface {
-
-        /**
-         * @var fDOMDocument
-         */
-        private $dom;
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMException;
+use TheSeer\phpDox\Generator\PHPDoxStartEvent;
+
+class PHPLoc extends AbstractEnricher implements StartEnricherInterface {
+    /**
+     * @var fDOMDocument
+     */
+    private $dom;
 
-        public function __construct(PHPLocConfig $config) {
-            $this->loadXML($config->getLogFilePath());
-        }
-
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'PHPLoc xml';
-        }
+    public function __construct(PHPLocConfig $config) {
+        $this->loadXML($config->getLogFilePath());
+    }
 
-        public function enrichStart(PHPDoxStartEvent $event) {
-            $index = $event->getIndex()->asDom();
-            $enrichment = $this->getEnrichtmentContainer($index->documentElement, 'phploc');
-
-            // Import nodes in a loop to fix empty namespaces until sebastian fixes phploc to generate
-            // "proper" xml ;)
-            foreach($this->dom->documentElement->getElementsByTagName('*') as $node) {
-                /** @var \DOMNode $node */
-
-                $enrichment->appendChild(
-                    $index->createElementNS(
-                        'http://xml.phpdox.net/src',
-                        $node->localName,
-                        $node->nodeValue
-                    )
-                );
+    public function getName(): string {
+        return 'PHPLoc xml';
+    }
 
-            }
+    public function enrichStart(PHPDoxStartEvent $event): void {
+        $index      = $event->getIndex()->asDom();
+        $enrichment = $this->getEnrichtmentContainer($index->documentElement, 'phploc');
+
+        // Import nodes in a loop to fix empty namespaces until sebastian fixes phploc to generate
+        // "proper" xml ;)
+        foreach ($this->dom->documentElement->getElementsByTagName('*') as $node) {
+            /* @var \DOMNode $node */
+
+            $enrichment->appendChild(
+                $index->createElementNS(
+                    'http://xml.phpdox.net/src',
+                    $node->localName,
+                    $node->nodeValue
+                )
+            );
         }
+    }
 
-        private function loadXML($fname) {
-            try {
-                if (!file_exists($fname)) {
-                    throw new EnricherException(
-                        sprintf('PHPLoc xml file "%s" not found.', $fname),
-                        EnricherException::LoadError
-                    );
-                }
-                $this->dom = new fDOMDocument();
-                $this->dom->load($fname);
-            } catch (fDOMException $e) {
+    private function loadXML($fname): void {
+        try {
+            if (!\file_exists($fname)) {
                 throw new EnricherException(
-                    'Parsing PHPLoc xml file failed: ' . $e->getMessage(),
+                    \sprintf('PHPLoc xml file "%s" not found.', $fname),
                     EnricherException::LoadError
                 );
             }
+            $this->dom = new fDOMDocument();
+            $this->dom->load($fname);
+        } catch (fDOMException $e) {
+            throw new EnricherException(
+                'Parsing PHPLoc xml file failed: ' . $e->getMessage(),
+                EnricherException::LoadError
+            );
         }
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/phpunit/PHPUnitConfig.php phpdox-0.12.0/src/generator/enricher/phpunit/PHPUnitConfig.php
--- phpdox-0.11.2/src/generator/enricher/phpunit/PHPUnitConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/phpunit/PHPUnitConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,54 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
-
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\GeneratorConfig;
-
-    class PHPUnitConfig {
-
-        /**
-         * @var GeneratorConfig
-         */
-        private $generator;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\GeneratorConfig;
+
+class PHPUnitConfig {
+    /**
+     * @var GeneratorConfig
+     */
+    private $generator;
+
+    /**
+     * @var fDOMElement
+     */
+    private $context;
+
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->context   = $ctx;
+        $this->generator = $generator;
+    }
 
-        /**
-         * @var fDOMElement
-         */
-        private $context;
+    public function getCoveragePath(): FileInfo {
+        $basedirDefault = \dirname($this->context->ownerDocument->baseURI);
+        $path           = $basedirDefault . '/build/logs';
 
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->context = $ctx;
-            $this->generator = $generator;
+        if ($this->context->parentNode->hasAttribute('base')) {
+            $path = $this->context->parentNode->getAttribute('base');
         }
 
-        /**
-         * @return FileInfo
-         */
-        public function getCoveragePath() {
-            $basedirDefault = dirname($this->context->ownerDocument->baseURI);
-            $path = $basedirDefault . '/build/logs';
-            if ($this->context->parentNode->hasAttribute('base')) {
-                $path = $this->context->parentNode->getAttribute('base');
-            }
-            if ($path != '') { $path .= '/'; }
-            $coverage = $this->context->queryOne('cfg:coverage');
-            if ($coverage && $coverage->hasAttribute('path')) {
-                $cfgPath = $coverage->getAttribute('path');
-                if ($cfgPath[0] === '/') {
-                    $path = '';
-                }
-                $path .= $coverage->getAttribute('path');
-            } else {
-                $path .= 'coverage';
-            }
-            return new FileInfo($path);
+        if ($path != '') {
+            $path .= '/';
         }
+        $coverage = $this->context->queryOne('cfg:coverage');
+
+        if ($coverage && $coverage->hasAttribute('path')) {
+            $cfgPath = $coverage->getAttribute('path');
 
-        /**
-         * @return FileInfo
-         */
-        public function getSourceDirectory() {
-            return $this->generator->getProjectConfig()->getSourceDirectory();
+            if ($cfgPath[0] === '/') {
+                $path = '';
+            }
+            $path .= $coverage->getAttribute('path');
+        } else {
+            $path .= 'coverage';
         }
 
+        return new FileInfo($path);
     }
 
+    public function getSourceDirectory(): FileInfo {
+        return $this->generator->getProjectConfig()->getSourceDirectory();
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/phpunit/PHPUnit.php phpdox-0.12.0/src/generator/enricher/phpunit/PHPUnit.php
--- phpdox-0.11.2/src/generator/enricher/phpunit/PHPUnit.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/phpunit/PHPUnit.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,280 +1,278 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\fDOM\fDOMException;
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\PHPDoxEndEvent;
-    use TheSeer\phpDox\Generator\TokenFileStartEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
-
-    class PHPUnit extends AbstractEnricher implements
-        EndEnricherInterface, ClassEnricherInterface, TraitEnricherInterface, TokenFileEnricherInterface {
-
-        const XMLNS_HTTP = 'http://schema.phpunit.de/coverage/1.0';
-        const XMLNS_HTTPS = 'https://schema.phpunit.de/coverage/1.0';
-
-        /**
-         * @var Fileinfo
-         */
-        private $coveragePath;
-
-        /**
-         * @var string
-         */
-        private $namespaceURI;
-
-        /**
-         * @var FileInfo
-         */
-        private $sourceDirectory;
-        /**
-         * @var fDOMDocument
-         */
-        private $index;
-
-        private $results = array();
-        private $coverage = array();
-
-        /**
-         * @param PHPUnitConfig $config
-         *
-         * @throws EnricherException
-         */
-        public function __construct(PHPUnitConfig $config) {
-            $this->coveragePath = $config->getCoveragePath();
-            $this->sourceDirectory = $config->getSourceDirectory();
-
-            $this->index = $this->loadXML('index.xml');
-        }
-
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'PHPUnit Coverage XML';
-        }
-
-        public function enrichEnd(PHPDoxEndEvent $event) {
-            $index = $event->getIndex()->asDom();
-            foreach($this->results as $namespace => $classes) {
-                foreach($classes as $class => $results) {
-                    $classNode = $index->queryOne(
-                        sprintf('//phpdox:namespace[@name = "%s"]/phpdox:class[@name = "%s"]', $namespace, $class)
-                    );
-                    if (!$classNode) {
-                        continue;
-                    }
-                    /** @var fDOMElement $classNode */
-                    $container = $this->getEnrichtmentContainer($classNode, 'phpunit');
-                    $resultNode = $container->appendElementNS($this->namespaceURI, 'result');
-                    foreach($results as $key => $value) {
-                        $resultNode->setAttribute(mb_strtolower($key), $value);
-                    }
-                    $container->appendChild(
-                        $container->ownerDocument->importNode($this->coverage[$namespace][$class])
-                    );
-                }
-            }
-        }
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMException;
+use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\PHPDoxEndEvent;
+use TheSeer\phpDox\Generator\TokenFileStartEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
+
+class PHPUnit extends AbstractEnricher implements
+    EndEnricherInterface, ClassEnricherInterface, TraitEnricherInterface, TokenFileEnricherInterface {
+    public const XMLNS_HTTP = 'http://schema.phpunit.de/coverage/1.0';
+
+    public const XMLNS_HTTPS = 'https://schema.phpunit.de/coverage/1.0';
+
+    /**
+     * @var Fileinfo
+     */
+    private $coveragePath;
+
+    /**
+     * @var string
+     */
+    private $namespaceURI;
+
+    /**
+     * @var FileInfo
+     */
+    private $sourceDirectory;
+
+    /**
+     * @var fDOMDocument
+     */
+    private $index;
+
+    private $results = [];
+
+    private $coverage = [];
+
+    /**
+     * @throws EnricherException
+     */
+    public function __construct(PHPUnitConfig $config) {
+        $this->coveragePath    = $config->getCoveragePath();
+        $this->sourceDirectory = $config->getSourceDirectory();
 
-        public function enrichClass(ClassStartEvent $event) {
-            $this->enrichByFile($event->getClass()->asDom());
-        }
+        $this->index = $this->loadXML('index.xml');
+    }
 
-        public function enrichTrait(TraitStartEvent $event) {
-            $this->enrichByFile($event->getTrait()->asDom());
-        }
+    public function getName(): string {
+        return 'PHPUnit Coverage XML';
+    }
 
-        public function enrichTokenFile(TokenFileStartEvent $event) {
-            try {
-                $tokenDom = $event->getTokenFile()->asDom();
-                $coverageDom = $this->loadCoverageInformation($tokenDom);
-                $coverage = $coverageDom->queryOne('//pu:coverage[pu:line]');
-                if ($coverage) {
-                    $container = $this->getEnrichtmentContainer($tokenDom->documentElement, 'phpunit');
-                    $container->appendChild($tokenDom->importNode($coverage, true));
+    public function enrichEnd(PHPDoxEndEvent $event): void {
+        $index = $event->getIndex()->asDom();
+
+        foreach ($this->results as $namespace => $classes) {
+            foreach ($classes as $class => $results) {
+                $classNode = $index->queryOne(
+                    \sprintf('//phpdox:namespace[@name = "%s"]/phpdox:class[@name = "%s"]', $namespace, $class)
+                );
+
+                if (!$classNode) {
+                    continue;
                 }
-            } catch (PHPUnitEnricherException $e) {
-                // Silently ignore for now
-            }
+                /** @var fDOMElement $classNode */
+                $container  = $this->getEnrichtmentContainer($classNode, 'phpunit');
+                $resultNode = $container->appendElementNS($this->namespaceURI, 'result');
 
+                foreach ($results as $key => $value) {
+                    $resultNode->setAttribute(\mb_strtolower($key), $value);
+                }
+                $container->appendChild(
+                    $container->ownerDocument->importNode($this->coverage[$namespace][$class])
+                );
+            }
         }
+    }
 
-        private function enrichByFile(fDOMDocument $dom) {
-            try {
-                $coverageDom = $this->loadCoverageInformation($dom);
-                $this->processUnit($dom, $coverageDom);
-            } catch (PHPUnitEnricherException $e) {
-                // Silently ignore for now
+    public function enrichClass(ClassStartEvent $event): void {
+        $this->enrichByFile($event->getClass()->asDom());
+    }
+
+    public function enrichTrait(TraitStartEvent $event): void {
+        $this->enrichByFile($event->getTrait()->asDom());
+    }
+
+    public function enrichTokenFile(TokenFileStartEvent $event): void {
+        try {
+            $tokenDom    = $event->getTokenFile()->asDom();
+            $coverageDom = $this->loadCoverageInformation($tokenDom);
+            $coverage    = $coverageDom->queryOne('//pu:coverage[pu:line]');
+
+            if ($coverage) {
+                $container = $this->getEnrichtmentContainer($tokenDom->documentElement, 'phpunit');
+                $container->appendChild($tokenDom->importNode($coverage, true));
             }
+        } catch (PHPUnitEnricherException $e) {
+            // Silently ignore for now
         }
+    }
 
-        /**
-         * @param $fname
-         *
-         * @return fDOMDocument
-         *
-         * @throws EnricherException
-         */
-        private function loadXML($fname) {
-            try {
-                $fname = (string)$this->coveragePath . '/' . $fname;
-                if (!file_exists($fname)) {
-                    throw new EnricherException(
-                        sprintf('PHPUnit coverage xml file "%s" not found.', $fname),
-                        EnricherException::LoadError
-                    );
-                }
-                $dom = new fDOMDocument();
-                $dom->load($fname);
+    private function enrichByFile(fDOMDocument $dom): void {
+        try {
+            $coverageDom = $this->loadCoverageInformation($dom);
+            $this->processUnit($dom, $coverageDom);
+        } catch (PHPUnitEnricherException $e) {
+            // Silently ignore for now
+        }
+    }
 
-                $this->namespaceURI = $dom->documentElement->namespaceURI;
+    /**
+     * @param $fname
+     *
+     * @throws EnricherException
+     */
+    private function loadXML($fname): fDOMDocument {
+        try {
+            $fname = (string)$this->coveragePath . '/' . $fname;
 
-                if (!in_array($this->namespaceURI, [self::XMLNS_HTTP, self::XMLNS_HTTPS])) {
-                    throw new EnricherException(
-                        'Wrong namspace - not a PHPUnit code coverage file',
-                        EnricherException::LoadError
-                    );
-                }
+            if (!\file_exists($fname)) {
+                throw new EnricherException(
+                    \sprintf('PHPUnit coverage xml file "%s" not found.', $fname),
+                    EnricherException::LoadError
+                );
+            }
+            $dom = new fDOMDocument();
+            $dom->load($fname);
 
-                $dom->registerNamespace('pu', $this->namespaceURI);
+            $this->namespaceURI = $dom->documentElement->namespaceURI;
 
-                return $dom;
-            } catch (fDOMException $e) {
+            if (!\in_array($this->namespaceURI, [self::XMLNS_HTTP, self::XMLNS_HTTPS])) {
                 throw new EnricherException(
-                    'Parsing PHPUnit xml file failed: ' . $e->getMessage(),
+                    'Wrong namspace - not a PHPUnit code coverage file',
                     EnricherException::LoadError
                 );
             }
+
+            $dom->registerNamespace('pu', $this->namespaceURI);
+
+            return $dom;
+        } catch (fDOMException $e) {
+            throw new EnricherException(
+                'Parsing PHPUnit xml file failed: ' . $e->getMessage(),
+                EnricherException::LoadError
+            );
         }
+    }
 
-        private function processUnit(fDOMDocument $unit, fDOMDocument $coverage) {
-            $enrichment = $this->getEnrichtmentContainer($unit->documentElement, 'phpunit');
+    private function processUnit(fDOMDocument $unit, fDOMDocument $coverage): void {
+        $enrichment = $this->getEnrichtmentContainer($unit->documentElement, 'phpunit');
 
-            $className = $unit->documentElement->getAttribute('name');
-            $classNamespace = $unit->documentElement->getAttribute('namespace');
+        $className      = $unit->documentElement->getAttribute('name');
+        $classNamespace = $unit->documentElement->getAttribute('namespace');
 
-            $classNode = $coverage->queryOne(
-                sprintf('//pu:class[@name = "%2$s\%1$s" or (@name = "%1$s" and pu:namespace[@name = "%2$s"])]', $className, $classNamespace)
+        $classNode = $coverage->queryOne(
+            \sprintf('//pu:class[@name = "%2$s\%1$s" or (@name = "%1$s" and pu:namespace[@name = "%2$s"])]', $className, $classNamespace)
+        );
+
+        if (!$classNode) {
+            // This class seems to be newer than the last phpunit run
+            return;
+        }
+        $coverageTarget = $enrichment->appendElementNS($this->namespaceURI, 'coverage');
+
+        foreach (['executable', 'executed', 'crap'] as $attr) {
+            $coverageTarget->appendChild(
+                $coverageTarget->ownerDocument->importNode($classNode->getAttributeNode($attr))
             );
+        }
 
-            if (!$classNode) {
-                // This class seems to be newer than the last phpunit run
-                return;
-            }
+        $result = [
+            'UNKNOWN'    => 0,
+            'PASSED'     => 0,
+            'SKIPPED'    => 0,
+            'INCOMPLETE' => 0,
+            'FAILURE'    => 0,
+            'ERROR'      => 0,
+            'RISKY'      => 0,
+            'WARNING'    => 0
+        ];
+
+        $methods = $unit->query('/phpdox:*/phpdox:constructor|/phpdox:*/phpdox:destructor|/phpdox:*/phpdox:method');
+        $xp      = $this->index->getDOMXPath();
+
+        foreach ($methods as $method) {
+            $start = $method->getAttribute('start');
+            $end   = $method->getAttribute('end');
+
+            $enrichment     = $this->getEnrichtmentContainer($method, 'phpunit');
             $coverageTarget = $enrichment->appendElementNS($this->namespaceURI, 'coverage');
-            foreach(array('executable','executed', 'crap') as $attr) {
-                $coverageTarget->appendChild(
-                    $coverageTarget->ownerDocument->importNode($classNode->getAttributeNode($attr))
-                );
-            }
 
-            $result = array(
-                'PASSED'  => 0,
-                'SKIPPED'  => 0,
-                'INCOMPLETE'  => 0,
-                'FAILURE'  => 0,
-                'ERROR'  => 0,
-                'RISKY'  => 0,
-                'WARNING' => 0
+            /** @var fDOMElement $coverageMethod */
+            $coverageMethod = $coverage->queryOne(
+                \sprintf('//pu:method[@start = "%d" and @end = "%d"]', $start, $end)
             );
 
-            $methods = $unit->query('/phpdox:*/phpdox:constructor|/phpdox:*/phpdox:destructor|/phpdox:*/phpdox:method');
-            $xp = $this->index->getDOMXPath();
-
-            foreach($methods as $method) {
-                $start = $method->getAttribute('start');
-                $end = $method->getAttribute('end');
-
-                $enrichment = $this->getEnrichtmentContainer($method, 'phpunit');
-                $coverageTarget = $enrichment->appendElementNS($this->namespaceURI, 'coverage');
-
-                /** @var fDOMElement $coverageMethod */
-                $coverageMethod = $coverage->queryOne(
-                    sprintf('//pu:method[@start = "%d" and @end = "%d"]', $start, $end)
-                );
-
-                if ($coverageMethod != NULL) {
-                    foreach(array('executable','executed','coverage', 'crap') as $attr) {
-                        $coverageTarget->appendChild(
-                            $coverageTarget->ownerDocument->importNode($coverageMethod->getAttributeNode($attr))
-                        );
-                    }
+            if ($coverageMethod != null) {
+                foreach (['executable', 'executed', 'coverage', 'crap'] as $attr) {
+                    $coverageTarget->appendChild(
+                        $coverageTarget->ownerDocument->importNode($coverageMethod->getAttributeNode($attr))
+                    );
                 }
+            }
 
-                $coveredNodes = $coverage->query(
-                    sprintf('//pu:coverage/pu:line[@nr >= "%d" and @nr <= "%d"]/pu:covered', $start, $end)
-                );
+            $coveredNodes = $coverage->query(
+                \sprintf('//pu:coverage/pu:line[@nr >= "%d" and @nr <= "%d"]/pu:covered', $start, $end)
+            );
 
-                $seen = array();
-                foreach($coveredNodes as $coveredNode) {
-                    $by = $coveredNode->getAttribute('by');
-                    if (isset($seen[$by])) {
-                        continue;
-                    }
-                    $seen[$by] = true;
-
-                    $name = $xp->prepare(':name', array('name' => $by));
-                    $test = $coverageTarget->appendChild(
-                        $unit->importNode(
-                            $this->index->queryOne(
-                                sprintf('//pu:tests/pu:test[@name = %s]', $name)
-                            )
-                        )
-                    );
+            $seen = [];
 
-                    $result[$test->getAttribute('status')]++;
+            foreach ($coveredNodes as $coveredNode) {
+                $by = $coveredNode->getAttribute('by');
 
+                if (isset($seen[$by])) {
+                    continue;
                 }
+                $seen[$by] = true;
 
-            }
+                $name = $xp->prepare(':name', ['name' => $by]);
+                $test = $coverageTarget->appendChild(
+                    $unit->importNode(
+                        $this->index->queryOne(
+                            \sprintf('//pu:tests/pu:test[@name = %s]', $name)
+                        )
+                    )
+                );
 
-            if (!isset($this->results[$classNamespace])) {
-                $this->results[$classNamespace] = array();
-                $this->coverage[$classNamespace] = array();
+                $result[$test->getAttribute('status')]++;
             }
-            $this->results[$classNamespace][$className] = $result;
-            $this->coverage[$classNamespace][$className] = $coverageTarget->cloneNode(false);
         }
 
-        /**
-         * @param fDOMDocument $dom
-         *
-         * @return fDOMDocument
-         *
-         * @throws EnricherException
-         * @throws PHPUnitEnricherException
-         */
-        private function loadCoverageInformation(fDOMDocument $dom) {
-            $fileNode = $dom->queryOne('//phpdox:file');
-            if (!$fileNode) {
-                throw new PHPUnitEnricherException('No file header in event dom');
-            }
+        if (!isset($this->results[$classNamespace])) {
+            $this->results[$classNamespace]  = [];
+            $this->coverage[$classNamespace] = [];
+        }
+        $this->results[$classNamespace][$className]  = $result;
+        $this->coverage[$classNamespace][$className] = $coverageTarget->cloneNode(false);
+    }
 
-            $fileInfo = new FileInfo($fileNode->getAttribute('path'));
-            $paths = explode('/', (string)$fileInfo->getRelative($this->sourceDirectory));
-            $file = $fileNode->getAttribute('file');
-            $paths = array_slice($paths, 1);
-
-            $query = sprintf('//pu:project/pu:directory');
-            foreach ($paths as $path) {
-                $query .= sprintf('/pu:directory[@name = "%s"]', $path);
-            }
-            $query .= sprintf('/pu:file[@name = "%s"]', $file);
+    /**
+     * @throws EnricherException
+     * @throws PHPUnitEnricherException
+     */
+    private function loadCoverageInformation(fDOMDocument $dom): fDOMDocument {
+        $fileNode = $dom->queryOne('//phpdox:file');
 
-            $phpunitFileNode = $this->index->queryOne($query);
-            if (!$phpunitFileNode) {
-                throw new PHPUnitEnricherException('No coverage information for file');
-            }
+        if (!$fileNode) {
+            throw new PHPUnitEnricherException('No file header in event dom');
+        }
+
+        $fileInfo = new FileInfo($fileNode->getAttribute('path'));
+        $paths    = \explode('/', (string)$fileInfo->getRelative($this->sourceDirectory));
+        $file     = $fileNode->getAttribute('file');
+        $paths    = \array_slice($paths, 1);
 
-            return $this->loadXML($phpunitFileNode->getAttribute('href'));
+        $query = \sprintf('//pu:project/pu:directory');
+
+        foreach ($paths as $path) {
+            $query .= \sprintf('/pu:directory[@name = "%s"]', $path);
         }
-    }
+        $query .= \sprintf('/pu:file[@name = "%s"]', $file);
 
+        $phpunitFileNode = $this->index->queryOne($query);
 
-    class PHPUnitEnricherException extends EnricherException {
+        if (!$phpunitFileNode) {
+            throw new PHPUnitEnricherException('No coverage information for file');
+        }
+
+        return $this->loadXML($phpunitFileNode->getAttribute('href'));
     }
 }
+
+class PHPUnitEnricherException extends EnricherException {
+}
diff -Nru phpdox-0.11.2/src/generator/enricher/pmd/PHPMessDetectorConfig.php phpdox-0.12.0/src/generator/enricher/pmd/PHPMessDetectorConfig.php
--- phpdox-0.11.2/src/generator/enricher/pmd/PHPMessDetectorConfig.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/pmd/PHPMessDetectorConfig.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,43 +1,44 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\phpDox\GeneratorConfig;
 
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\phpDox\GeneratorConfig;
-
-    class PHPMessDetectorConfig {
+class PHPMessDetectorConfig {
+    /**
+     * @var GeneratorConfig
+     */
+    private $generator;
+
+    /**
+     * @var fDOMElement
+     */
+    private $context;
+
+    public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
+        $this->context   = $ctx;
+        $this->generator = $generator;
+    }
 
-        /**
-         * @var GeneratorConfig
-         */
-        private $generator;
+    public function getLogFilePath() {
+        $basedirDefault = \dirname($this->context->ownerDocument->baseURI);
+        $path           = $basedirDefault . '/build/logs';
 
-        /**
-         * @var fDOMElement
-         */
-        private $context;
+        if ($this->context->parentNode->hasAttribute('base')) {
+            $path = $this->context->parentNode->getAttribute('base');
+        }
 
-        public function __construct(GeneratorConfig $generator, fDOMElement $ctx) {
-            $this->context = $ctx;
-            $this->generator = $generator;
+        if ($path != '') {
+            $path .= '/';
         }
+        $file = $this->context->queryOne('cfg:file');
 
-        public function getLogFilePath() {
-            $basedirDefault = dirname($this->context->ownerDocument->baseURI);
-            $path = $basedirDefault . '/build/logs';
-            if ($this->context->parentNode->hasAttribute('base')) {
-                $path = $this->context->parentNode->getAttribute('base');
-            }
-            if ($path != '') { $path .= '/'; }
-            $file = $this->context->queryOne('cfg:file');
-            if ($file && $file->hasAttribute('name')) {
-                $path .= $file->getAttribute('name');
-            } else {
-                $path .= 'pmd.xml';
-            }
-            return $path;
+        if ($file && $file->hasAttribute('name')) {
+            $path .= $file->getAttribute('name');
+        } else {
+            $path .= 'pmd.xml';
         }
 
+        return $path;
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/pmd/PHPMessDetector.php phpdox-0.12.0/src/generator/enricher/pmd/PHPMessDetector.php
--- phpdox-0.11.2/src/generator/enricher/pmd/PHPMessDetector.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/pmd/PHPMessDetector.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,98 +1,95 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-namespace TheSeer\phpDox\Generator\Enricher {
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMException;
+use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\Generator\AbstractUnitObject;
+use TheSeer\phpDox\Generator\ClassStartEvent;
+use TheSeer\phpDox\Generator\InterfaceStartEvent;
+use TheSeer\phpDox\Generator\TraitStartEvent;
+
+class PHPMessDetector extends AbstractEnricher implements ClassEnricherInterface, InterfaceEnricherInterface, TraitEnricherInterface {
+    private $config;
+
+    private $violations;
+
+    public function __construct(PHPMessDetectorConfig $config) {
+        $this->config = $config;
+        $this->loadViolations($config->getLogFilePath());
+    }
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\fDOM\fDOMException;
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\Generator\AbstractUnitObject;
-    use TheSeer\phpDox\Generator\ClassStartEvent;
-    use TheSeer\phpDox\Generator\InterfaceStartEvent;
-    use TheSeer\phpDox\Generator\TraitStartEvent;
-
-    class PHPMessDetector extends AbstractEnricher implements ClassEnricherInterface, InterfaceEnricherInterface, TraitEnricherInterface {
-
-        private $config;
-        private $violations = NULL;
-
-        public function __construct(PHPMessDetectorConfig $config) {
-            $this->config = $config;
-            $this->loadViolations($config->getLogFilePath());
-        }
+    public function getName(): string {
+        return 'PHPMessDetector XML';
+    }
 
-        /**
-         * @return string
-         */
-        public function getName() {
-            return 'PHPMessDetector XML';
-        }
+    public function enrichClass(ClassStartEvent $event): void {
+        $this->enrichUnit($event->getClass());
+    }
 
-        public function enrichClass(ClassStartEvent $event) {
-            $this->enrichUnit($event->getClass());
-        }
+    public function enrichInterface(InterfaceStartEvent $event): void {
+        $this->enrichUnit($event->getInterface());
+    }
 
-        public function enrichInterface(InterfaceStartEvent $event) {
-            $this->enrichUnit($event->getInterface());
-        }
+    public function enrichTrait(TraitStartEvent $event): void {
+        $this->enrichUnit($event->getTrait());
+    }
 
-        public function enrichTrait(TraitStartEvent $event) {
-            $this->enrichUnit($event->getTrait());
-        }
+    public function enrichUnit(AbstractUnitObject $ctx): void {
+        $file = $ctx->getSourceFile();
 
-        public function enrichUnit(AbstractUnitObject $ctx) {
-            $file = $ctx->getSourceFile();
-            if (isset($this->violations[$file])) {
-                $this->processViolations($ctx->asDom(), $this->violations[$file]);
-            }
+        if (isset($this->violations[$file])) {
+            $this->processViolations($ctx->asDom(), $this->violations[$file]);
         }
+    }
+
+    private function loadViolations($xmlFile): void {
+        $this->violations = [];
 
-        private function loadViolations($xmlFile) {
-            $this->violations = array();
-            try {
-                if (!file_exists($xmlFile)) {
-                    throw new EnricherException(
-                        sprintf('Logfile "%s" not found.', $xmlFile),
-                        EnricherException::LoadError
-                    );
-                }
-                $dom = new fDOMDocument();
-                $dom->load($xmlFile);
-                foreach($dom->query('/pmd/file') as $file) {
-                    $fileInfo = new FileInfo($file->getAttribute('name'));
-                    $this->violations[$fileInfo->getPathname()] = $file->query('*');
-                }
-            } catch (fDOMException $e) {
+        try {
+            if (!\file_exists($xmlFile)) {
                 throw new EnricherException(
-                    'Parsing pmd logfile failed: ' . $e->getMessage(),
+                    \sprintf('Logfile "%s" not found.', $xmlFile),
                     EnricherException::LoadError
                 );
             }
+            $dom = new fDOMDocument();
+            $dom->load($xmlFile);
 
+            foreach ($dom->query('/pmd/file') as $file) {
+                $fileInfo                                   = new FileInfo($file->getAttribute('name'));
+                $this->violations[$fileInfo->getPathname()] = $file->query('*');
+            }
+        } catch (fDOMException $e) {
+            throw new EnricherException(
+                'Parsing pmd logfile failed: ' . $e->getMessage(),
+                EnricherException::LoadError
+            );
         }
+    }
 
-        private function processViolations(fDOMDocument $dom, \DOMNodeList $violations) {
-            foreach($violations as $violation) {
-                /** @var fDOMElement $violation */
-                $line = $violation->getAttribute('beginline');
-                $ref = $dom->queryOne(sprintf('//phpdox:*/*[@line = %d or (@start <= %d and @end >= %d)]', $line, $line, $line));
-                if (!$ref) {
-                    // One src file may contain multiple classes/traits/interfaces, so the
-                    // finding might not apply to the current object since violations are based on filenames
-                    // but we have individual objects - so we just ignore the finding for this context
-                    continue;
-                }
-
-                $enrichment = $this->getEnrichtmentContainer($ref, 'pmd');
-                $enrichViolation = $dom->createElementNS(self::XMLNS, 'violation');
-                $enrichment->appendChild($enrichViolation);
-                $enrichViolation->setAttribute('message', trim($violation->nodeValue));
-                foreach($violation->attributes as $attr) {
-                    $enrichViolation->setAttributeNode($dom->importNode($attr, true));
-                }
+    private function processViolations(fDOMDocument $dom, \DOMNodeList $violations): void {
+        foreach ($violations as $violation) {
+            /** @var fDOMElement $violation */
+            $line = $violation->getAttribute('beginline');
+            $ref  = $dom->queryOne(\sprintf('//phpdox:*/*[@line = %d or (@start <= %d and @end >= %d)]', $line, $line, $line));
+
+            if (!$ref) {
+                // One src file may contain multiple classes/traits/interfaces, so the
+                // finding might not apply to the current object since violations are based on filenames
+                // but we have individual objects - so we just ignore the finding for this context
+                continue;
+            }
+
+            $enrichment      = $this->getEnrichtmentContainer($ref, 'pmd');
+            $enrichViolation = $dom->createElementNS(self::XMLNS, 'violation');
+            $enrichment->appendChild($enrichViolation);
+            $enrichViolation->setAttribute('message', \trim($violation->nodeValue));
 
+            foreach ($violation->attributes as $attr) {
+                $enrichViolation->setAttributeNode($dom->importNode($attr, true));
             }
-         }
+        }
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/StartEnricherInterface.php phpdox-0.12.0/src/generator/enricher/StartEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/StartEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/StartEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\phpDox\Generator\PHPDoxStartEvent;
-
-    interface StartEnricherInterface extends EnricherInterface {
-
-        public function enrichStart(PHPDoxStartEvent $event);
-
-    }
+use TheSeer\phpDox\Generator\PHPDoxStartEvent;
 
+interface StartEnricherInterface extends EnricherInterface {
+    public function enrichStart(PHPDoxStartEvent $event);
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/TokenFileEnricherInterface.php phpdox-0.12.0/src/generator/enricher/TokenFileEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/TokenFileEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/TokenFileEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\phpDox\Generator\TokenFileStartEvent;
-
-    interface TokenFileEnricherInterface extends EnricherInterface {
-
-        public function enrichTokenFile(TokenFileStartEvent $event);
-
-    }
+use TheSeer\phpDox\Generator\TokenFileStartEvent;
 
+interface TokenFileEnricherInterface extends EnricherInterface {
+    public function enrichTokenFile(TokenFileStartEvent $event);
 }
diff -Nru phpdox-0.11.2/src/generator/enricher/TraitEnricherInterface.php phpdox-0.12.0/src/generator/enricher/TraitEnricherInterface.php
--- phpdox-0.11.2/src/generator/enricher/TraitEnricherInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/enricher/TraitEnricherInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,12 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator\Enricher {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator\Enricher;
 
-    use TheSeer\phpDox\Generator\TraitStartEvent;
-
-    interface TraitEnricherInterface extends EnricherInterface {
-
-        public function enrichTrait(TraitStartEvent $event);
-
-    }
+use TheSeer\phpDox\Generator\TraitStartEvent;
 
+interface TraitEnricherInterface extends EnricherInterface {
+    public function enrichTrait(TraitStartEvent $event);
 }
diff -Nru phpdox-0.11.2/src/generator/events/AbstractClassEvent.php phpdox-0.12.0/src/generator/events/AbstractClassEvent.php
--- phpdox-0.11.2/src/generator/events/AbstractClassEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/AbstractClassEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,21 +1,17 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    abstract class AbstractClassEvent extends AbstractEvent {
+abstract class AbstractClassEvent extends AbstractEvent {
+    private $class;
 
-        private $class;
-
-        public function __construct($class) {
-            $this->class = $class;
-        }
-
-        public function getClass() {
-            return $this->class;
-        }
-
-        public function getNamespace() {
+    public function __construct($class) {
+        $this->class = $class;
+    }
 
-        }
+    public function getClass() {
+        return $this->class;
     }
 
+    public function getNamespace(): void {
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/ClassConstantEvent.php phpdox-0.12.0/src/generator/events/ClassConstantEvent.php
--- phpdox-0.11.2/src/generator/events/ClassConstantEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/ClassConstantEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class ClassConstantEvent extends ConstantEvent {
+class ClassConstantEvent extends ConstantEvent {
+    private $class;
 
-        private $class;
-
-        public function __construct(ConstantObject $constant, ClassObject $class) {
-            parent::__construct($constant);
-            $this->class = $class;
-        }
-
-        public function getClass() {
-            return $this->class;
-        }
-
-        protected function getEventName() {
-            return 'class.constant';
-        }
+    public function __construct(ConstantObject $constant, ClassObject $class) {
+        parent::__construct($constant);
+        $this->class = $class;
+    }
 
+    public function getClass() {
+        return $this->class;
     }
 
+    protected function getEventName() {
+        return 'class.constant';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/ClassEndEvent.php phpdox-0.12.0/src/generator/events/ClassEndEvent.php
--- phpdox-0.11.2/src/generator/events/ClassEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/ClassEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class ClassEndEvent extends AbstractEvent {
+class ClassEndEvent extends AbstractEvent {
+    private $class;
 
-        private $class;
-
-        public function __construct(ClassObject $class) {
-            $this->class = $class;
-        }
-
-        public function getClass() {
-            return $this->class;
-        }
-
-        protected function getEventName() {
-            return 'class.end';
-        }
+    public function __construct(ClassObject $class) {
+        $this->class = $class;
+    }
 
+    public function getClass() {
+        return $this->class;
     }
 
+    protected function getEventName() {
+        return 'class.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/ClassMemberEvent.php phpdox-0.12.0/src/generator/events/ClassMemberEvent.php
--- phpdox-0.11.2/src/generator/events/ClassMemberEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/ClassMemberEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class ClassMemberEvent extends MemberEvent {
+class ClassMemberEvent extends MemberEvent {
+    private $class;
 
-        private $class;
-
-        public function __construct(MemberObject $member, ClassObject $class) {
-            parent::__construct($member);
-            $this->class = $class;
-        }
-
-        public function getClass() {
-            return $this->class;
-        }
-
-        protected function getEventName() {
-            return 'class.member';
-        }
+    public function __construct(MemberObject $member, ClassObject $class) {
+        parent::__construct($member);
+        $this->class = $class;
+    }
 
+    public function getClass() {
+        return $this->class;
     }
 
+    protected function getEventName() {
+        return 'class.member';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/ClassMethodEvent.php phpdox-0.12.0/src/generator/events/ClassMethodEvent.php
--- phpdox-0.11.2/src/generator/events/ClassMethodEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/ClassMethodEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class ClassMethodEvent extends MethodEvent {
+class ClassMethodEvent extends MethodEvent {
+    private $class;
 
-        private $class;
-
-        public function __construct(MethodObject $method, ClassObject $class) {
-            parent::__construct($method);
-            $this->class = $class;
-        }
-
-        public function getClass() {
-            return $this->class;
-        }
-
-        protected function getEventName() {
-            return 'class.method';
-        }
+    public function __construct(MethodObject $method, ClassObject $class) {
+        parent::__construct($method);
+        $this->class = $class;
+    }
 
+    public function getClass() {
+        return $this->class;
     }
 
+    protected function getEventName() {
+        return 'class.method';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/ClassStartEvent.php phpdox-0.12.0/src/generator/events/ClassStartEvent.php
--- phpdox-0.11.2/src/generator/events/ClassStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/ClassStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class ClassStartEvent extends AbstractEvent {
+class ClassStartEvent extends AbstractEvent {
+    private $class;
 
-        private $class;
-
-        public function __construct(ClassObject $class) {
-            $this->class = $class;
-        }
-
-        public function getClass() {
-            return $this->class;
-        }
-
-        protected function getEventName() {
-            return 'class.start';
-        }
+    public function __construct(ClassObject $class) {
+        $this->class = $class;
+    }
 
+    public function getClass() {
+        return $this->class;
     }
 
+    protected function getEventName() {
+        return 'class.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/ConstantEvent.php phpdox-0.12.0/src/generator/events/ConstantEvent.php
--- phpdox-0.11.2/src/generator/events/ConstantEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/ConstantEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,18 +1,14 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    abstract class ConstantEvent extends AbstractEvent {
-
-        private $constant;
-
-        public function __construct(ConstantObject $constant) {
-            $this->constant = $constant;
-        }
-
-        public function getConstant() {
-            return $this->constant;
-        }
+abstract class ConstantEvent extends AbstractEvent {
+    private $constant;
 
+    public function __construct(ConstantObject $constant) {
+        $this->constant = $constant;
     }
 
+    public function getConstant() {
+        return $this->constant;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/InterfaceConstantEvent.php phpdox-0.12.0/src/generator/events/InterfaceConstantEvent.php
--- phpdox-0.11.2/src/generator/events/InterfaceConstantEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/InterfaceConstantEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class InterfaceConstantEvent extends ConstantEvent {
+class InterfaceConstantEvent extends ConstantEvent {
+    private $interface;
 
-        private $interface;
-
-        public function __construct(ConstantObject $constant, InterfaceObject $interface) {
-            parent::__construct($constant);
-            $this->interface = $interface;
-        }
-
-        public function getInterface() {
-            return $this->interface;
-        }
-
-        protected function getEventName() {
-            return 'interface.constant';
-        }
+    public function __construct(ConstantObject $constant, InterfaceObject $interface) {
+        parent::__construct($constant);
+        $this->interface = $interface;
+    }
 
+    public function getInterface() {
+        return $this->interface;
     }
 
+    protected function getEventName() {
+        return 'interface.constant';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/InterfaceEndEvent.php phpdox-0.12.0/src/generator/events/InterfaceEndEvent.php
--- phpdox-0.11.2/src/generator/events/InterfaceEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/InterfaceEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class InterfaceEndEvent extends AbstractEvent {
+class InterfaceEndEvent extends AbstractEvent {
+    private $interface;
 
-        private $interface;
-
-        public function __construct(InterfaceObject $interface) {
-            $this->interface = $interface;
-        }
-
-        public function getInterface() {
-            return $this->interface;
-        }
-
-        protected function getEventName() {
-            return 'interface.end';
-        }
+    public function __construct(InterfaceObject $interface) {
+        $this->interface = $interface;
+    }
 
+    public function getInterface() {
+        return $this->interface;
     }
 
+    protected function getEventName() {
+        return 'interface.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/InterfaceMethodEvent.php phpdox-0.12.0/src/generator/events/InterfaceMethodEvent.php
--- phpdox-0.11.2/src/generator/events/InterfaceMethodEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/InterfaceMethodEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class InterfaceMethodEvent extends MethodEvent {
+class InterfaceMethodEvent extends MethodEvent {
+    private $interface;
 
-        private $interface;
-
-        public function __construct(MethodObject $method, InterfaceObject $interface) {
-            parent::__construct($method);
-            $this->interface = $interface;
-        }
-
-        public function getInterface() {
-            return $this->interface;
-        }
-
-        protected function getEventName() {
-            return 'interface.method';
-        }
+    public function __construct(MethodObject $method, InterfaceObject $interface) {
+        parent::__construct($method);
+        $this->interface = $interface;
+    }
 
+    public function getInterface() {
+        return $this->interface;
     }
 
+    protected function getEventName() {
+        return 'interface.method';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/InterfaceStartEvent.php phpdox-0.12.0/src/generator/events/InterfaceStartEvent.php
--- phpdox-0.11.2/src/generator/events/InterfaceStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/InterfaceStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class InterfaceStartEvent extends AbstractEvent {
+class InterfaceStartEvent extends AbstractEvent {
+    private $interface;
 
-        private $interface;
-
-        public function __construct(InterfaceObject $interface) {
-            $this->interface = $interface;
-        }
-
-        public function getInterface() {
-            return $this->interface;
-        }
-
-        protected function getEventName() {
-            return 'interface.start';
-        }
+    public function __construct(InterfaceObject $interface) {
+        $this->interface = $interface;
+    }
 
+    public function getInterface() {
+        return $this->interface;
     }
 
+    protected function getEventName() {
+        return 'interface.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/MemberEvent.php phpdox-0.12.0/src/generator/events/MemberEvent.php
--- phpdox-0.11.2/src/generator/events/MemberEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/MemberEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,18 +1,14 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    abstract class MemberEvent extends AbstractEvent {
-
-        private $member;
-
-        public function __construct(MemberObject $member) {
-            $this->member = $member;
-        }
-
-        public function getMember() {
-            return $this->member;
-        }
+abstract class MemberEvent extends AbstractEvent {
+    private $member;
 
+    public function __construct(MemberObject $member) {
+        $this->member = $member;
     }
 
+    public function getMember() {
+        return $this->member;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/MethodEvent.php phpdox-0.12.0/src/generator/events/MethodEvent.php
--- phpdox-0.11.2/src/generator/events/MethodEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/MethodEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,18 +1,14 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    abstract class MethodEvent extends AbstractEvent {
-
-        private $method;
-
-        public function __construct(MethodObject $method) {
-            $this->method = $method;
-        }
-
-        public function getMethod() {
-            return $this->method;
-        }
+abstract class MethodEvent extends AbstractEvent {
+    private $method;
 
+    public function __construct(MethodObject $method) {
+        $this->method = $method;
     }
 
+    public function getMethod() {
+        return $this->method;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceClassesEndEvent.php phpdox-0.12.0/src/generator/events/NamespaceClassesEndEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceClassesEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceClassesEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceClassesEndEvent extends AbstractEvent {
-
-        private $classes;
-        private $namespace;
-
-        public function __construct(ClassCollection $classes, $namespace) {
-            $this->classes = $classes;
-            $this->namespace = $namespace;
-        }
-
-        public function getClasses() {
-            return $this->classes;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.classes.end';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceClassesEndEvent extends AbstractEvent {
+    private $classes;
+
+    private $namespace;
+
+    public function __construct(ClassCollection $classes, $namespace) {
+        $this->classes   = $classes;
+        $this->namespace = $namespace;
+    }
+
+    public function getClasses() {
+        return $this->classes;
     }
 
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    protected function getEventName() {
+        return 'namespace.classes.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceClassesStartEvent.php phpdox-0.12.0/src/generator/events/NamespaceClassesStartEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceClassesStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceClassesStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceClassesStartEvent extends AbstractEvent {
-
-        private $classes;
-        private $namespace;
-
-        public function __construct(ClassCollection $classes, $namespace) {
-            $this->classes = $classes;
-            $this->namespace = $namespace;
-        }
-
-        public function getClasses() {
-            return $this->classes;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.classes.start';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceClassesStartEvent extends AbstractEvent {
+    private $classes;
+
+    private $namespace;
+
+    public function __construct(ClassCollection $classes, $namespace) {
+        $this->classes   = $classes;
+        $this->namespace = $namespace;
+    }
+
+    public function getClasses() {
+        return $this->classes;
     }
 
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    protected function getEventName() {
+        return 'namespace.classes.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceEndEvent.php phpdox-0.12.0/src/generator/events/NamespaceEndEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class NamespaceEndEvent extends AbstractEvent {
+class NamespaceEndEvent extends AbstractEvent {
+    private $namespace;
 
-        private $namespace;
-
-        public function __construct(NamespaceEntry $namespace) {
-            $this->namespace = $namespace;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.end';
-        }
+    public function __construct(NamespaceEntry $namespace) {
+        $this->namespace = $namespace;
+    }
 
+    public function getNamespace() {
+        return $this->namespace;
     }
 
+    protected function getEventName() {
+        return 'namespace.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceInterfacesEndEvent.php phpdox-0.12.0/src/generator/events/NamespaceInterfacesEndEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceInterfacesEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceInterfacesEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceInterfacesEndEvent extends AbstractEvent {
-
-        private $interfaces;
-        private $namespace;
-
-        public function __construct(InterfaceCollection $interfaces, $namespace) {
-            $this->interfaces = $interfaces;
-            $this->namespace = $namespace;
-        }
-
-        public function getInterfaces() {
-            return $this->interfaces;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.interfaces.end';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceInterfacesEndEvent extends AbstractEvent {
+    private $interfaces;
+
+    private $namespace;
+
+    public function __construct(InterfaceCollection $interfaces, $namespace) {
+        $this->interfaces = $interfaces;
+        $this->namespace  = $namespace;
+    }
+
+    public function getInterfaces() {
+        return $this->interfaces;
     }
 
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    protected function getEventName() {
+        return 'namespace.interfaces.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceInterfacesStartEvent.php phpdox-0.12.0/src/generator/events/NamespaceInterfacesStartEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceInterfacesStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceInterfacesStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceInterfacesStartEvent extends AbstractEvent {
-
-        private $interfaces;
-        private $namespace;
-
-        public function __construct(InterfaceCollection $interfaces, $namespace) {
-            $this->interfaces = $interfaces;
-            $this->namespace = $namespace;
-        }
-
-        public function getInterfaces() {
-            return $this->interfaces;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.interfaces.start';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceInterfacesStartEvent extends AbstractEvent {
+    private $interfaces;
+
+    private $namespace;
+
+    public function __construct(InterfaceCollection $interfaces, $namespace) {
+        $this->interfaces = $interfaces;
+        $this->namespace  = $namespace;
+    }
+
+    public function getInterfaces() {
+        return $this->interfaces;
     }
 
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    protected function getEventName() {
+        return 'namespace.interfaces.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceStartEvent.php phpdox-0.12.0/src/generator/events/NamespaceStartEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class NamespaceStartEvent extends AbstractEvent {
+class NamespaceStartEvent extends AbstractEvent {
+    private $namespace;
 
-        private $namespace;
-
-        public function __construct(NamespaceEntry $namespace) {
-            $this->namespace = $namespace;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.start';
-        }
+    public function __construct(NamespaceEntry $namespace) {
+        $this->namespace = $namespace;
+    }
 
+    public function getNamespace() {
+        return $this->namespace;
     }
 
+    protected function getEventName() {
+        return 'namespace.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceTraitsEndEvent.php phpdox-0.12.0/src/generator/events/NamespaceTraitsEndEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceTraitsEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceTraitsEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceTraitsEndEvent extends AbstractEvent {
-
-        private $traits;
-        private $namespace;
-
-        public function __construct(TraitCollection $traits, $namespace) {
-            $this->traits = $traits;
-            $this->namespace = $namespace;
-        }
-
-        public function getTraits() {
-            return $this->traits;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.traits.end';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceTraitsEndEvent extends AbstractEvent {
+    private $traits;
+
+    private $namespace;
+
+    public function __construct(TraitCollection $traits, $namespace) {
+        $this->traits    = $traits;
+        $this->namespace = $namespace;
+    }
+
+    public function getTraits() {
+        return $this->traits;
     }
 
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    protected function getEventName() {
+        return 'namespace.traits.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/NamespaceTraitsStartEvent.php phpdox-0.12.0/src/generator/events/NamespaceTraitsStartEvent.php
--- phpdox-0.11.2/src/generator/events/NamespaceTraitsStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/NamespaceTraitsStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceTraitsStartEvent extends AbstractEvent {
-
-        private $traits;
-        private $namespace;
-
-        public function __construct(TraitCollection $traits, $namespace) {
-            $this->traits = $traits;
-            $this->namespace = $namespace;
-        }
-
-        public function getTraits() {
-            return $this->traits;
-        }
-
-        public function getNamespace() {
-            return $this->namespace;
-        }
-
-        protected function getEventName() {
-            return 'namespace.traits.start';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceTraitsStartEvent extends AbstractEvent {
+    private $traits;
+
+    private $namespace;
+
+    public function __construct(TraitCollection $traits, $namespace) {
+        $this->traits    = $traits;
+        $this->namespace = $namespace;
+    }
+
+    public function getTraits() {
+        return $this->traits;
     }
 
+    public function getNamespace() {
+        return $this->namespace;
+    }
+
+    protected function getEventName() {
+        return 'namespace.traits.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxClassesEndEvent.php phpdox-0.12.0/src/generator/events/PHPDoxClassesEndEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxClassesEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxClassesEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxClassesEndEvent extends AbstractEvent {
+class PHPDoxClassesEndEvent extends AbstractEvent {
+    private $classes;
 
-        private $classes;
-
-        public function __construct(ClassCollection $classes) {
-            $this->classes = $classes;
-        }
-
-        public function getClasses() {
-            return $this->classes;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.classes.end';
-        }
+    public function __construct(ClassCollection $classes) {
+        $this->classes = $classes;
+    }
 
+    public function getClasses() {
+        return $this->classes;
     }
 
+    protected function getEventName() {
+        return 'phpdox.classes.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxClassesStartEvent.php phpdox-0.12.0/src/generator/events/PHPDoxClassesStartEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxClassesStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxClassesStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxClassesStartEvent extends AbstractEvent {
+class PHPDoxClassesStartEvent extends AbstractEvent {
+    private $classes;
 
-        private $classes;
-
-        public function __construct(ClassCollection $classes) {
-            $this->classes = $classes;
-        }
-
-        public function getClasses() {
-            return $this->classes;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.classes.start';
-        }
+    public function __construct(ClassCollection $classes) {
+        $this->classes = $classes;
+    }
 
+    public function getClasses() {
+        return $this->classes;
     }
 
+    protected function getEventName() {
+        return 'phpdox.classes.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxEndEvent.php phpdox-0.12.0/src/generator/events/PHPDoxEndEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class PHPDoxEndEvent extends AbstractEvent {
-
-        private $index;
-        private $tree;
-
-        public function __construct(Index $index, SourceTree $tree) {
-            $this->index = $index;
-            $this->tree = $tree;
-        }
-
-        public function getIndex() {
-            return $this->index;
-        }
-
-        public function getTree() {
-            return $this->tree;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.end';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class PHPDoxEndEvent extends AbstractEvent {
+    private $index;
+
+    private $tree;
+
+    public function __construct(Index $index, SourceTree $tree) {
+        $this->index = $index;
+        $this->tree  = $tree;
+    }
+
+    public function getIndex() {
+        return $this->index;
     }
 
+    public function getTree() {
+        return $this->tree;
+    }
+
+    protected function getEventName() {
+        return 'phpdox.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxInterfacesEndEvent.php phpdox-0.12.0/src/generator/events/PHPDoxInterfacesEndEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxInterfacesEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxInterfacesEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxInterfacesEndEvent extends AbstractEvent {
+class PHPDoxInterfacesEndEvent extends AbstractEvent {
+    private $interfaces;
 
-        private $interfaces;
-
-        public function __construct(InterfaceCollection $interfaces) {
-            $this->interfaces = $interfaces;
-        }
-
-        public function getInterfaces() {
-            return $this->interfaces;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.interfaces.end';
-        }
+    public function __construct(InterfaceCollection $interfaces) {
+        $this->interfaces = $interfaces;
+    }
 
+    public function getInterfaces() {
+        return $this->interfaces;
     }
 
+    protected function getEventName() {
+        return 'phpdox.interfaces.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxInterfacesStartEvent.php phpdox-0.12.0/src/generator/events/PHPDoxInterfacesStartEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxInterfacesStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxInterfacesStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxInterfacesStartEvent extends AbstractEvent {
+class PHPDoxInterfacesStartEvent extends AbstractEvent {
+    private $interfaces;
 
-        private $interfaces;
-
-        public function __construct(InterfaceCollection $interfaces) {
-            $this->interfaces = $interfaces;
-        }
-
-        public function getInterfaces() {
-            return $this->interfaces;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.interfaces.start';
-        }
+    public function __construct(InterfaceCollection $interfaces) {
+        $this->interfaces = $interfaces;
+    }
 
+    public function getInterfaces() {
+        return $this->interfaces;
     }
 
+    protected function getEventName() {
+        return 'phpdox.interfaces.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxNamespacesEndEvent.php phpdox-0.12.0/src/generator/events/PHPDoxNamespacesEndEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxNamespacesEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxNamespacesEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxNamespacesEndEvent extends AbstractEvent {
+class PHPDoxNamespacesEndEvent extends AbstractEvent {
+    private $namespaces;
 
-        private $namespaces;
-
-        public function __construct(NamespaceCollection $namespaces) {
-            $this->namespaces = $namespaces;
-        }
-
-        public function getNamespaces() {
-            return $this->namespaces;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.namespaces.end';
-        }
+    public function __construct(NamespaceCollection $namespaces) {
+        $this->namespaces = $namespaces;
+    }
 
+    public function getNamespaces() {
+        return $this->namespaces;
     }
 
+    protected function getEventName() {
+        return 'phpdox.namespaces.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxNamespacesStartEvent.php phpdox-0.12.0/src/generator/events/PHPDoxNamespacesStartEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxNamespacesStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxNamespacesStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxNamespacesStartEvent extends AbstractEvent {
+class PHPDoxNamespacesStartEvent extends AbstractEvent {
+    private $namespaces;
 
-        private $namespaces;
-
-        public function __construct(NamespaceCollection $namespaces) {
-            $this->namespaces = $namespaces;
-        }
-
-        public function getNamespaces() {
-            return $this->namespaces;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.namespaces.start';
-        }
+    public function __construct(NamespaceCollection $namespaces) {
+        $this->namespaces = $namespaces;
+    }
 
+    public function getNamespaces() {
+        return $this->namespaces;
     }
 
+    protected function getEventName() {
+        return 'phpdox.namespaces.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxStartEvent.php phpdox-0.12.0/src/generator/events/PHPDoxStartEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,64 +1,25 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class PHPDoxStartEvent extends AbstractEvent {
-
-        private $index;
-        private $tree;
-
-        public function __construct(Index $index, SourceTree $tree) {
-            $this->index = $index;
-            $this->tree = $tree;
-        }
-
-        public function getIndex() {
-            return $this->index;
-        }
-
-        public function getTree() {
-            return $this->tree;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.start';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class PHPDoxStartEvent extends AbstractEvent {
+    private $index;
+
+    private $tree;
+
+    public function __construct(Index $index, SourceTree $tree) {
+        $this->index = $index;
+        $this->tree  = $tree;
+    }
+
+    public function getIndex() {
+        return $this->index;
     }
 
+    public function getTree() {
+        return $this->tree;
+    }
+
+    protected function getEventName() {
+        return 'phpdox.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxTraitsEndEvent.php phpdox-0.12.0/src/generator/events/PHPDoxTraitsEndEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxTraitsEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxTraitsEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxTraitsEndEvent extends AbstractEvent {
+class PHPDoxTraitsEndEvent extends AbstractEvent {
+    private $traits;
 
-        private $traits;
-
-        public function __construct(TraitCollection $traits) {
-            $this->traits = $traits;
-        }
-
-        public function getTraits() {
-            return $this->traits;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.traits.end';
-        }
+    public function __construct(TraitCollection $traits) {
+        $this->traits = $traits;
+    }
 
+    public function getTraits() {
+        return $this->traits;
     }
 
+    protected function getEventName() {
+        return 'phpdox.traits.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/PHPDoxTraitsStartEvent.php phpdox-0.12.0/src/generator/events/PHPDoxTraitsStartEvent.php
--- phpdox-0.11.2/src/generator/events/PHPDoxTraitsStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/PHPDoxTraitsStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class PHPDoxTraitsStartEvent extends AbstractEvent {
+class PHPDoxTraitsStartEvent extends AbstractEvent {
+    private $traits;
 
-        private $traits;
-
-        public function __construct(TraitCollection $traits) {
-            $this->traits = $traits;
-        }
-
-        public function getTraits() {
-            return $this->traits;
-        }
-
-        protected function getEventName() {
-            return 'phpdox.traits.start';
-        }
+    public function __construct(TraitCollection $traits) {
+        $this->traits = $traits;
+    }
 
+    public function getTraits() {
+        return $this->traits;
     }
 
+    protected function getEventName() {
+        return 'phpdox.traits.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/TokenEvent.php phpdox-0.12.0/src/generator/events/TokenEvent.php
--- phpdox-0.11.2/src/generator/events/TokenEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TokenEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,47 +1,8 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class TokenEvent extends AbstractEvent {
-        protected function getEventName() {
-            return 'token';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TokenEvent extends AbstractEvent {
+    protected function getEventName() {
+        return 'token';
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/events/TokenFileEndEvent.php phpdox-0.12.0/src/generator/events/TokenFileEndEvent.php
--- phpdox-0.11.2/src/generator/events/TokenFileEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TokenFileEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,48 +1,8 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
-
-    class TokenFileEndEvent extends AbstractEvent {
-
-        protected function getEventName() {
-            return 'token.line.end';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TokenFileEndEvent extends AbstractEvent {
+    protected function getEventName() {
+        return 'token.line.end';
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/events/TokenFileStartEvent.php phpdox-0.12.0/src/generator/events/TokenFileStartEvent.php
--- phpdox-0.11.2/src/generator/events/TokenFileStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TokenFileStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,28 +1,21 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class TokenFileStartEvent extends AbstractEvent {
+class TokenFileStartEvent extends AbstractEvent {
+    /**
+     * @var TokenFile
+     */
+    private $tokenFile;
 
-        /**
-         * @var TokenFile
-         */
-        private $tokenFile;
-
-        public function __construct(TokenFile $tokenFile) {
-            $this->tokenFile = $tokenFile;
-        }
-
-        /**
-         * @return TokenFile
-         */
-        public function getTokenFile() {
-            return $this->tokenFile;
-        }
-
-        protected function getEventName() {
-            return 'token.file.start';
-        }
+    public function __construct(TokenFile $tokenFile) {
+        $this->tokenFile = $tokenFile;
+    }
 
+    public function getTokenFile(): TokenFile {
+        return $this->tokenFile;
     }
 
+    protected function getEventName() {
+        return 'token.file.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/TokenLineEndEvent.php phpdox-0.12.0/src/generator/events/TokenLineEndEvent.php
--- phpdox-0.11.2/src/generator/events/TokenLineEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TokenLineEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,48 +1,8 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox\Generator {
-
-    class TokenLineEndEvent extends AbstractEvent {
-        protected function getEventName() {
-            return 'token.line.end';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TokenLineEndEvent extends AbstractEvent {
+    protected function getEventName() {
+        return 'token.line.end';
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/events/TokenLineStartEvent.php phpdox-0.12.0/src/generator/events/TokenLineStartEvent.php
--- phpdox-0.11.2/src/generator/events/TokenLineStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TokenLineStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,49 +1,8 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-
-namespace TheSeer\phpDox\Generator {
-
-    class TokenLineStartEvent extends AbstractEvent {
-
-        protected function getEventName() {
-            return 'token.line.start';
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TokenLineStartEvent extends AbstractEvent {
+    protected function getEventName() {
+        return 'token.line.start';
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/events/TraitConstantEvent.php phpdox-0.12.0/src/generator/events/TraitConstantEvent.php
--- phpdox-0.11.2/src/generator/events/TraitConstantEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TraitConstantEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class TraitConstantEvent extends ConstantEvent {
+class TraitConstantEvent extends ConstantEvent {
+    private $trait;
 
-        private $trait;
-
-        public function __construct(ConstantObject $constant, TraitObject $trait) {
-            parent::__construct($constant);
-            $this->trait = $trait;
-        }
-
-        public function getTrait() {
-            return $this->trait;
-        }
-
-        protected function getEventName() {
-            return 'trait.constant';
-        }
+    public function __construct(ConstantObject $constant, TraitObject $trait) {
+        parent::__construct($constant);
+        $this->trait = $trait;
+    }
 
+    public function getTrait() {
+        return $this->trait;
     }
 
+    protected function getEventName() {
+        return 'trait.constant';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/TraitEndEvent.php phpdox-0.12.0/src/generator/events/TraitEndEvent.php
--- phpdox-0.11.2/src/generator/events/TraitEndEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TraitEndEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class TraitEndEvent extends AbstractEvent {
+class TraitEndEvent extends AbstractEvent {
+    private $trait;
 
-        private $trait;
-
-        public function __construct(TraitObject $trait) {
-            $this->trait = $trait;
-        }
-
-        public function getTrait() {
-            return $this->trait;
-        }
-
-        protected function getEventName() {
-            return 'trait.end';
-        }
+    public function __construct(TraitObject $trait) {
+        $this->trait = $trait;
+    }
 
+    public function getTrait() {
+        return $this->trait;
     }
 
+    protected function getEventName() {
+        return 'trait.end';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/TraitMemberEvent.php phpdox-0.12.0/src/generator/events/TraitMemberEvent.php
--- phpdox-0.11.2/src/generator/events/TraitMemberEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TraitMemberEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class TraitMemberEvent extends MemberEvent {
+class TraitMemberEvent extends MemberEvent {
+    private $trait;
 
-        private $trait;
-
-        public function __construct(MemberObject $member, TraitObject $trait) {
-            parent::__construct($member);
-            $this->trait = $trait;
-        }
-
-        public function getTrait() {
-            return $this->trait;
-        }
-
-        protected function getEventName() {
-            return 'trait.member';
-        }
+    public function __construct(MemberObject $member, TraitObject $trait) {
+        parent::__construct($member);
+        $this->trait = $trait;
+    }
 
+    public function getTrait() {
+        return $this->trait;
     }
 
+    protected function getEventName() {
+        return 'trait.member';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/TraitMethodEvent.php phpdox-0.12.0/src/generator/events/TraitMethodEvent.php
--- phpdox-0.11.2/src/generator/events/TraitMethodEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TraitMethodEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,59 +1,19 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class TraitMethodEvent extends MethodEvent {
+class TraitMethodEvent extends MethodEvent {
+    private $trait;
 
-        private $trait;
-
-        public function __construct(MethodObject $method, TraitObject $trait) {
-            parent::__construct($method);
-            $this->trait = $trait;
-        }
-
-        public function getTrait() {
-            return $this->trait;
-        }
-
-        protected function getEventName() {
-            return 'trait.method';
-        }
+    public function __construct(MethodObject $method, TraitObject $trait) {
+        parent::__construct($method);
+        $this->trait = $trait;
+    }
 
+    public function getTrait() {
+        return $this->trait;
     }
 
+    protected function getEventName() {
+        return 'trait.method';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/events/TraitStartEvent.php phpdox-0.12.0/src/generator/events/TraitStartEvent.php
--- phpdox-0.11.2/src/generator/events/TraitStartEvent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/events/TraitStartEvent.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,58 +1,18 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class TraitStartEvent extends AbstractEvent {
+class TraitStartEvent extends AbstractEvent {
+    private $trait;
 
-        private $trait;
-
-        public function __construct(TraitObject $trait) {
-            $this->trait = $trait;
-        }
-
-        public function getTrait() {
-            return $this->trait;
-        }
-
-        protected function getEventName() {
-            return 'trait.start';
-        }
+    public function __construct(TraitObject $trait) {
+        $this->trait = $trait;
+    }
 
+    public function getTrait() {
+        return $this->trait;
     }
 
+    protected function getEventName() {
+        return 'trait.start';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/Generator.php phpdox-0.12.0/src/generator/Generator.php
--- phpdox-0.11.2/src/generator/Generator.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/Generator.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,335 +1,298 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Generator {
-
-    use TheSeer\phpDox\Generator\Engine\EngineInterface;
-    use TheSeer\phpDox\Generator\Engine\EventHandlerRegistry;
-    use TheSeer\phpDox\Generator\Enricher\ClassEnricherInterface;
-    use TheSeer\phpDox\Generator\Enricher\EndEnricherInterface;
-    use TheSeer\phpDox\Generator\Enricher\EnricherInterface;
-    use TheSeer\phpDox\Generator\Enricher\StartEnricherInterface;
-    use TheSeer\phpDox\Generator\Enricher\InterfaceEnricherInterface;
-    use TheSeer\phpDox\Generator\Enricher\TokenFileEnricherInterface;
-    use TheSeer\phpDox\Generator\Enricher\TraitEnricherInterface;
-    use TheSeer\phpDox\ProgressLogger;
-
-    class Generator {
-
-        /**
-         * @var ProgressLogger
-         */
-        private $logger;
-
-        /**
-         * @var array
-         */
-        private $enrichers = array(
-            'phpdox.start'       => array(),
-            'class.start'        => array(),
-            'trait.start'        => array(),
-            'interface.start'    => array(),
-            'token.file.start'   => array(),
-            'phpdox.end'         => array()
-        );
-
-        /**
-         * @var string
-         */
-        private $xmlDir;
-
-        /**
-         * @var Project
-         */
-        private $project;
-
-        /**
-         * Map of events with engines
-         *
-         * @var EventHandlerRegistry
-         */
-        private $handlerRegistry;
-
-        /**
-         * @param ProgressLogger       $logger
-         * @param EventHandlerRegistry $registry
-         */
-        public function __construct(ProgressLogger $logger, EventHandlerRegistry $registry) {
-            $this->logger = $logger;
-            $this->handlerRegistry = $registry;
-        }
-
-        /**
-         * @param EngineInterface $engine
-         *
-         * @throws
-         * @throws GeneratorException
-         */
-        public function addEngine(EngineInterface $engine) {
-            $engine->registerEventHandlers($this->handlerRegistry);
-        }
-
-        public function addEnricher(EnricherInterface $enricher) {
-            if ($enricher instanceof StartEnricherInterface) {
-                $this->enrichers['phpdox.start'][] = $enricher;
-            }
-            if ($enricher instanceof ClassEnricherInterface) {
-                $this->enrichers['class.start'][] = $enricher;
-            }
-            if ($enricher instanceof InterfaceEnricherInterface) {
-                $this->enrichers['interface.start'][] = $enricher;
-            }
-            if ($enricher instanceof TraitEnricherInterface) {
-                $this->enrichers['trait.start'][] = $enricher;
-            }
-            if ($enricher instanceof TokenFileEnricherInterface) {
-                $this->enrichers['token.file.start'][] = $enricher;
-            }
-            if ($enricher instanceof EndEnricherInterface) {
-                $this->enrichers['phpdox.end'][] = $enricher;
-            }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
+
+use TheSeer\phpDox\Generator\Engine\EngineInterface;
+use TheSeer\phpDox\Generator\Engine\EventHandlerRegistry;
+use TheSeer\phpDox\Generator\Enricher\ClassEnricherInterface;
+use TheSeer\phpDox\Generator\Enricher\EndEnricherInterface;
+use TheSeer\phpDox\Generator\Enricher\EnricherInterface;
+use TheSeer\phpDox\Generator\Enricher\InterfaceEnricherInterface;
+use TheSeer\phpDox\Generator\Enricher\StartEnricherInterface;
+use TheSeer\phpDox\Generator\Enricher\TokenFileEnricherInterface;
+use TheSeer\phpDox\Generator\Enricher\TraitEnricherInterface;
+use TheSeer\phpDox\ProgressLogger;
+
+class Generator {
+    /**
+     * @var ProgressLogger
+     */
+    private $logger;
+
+    /**
+     * @var array
+     */
+    private $enrichers = [
+        'phpdox.start'     => [],
+        'class.start'      => [],
+        'trait.start'      => [],
+        'interface.start'  => [],
+        'token.file.start' => [],
+        'phpdox.end'       => []
+    ];
+
+    /**
+     * @var string
+     */
+    private $xmlDir;
+
+    /**
+     * @var Project
+     */
+    private $project;
+
+    /**
+     * Map of events with engines
+     *
+     * @var EventHandlerRegistry
+     */
+    private $handlerRegistry;
+
+    public function __construct(ProgressLogger $logger, EventHandlerRegistry $registry) {
+        $this->logger          = $logger;
+        $this->handlerRegistry = $registry;
+    }
+
+    /**
+     * @throws
+     * @throws GeneratorException
+     */
+    public function addEngine(EngineInterface $engine): void {
+        $engine->registerEventHandlers($this->handlerRegistry);
+    }
+
+    public function addEnricher(EnricherInterface $enricher): void {
+        if ($enricher instanceof StartEnricherInterface) {
+            $this->enrichers['phpdox.start'][] = $enricher;
         }
 
-        /**
-         * @param Project $project
-         * @param bool    $publicOnly
-         */
-        public function run(Project $project) {
-            $this->xmlDir     = $project->getXmlDir();
-            $this->project    = $project;
-
-            $this->handleEvent(new PHPDoxStartEvent($project->getIndex(), $project->getSourceTree()));
-            if ($this->project->hasNamespaces()) {
-                $this->processWithNamespace();
-            } else {
-                $this->processGlobalOnly();
-            }
-            $this->processTokenFiles($project->getSourceTree());
-            $this->handleEvent(new PHPDoxEndEvent($project->getIndex(), $project->getSourceTree()));
-            $this->logger->completed();
+        if ($enricher instanceof ClassEnricherInterface) {
+            $this->enrichers['class.start'][] = $enricher;
+        }
+
+        if ($enricher instanceof InterfaceEnricherInterface) {
+            $this->enrichers['interface.start'][] = $enricher;
+        }
 
+        if ($enricher instanceof TraitEnricherInterface) {
+            $this->enrichers['trait.start'][] = $enricher;
         }
 
-        private function processTokenFiles(SourceTree $sourceTree) {
-            foreach($sourceTree as $tokenFile) {
-                $this->handleEvent(new TokenFileStartEvent($tokenFile));
-                foreach($tokenFile as $sourceLine) {
-                    $this->handleEvent(new TokenLineStartEvent($tokenFile, $sourceLine));
-                    foreach($sourceLine as $token) {
-                        $this->handleEvent(new TokenEvent($sourceLine, $token));
-                    }
-                    $this->handleEvent(new TokenLineEndEvent($tokenFile, $sourceLine));
+        if ($enricher instanceof TokenFileEnricherInterface) {
+            $this->enrichers['token.file.start'][] = $enricher;
+        }
+
+        if ($enricher instanceof EndEnricherInterface) {
+            $this->enrichers['phpdox.end'][] = $enricher;
+        }
+    }
+
+    public function run(Project $project): void {
+        $this->xmlDir  = $project->getXmlDir();
+        $this->project = $project;
+
+        $this->handleEvent(new PHPDoxStartEvent($project->getIndex(), $project->getSourceTree()));
+
+        if ($this->project->hasNamespaces()) {
+            $this->processWithNamespace();
+        } else {
+            $this->processGlobalOnly();
+        }
+        $this->processTokenFiles($project->getSourceTree());
+        $this->handleEvent(new PHPDoxEndEvent($project->getIndex(), $project->getSourceTree()));
+        $this->logger->completed();
+    }
+
+    private function processTokenFiles(SourceTree $sourceTree): void {
+        foreach ($sourceTree as $tokenFile) {
+            $this->handleEvent(new TokenFileStartEvent($tokenFile));
+
+            foreach ($tokenFile as $sourceLine) {
+                $this->handleEvent(new TokenLineStartEvent($tokenFile, $sourceLine));
+
+                foreach ($sourceLine as $token) {
+                    $this->handleEvent(new TokenEvent($sourceLine, $token));
                 }
-                $this->handleEvent(new TokenFileEndEvent($tokenFile));
+                $this->handleEvent(new TokenLineEndEvent($tokenFile, $sourceLine));
             }
+            $this->handleEvent(new TokenFileEndEvent($tokenFile));
         }
+    }
 
-        /**
-         * @param AbstractEvent $event
-         * @param bool          $progress
-         */
-        private function handleEvent(AbstractEvent $event, $progress = TRUE) {
-            $eventType = $event->getType();
-            if (isset($this->enrichers[$eventType])) {
-                foreach($this->enrichers[$eventType] as $enricher) {
-                    switch($eventType) {
-                        case 'phpdox.start': {
+    /**
+     * @param bool $progress
+     */
+    private function handleEvent(AbstractEvent $event, $progress = true): void {
+        $eventType = $event->getType();
+
+        if (isset($this->enrichers[$eventType])) {
+            foreach ($this->enrichers[$eventType] as $enricher) {
+                switch ($eventType) {
+                    case 'phpdox.start':
+                        {
                             $enricher->enrichStart($event);
+
                             break;
                         }
-                        case 'class.start': {
+                    case 'class.start':
+                        {
                             $enricher->enrichClass($event);
+
                             break;
                         }
-                        case 'interface.start': {
+                    case 'interface.start':
+                        {
                             $enricher->enrichInterface($event);
+
                             break;
                         }
-                        case 'trait.start': {
+                    case 'trait.start':
+                        {
                             $enricher->enrichTrait($event);
+
                             break;
                         }
-                        case 'token.file.start': {
+                    case 'token.file.start':
+                        {
                             $enricher->enrichTokenFile($event);
+
                             break;
                         }
-                        case 'phpdox.end': {
+                    case 'phpdox.end':
+                        {
                             $enricher->enrichEnd($event);
+
                             break;
                         }
-                    }
                 }
             }
-            foreach($this->handlerRegistry->getHandlersForEvent($event->getType()) as $callback) {
-                call_user_func($callback, $event);
-            }
-            if ($progress) {
-                $this->logger->progress('processed');
-            }
-    }
+        }
 
-        /**
-         *
-         */
-        private function processGlobalOnly() {
-            $classes = $this->project->getClasses();
-            $this->handleEvent(new PHPDoxClassesStartEvent($classes));
-            foreach($classes as $class) {
-                $this->processClass($class);
-            }
-            $this->handleEvent(new PHPDoxClassesEndEvent($classes));
+        foreach ($this->handlerRegistry->getHandlersForEvent($event->getType()) as $callback) {
+            \call_user_func($callback, $event);
+        }
 
-            $traits = $this->project->getTraits();
-            $this->handleEvent(new PHPDoxTraitsStartEvent($traits));
-            foreach($traits as $trait) {
-                $this->processTrait($trait);
-            }
-            $this->handleEvent(new PHPDoxTraitsEndEvent($traits));
+        if ($progress) {
+            $this->logger->progress('processed');
+        }
+    }
 
-            $interfaces = $this->project->getInterfaces();
-            $this->handleEvent(new PHPDoxInterfacesStartEvent($interfaces));
-            foreach($interfaces as $interface) {
-                $this->processInterface($interface);
-            }
-            $this->handleEvent(new PHPDoxInterfacesEndEvent($interfaces));
+    private function processGlobalOnly(): void {
+        $classes = $this->project->getClasses();
+        $this->handleEvent(new PHPDoxClassesStartEvent($classes));
+
+        foreach ($classes as $class) {
+            $this->processClass($class);
         }
+        $this->handleEvent(new PHPDoxClassesEndEvent($classes));
 
-        /**
-         *
-         */
-        private function processWithNamespace() {
-            $namespaces = $this->project->getNamespaces();
-            $this->handleEvent(new PHPDoxNamespacesStartEvent($namespaces));
-
-            foreach($namespaces as $namespace) {
-                $this->handleEvent(new NamespaceStartEvent($namespace));
-
-                $classes = $namespace->getClasses();
-                $this->handleEvent(new NamespaceClassesStartEvent($classes, $namespace));
-                foreach($classes as $class) {
-                    $this->processClass($class);
-                }
-                $this->handleEvent(new NamespaceClassesEndEvent($classes, $namespace));
+        $traits = $this->project->getTraits();
+        $this->handleEvent(new PHPDoxTraitsStartEvent($traits));
 
-                $traits = $namespace->getTraits();
-                $this->handleEvent(new NamespaceTraitsStartEvent($traits, $namespace));
-                foreach($traits as $trait) {
-                    $this->processTrait($trait);
-                }
-                $this->handleEvent(new NamespaceTraitsEndEvent($traits, $namespace));
+        foreach ($traits as $trait) {
+            $this->processTrait($trait);
+        }
+        $this->handleEvent(new PHPDoxTraitsEndEvent($traits));
 
-                $interfaces = $namespace->getInterfaces();
-                $this->handleEvent(new NamespaceInterfacesStartEvent($interfaces, $namespace));
-                foreach($interfaces as $interface) {
-                    $this->processInterface($interface);
-                }
-                $this->handleEvent(new NamespaceInterfacesEndEvent($interfaces, $namespace));
+        $interfaces = $this->project->getInterfaces();
+        $this->handleEvent(new PHPDoxInterfacesStartEvent($interfaces));
 
-                $this->handleEvent(new NamespaceEndEvent($namespace));
-            }
-            $this->handleEvent(new PHPDoxNamespacesEndEvent($namespaces));
+        foreach ($interfaces as $interface) {
+            $this->processInterface($interface);
         }
+        $this->handleEvent(new PHPDoxInterfacesEndEvent($interfaces));
+    }
+
+    private function processWithNamespace(): void {
+        $namespaces = $this->project->getNamespaces();
+        $this->handleEvent(new PHPDoxNamespacesStartEvent($namespaces));
+
+        foreach ($namespaces as $namespace) {
+            $this->handleEvent(new NamespaceStartEvent($namespace));
 
-        /**
-         * @param $class ClassEntry
-         */
-        private function processClass(ClassEntry $entry) {
-            $class = $entry->getClassObject($this->xmlDir);
-            $this->handleEvent(new ClassStartEvent($class));
+            $classes = $namespace->getClasses();
+            $this->handleEvent(new NamespaceClassesStartEvent($classes, $namespace));
 
-            foreach($class->getConstants() as $constant) {
-                $this->handleEvent(new ClassConstantEvent($constant, $class));
+            foreach ($classes as $class) {
+                $this->processClass($class);
             }
+            $this->handleEvent(new NamespaceClassesEndEvent($classes, $namespace));
+
+            $traits = $namespace->getTraits();
+            $this->handleEvent(new NamespaceTraitsStartEvent($traits, $namespace));
 
-            foreach($class->getMembers() as $member) {
-                $this->handleEvent(new ClassMemberEvent($member, $class));
+            foreach ($traits as $trait) {
+                $this->processTrait($trait);
             }
+            $this->handleEvent(new NamespaceTraitsEndEvent($traits, $namespace));
 
-            foreach($class->getMethods() as $method) {
-                $this->handleEvent(new ClassMethodEvent($method, $class));
+            $interfaces = $namespace->getInterfaces();
+            $this->handleEvent(new NamespaceInterfacesStartEvent($interfaces, $namespace));
+
+            foreach ($interfaces as $interface) {
+                $this->processInterface($interface);
             }
-            $this->handleEvent(new ClassEndEvent($class));
+            $this->handleEvent(new NamespaceInterfacesEndEvent($interfaces, $namespace));
 
+            $this->handleEvent(new NamespaceEndEvent($namespace));
         }
+        $this->handleEvent(new PHPDoxNamespacesEndEvent($namespaces));
+    }
 
-        /**
-         * @param TraitEntry $traitEntry
-         */
-        private function processTrait(TraitEntry $traitEntry) {
-            $trait = $traitEntry->getTraitObject($this->xmlDir);
-            $this->handleEvent(new TraitStartEvent($trait));
+    private function processClass(ClassEntry $entry): void {
+        $class = $entry->getClassObject($this->xmlDir);
+        $this->handleEvent(new ClassStartEvent($class));
 
-            foreach($trait->getConstants() as $constant) {
-                $this->handleEvent(new TraitConstantEvent($constant, $trait));
-            }
+        foreach ($class->getConstants() as $constant) {
+            $this->handleEvent(new ClassConstantEvent($constant, $class));
+        }
 
-            foreach($trait->getMembers() as $member) {
-                $this->handleEvent(new TraitMemberEvent($member, $trait));
-            }
+        foreach ($class->getMembers() as $member) {
+            $this->handleEvent(new ClassMemberEvent($member, $class));
+        }
 
-            foreach($trait->getMethods() as $method) {
-                $this->handleEvent(new TraitMethodEvent($method, $trait));
-            }
-            $this->handleEvent(new TraitEndEvent($trait));
+        foreach ($class->getMethods() as $method) {
+            $this->handleEvent(new ClassMethodEvent($method, $class));
         }
+        $this->handleEvent(new ClassEndEvent($class));
+    }
 
-        /**
-         * @param InterfaceEntry $interface
-         */
-        private function processInterface(InterfaceEntry $interfaceEntry) {
-            $interface = $interfaceEntry->getInterfaceObject($this->xmlDir);
+    private function processTrait(TraitEntry $traitEntry): void {
+        $trait = $traitEntry->getTraitObject($this->xmlDir);
+        $this->handleEvent(new TraitStartEvent($trait));
 
-            $this->handleEvent(new InterfaceStartEvent($interface));
+        foreach ($trait->getConstants() as $constant) {
+            $this->handleEvent(new TraitConstantEvent($constant, $trait));
+        }
 
-            foreach($interface->getConstants() as $constant) {
-                $this->handleEvent(new InterfaceConstantEvent($constant, $interface));
-            }
+        foreach ($trait->getMembers() as $member) {
+            $this->handleEvent(new TraitMemberEvent($member, $trait));
+        }
 
-            foreach($interface->getMethods() as $method) {
-                $this->handleEvent(new InterfaceMethodEvent($method, $interface));
-            }
+        foreach ($trait->getMethods() as $method) {
+            $this->handleEvent(new TraitMethodEvent($method, $trait));
+        }
+        $this->handleEvent(new TraitEndEvent($trait));
+    }
+
+    private function processInterface(InterfaceEntry $interfaceEntry): void {
+        $interface = $interfaceEntry->getInterfaceObject($this->xmlDir);
+
+        $this->handleEvent(new InterfaceStartEvent($interface));
 
-            $this->handleEvent(new InterfaceEndEvent($interface));
+        foreach ($interface->getConstants() as $constant) {
+            $this->handleEvent(new InterfaceConstantEvent($constant, $interface));
         }
 
-    }
+        foreach ($interface->getMethods() as $method) {
+            $this->handleEvent(new InterfaceMethodEvent($method, $interface));
+        }
 
-    class GeneratorException extends \Exception {
-        const UnknownEvent = 1;
-        const AlreadyRegistered = 2;
+        $this->handleEvent(new InterfaceEndEvent($interface));
     }
+}
+
+class GeneratorException extends \Exception {
+    public const UnknownEvent = 1;
 
+    public const AlreadyRegistered = 2;
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/AbstractCollection.php phpdox-0.12.0/src/generator/project/collections/AbstractCollection.php
--- phpdox-0.11.2/src/generator/project/collections/AbstractCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/AbstractCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,76 +1,69 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
 
-    abstract class AbstractCollection implements \Iterator {
+abstract class AbstractCollection implements \Iterator {
+    /**
+     * @var \DOMNodeList
+     */
+    private $nodeList;
+
+    /**
+     * @var int
+     */
+    private $position = 0;
 
-        /**
-         * @var \DOMNodeList
-         */
-        private $nodeList;
-
-        /**
-         * @var int
-         */
-        private $position = 0;
-
-        public function __construct(\DOMNodeList $nodeList) {
-            $this->nodeList = $nodeList;
-        }
-
-        /**
-         * @return fDOMElement
-         */
-        protected function getCurrentNode() {
-            return $this->nodeList->item($this->position);
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Move forward to next element
-         *
-         * @link http://php.net/manual/en/iterator.next.php
-         * @return void Any returned value is ignored.
-         */
-        public function next() {
-            $this->position++;
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Return the key of the current element
-         *
-         * @link http://php.net/manual/en/iterator.key.php
-         * @return mixed scalar on success, or null on failure.
-         */
-        public function key() {
-            return $this->position;
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Checks if current position is valid
-         *
-         * @link http://php.net/manual/en/iterator.valid.php
-         * @return boolean The return value will be casted to boolean and then evaluated.
-         *       Returns true on success or false on failure.
-         */
-        public function valid() {
-            return $this->nodeList->length > $this->position;
-        }
-
-        /**
-         * (PHP 5 &gt;= 5.0.0)<br/>
-         * Rewind the Iterator to the first element
-         *
-         * @link http://php.net/manual/en/iterator.rewind.php
-         * @return void Any returned value is ignored.
-         */
-        public function rewind() {
-            $this->position = 0;
-        }
+    public function __construct(\DOMNodeList $nodeList) {
+        $this->nodeList = $nodeList;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Move forward to next element
+     *
+     * @link http://php.net/manual/en/iterator.next.php
+     */
+    public function next(): void {
+        $this->position++;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Return the key of the current element
+     *
+     * @link http://php.net/manual/en/iterator.key.php
+     *
+     * @return mixed scalar on success, or null on failure
+     */
+    public function key() {
+        return $this->position;
+    }
+
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Checks if current position is valid
+     *
+     * @link http://php.net/manual/en/iterator.valid.php
+     *
+     * @return bool The return value will be casted to boolean and then evaluated.
+     *              Returns true on success or false on failure.
+     */
+    public function valid(): bool {
+        return $this->nodeList->length > $this->position;
+    }
 
+    /**
+     * (PHP 5 &gt;= 5.0.0)<br/>
+     * Rewind the Iterator to the first element
+     *
+     * @link http://php.net/manual/en/iterator.rewind.php
+     */
+    public function rewind(): void {
+        $this->position = 0;
     }
 
+    protected function getCurrentNode(): fDOMElement {
+        return $this->nodeList->item($this->position);
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/ClassCollection.php phpdox-0.12.0/src/generator/project/collections/ClassCollection.php
--- phpdox-0.11.2/src/generator/project/collections/ClassCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/ClassCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class ClassCollection extends AbstractCollection {
-
-        /**
-         * @return ClassEntry
-         */
-        public function current() {
-            return new ClassEntry($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class ClassCollection extends AbstractCollection {
+    public function current(): ClassEntry {
+        return new ClassEntry($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/ConstantCollection.php phpdox-0.12.0/src/generator/project/collections/ConstantCollection.php
--- phpdox-0.11.2/src/generator/project/collections/ConstantCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/ConstantCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class ConstantCollection extends AbstractCollection {
-
-        /**
-         * @return ConstantObject
-         */
-        public function current() {
-            return new ConstantObject($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class ConstantCollection extends AbstractCollection {
+    public function current(): ConstantObject {
+        return new ConstantObject($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/InlineCommentCollection.php phpdox-0.12.0/src/generator/project/collections/InlineCommentCollection.php
--- phpdox-0.11.2/src/generator/project/collections/InlineCommentCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/InlineCommentCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class InlineCommentCollection extends AbstractCollection {
-
-        /**
-         * @return MethodObject
-         */
-        public function current() {
-            return new InlineCommentObject($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class InlineCommentCollection extends AbstractCollection {
+    public function current(): MethodObject {
+        return new InlineCommentObject($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/InterfaceCollection.php phpdox-0.12.0/src/generator/project/collections/InterfaceCollection.php
--- phpdox-0.11.2/src/generator/project/collections/InterfaceCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/InterfaceCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class InterfaceCollection extends AbstractCollection {
-
-        /**
-         * @return InterfaceEntry
-         */
-        public function current() {
-            return new InterfaceEntry($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class InterfaceCollection extends AbstractCollection {
+    public function current(): InterfaceEntry {
+        return new InterfaceEntry($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/MemberCollection.php phpdox-0.12.0/src/generator/project/collections/MemberCollection.php
--- phpdox-0.11.2/src/generator/project/collections/MemberCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/MemberCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class MemberCollection extends AbstractCollection {
-
-        /**
-         * @return MemberObject
-         */
-        public function current() {
-            return new MemberObject($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class MemberCollection extends AbstractCollection {
+    public function current(): MemberObject {
+        return new MemberObject($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/MethodCollection.php phpdox-0.12.0/src/generator/project/collections/MethodCollection.php
--- phpdox-0.11.2/src/generator/project/collections/MethodCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/MethodCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class MethodCollection extends AbstractCollection {
-
-        /**
-         * @return MethodObject
-         */
-        public function current() {
-            return new MethodObject($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class MethodCollection extends AbstractCollection {
+    public function current(): MethodObject {
+        return new MethodObject($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/NamespaceCollection.php phpdox-0.12.0/src/generator/project/collections/NamespaceCollection.php
--- phpdox-0.11.2/src/generator/project/collections/NamespaceCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/NamespaceCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class NamespaceCollection extends AbstractCollection {
-
-        /**
-         * @return NamespaceEntry
-         */
-        public function current() {
-            return new NamespaceEntry($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class NamespaceCollection extends AbstractCollection {
+    public function current(): NamespaceEntry {
+        return new NamespaceEntry($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/collections/TraitCollection.php phpdox-0.12.0/src/generator/project/collections/TraitCollection.php
--- phpdox-0.11.2/src/generator/project/collections/TraitCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/collections/TraitCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class TraitCollection extends AbstractCollection {
-
-        /**
-         * @return TraitEntry
-         */
-        public function current() {
-            return new TraitEntry($this->getCurrentNode());
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TraitCollection extends AbstractCollection {
+    public function current(): TraitEntry {
+        return new TraitEntry($this->getCurrentNode());
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/entries/AbstractEntry.php phpdox-0.12.0/src/generator/project/entries/AbstractEntry.php
--- phpdox-0.11.2/src/generator/project/entries/AbstractEntry.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/entries/AbstractEntry.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,36 +1,35 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMElement;
-    use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMElement;
 
-    abstract class AbstractEntry {
+abstract class AbstractEntry {
+    /**
+     * @var fDOMElement
+     */
+    private $node;
 
-        /**
-         * @var fDOMElement
-         */
-        private $node;
+    private $dom = [];
 
-        private $dom = array();
+    public function __construct(fDOMElement $node) {
+        $this->node = $node;
+    }
 
-        public function __construct(fDOMElement $node) {
-            $this->node = $node;
-        }
+    protected function getNode() {
+        return $this->node;
+    }
 
-        protected function getNode() {
-            return $this->node;
-        }
+    protected function loadDocument($dir) {
+        $path = $dir . '/' . $this->getNode()->getAttribute('xml');
 
-        protected function loadDocument($dir) {
-            $path = $dir . '/' . $this->getNode()->getAttribute('xml');
-            if (!isset($this->dom[$path])) {
-                $classDom = new fDOMDocument();
-                $classDom->load($path);
-                $classDom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-                $this->dom[$path] = $classDom;
-            }
-            return $this->dom[$path];
+        if (!isset($this->dom[$path])) {
+            $classDom = new fDOMDocument();
+            $classDom->load($path);
+            $classDom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+            $this->dom[$path] = $classDom;
         }
-    }
 
+        return $this->dom[$path];
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/entries/ClassEntry.php phpdox-0.12.0/src/generator/project/entries/ClassEntry.php
--- phpdox-0.11.2/src/generator/project/entries/ClassEntry.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/entries/ClassEntry.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,20 +1,16 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class ClassEntry extends AbstractEntry {
-
-        public function getName() {
-            return $this->getNode()->getAttribute('name');
-        }
-
-        public function asDom() {
-            return $this->getNode();
-        }
-
-        public function getClassObject($dir) {
-            return new ClassObject($this->loadDocument($dir));
-        }
+class ClassEntry extends AbstractEntry {
+    public function getName() {
+        return $this->getNode()->getAttribute('name');
+    }
 
+    public function asDom() {
+        return $this->getNode();
     }
 
+    public function getClassObject($dir) {
+        return new ClassObject($this->loadDocument($dir));
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/entries/InterfaceEntry.php phpdox-0.12.0/src/generator/project/entries/InterfaceEntry.php
--- phpdox-0.11.2/src/generator/project/entries/InterfaceEntry.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/entries/InterfaceEntry.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,21 +1,16 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class InterfaceEntry extends AbstractEntry {
-
-        public function getName() {
-            return $this->getNode()->getAttribute('name');
-        }
-
-        public function asDom() {
-            return $this->getNode();
-        }
-
-        public function getInterfaceObject($dir) {
-            return new InterfaceObject($this->loadDocument($dir));
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class InterfaceEntry extends AbstractEntry {
+    public function getName() {
+        return $this->getNode()->getAttribute('name');
+    }
 
+    public function asDom() {
+        return $this->getNode();
     }
 
+    public function getInterfaceObject($dir) {
+        return new InterfaceObject($this->loadDocument($dir));
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/entries/NamespaceEntry.php phpdox-0.12.0/src/generator/project/entries/NamespaceEntry.php
--- phpdox-0.11.2/src/generator/project/entries/NamespaceEntry.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/entries/NamespaceEntry.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,24 +1,20 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    class NamespaceEntry extends AbstractEntry {
-
-        public function getName() {
-            return $this->getNode()->getAttribute('name');
-        }
-
-        public function getClasses() {
-            return new ClassCollection($this->getNode()->query('phpdox:class'));
-        }
-
-        public function getTraits() {
-            return new TraitCollection($this->getNode()->query('phpdox:trait'));
-        }
+class NamespaceEntry extends AbstractEntry {
+    public function getName() {
+        return $this->getNode()->getAttribute('name');
+    }
 
-        public function getInterfaces() {
-            return new InterfaceCollection($this->getNode()->query('phpdox:interface'));
-        }
+    public function getClasses() {
+        return new ClassCollection($this->getNode()->query('phpdox:class'));
+    }
 
+    public function getTraits() {
+        return new TraitCollection($this->getNode()->query('phpdox:trait'));
     }
 
+    public function getInterfaces() {
+        return new InterfaceCollection($this->getNode()->query('phpdox:interface'));
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/entries/TraitEntry.php phpdox-0.12.0/src/generator/project/entries/TraitEntry.php
--- phpdox-0.11.2/src/generator/project/entries/TraitEntry.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/entries/TraitEntry.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,21 +1,16 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class TraitEntry extends AbstractEntry {
-
-        public function getName() {
-            return $this->getNode()->getAttribute('name');
-        }
-
-        public function asDom() {
-            return $this->getNode();
-        }
-
-        public function getTraitObject($dir) {
-            return new TraitObject($this->loadDocument($dir));
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TraitEntry extends AbstractEntry {
+    public function getName() {
+        return $this->getNode()->getAttribute('name');
+    }
 
+    public function asDom() {
+        return $this->getNode();
     }
 
+    public function getTraitObject($dir) {
+        return new TraitObject($this->loadDocument($dir));
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/Index.php phpdox-0.12.0/src/generator/project/Index.php
--- phpdox-0.11.2/src/generator/project/Index.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/Index.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,36 +1,32 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMDocument;
 
-    class Index {
+class Index {
+    private $dom;
 
-        private $dom;
-
-        public function __construct(fDOMDocument $dom) {
-            $this->dom = $dom;
-        }
-
-        public function asDom() {
-            return $this->dom;
-        }
-
-        public function hasNamespaces() {
-            return $this->dom->queryOne('count(//phpdox:namespace)') > 0;
-        }
+    public function __construct(fDOMDocument $dom) {
+        $this->dom = $dom;
+    }
 
-        public function hasInterfaces() {
-            return $this->dom->queryOne('count(//phpdox:interface)') > 0;
-        }
+    public function asDom() {
+        return $this->dom;
+    }
 
-        public function hasTraits() {
-            return $this->dom->queryOne('count(//phpdox:trait)') > 0;
-        }
+    public function hasNamespaces() {
+        return $this->dom->queryOne('count(//phpdox:namespace)') > 0;
+    }
 
-        public function hasClasses() {
-            return $this->dom->queryOne('count(//phpdox:class)') > 0;
-        }
+    public function hasInterfaces() {
+        return $this->dom->queryOne('count(//phpdox:interface)') > 0;
+    }
 
+    public function hasTraits() {
+        return $this->dom->queryOne('count(//phpdox:trait)') > 0;
     }
 
+    public function hasClasses() {
+        return $this->dom->queryOne('count(//phpdox:class)') > 0;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/AbstractUnitObject.php phpdox-0.12.0/src/generator/project/objects/AbstractUnitObject.php
--- phpdox-0.11.2/src/generator/project/objects/AbstractUnitObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/AbstractUnitObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,66 +1,45 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMDocument;
+use TheSeer\fDOM\fDOMDocument;
 
-    class AbstractUnitObject {
+class AbstractUnitObject {
+    /**
+     * @var fDOMDocument
+     */
+    private $dom;
 
-        /**
-         * @var fDOMDocument
-         */
-        private $dom;
-
-        /**
-         * @param fDOMDocument $dom
-         */
-        public function __construct(fDOMDocument $dom) {
-            $this->dom = $dom;
-        }
-
-        /**
-         * @return fDOMDocument
-         */
-        public function asDom() {
-            return $this->dom;
-        }
+    public function __construct(fDOMDocument $dom) {
+        $this->dom = $dom;
+    }
 
-        public function getInlineComments() {
-            return new InlineCommentCollection($this->dom->query('phpdox:inline'));
-        }
+    public function asDom(): fDOMDocument {
+        return $this->dom;
+    }
 
-        /**
-         * @return string
-         */
-        public function getSourceFile() {
-            $file = $this->asDom()->queryOne('//phpdox:file');
-            if (!$file) {
-                return '';
-            }
-            return $file->getAttribute('realpath');
-        }
+    public function getInlineComments() {
+        return new InlineCommentCollection($this->dom->query('phpdox:inline'));
+    }
 
-        /**
-         * @return string
-         */
-        public function getFullName() {
-            return $this->dom->documentElement->getAttribute('full');
-        }
+    public function getSourceFile(): string {
+        $file = $this->asDom()->queryOne('//phpdox:file');
 
-        /**
-         * @return ConstantCollection
-         */
-        public function getConstants() {
-            return new ConstantCollection($this->dom->query('phpdox:constant'));
+        if (!$file) {
+            return '';
         }
 
-        /**
-         * @return MethodCollection
-         */
-        public function getMethods() {
-            return new MethodCollection($this->dom->query('phpdox:constructor|phpdox:method|phpdox:destructor'));
-        }
+        return $file->getAttribute('realpath');
+    }
 
+    public function getFullName(): string {
+        return $this->dom->documentElement->getAttribute('full');
+    }
 
+    public function getConstants(): ConstantCollection {
+        return new ConstantCollection($this->dom->query('phpdox:constant'));
     }
 
+    public function getMethods(): MethodCollection {
+        return new MethodCollection($this->dom->query('phpdox:constructor|phpdox:method|phpdox:destructor'));
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/ClassObject.php phpdox-0.12.0/src/generator/project/objects/ClassObject.php
--- phpdox-0.11.2/src/generator/project/objects/ClassObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/ClassObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,16 +1,8 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class ClassObject extends AbstractUnitObject {
-
-        /**
-         * @return MemberCollection
-         */
-        public function getMembers() {
-            return new MemberCollection($this->asDom()->query('phpdox:member'));
-        }
-
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class ClassObject extends AbstractUnitObject {
+    public function getMembers(): MemberCollection {
+        return new MemberCollection($this->asDom()->query('phpdox:member'));
     }
-
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/ConstantObject.php phpdox-0.12.0/src/generator/project/objects/ConstantObject.php
--- phpdox-0.11.2/src/generator/project/objects/ConstantObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/ConstantObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,27 +1,23 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
 
-    class ConstantObject {
+class ConstantObject {
+    /**
+     * @var fDOMElement
+     */
+    private $node;
 
-        /**
-         * @var fDOMElement
-         */
-        private $node;
-
-        public function __construct(fDOMElement $node) {
-            $this->node = $node;
-        }
-
-        public function getName() {
-            return $this->node->getAttribute('name');
-        }
-
-        public function getValue() {
-            return $this->node->getAttribute('value');
-        }
+    public function __construct(fDOMElement $node) {
+        $this->node = $node;
+    }
 
+    public function getName() {
+        return $this->node->getAttribute('name');
     }
 
+    public function getValue() {
+        return $this->node->getAttribute('value');
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/InlineCommentObject.php phpdox-0.12.0/src/generator/project/objects/InlineCommentObject.php
--- phpdox-0.11.2/src/generator/project/objects/InlineCommentObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/InlineCommentObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,23 +1,19 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
 
-    class InlineCommentObject {
-
-        /**
-         * @var fDOMElement
-         */
-        private $node;
-
-        public function __construct(fDOMElement $node) {
-            $this->node = $node;
-        }
-
-        public function asDom() {
-            return $this->node;
-        }
+class InlineCommentObject {
+    /**
+     * @var fDOMElement
+     */
+    private $node;
 
+    public function __construct(fDOMElement $node) {
+        $this->node = $node;
     }
 
+    public function asDom() {
+        return $this->node;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/InterfaceObject.php phpdox-0.12.0/src/generator/project/objects/InterfaceObject.php
--- phpdox-0.11.2/src/generator/project/objects/InterfaceObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/InterfaceObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,7 +1,5 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class InterfaceObject extends AbstractUnitObject {
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class InterfaceObject extends AbstractUnitObject {
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/MemberObject.php phpdox-0.12.0/src/generator/project/objects/MemberObject.php
--- phpdox-0.11.2/src/generator/project/objects/MemberObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/MemberObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,35 +1,31 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
 
-    class MemberObject {
+class MemberObject {
+    /**
+     * @var fDOMElement
+     */
+    private $node;
 
-        /**
-         * @var fDOMElement
-         */
-        private $node;
-
-        public function __construct(fDOMElement $node) {
-            $this->node = $node;
-        }
-
-        public function asDom() {
-            return $this->node;
-        }
-
-        public function isPublic() {
-            return $this->node->getAttribute('visibility', 'public') == 'public';
-        }
+    public function __construct(fDOMElement $node) {
+        $this->node = $node;
+    }
 
-        public function isPrivate() {
-            return $this->node->getAttribute('visibility', 'public') == 'private';
-        }
+    public function asDom() {
+        return $this->node;
+    }
 
-        public function isProtected() {
-            return $this->node->getAttribute('visibility', 'public') == 'protected';
-        }
+    public function isPublic() {
+        return $this->node->getAttribute('visibility', 'public') == 'public';
+    }
 
+    public function isPrivate() {
+        return $this->node->getAttribute('visibility', 'public') == 'private';
     }
 
+    public function isProtected() {
+        return $this->node->getAttribute('visibility', 'public') == 'protected';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/MethodObject.php phpdox-0.12.0/src/generator/project/objects/MethodObject.php
--- phpdox-0.11.2/src/generator/project/objects/MethodObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/MethodObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,39 +1,35 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMElement;
+use TheSeer\fDOM\fDOMElement;
 
-    class MethodObject {
+class MethodObject {
+    /**
+     * @var fDOMElement
+     */
+    private $node;
 
-        /**
-         * @var fDOMElement
-         */
-        private $node;
-
-        public function __construct(fDOMElement $node) {
-            $this->node = $node;
-        }
-
-        public function asDom() {
-            return $this->node;
-        }
-
-        public function getName() {
-            return $this->node->getAttribute('name');
-        }
+    public function __construct(fDOMElement $node) {
+        $this->node = $node;
+    }
 
-        public function isPublic() {
-            return $this->node->getAttribute('visibility', 'public') == 'public';
-        }
+    public function asDom() {
+        return $this->node;
+    }
 
-        public function isPrivate() {
-            return $this->node->getAttribute('visibility', 'public') == 'private';
-        }
+    public function getName() {
+        return $this->node->getAttribute('name');
+    }
 
-        public function isProtected() {
-            return $this->node->getAttribute('visibility', 'public') == 'protected';
-        }
+    public function isPublic() {
+        return $this->node->getAttribute('visibility', 'public') == 'public';
+    }
 
+    public function isPrivate() {
+        return $this->node->getAttribute('visibility', 'public') == 'private';
     }
 
+    public function isProtected() {
+        return $this->node->getAttribute('visibility', 'public') == 'protected';
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/objects/TraitObject.php phpdox-0.12.0/src/generator/project/objects/TraitObject.php
--- phpdox-0.11.2/src/generator/project/objects/TraitObject.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/objects/TraitObject.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,7 +1,5 @@
-<?php
-namespace TheSeer\phpDox\Generator {
-
-    class TraitObject extends ClassObject {
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+class TraitObject extends ClassObject {
 }
diff -Nru phpdox-0.11.2/src/generator/project/Project.php phpdox-0.12.0/src/generator/project/Project.php
--- phpdox-0.11.2/src/generator/project/Project.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/Project.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,169 +1,98 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Generator {
-
-    use DOMNodeList;
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\FileInfo;
-
-    /**
-     *
-     */
-    class Project {
-
-        /**
-         * @var string
-         */
-        private $xmlDir;
-
-        /**
-         * @var string
-         */
-        private $srcDir;
-
-        /**
-         * @var fDOMDocument
-         */
-        private $source = NULL;
-
-        /**
-         * @var fDOMDocument
-         */
-        private $index = NULL;
-
-        /**
-         * @param FileInfo $srcDir
-         * @param FileInfo $xmlDir
-         */
-        public function __construct(FileInfo $srcDir, FileInfo $xmlDir) {
-            $this->xmlDir = $xmlDir;
-            $this->srcDir = $srcDir;
-            $this->initCollections();
-        }
-
-        /**
-         * @return FileInfo
-         */
-        public function getSourceDir() {
-            return $this->srcDir;
-        }
-
-        /**
-         * @return FileInfo
-         */
-        public function getXmlDir() {
-            return $this->xmlDir;
-        }
-
-
-        /**
-         * @return Index
-         */
-        public function getIndex() {
-            return new Index($this->index);
-        }
-
-        /**
-         * @return SourceTree
-         */
-        public function getSourceTree() {
-            return new SourceTree($this->source);
-        }
-
-        /**
-         * @return bool
-         */
-        public function hasNamespaces() {
-            return $this->index->query('count(//phpdox:namespace[not(@name="/")])') > 0;
-        }
-
-        /**
-         * @return DOMNodeList
-         */
-        public function getNamespaces() {
-            return new NamespaceCollection($this->index->query('//phpdox:namespace'));
-        }
-
-        /**
-         * @param string $namespace
-         * @return ClassCollection
-         */
-        public function getClasses($namespace = NULL) {
-            $root = ($namespace !== NULL) ? sprintf('//phpdox:namespace[@name="%s"]/', $namespace) : '//';
-            return new ClassCollection($this->index->query($root . 'phpdox:class'));
-        }
-
-        /**
-         * @param string $namespace
-         * @return TraitCollection
-         */
-        public function getTraits($namespace = NULL) {
-            $root = ($namespace !== NULL) ? sprintf('//phpdox:namespace[@name="%s"]/', $namespace) : '//';
-            return new TraitCollection($this->index->query($root . 'phpdox:trait'));
-        }
-
-        /**
-         * @param string $namespace
-         * @return InterfaceCollection
-         */
-        public function getInterfaces($namespace = NULL) {
-            $root = ($namespace !== NULL) ? sprintf('//phpdox:namespace[@name="%s"]/', $namespace) : '//';
-            return new InterfaceCollection($this->index->query($root . 'phpdox:interface'));
-        }
-
-        /**
-         * @return void
-         */
-        private function initCollections() {
-            $this->source = new fDOMDocument();
-            $this->source->load($this->xmlDir . '/source.xml');
-            $this->source->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-
-            $this->index = new fDOMDocument();
-            $this->index->load($this->xmlDir . '/index.xml');
-            $this->index->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-        }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\FileInfo;
+
+class Project {
+    /**
+     * @var string
+     */
+    private $xmlDir;
+
+    /**
+     * @var string
+     */
+    private $srcDir;
+
+    /**
+     * @var fDOMDocument
+     */
+    private $source;
+
+    /**
+     * @var fDOMDocument
+     */
+    private $index;
+
+    public function __construct(FileInfo $srcDir, FileInfo $xmlDir) {
+        $this->xmlDir = $xmlDir;
+        $this->srcDir = $srcDir;
+        $this->initCollections();
+    }
+
+    public function getSourceDir(): FileInfo {
+        return $this->srcDir;
     }
 
+    public function getXmlDir(): FileInfo {
+        return $this->xmlDir;
+    }
 
-    class ProjectException extends \Exception {
+    public function getIndex(): Index {
+        return new Index($this->index);
+    }
 
-        const UnitNotFoundInIndex = 1;
+    public function getSourceTree(): SourceTree {
+        return new SourceTree($this->source);
+    }
+
+    public function hasNamespaces(): bool {
+        return $this->index->query('count(//phpdox:namespace[not(@name="/")])') > 0;
+    }
 
+    public function getNamespaces(): NamespaceCollection {
+        return new NamespaceCollection($this->index->query('//phpdox:namespace'));
     }
+
+    /**
+     * @param string $namespace
+     */
+    public function getClasses($namespace = null): ClassCollection {
+        $root = ($namespace !== null) ? \sprintf('//phpdox:namespace[@name="%s"]/', $namespace) : '//';
+
+        return new ClassCollection($this->index->query($root . 'phpdox:class'));
+    }
+
+    /**
+     * @param string $namespace
+     */
+    public function getTraits($namespace = null): TraitCollection {
+        $root = ($namespace !== null) ? \sprintf('//phpdox:namespace[@name="%s"]/', $namespace) : '//';
+
+        return new TraitCollection($this->index->query($root . 'phpdox:trait'));
+    }
+
+    /**
+     * @param string $namespace
+     */
+    public function getInterfaces($namespace = null): InterfaceCollection {
+        $root = ($namespace !== null) ? \sprintf('//phpdox:namespace[@name="%s"]/', $namespace) : '//';
+
+        return new InterfaceCollection($this->index->query($root . 'phpdox:interface'));
+    }
+
+    private function initCollections(): void {
+        $this->source = new fDOMDocument();
+        $this->source->load($this->xmlDir . '/source.xml');
+        $this->source->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+
+        $this->index = new fDOMDocument();
+        $this->index->load($this->xmlDir . '/index.xml');
+        $this->index->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+    }
+}
+
+class ProjectException extends \Exception {
+    public const UnitNotFoundInIndex = 1;
 }
diff -Nru phpdox-0.11.2/src/generator/project/SourceTree.php phpdox-0.12.0/src/generator/project/SourceTree.php
--- phpdox-0.11.2/src/generator/project/SourceTree.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/SourceTree.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,29 +1,21 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use Traversable;
+use TheSeer\fDOM\fDOMDocument;
 
-    class SourceTree implements \IteratorAggregate {
+class SourceTree implements \IteratorAggregate {
+    private $dom;
 
-        private $dom;
-
-        public function __construct(fDOMDocument $dom) {
-            $this->dom = $dom;
-            $this->dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
-        }
-
-        /**
-         * @return TokenFileIterator
-         */
-        public function getIterator() {
-            return new TokenFileIterator($this->dom->query('//phpdox:file'));
-        }
-
-        public function asDom() {
-            return $this->dom;
-        }
+    public function __construct(fDOMDocument $dom) {
+        $this->dom = $dom;
+        $this->dom->registerNamespace('phpdox', 'http://xml.phpdox.net/src');
+    }
 
+    public function getIterator(): TokenFileIterator {
+        return new TokenFileIterator($this->dom->query('//phpdox:file'));
     }
 
+    public function asDom() {
+        return $this->dom;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/TokenFileIterator.php phpdox-0.12.0/src/generator/project/TokenFileIterator.php
--- phpdox-0.11.2/src/generator/project/TokenFileIterator.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/TokenFileIterator.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,49 +1,43 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\FileInfo;
 
-    class TokenFileIterator implements \Iterator {
+class TokenFileIterator implements \Iterator {
+    /**
+     * @var \DOMNodeList
+     */
+    private $nodeList;
+
+    /**
+     * @var int
+     */
+    private $pos = 0;
 
-        /**
-         * @var \DOMNodeList
-         */
-        private $nodeList;
-
-        public function __construct(\DOMNodeList $nodeList) {
-            $this->nodeList = $nodeList;
-        }
-
-        /**
-         * @var int
-         */
-        private $pos = 0;
-
-        /**
-         * @return TokenFile
-         */
-        public function current() {
-            $item = $this->nodeList->item($this->pos);
-            $path = dirname(urldecode($item->ownerDocument->documentURI)) . '/' . $item->getAttribute('xml');
-            return new TokenFile(new FileInfo($path));
-        }
-
-        public function next() {
-            $this->pos++;
-        }
-
-        public function key() {
-            return $this->pos;
-        }
-
-        public function valid() {
-            return $this->nodeList->length > $this->pos;
-        }
-
-        public function rewind() {
-            $this->pos = 0;
-        }
+    public function __construct(\DOMNodeList $nodeList) {
+        $this->nodeList = $nodeList;
+    }
+
+    public function current(): TokenFile {
+        $item = $this->nodeList->item($this->pos);
+        $path = \dirname(\str_replace('file:/', '', \urldecode($item->ownerDocument->documentURI))) . '/' . $item->getAttribute('xml');
 
+        return new TokenFile(new FileInfo($path));
     }
 
+    public function next(): void {
+        $this->pos++;
+    }
+
+    public function key() {
+        return $this->pos;
+    }
+
+    public function valid() {
+        return $this->nodeList->length > $this->pos;
+    }
+
+    public function rewind(): void {
+        $this->pos = 0;
+    }
 }
diff -Nru phpdox-0.11.2/src/generator/project/TokenFile.php phpdox-0.12.0/src/generator/project/TokenFile.php
--- phpdox-0.11.2/src/generator/project/TokenFile.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/generator/project/TokenFile.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,47 +1,45 @@
-<?php
-namespace TheSeer\phpDox\Generator {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Generator;
 
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\Collector\SourceFile;
-    use TheSeer\phpDox\FileInfo;
-
-    class TokenFile {
-
-        /**
-         * @var FileInfo
-         */
-        private $file;
-
-        private $dom;
-
-        public function __construct(FileInfo $file) {
-            if (!$file->exists()) {
-                throw new TokenFileException(
-                    sprintf("File '%s' not found", $file->getPathname()),
-                    TokenFileException::FileNotFound
-                );
-            }
-            $this->file = $file;
-        }
-
-        public function getRelativeName(FileInfo $path) {
-            $file = new FileInfo($this->asDom()->getElementsByTagNameNS(SourceFile::XMLNS, 'file')->item(0)->getAttribute('realpath'));
-            return $file->getRelative($path, FALSE);
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\Collector\SourceFile;
+use TheSeer\phpDox\FileInfo;
+
+class TokenFile {
+    /**
+     * @var FileInfo
+     */
+    private $file;
+
+    private $dom;
+
+    public function __construct(FileInfo $file) {
+        if (!$file->exists()) {
+            throw new TokenFileException(
+                \sprintf("File '%s' not found", $file->getPathname()),
+                TokenFileException::FileNotFound
+            );
         }
+        $this->file = $file;
+    }
 
-        public function asDom() {
-            if (!$this->dom instanceof fDOMDocument) {
-                $this->dom = new fDOMDocument();
-                $this->dom->load($this->file->getPathname());
-                $this->dom->registerNamespace('phpdox', SourceFile::XMLNS);
-            }
-            return $this->dom;
-        }
+    public function getRelativeName(FileInfo $path) {
+        $file = new FileInfo($this->asDom()->getElementsByTagNameNS(SourceFile::XMLNS, 'file')->item(0)->getAttribute('realpath'));
 
+        return $file->getRelative($path, false);
     }
 
-    class TokenFileException extends \Exception {
-        const FileNotFound = 1;
+    public function asDom() {
+        if (!$this->dom instanceof fDOMDocument) {
+            $this->dom = new fDOMDocument();
+            $this->dom->load($this->file->getPathname());
+            $this->dom->registerNamespace('phpdox', SourceFile::XMLNS);
+        }
+
+        return $this->dom;
     }
+}
 
+class TokenFileException extends \Exception {
+    public const FileNotFound = 1;
 }
diff -Nru phpdox-0.11.2/src/logger/ProgressLoggerException.php phpdox-0.12.0/src/logger/ProgressLoggerException.php
--- phpdox-0.11.2/src/logger/ProgressLoggerException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/logger/ProgressLoggerException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,6 @@
-<?php
-namespace TheSeer\phpDox {
-
-    class ProgressLoggerException extends \Exception {
-
-        const UnknownState = 1;
-
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+class ProgressLoggerException extends \Exception {
+    public const UnknownState = 1;
 }
diff -Nru phpdox-0.11.2/src/logger/ProgressLogger.php phpdox-0.12.0/src/logger/ProgressLogger.php
--- phpdox-0.11.2/src/logger/ProgressLogger.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/logger/ProgressLogger.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,37 +1,25 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+/**
+ * Generic progress logger
+ */
+interface ProgressLogger {
     /**
-     * Generic progress logger
+     * @param $state
+     *
+     * @throws ProgressLoggerException
      */
-    interface ProgressLogger {
+    public function progress($state);
 
-        /**
-         * @param $state
-         *
-         * @throws ProgressLoggerException
-         */
-        public function progress($state);
+    public function reset();
 
-        /**
-         *
-         */
-        public function reset();
+    public function completed();
 
-        /**
-         *
-         */
-        public function completed();
-
-        /**
-         * @param $msg
-         */
-        public function log($msg);
-
-        /**
-         *
-         */
-        public function buildSummary();
+    /**
+     * @param $msg
+     */
+    public function log($msg);
 
-    }
+    public function buildSummary();
 }
diff -Nru phpdox-0.11.2/src/logger/ShellProgressLogger.php phpdox-0.12.0/src/logger/ShellProgressLogger.php
--- phpdox-0.11.2/src/logger/ShellProgressLogger.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/logger/ShellProgressLogger.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,137 +1,94 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use SebastianBergmann\Timer\Timer;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
+ * Shell output based logger
  */
-namespace TheSeer\phpDox {
+class ShellProgressLogger implements ProgressLogger {
+    /**
+     * @var array
+     */
+    private $stateChars;
 
     /**
-     * Shell output based logger
+     * @var int
      */
-    class ShellProgressLogger implements ProgressLogger {
+    private $totalCount = 0;
 
-        /**
-         * @var array
-         */
-        private $stateChars;
-
-        /**
-         * @var int
-         */
-        private $totalCount = 0;
-        /**
-         * @var array
-         */
-        private $stateCount = array(
-            'processed' => 0,
-            'cached' => 0,
-            'failed' => 0
-        );
-
-        /**
-         * @param string $processed
-         * @param string $cached
-         * @param string $failed
-         */
-        public function __construct($processed = '.', $cached = 'c', $failed = 'f') {
-            $this->stateChars = array(
-                'processed' => $processed,
-                'cached' => $cached,
-                'failed' => $failed
-            );
-        }
+    /**
+     * @var array
+     */
+    private $stateCount = [
+        'processed' => 0,
+        'cached'    => 0,
+        'failed'    => 0
+    ];
 
-        /**
-         * @param $state
-         * @throws ProgressLoggerException
-         */
-        public function progress($state) {
-            if (!isset($this->stateChars[$state])) {
-                throw new ProgressLoggerException("Unkown progress state '$state'", ProgressLoggerException::UnknownState);
-            }
-            $this->stateCount[$state]++;
-            $this->totalCount++;
-
-            echo $this->stateChars[$state];
-            if ($this->totalCount % 50 == 0) {
-                echo "\t[". $this->totalCount . "]\n";
-            }
-        }
+    /**
+     * @param string $processed
+     * @param string $cached
+     * @param string $failed
+     */
+    public function __construct($processed = '.', $cached = 'c', $failed = 'f') {
+        $this->stateChars = [
+            'processed' => $processed,
+            'cached'    => $cached,
+            'failed'    => $failed
+        ];
+    }
 
-        /**
-         *
-         */
-        public function reset() {
-            $this->totalCount = 0;
-            $this->stateCount = array(
-                'processed' => 0,
-                'cached' => 0,
-                'failed' => 0
-            );
+    /**
+     * @param $state
+     *
+     * @throws ProgressLoggerException
+     */
+    public function progress($state): void {
+        if (!isset($this->stateChars[$state])) {
+            throw new ProgressLoggerException("Unkown progress state '$state'", ProgressLoggerException::UnknownState);
         }
+        $this->stateCount[$state]++;
+        $this->totalCount++;
 
-        /**
-         *
-         */
-        public function completed() {
-            $pad = (ceil($this->totalCount / 50) * 50) - $this->totalCount;
-            if ($pad !=0) {
-                echo str_pad('', $pad, ' ') . "\t[". $this->totalCount . "]\n";
-            }
-            echo "\n";
-        }
+        print $this->stateChars[$state];
 
-        /**
-         * @param $msg
-         */
-        public function log($msg) {
-            if (func_num_args()>1) {
-                $msg = vsprintf($msg, array_slice(func_get_args(), 1));
-            }
-            echo "[" . date('d.m.Y - H:i:s') . '] ' . $msg . "\n";
+        if ($this->totalCount % 50 == 0) {
+            print "\t[" . $this->totalCount . "]\n";
         }
+    }
+
+    public function reset(): void {
+        $this->totalCount = 0;
+        $this->stateCount = [
+            'processed' => 0,
+            'cached'    => 0,
+            'failed'    => 0
+        ];
+    }
 
-        /**
-         *
-         */
-        public function buildSummary() {
-            echo "\n\n";
-            echo \PHP_Timer::resourceUsage();
-            echo "\n\n";
+    public function completed(): void {
+        $pad = (\ceil($this->totalCount / 50) * 50) - $this->totalCount;
+
+        if ($pad != 0) {
+            print \str_pad('', (int)$pad, ' ') . "\t[" . $this->totalCount . "]\n";
         }
+        print "\n";
+    }
 
+    /**
+     * @param $msg
+     */
+    public function log($msg): void {
+        if (\func_num_args() > 1) {
+            $msg = \vsprintf($msg, \array_slice(\func_get_args(), 1));
+        }
+        print '[' . \date('d.m.Y - H:i:s') . '] ' . $msg . "\n";
     }
 
+    public function buildSummary(): void {
+        print "\n\n";
+        print Timer::resourceUsage();
+        print "\n\n";
+    }
 }
diff -Nru phpdox-0.11.2/src/logger/SilentProgressLogger.php phpdox-0.12.0/src/logger/SilentProgressLogger.php
--- phpdox-0.11.2/src/logger/SilentProgressLogger.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/logger/SilentProgressLogger.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,62 +1,22 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
 /**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
+ * Silent progress logger
  */
-namespace TheSeer\phpDox {
-
-    /**
-     * Silent progress logger
-     */
-    class SilentProgressLogger implements ProgressLogger {
-
-        public function progress($state) {
-        }
-
-        public function reset() {
-        }
-
-        public function completed() {
-        }
+class SilentProgressLogger implements ProgressLogger {
+    public function progress($state): void {
+    }
 
-        public function log($msg) {
-        }
+    public function reset(): void {
+    }
 
-        public function buildSummary() {
-        }
+    public function completed(): void {
+    }
 
+    public function log($msg): void {
     }
 
+    public function buildSummary(): void {
+    }
 }
diff -Nru phpdox-0.11.2/src/runtimecheck.php phpdox-0.12.0/src/runtimecheck.php
--- phpdox-0.11.2/src/runtimecheck.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/runtimecheck.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,33 +1,26 @@
-<?php
+<?php declare(strict_types = 1);
 
-if (defined('HHVM_VERSION')) {
-    fwrite(
-        STDERR,
-        "It seems like you are using HHVM to run phpDox.\nHHVM is no longer a supported environment." .
-             "Please consider using PHP 7.x.\n\n"
+if (\defined('HHVM_VERSION')) {
+    \fwrite(
+        \STDERR,
+        "\nWARNING - UNSUPPORTED RUNTIME\n\n" .
+        "It seems like you are using HHVM to run phpDox.\n" .
+        "This version of phpDox has not been tested with HHVM.\n\n" .
+        "Please use PHP 7.1+.\n\n"
     );
+
     return;
 }
 
-if ((version_compare(phpversion(), '5.5', 'lt'))) {
-    fwrite(
-        STDERR,
-        sprintf(
-            "phpDox requires PHP 5.5 or later; " .
+if ((\version_compare(\phpversion(), '7.1', 'lt'))) {
+    \fwrite(
+        \STDERR,
+        \sprintf(
+            'phpDox requires PHP 7.1 or later; ' .
             "Upgrading to the latest version of PHP is highly recommended. (Version used: %s)\n\n",
-            phpversion()
+            \phpversion()
         )
     );
 
-    die(1);
-}
-
-if ((version_compare(phpversion(), '7.0', 'lt'))) {
-    fwrite(
-        STDERR,
-        sprintf(
-            "You are using an outdated version of PHP (%s) to run phpDox. Please consider upgrading to PHP 7.x!\n\n",
-            phpversion()
-        )
-    );
+    exit(1);
 }
diff -Nru phpdox-0.11.2/src/shared/DirectoryCleanerException.php phpdox-0.12.0/src/shared/DirectoryCleanerException.php
--- phpdox-0.11.2/src/shared/DirectoryCleanerException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/DirectoryCleanerException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,9 +1,6 @@
-<?php
-namespace TheSeer\phpDox {
-
-    class DirectoryCleanerException extends \Exception {
-
-        const SecurityLimitation = 1;
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+class DirectoryCleanerException extends \Exception {
+    public const SecurityLimitation = 1;
 }
diff -Nru phpdox-0.11.2/src/shared/DirectoryCleaner.php phpdox-0.12.0/src/shared/DirectoryCleaner.php
--- phpdox-0.11.2/src/shared/DirectoryCleaner.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/DirectoryCleaner.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,38 +1,34 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class DirectoryCleaner {
-
-        public function process(FileInfo $path) {
-            if (mb_strlen($path->getPathname()) < 5) {
-                throw new DirectoryCleanerException(
-                    'For security reasons, path must be at least 5 chars long',
-                    DirectoryCleanerException::SecurityLimitation
-                );
-            }
-
-            if (!$path->exists()) {
-                return;
-            }
-
-            $worker = new \RecursiveIteratorIterator(
-                new \RecursiveDirectoryIterator(
-                    $path->getPathname(),
-                    \FilesystemIterator::SKIP_DOTS
-                ),
-                \RecursiveIteratorIterator::CHILD_FIRST
+class DirectoryCleaner {
+    public function process(FileInfo $path): void {
+        if (\mb_strlen($path->getPathname()) < 5) {
+            throw new DirectoryCleanerException(
+                'For security reasons, path must be at least 5 chars long',
+                DirectoryCleanerException::SecurityLimitation
             );
+        }
 
-            foreach($worker as $entry) {
-                if ($entry->isDir() && !$entry->isLink()) {
-                    rmdir($entry->getPathname());
-                } else {
-                    unlink($entry->getPathname());
-                }
-            }
-            rmdir($path);
+        if (!$path->exists()) {
+            return;
         }
 
+        $worker = new \RecursiveIteratorIterator(
+            new \RecursiveDirectoryIterator(
+                $path->getPathname(),
+                \FilesystemIterator::SKIP_DOTS
+            ),
+            \RecursiveIteratorIterator::CHILD_FIRST
+        );
+
+        foreach ($worker as $entry) {
+            if ($entry->isDir() && !$entry->isLink()) {
+                \rmdir($entry->getPathname());
+            } else {
+                \unlink($entry->getPathname());
+            }
+        }
+        \rmdir($path->getPathname());
     }
-
 }
diff -Nru phpdox-0.11.2/src/shared/EnvironmentException.php phpdox-0.12.0/src/shared/EnvironmentException.php
--- phpdox-0.11.2/src/shared/EnvironmentException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/EnvironmentException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,8 +1,8 @@
-<?php
+<?php declare(strict_types = 1);
 namespace TheSeer\phpDox;
 
 class EnvironmentException extends \Exception {
+    public const ExtensionMissing = 1;
 
-    const ExtensionMissing = 1;
-    const VendorMissing = 2;
+    public const VendorMissing = 2;
 }
diff -Nru phpdox-0.11.2/src/shared/Environment.php phpdox-0.12.0/src/shared/Environment.php
--- phpdox-0.11.2/src/shared/Environment.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/Environment.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,56 +1,54 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class Environment {
-
-        public function ensureFitness() {
-            $this->ensureTimezoneSet();
-            $this->ensureRequiredExtensionsLoaded();
-            $this->disableXDebug();
-        }
+class Environment {
+    public function ensureFitness(): void {
+        $this->ensureTimezoneSet();
+        $this->ensureRequiredExtensionsLoaded();
+        $this->disableXDebug();
+    }
 
-        private function ensureRequiredExtensionsLoaded() {
-            $required = array('tokenizer', 'iconv', 'fileinfo', 'libxml', 'dom', 'xsl', 'mbstring','pcre');
-            $missing = array();
-
-            foreach ($required as $test) {
-                if (!extension_loaded($test)) {
-                    $missing[] = sprintf('ext/%s not installed/enabled', $test);
-                }
+    private function ensureRequiredExtensionsLoaded(): void {
+        $required = ['tokenizer', 'iconv', 'fileinfo', 'libxml', 'dom', 'xsl', 'mbstring', 'pcre'];
+        $missing  = [];
+
+        foreach ($required as $test) {
+            if (!\extension_loaded($test)) {
+                $missing[] = \sprintf('ext/%s not installed/enabled', $test);
             }
+        }
 
-            try {
-                $test = preg_replace( '/[\x{0430}-\x{04FF}]/iu', '', '-АБВГД-' );
-                if ($test != '--') {
-                    throw new \ErrorException('PCRE unicode support broken.');
-                }
-            } catch(\ErrorException $e) {
-                $missing[] = 'PCRE installation does not support unicode / unicode properties.';
-            }
+        try {
+            $test = \preg_replace('/[\x{0430}-\x{04FF}]/iu', '', '-АБВГД-');
 
-            if (count($missing)) {
-                throw new EnvironmentException(
-                    join("\n", $missing),
-                    EnvironmentException::ExtensionMissing
-                );
+            if ($test != '--') {
+                throw new \ErrorException('PCRE unicode support broken.');
             }
+        } catch (\ErrorException $e) {
+            $missing[] = 'PCRE installation does not support unicode / unicode properties.';
         }
 
-        private function disableXDebug() {
-            if (!extension_loaded('xdebug')) {
-                return;
-            }
-            ini_set('xdebug.scream', 0);
-            ini_set('xdebug.max_nesting_level', 8192);
-            ini_set('xdebug.show_exception_trace', 0);
-            xdebug_disable();
+        if (\count($missing)) {
+            throw new EnvironmentException(
+                \implode("\n", $missing),
+                EnvironmentException::ExtensionMissing
+            );
         }
+    }
 
-        private function ensureTimezoneSet() {
-            if (!ini_get('date.timezone')) {
-                date_default_timezone_set('UTC');
-            }
+    private function disableXDebug(): void {
+        if (!\extension_loaded('xdebug')) {
+            return;
         }
+        \ini_set('xdebug.scream', 'off');
+        \ini_set('xdebug.max_nesting_level', '8192');
+        \ini_set('xdebug.show_exception_trace', 'off');
+        xdebug_disable();
     }
 
+    private function ensureTimezoneSet(): void {
+        if (!\ini_get('date.timezone')) {
+            \date_default_timezone_set('UTC');
+        }
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/ErrorException.php phpdox-0.12.0/src/shared/ErrorException.php
--- phpdox-0.11.2/src/shared/ErrorException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/ErrorException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,32 +1,30 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class ErrorException extends \ErrorException {
+class ErrorException extends \ErrorException {
+    private $map = [
+        \E_ERROR             => 'E_ERROR',
+        \E_WARNING           => 'E_WARNING',
+        \E_PARSE             => 'E_PARSE',
+        \E_NOTICE            => 'E_NOTICE',
+        \E_CORE_ERROR        => 'E_CORE_ERROR',
+        \E_CORE_WARNING      => 'E_CORE_WARNING',
+        \E_COMPILE_ERROR     => 'E_COMPILE_ERROR',
+        \E_COMPILE_WARNING   => 'E_COMPILE_WARNING',
+        \E_USER_ERROR        => 'E_USER_ERROR',
+        \E_USER_WARNING      => 'E_USER_WARNING',
+        \E_USER_NOTICE       => 'E_USER_NOTICE',
+        \E_STRICT            => 'E_STRICT',
+        \E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
+        \E_DEPRECATED        => 'E_DEPRECATED',
+        \E_USER_DEPRECATED   => 'E_USER_DEPRECATED'
+    ];
 
-        private $map = array(
-            \E_ERROR => 'E_ERROR',
-            \E_WARNING => 'E_WARNING',
-            \E_PARSE => 'E_PARSE',
-            \E_NOTICE => 'E_NOTICE',
-            \E_CORE_ERROR => 'E_CORE_ERROR',
-            \E_CORE_WARNING => 'E_CORE_WARNING',
-            \E_COMPILE_ERROR => 'E_COMPILE_ERROR',
-            \E_COMPILE_WARNING => 'E_COMPILE_WARNING',
-            \E_USER_ERROR => 'E_USER_ERROR',
-            \E_USER_WARNING => 'E_USER_WARNING',
-            \E_USER_NOTICE => 'E_USER_NOTICE',
-            \E_STRICT => 'E_STRICT',
-            \E_RECOVERABLE_ERROR => 'E_RECOVERABLE_ERROR',
-            \E_DEPRECATED => 'E_DEPRECATED',
-            \E_USER_DEPRECATED => 'E_USER_DEPRECATED'
-        );
-
-        public function getErrorName() {
-            if (isset($this->map[$this->code])) {
-                return $this->map[$this->code];
-            }
-            return 'E_FATAL';
+    public function getErrorName() {
+        if (isset($this->map[$this->code])) {
+            return $this->map[$this->code];
         }
-    }
 
+        return 'E_FATAL';
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/ErrorHandler.php phpdox-0.12.0/src/shared/ErrorHandler.php
--- phpdox-0.11.2/src/shared/ErrorHandler.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/ErrorHandler.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,197 +1,149 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    class ErrorHandler {
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        /**
-         * ErrorHandler constructor.
-         *
-         * @param Version $version
-         */
-        public function __construct(Version $version) {
-            $this->version = $version;
-        }
-
-        /**
-         * Init method
-         *
-         * Register shutdown, exception and error handler
-         *
-         * @return void
-         */
-        public function register() {
-            error_reporting(0);
-            ini_set('display_errors', FALSE);
-            register_shutdown_function(array($this, "handleShutdown"));
-            set_exception_handler(array($this, 'handleException'));
-            set_error_handler(array($this, 'handleError'), E_STRICT|E_NOTICE|E_WARNING|E_RECOVERABLE_ERROR|E_USER_ERROR);
-            class_exists('\TheSeer\phpDox\ErrorException', true);
-        }
-
-        /**
-         * Destructor
-         *
-         * @return void
-         */
-        public function __destruct() {
-            restore_exception_handler();
-            restore_error_handler();
-        }
-
-        /**
-         * General System error handler
-         *
-         * Capture error messages and transform them into an exception
-         *
-         * @param integer $errno   Error code
-         * @param string  $errstr  Error message
-         * @param string  $errfile Filename error occured in
-         * @param integer $errline Line of error
-         *
-         * @throws \ErrorException
-         */
-        public function handleError($errno, $errstr, $errfile, $errline) {
-            throw new ErrorException($errstr, $errno, 0, $errfile, $errline);
-        }
-
-        /**
-         * System shutdown handler
-         *
-         * Used to grab fatal errors and handle them gracefully
-         *
-         * @return void
-         */
-        public function handleShutdown() {
-            $error = $this->getLastError();
-            if ($error) {
-                $exception = new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
-                $this->handleException($exception);
-            }
-        }
-
-        /**
-         * System Exception Handler
-         *
-         * @param \Exception|\Throwable $exception The exception to handle
-         *
-         * @return void
-         */
-        public function handleException($exception) {
-            fwrite(STDERR, "\n\nOups... phpDox encountered a problem and has terminated!\n");
-            fwrite(STDERR, "\nIt most likely means you've found a bug, so please file a report for this\n");
-            fwrite(STDERR, "and paste the following details and the stacktrace (if given) along:\n\n");
-            fwrite(STDERR, "PHP Version: " . PHP_VERSION . " (" . PHP_OS . ")\n");
-            fwrite(STDERR, "PHPDox Version: " . $this->version->getVersion() . "\n");
-            $this->renderException($exception);
-            fwrite(STDERR, "\n\n\n");
-        }
-
-        /**
-         * @param \Exception|\Throwable $exception
-         */
-        private function renderException($exception) {
-            if ($exception instanceof ErrorException) {
-                fwrite(STDERR, sprintf("ErrorException: %s \n", $exception->getErrorName()));
-            } else {
-                fwrite(STDERR, sprintf("Exception: %s (Code: %d)\n", get_class($exception), $exception->getCode()));
-            }
-            fwrite(STDERR, sprintf("Location: %s (Line %d)\n\n", $exception->getFile(), $exception->getLine()));
-            fwrite(STDERR, $exception->getMessage() . "\n\n");
-
-            if ($exception instanceof HasFileInfoException) {
-                fwrite(STDERR, "\nException occured while processing file: " .  $exception->getFile()."\n\n");
-            }
-
-            $trace = $exception->getTrace();
-            array_shift($trace);
-            if (count($trace) == 0) {
-                fwrite(STDERR, 'No stacktrace available');
-            }
-            foreach($trace as $pos => $entry) {
-                fwrite(STDERR,
-                    sprintf('#%1$d %2$s(%3$d): %4$s%5$s%6$s()'."\n",
-                        $pos,
-                        isset($entry['file']) ? $entry['file'] : 'unknown',
-                        isset ($entry['line']) ? $entry['line'] : '0',
-                        isset($entry['class']) ? $entry['class'] : '',
-                        isset($entry['type']) ? $entry['type'] : '',
-                        isset($entry['function']) ? $entry['function'] : ''
-                    )
-                );
-            }
-
-            $nested = $exception->getPrevious();
-            if ($nested !== NULL) {
-                fwrite(STDERR, "\n\n");
-                $this->renderException($nested);
-            }
-
-        }
-
-        public function clearLastError() {
-            if (function_exists('error_clear_last')) {
-                error_clear_last();
-            } else {
-                set_error_handler(function () { return false; }, 0);
-                @trigger_error('');
-                restore_error_handler();
-            }
-        }
-
-        /**
-         * This method implements a workaround for PHP < 7 where no error_clear_last() exists
-         * by considering a last error of type E_USER_NOTICE as "cleared".
-         *
-         * @return array
-         */
-        private function getLastError() {
-            $error = error_get_last();
-            if ($error && $error['type'] == E_USER_NOTICE) {
-                return [];
-            }
-            return $error;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+class ErrorHandler {
+    /**
+     * @var Version
+     */
+    private $version;
+
+    public function __construct(Version $version) {
+        $this->version = $version;
+    }
+
+    public function __destruct() {
+        \restore_exception_handler();
+        \restore_error_handler();
+    }
+
+    /**
+     * Init method
+     *
+     * Register shutdown, exception and error handler
+     */
+    public function register(): void {
+        \error_reporting(0);
+        \ini_set('display_errors', 'off');
+        \register_shutdown_function([$this, 'handleShutdown']);
+        \set_exception_handler([$this, 'handleException']);
+        \set_error_handler([$this, 'handleError'], \E_STRICT | \E_NOTICE | \E_WARNING | \E_RECOVERABLE_ERROR | \E_USER_ERROR);
+        \class_exists(\TheSeer\phpDox\ErrorException::class, true);
+    }
+
+    /**
+     * General System error handler
+     *
+     * Capture error messages and transform them into an exception
+     *
+     * @param int    $errno   Error code
+     * @param string $errstr  Error message
+     * @param string $errfile Filename error occured in
+     * @param int    $errline Line of error
+     *
+     * @throws \ErrorException
+     */
+    public function handleError($errno, $errstr, $errfile, $errline): void {
+        throw new ErrorException($errstr, $errno, 0, $errfile, $errline);
+    }
+
+    /**
+     * System shutdown handler
+     *
+     * Used to grab fatal errors and handle them gracefully
+     */
+    public function handleShutdown(): void {
+        $error = $this->getLastError();
+
+        if ($error) {
+            $exception = new ErrorException($error['message'], $error['type'], 0, $error['file'], $error['line']);
+            $this->handleException($exception);
+        }
+    }
+
+    /**
+     * System Exception Handler
+     *
+     * @param \Exception|\Throwable $exception The exception to handle
+     */
+    public function handleException($exception): void {
+        \fwrite(\STDERR, "\n\nOups... phpDox encountered a problem and has terminated!\n");
+        \fwrite(\STDERR, "\nIt most likely means you've found a bug, so please file a report for this\n");
+        \fwrite(\STDERR, "and paste the following details and the stacktrace (if given) along:\n\n");
+        \fwrite(\STDERR, 'PHP Version: ' . \PHP_VERSION . ' (' . \PHP_OS . ")\n");
+        \fwrite(\STDERR, 'PHPDox Version: ' . $this->version->getVersion() . "\n");
+        $this->renderException($exception);
+        \fwrite(\STDERR, "\n\n\n");
+    }
+
+    public function clearLastError(): void {
+        if (\function_exists('error_clear_last')) {
+            \error_clear_last();
+        } else {
+            \set_error_handler(function () {
+                return false;
+            }, 0);
+            @\trigger_error('');
+            \restore_error_handler();
         }
     }
 
+    /**
+     * @param \Exception|\Throwable $exception
+     */
+    private function renderException($exception): void {
+        if ($exception instanceof ErrorException) {
+            \fwrite(\STDERR, \sprintf("ErrorException: %s \n", $exception->getErrorName()));
+        } else {
+            \fwrite(\STDERR, \sprintf("Exception: %s (Code: %d)\n", \get_class($exception), $exception->getCode()));
+        }
+        \fwrite(\STDERR, \sprintf("Location: %s (Line %d)\n\n", $exception->getFile(), $exception->getLine()));
+        \fwrite(\STDERR, $exception->getMessage() . "\n\n");
+
+        if ($exception instanceof HasFileInfoException) {
+            \fwrite(\STDERR, "\nException occured while processing file: " . $exception->getFile() . "\n\n");
+        }
+
+        $trace = $exception->getTrace();
+        \array_shift($trace);
+
+        if (\count($trace) === 0) {
+            \fwrite(\STDERR, 'No stacktrace available');
+        }
+
+        foreach ($trace as $pos => $entry) {
+            \fwrite(
+                \STDERR,
+                \sprintf(
+                    '#%1$d %2$s(%3$d): %4$s%5$s%6$s()' . "\n",
+                    $pos,
+                    $entry['file'] ?? 'unknown',
+                    $entry['line'] ?? '0',
+                    $entry['class'] ?? '',
+                    $entry['type'] ?? '',
+                    $entry['function'] ?? ''
+                )
+            );
+        }
+
+        $nested = $exception->getPrevious();
+
+        if ($nested !== null) {
+            \fwrite(\STDERR, "\n\n");
+            $this->renderException($nested);
+        }
+    }
+
+    /**
+     * This method implements a workaround for PHP < 7 where no error_clear_last() exists
+     * by considering a last error of type E_USER_NOTICE as "cleared".
+     */
+    private function getLastError(): array {
+        $error = \error_get_last();
+
+        if ($error === null || $error['type'] === \E_USER_NOTICE) {
+            return [];
+        }
+
+        return $error;
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/FactoryException.php phpdox-0.12.0/src/shared/FactoryException.php
--- phpdox-0.11.2/src/shared/FactoryException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/FactoryException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,23 +1,10 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    /**
-     *
-     */
-    class FactoryException extends \Exception {
+class FactoryException extends \Exception {
+    public const NoClassDefined = 1;
 
-        /**
-         *
-         */
-        const NoClassDefined = 1;
-        /**
-         *
-         */
-        const NotInstantiable = 2;
-        /**
-         *
-         */
-        const NoConstructor = 3;
-    }
+    public const NotInstantiable = 2;
 
+    public const NoConstructor = 3;
 }
diff -Nru phpdox-0.11.2/src/shared/FactoryInterface.php phpdox-0.12.0/src/shared/FactoryInterface.php
--- phpdox-0.11.2/src/shared/FactoryInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/FactoryInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,45 +1,6 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    interface FactoryInterface {
-
-        public function getInstanceFor($name);
-    }
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+interface FactoryInterface {
+    public function getInstanceFor($name);
 }
diff -Nru phpdox-0.11.2/src/shared/Factory.php phpdox-0.12.0/src/shared/Factory.php
--- phpdox-0.11.2/src/shared/Factory.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/Factory.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,275 +1,185 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
-
-    use TheSeer\DirectoryScanner\DirectoryScanner;
-    use TheSeer\phpDox\Collector\Collector;
-    use TheSeer\phpDox\Collector\InheritanceResolver;
-    use TheSeer\phpDox\Collector\Project;
-    use TheSeer\phpDox\Generator\Engine\EventHandlerRegistry;
-    use TheSeer\phpDox\Generator\Generator;
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+use TheSeer\DirectoryScanner\DirectoryScanner;
+use TheSeer\phpDox\Collector\Collector;
+use TheSeer\phpDox\Collector\InheritanceResolver;
+use TheSeer\phpDox\Collector\Project;
+use TheSeer\phpDox\Generator\Engine\EventHandlerRegistry;
+use TheSeer\phpDox\Generator\Generator;
+
+class Factory {
     /**
-     *
+     * @var FileInfo
      */
-    class Factory {
+    private $homeDir;
 
-        /**
-         * @var FileInfo
-         */
-        private $homeDir;
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        /**
-         * @var array
-         */
-        private $instances = array();
-
-        /**
-         * @var bool
-         */
-        private $isSilentMode = false;
-
-        /**
-         * @param array $map
-         */
-        public function __construct(FileInfo $home, Version $version) {
-            $this->homeDir = $home;
-            $this->version = $version;
-        }
+    /**
+     * @var Version
+     */
+    private $version;
 
-        public function activateSilentMode() {
-            $this->isSilentMode = true;
-        }
+    /**
+     * @var array
+     */
+    private $instances = [];
 
-        /**
-         * @return ErrorHandler
-         */
-        public function getErrorHandler() {
-            return new ErrorHandler($this->version);
-        }
+    /**
+     * @var bool
+     */
+    private $isSilentMode = false;
 
-        /**
-         * @return CLI
-         */
-        public function getCLI() {
-            return new CLI(new Environment(), $this->version, $this);
-        }
+    public function __construct(FileInfo $home, Version $version) {
+        $this->homeDir = $home;
+        $this->version = $version;
+    }
 
-        /**
-         * @return ConfigLoader
-         */
-        public function getConfigLoader() {
-            return new ConfigLoader($this->version, $this->homeDir);
-        }
+    public function activateSilentMode(): void {
+        $this->isSilentMode = true;
+    }
 
-        public function getConfigSkeleton() {
-            return new ConfigSkeleton(
-                new FileInfo(__DIR__ . '/../config/skeleton.xml')
-            );
-        }
+    public function getErrorHandler(): ErrorHandler {
+        return new ErrorHandler($this->version);
+    }
 
-        /**
-         * @return DirectoryScanner
-         */
-        private function getDirectoryScanner() {
-            return new DirectoryScanner();
-        }
+    public function getCLI(): CLI {
+        return new CLI(new Environment(), $this->version, $this);
+    }
 
-        /**
-         * @return DirectoryCleaner
-         */
-        public function getDirectoryCleaner() {
-            return new DirectoryCleaner();
-        }
+    public function getConfigLoader(): ConfigLoader {
+        return new ConfigLoader($this->version, $this->homeDir);
+    }
 
-        /**
-         * @return BootstrapApi
-         */
-        private function getBootstrapApi() {
-            return new BootstrapApi($this->getBackendFactory(), $this->getDocblockFactory(), $this->getEnricherFactory(), $this->getEngineFactory(), $this->getLogger());
-        }
+    public function getConfigSkeleton() {
+        return new ConfigSkeleton(
+            new FileInfo(__DIR__ . '/../config/skeleton.xml')
+        );
+    }
 
-        /**
-         * @return ProgressLogger
-         */
-        public function getLogger() {
-            if (!isset($this->instances['logger'])) {
-                $this->instances['logger'] = $this->isSilentMode ? $this->getSilentProgressLogger() : $this->getShellProgressLogger();
-            }
-            return $this->instances['logger'];
-        }
+    public function getDirectoryCleaner(): DirectoryCleaner {
+        return new DirectoryCleaner();
+    }
 
-        private function getSilentProgressLogger() {
-            return new SilentProgressLogger();
+    public function getLogger(): ProgressLogger {
+        if (!isset($this->instances['logger'])) {
+            $this->instances['logger'] = $this->isSilentMode ? $this->getSilentProgressLogger() : $this->getShellProgressLogger();
         }
 
-        private function getShellProgressLogger() {
-            return new ShellProgressLogger();
-        }
+        return $this->instances['logger'];
+    }
 
-        /**
-         * @return Bootstrap
-         */
-        public function getBootstrap() {
-            return new Bootstrap($this->getLogger(), $this->getBootstrapApi());
-        }
+    public function getBootstrap(): Bootstrap {
+        return new Bootstrap($this->getLogger(), $this->getBootstrapApi());
+    }
 
-        /**
-         * @return Application
-         */
-        public function getApplication() {
-            return new Application($this, $this->getLogger());
-        }
+    public function getApplication(): Application {
+        return new Application($this, $this->getLogger());
+    }
 
-        /**
-         * @param string|array $include
-         * @param string|array $exclude
-         * @return mixed|object
-         */
-        public function getScanner($include, $exclude = NULL) {
-            $scanner = $this->getDirectoryScanner();
+    /**
+     * @param array|string $include
+     * @param array|string $exclude
+     *
+     * @return mixed|object
+     */
+    public function getScanner($include, $exclude = null) {
+        $scanner = $this->getDirectoryScanner();
+
+        if (\is_array($include)) {
+            $scanner->setIncludes($include);
+        } else {
+            $scanner->addInclude($include);
+        }
 
-            if (is_array($include)) {
-                $scanner->setIncludes($include);
+        if ($exclude != null) {
+            if (\is_array($exclude)) {
+                $scanner->setExcludes($exclude);
             } else {
-                $scanner->addInclude($include);
+                $scanner->addExclude($exclude);
             }
+        }
+        $scanner->setFlag(\FilesystemIterator::UNIX_PATHS);
 
-            if ($exclude != NULL) {
-                if (is_array($exclude)) {
-                    $scanner->setExcludes($exclude);
-                } else {
-                    $scanner->addExclude($exclude);
-                }
-            }
-            $scanner->setFlag(\FilesystemIterator::UNIX_PATHS);
+        return $scanner;
+    }
 
-            return $scanner;
-        }
+    public function getCollector(CollectorConfig $config): Collector {
+        return new Collector(
+            $this->getLogger(),
+            new Project(
+                $config->getSourceDirectory(),
+                $config->getWorkDirectory()
+            ),
+            $this->getBackendFactory()->getInstanceFor($config->getBackend()),
+            $config->getFileEncoding(),
+            $config->isPublicOnlyMode()
+        );
+    }
 
-        /**
-         * @param CollectorConfig $config
-         *
-         * @return Collector
-         */
-        public function getCollector(CollectorConfig $config) {
-            return new Collector(
-                $this->getLogger(),
-                new Project(
-                    $config->getSourceDirectory(),
-                    $config->getWorkDirectory()
-                ),
-                $this->getBackendFactory()->getInstanceFor($config->getBackend()),
-                $config->getFileEncoding(),
-                $config->isPublicOnlyMode()
-            );
-        }
+    public function getInheritanceResolver(): InheritanceResolver {
+        return new \TheSeer\phpDox\Collector\InheritanceResolver($this->getLogger());
+    }
 
-        /**
-         * @return InheritanceResolver
-         */
-        public function getInheritanceResolver() {
-            return new \TheSeer\phpDox\Collector\InheritanceResolver($this->getLogger());
-        }
+    public function getGenerator(): Generator {
+        return new Generator($this->getLogger(), new EventHandlerRegistry());
+    }
 
-        /**
-         * @return Generator
-         */
-        public function getGenerator() {
-            return new Generator($this->getLogger(), new EventHandlerRegistry());
+    /**
+     * @return \TheSeer\phpDox\DocBlock\Factory
+     */
+    public function getDocblockFactory(): DocBlock\Factory {
+        if (!isset($this->instances['DocblockFactory'])) {
+            $this->instances['DocblockFactory'] = new \TheSeer\phpDox\DocBlock\Factory($this);
         }
 
-        /**
-         * @return \TheSeer\phpDox\DocBlock\Factory
-         */
-        public function getDocblockFactory() {
-            if (!isset($this->instances['DocblockFactory'])) {
-                $this->instances['DocblockFactory'] = new \TheSeer\phpDox\DocBlock\Factory($this);
-            }
-            return $this->instances['DocblockFactory'];
-        }
+        return $this->instances['DocblockFactory'];
+    }
 
-        /**
-         * @return mixed
-         */
-        public function getBackendFactory() {
-            if (!isset($this->instances['BackendFactory'])) {
-                $this->instances['BackendFactory'] = new \TheSeer\phpDox\Collector\Backend\Factory($this);
-            }
-            return $this->instances['BackendFactory'];
+    public function getBackendFactory() {
+        if (!isset($this->instances['BackendFactory'])) {
+            $this->instances['BackendFactory'] = new \TheSeer\phpDox\Collector\Backend\Factory($this);
         }
 
-        /**
-         * @return mixed
-         */
-        public function getEngineFactory() {
-            if (!isset($this->instances['EngineFactory'])) {
-                $this->instances['EngineFactory'] = new \TheSeer\phpDox\Generator\Engine\Factory();
-            }
-            return $this->instances['EngineFactory'];
+        return $this->instances['BackendFactory'];
+    }
+
+    public function getEngineFactory() {
+        if (!isset($this->instances['EngineFactory'])) {
+            $this->instances['EngineFactory'] = new \TheSeer\phpDox\Generator\Engine\Factory();
         }
 
-        /**
-         * @return Generator\Enricher\Factory
-         */
-        public function getEnricherFactory() {
-            if (!isset($this->instances['EnricherFactory'])) {
-                $this->instances['EnricherFactory'] = new \TheSeer\phpDox\Generator\Enricher\Factory();
-            }
-            return $this->instances['EnricherFactory'];
+        return $this->instances['EngineFactory'];
+    }
+
+    public function getEnricherFactory() {
+        if (!isset($this->instances['EnricherFactory'])) {
+            $this->instances['EnricherFactory'] = new \TheSeer\phpDox\Generator\Enricher\Factory();
         }
 
+        return $this->instances['EnricherFactory'];
+    }
 
-        /**
-         * @return mixed
-         */
-        public function getDocblockParser() {
-            if (!isset($this->instances['DocblockParser'])) {
-                $this->instances['DocblockParser'] = new \TheSeer\phpDox\DocBlock\Parser($this->getDocblockFactory());
-            }
-            return $this->instances['DocblockParser'];
+    public function getDocblockParser() {
+        if (!isset($this->instances['DocblockParser'])) {
+            $this->instances['DocblockParser'] = new \TheSeer\phpDox\DocBlock\Parser($this->getDocblockFactory());
         }
 
+        return $this->instances['DocblockParser'];
+    }
+
+    private function getDirectoryScanner(): DirectoryScanner {
+        return new DirectoryScanner();
+    }
+
+    private function getBootstrapApi(): BootstrapApi {
+        return new BootstrapApi($this->getBackendFactory(), $this->getDocblockFactory(), $this->getEnricherFactory(), $this->getEngineFactory(), $this->getLogger());
+    }
+
+    private function getSilentProgressLogger() {
+        return new SilentProgressLogger();
     }
 
+    private function getShellProgressLogger() {
+        return new ShellProgressLogger();
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/FileInfoCollectionException.php phpdox-0.12.0/src/shared/FileInfoCollectionException.php
--- phpdox-0.11.2/src/shared/FileInfoCollectionException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/FileInfoCollectionException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,7 +1,5 @@
-<?php declare(strict_types=1);
-
+<?php declare(strict_types = 1);
 namespace TheSeer\phpDox;
 
 class FileInfoCollectionException extends \Exception {
-
 }
diff -Nru phpdox-0.11.2/src/shared/FileInfoCollection.php phpdox-0.12.0/src/shared/FileInfoCollection.php
--- phpdox-0.11.2/src/shared/FileInfoCollection.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/FileInfoCollection.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,76 +1,52 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
+/**
+ * Class FileInfoCollection
+ */
+class FileInfoCollection implements \Iterator, \Countable {
     /**
-     * Class FileInfoCollection
-     *
-     * @package TheSeer\phpDox
+     * @var FileInfo[]
      */
-    class FileInfoCollection implements \Iterator, \Countable {
+    private $data = [];
 
-        /**
-         * @var FileInfo[]
-         */
-        private $data = [];
-
-        /**
-         * @var int
-         */
-        private $pos = 0;
-
-        /**
-         * @param FileInfo $file
-         */
-        public function add(FileInfo $file) {
-            $this->data[] = $file;
-        }
+    /**
+     * @var int
+     */
+    private $pos = 0;
 
-        /**
-         * @return FileInfo
-         * @throws \TheSeer\phpDox\FileInfoCollectionException
-         */
-        public function current() {
-            if (!isset($this->data[$this->pos])) {
-                throw new FileInfoCollectionException('Empty collection');
-            }
-            return $this->data[$this->pos];
-        }
+    public function add(FileInfo $file): void {
+        $this->data[] = $file;
+    }
 
-        /**
-         *
-         */
-        public function next() {
-            $this->pos++;
+    /**
+     * @throws \TheSeer\phpDox\FileInfoCollectionException
+     */
+    public function current(): FileInfo {
+        if (!isset($this->data[$this->pos])) {
+            throw new FileInfoCollectionException('Empty collection');
         }
 
-        /**
-         * @return int
-         */
-        public function key() {
-            return $this->pos;
-        }
+        return $this->data[$this->pos];
+    }
 
-        /**
-         * @return bool
-         */
-        public function valid() {
-            return $this->count() > $this->pos;
-        }
+    public function next(): void {
+        $this->pos++;
+    }
 
-        /**
-         *
-         */
-        public function rewind() {
-            $this->pos = 0;
-        }
+    public function key(): int {
+        return $this->pos;
+    }
 
-        /**
-         * @return int
-         */
-        public function count() {
-            return count($this->data);
-        }
+    public function valid(): bool {
+        return $this->count() > $this->pos;
+    }
 
+    public function rewind(): void {
+        $this->pos = 0;
     }
 
+    public function count(): int {
+        return \count($this->data);
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/FileInfoException.php phpdox-0.12.0/src/shared/FileInfoException.php
--- phpdox-0.11.2/src/shared/FileInfoException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/FileInfoException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,10 +1,8 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class FileInfoException extends \Exception {
-
-        const InvalidPath = 1;
-        const NotImplemented = 2;
-    }
+class FileInfoException extends \Exception {
+    public const InvalidPath = 1;
 
+    public const NotImplemented = 2;
 }
diff -Nru phpdox-0.11.2/src/shared/FileInfo.php phpdox-0.12.0/src/shared/FileInfo.php
--- phpdox-0.11.2/src/shared/FileInfo.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/FileInfo.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,113 +1,92 @@
-<?php
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    class FileInfo extends \SplFileInfo {
+class FileInfo extends \SplFileInfo {
+    public function __toString(): string {
+        return $this->getPathname();
+    }
 
-        /**
-         * @return mixed
-         * @throws FileInfoException
-         */
-        public function getRealPath() {
-            $path = parent::getRealPath();
-            if (!$path) {
-                throw new FileInfoException(
-                    sprintf("Path '%s' does not exist - call to realpath failed", $this->getPathname()),
-                    FileInfoException::InvalidPath
-                );
-            }
-            return $this->toUnix($path);
+    /**
+     * @throws FileInfoException
+     */
+    public function getRealPath() {
+        $path = parent::getRealPath();
+
+        if (!$path) {
+            throw new FileInfoException(
+                \sprintf("Path '%s' does not exist - call to realpath failed", $this->getPathname()),
+                FileInfoException::InvalidPath
+            );
         }
 
-        /**
-         * @return bool
-         */
-        public function exists() {
-            clearstatcache(true, $this->getPathname());
-            return file_exists($this->getPathname());
-        }
+        return $this->toUnix($path);
+    }
 
-        /**
-         * @return string
-         */
-        public function asFileUri() {
-            $result = $this->getRealPath();
-            if ($result[0] !== '/') {
-                $result = '/' . $result;
-            }
-            return 'file://' . $result;
-        }
+    public function exists(): bool {
+        \clearstatcache(true, $this->getPathname());
 
-        /**
-         * @return mixed
-         */
-        public function getPath() {
-            return $this->toUnix(parent::getPath());
-        }
+        return \file_exists($this->getPathname());
+    }
 
-        /**
-         * @param \SplFileInfo $relation
-         * @param bool         $inclusive
-         *
-         * @return FileInfo
-         */
-        public function getRelative(\SplFileInfo $relation, $inclusive = TRUE) {
-            $relPath = $this->getRealPath();
-            $relationPath = $relation->getRealPath();
-            if ($inclusive) {
-                $relationPath = dirname($relationPath);
-            }
-            $relPath = mb_substr($relPath, mb_strlen($relationPath)+1);
-            return new FileInfo($relPath);
-        }
+    public function asFileUri(): string {
+        $result = $this->getRealPath();
 
-        /**
-         * @return string
-         */
-        public function getPathname() {
-            return $this->toUnix(parent::getPathname());
+        if ($result[0] !== '/') {
+            $result = '/' . $result;
         }
 
-        /**
-         * @return string
-         */
-        public function getLinkTarget() {
-            return $this->toUnix(parent::getLinkTarget());
-        }
+        return 'file://' . urlencode($result);
+    }
 
-        /**
-         * @return string
-         */
-        public function __toString() {
-            return $this->getPathname();
-        }
+    public function getPath() {
+        return $this->toUnix(parent::getPath());
+    }
 
-        /**
-         * @param string $class_name
-         *
-         * @throws FileInfoException
-         */
-        public function getFileInfo($class_name = NULL) {
-            throw new FileInfoException("getFileInfo not implemented", FileInfoException::NotImplemented);
-        }
+    /**
+     * @param bool $inclusive
+     */
+    public function getRelative(\SplFileInfo $relation, $inclusive = true): self {
+        $relPath      = $this->getRealPath();
+        $relationPath = $relation->getRealPath();
 
-        /**
-         * @param string $class_name
-         *
-         * @throws FileInfoException
-         */
-        public function getPathInfo($class_name = NULL) {
-            throw new FileInfoException("getPathInfo not implemented", FileInfoException::NotImplemented);
+        if ($inclusive) {
+            $relationPath = \dirname($relationPath);
         }
+        $relPath = \mb_substr($relPath, \mb_strlen($relationPath) + 1);
 
-        /**
-         * @param string $str
-         *
-         * @return string
-         */
-        private function toUnix($str) {
-            return str_replace('\\', '/', $str);
-        }
+        return new self($relPath);
+    }
+
+    public function getPathname(): string {
+        return $this->toUnix(parent::getPathname());
+    }
 
+    public function getLinkTarget(): string {
+        return $this->toUnix(parent::getLinkTarget());
     }
 
+    /**
+     * @param string $class_name
+     *
+     * @throws FileInfoException
+     */
+    public function getFileInfo($class_name = null): void {
+        throw new FileInfoException('getFileInfo not implemented', FileInfoException::NotImplemented);
+    }
+
+    /**
+     * @param string $class_name
+     *
+     * @throws FileInfoException
+     */
+    public function getPathInfo($class_name = null): void {
+        throw new FileInfoException('getPathInfo not implemented', FileInfoException::NotImplemented);
+    }
+
+    /**
+     * @param string $str
+     */
+    private function toUnix($str): string {
+        return \str_replace('\\', '/', $str);
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/HasFileInfoException.php phpdox-0.12.0/src/shared/HasFileInfoException.php
--- phpdox-0.11.2/src/shared/HasFileInfoException.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/HasFileInfoException.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,54 +1,15 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- *
- */
-namespace TheSeer\phpDox {
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-    abstract class HasFileInfoException extends \Exception {
+abstract class HasFileInfoException extends \Exception {
+    protected $file;
 
-        protected $file;
-
-        public function __construct($message, $code, \Exception $previous, \SPLFileInfo $file) {
-            parent::__construct($message, $code, $previous);
-            $this->file = $file;
-        }
-
-        public function getFileInfo() {
-            return $this->file;
-        }
+    public function __construct($message, $code, \Exception $previous, \SPLFileInfo $file) {
+        parent::__construct($message, $code, $previous);
+        $this->file = $file;
     }
 
+    public function getFileInfo() {
+        return $this->file;
+    }
 }
diff -Nru phpdox-0.11.2/src/shared/Version.php phpdox-0.12.0/src/shared/Version.php
--- phpdox-0.11.2/src/shared/Version.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/src/shared/Version.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,102 +1,64 @@
-<?php
-/**
-     * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
-     * All rights reserved.
-     *
-     * Redistribution and use in source and binary forms, with or without modification,
-     * are permitted provided that the following conditions are met:
-     *
-     *   * Redistributions of source code must retain the above copyright notice,
-     *     this list of conditions and the following disclaimer.
-     *
-     *   * Redistributions in binary form must reproduce the above copyright notice,
-     *     this list of conditions and the following disclaimer in the documentation
-     *     and/or other materials provided with the distribution.
-     *
-     *   * Neither the name of Arne Blankerts nor the names of contributors
-     *     may be used to endorse or promote products derived from this software
-     *     without specific prior written permission.
-     *
-     * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-     * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
-     * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
-     * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
-     * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-     * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-     * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-     * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-     * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-     * POSSIBILITY OF SUCH DAMAGE.
-     *
-     * @package    phpDox
-     * @author     Arne Blankerts <arne@blankerts.de>
-     * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
-     * @license    BSD License
-     *
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+class Version {
+    /**
+     * @var string
      */
-namespace TheSeer\phpDox {
+    private $release;
 
-    class Version {
+    /**
+     * @var string
+     */
+    private $version;
 
-        /**
-         * @var string
-         */
-        private $release;
-
-        /**
-         * @var string
-         */
-        private $version = NULL;
+    public function __construct($release) {
+        $this->release = $release;
+    }
 
-        public function __construct($release) {
-            $this->release = $release;
-        }
+    public function __toString() {
+        return $this->getInfoString();
+    }
 
-        public function __toString() {
-            return $this->getInfoString();
+    public function getVersion(): string {
+        if ($this->version == null) {
+            $this->version = $this->initialize();
         }
 
-        /**
-         * @return string
-         */
-        public function getVersion() {
-            if ($this->version == NULL) {
-                $this->version = $this->initialize();
-            }
-            return $this->version;
-        }
+        return $this->version;
+    }
+
+    public function getInfoString() {
+        return 'phpDox ' . $this->getVersion() . ' - Copyright (C) 2010 - ' . \date('Y', \getenv('SOURCE_DATE_EPOCH') ?: \time()) . ' by Arne Blankerts and Contributors';
+    }
+
+    public function getGeneratedByString() {
+        return 'Generated using ' . $this->getInfoString();
+    }
 
-        public function getInfoString() {
-            return 'phpDox ' . $this->getVersion() . " - Copyright (C) 2010 - " . date('Y', getenv('SOURCE_DATE_EPOCH') ?: time()) . " by Arne Blankerts and Contributors";
+    private function initialize() {
+        if (!\is_dir(__DIR__ . '/../../.git') || \strpos(\ini_get('disable_functions'), 'exec') !== false) {
+            return $this->release;
         }
 
-        public function getGeneratedByString() {
-            return 'Generated using ' . $this->getInfoString();
+        $dir = \getcwd();
+        \chdir(__DIR__);
+
+        $devNull = '/dev/null';
+        $cmd     = 'command -p git';
+
+        if (\strtolower(\substr(\PHP_OS, 0, 3)) === 'win') {
+            $devNull = 'nul';
+            $cmd     = 'git.exe';
         }
 
-        private function initialize() {
-            if (!is_dir(__DIR__ . '/../../.git') || strpos(ini_get('disable_functions'), 'exec') !== false) {
-                return $this->release;
-            }
-
-            $dir = getcwd();
-            chdir(__DIR__);
-
-            $devNull = '/dev/null';
-            $cmd = 'command -p git';
-            if (strtolower(substr(PHP_OS, 0, 3)) === 'win') {
-                $devNull = 'nul';
-                $cmd = 'git.exe';
-            }
-
-            $git = exec($cmd . ' describe --always --dirty 2>'.$devNull, $foo, $rc);
-            chdir($dir);
-            if ($rc === 0) {
-                return $git;
-            }
+        $git = \exec($cmd . ' describe --always --dirty 2>' . $devNull, $foo, $rc);
+        \chdir($dir);
 
-            return $this->release;
+        if ($rc === 0) {
+            return $git;
         }
+
+        return $this->release;
     }
 }
Binary files /tmp/tmpdHju1E/bt1iaM3Asf/phpdox-0.11.2/templates/html/static/css/SourceSansPro-Regular.ttf and /tmp/tmpdHju1E/0NoNkhSEK9/phpdox-0.12.0/templates/html/static/css/SourceSansPro-Regular.ttf differ
diff -Nru phpdox-0.11.2/templates/html/static/css/style.css phpdox-0.12.0/templates/html/static/css/style.css
--- phpdox-0.11.2/templates/html/static/css/style.css	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/templates/html/static/css/style.css	2019-03-13 09:34:17.000000000 +0000
@@ -1,4 +1,9 @@
-@import url(http://fonts.googleapis.com/css?family=Source+Sans+Pro);
+@font-face {
+    font-family: 'Source Sans Pro';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Source Sans Pro Regular'), local('SourceSansPro-Regular'), url(SourceSansPro-Regular.ttf) format('truetype');
+}
 
 html {
     background-color: #888888;
@@ -120,7 +125,7 @@
 }
 
 #index h1 {
-    text-shadow: 0px -1px 0 #555555;
+    text-shadow: 0 -1px 0 #555555;
 }
 
 #index p {
@@ -198,7 +203,6 @@
 .wrapped {
     white-space: pre-wrap;
     white-space: -moz-pre-wrap;
-    white-space: -pre-wrap;
     white-space: -o-pre-wrap;
     word-wrap: break-word;
 }
@@ -222,7 +226,7 @@
 
 .box {
     padding:1em;
-    margin:1em 1em 2em 0em;
+    margin:1em 1em 2em 0;
     border: 1px solid #cccccc;
     font-size: 1em;
     color: #888888;
@@ -259,7 +263,7 @@
     padding:1em;
     background-color: #efefef;
     border-top: 2px solid rgba(255,147,30,1);
-    font-family: "Courier New", Courier, mono;
+    font-family: "Courier New", Courier, monospace;
     width:50em;
 }
 
@@ -354,8 +358,8 @@
 
 nav.box ul {
     list-style: none outside none;
-    margin: 0px;
-    padding: 0px;
+    margin: 0;
+    padding: 0;
 }
 
 nav.box ul li {
diff -Nru phpdox-0.11.2/tests/bootstrap.php phpdox-0.12.0/tests/bootstrap.php
--- phpdox-0.11.2/tests/bootstrap.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/bootstrap.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,40 +1,5 @@
-<?php
-/**
- * Copyright (c) 2010-2018 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @subpackage Tests
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
+<?php declare(strict_types = 1);
 
 require __DIR__ . '/../src/autoload.php';
+
 require __DIR__ . '/../vendor/autoload.php';
diff -Nru phpdox-0.11.2/tests/data/classes/dummyAbstract.php phpdox-0.12.0/tests/data/classes/dummyAbstract.php
--- phpdox-0.11.2/tests/data/classes/dummyAbstract.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/classes/dummyAbstract.php	2019-03-13 09:34:17.000000000 +0000
@@ -36,7 +36,7 @@
  * @license    BSD License
  */
 
-namespace TheSeer\phpDox\Tests\Issues\Fixtures {
+namespace TheSeer\phpDox\Tests\Issues\Fixtures;
 
     /**
      * Short description for Dummy class
@@ -72,4 +72,4 @@
             $this->myProtected = $count;
         }
     }
-}
\ No newline at end of file
+}
diff -Nru phpdox-0.11.2/tests/data/classes/dummyExtendingParent.php phpdox-0.12.0/tests/data/classes/dummyExtendingParent.php
--- phpdox-0.11.2/tests/data/classes/dummyExtendingParent.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/classes/dummyExtendingParent.php	2019-03-13 09:34:17.000000000 +0000
@@ -36,7 +36,7 @@
  * @license    BSD License
  */
 
-namespace TheSeer\phpDox\Tests\Fixtures {
+namespace TheSeer\phpDox\Tests\Fixtures;
 
     /**
      * Short description for Dummy class
@@ -64,4 +64,4 @@
             // do something
         }
     }
-}
\ No newline at end of file
+}
diff -Nru phpdox-0.11.2/tests/data/classes/dummyImplementingInterface.php phpdox-0.12.0/tests/data/classes/dummyImplementingInterface.php
--- phpdox-0.11.2/tests/data/classes/dummyImplementingInterface.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/classes/dummyImplementingInterface.php	2019-03-13 09:34:17.000000000 +0000
@@ -36,7 +36,7 @@
  * @license    BSD License
  */
 
-namespace TheSeer\phpDox\Tests\Fixtures {
+namespace TheSeer\phpDox\Tests\Fixtures;
 
     /**
      * Short description for Dummy class
@@ -74,4 +74,4 @@
             return 4;
         }
     }
-}
\ No newline at end of file
+}
diff -Nru phpdox-0.11.2/tests/data/classes/dummy.php phpdox-0.12.0/tests/data/classes/dummy.php
--- phpdox-0.11.2/tests/data/classes/dummy.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/classes/dummy.php	2019-03-13 09:34:17.000000000 +0000
@@ -36,7 +36,7 @@
  * @license    BSD License
  */
 
-namespace TheSeer\phpDox\Tests\Fixtures {
+namespace TheSeer\phpDox\Tests\Fixtures;
 
     /**
      * Short description for Dummy class
@@ -103,4 +103,4 @@
             return;
         }
     }
-}
\ No newline at end of file
+}
diff -Nru phpdox-0.11.2/tests/data/classMoved/src/First.php phpdox-0.12.0/tests/data/classMoved/src/First.php
--- phpdox-0.11.2/tests/data/classMoved/src/First.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/classMoved/src/First.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-namespace Debug\Sample {
+namespace Debug\Sample;
 
     class First {}
 
diff -Nru phpdox-0.11.2/tests/data/classMoved/src/Second.php phpdox-0.12.0/tests/data/classMoved/src/Second.php
--- phpdox-0.11.2/tests/data/classMoved/src/Second.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/classMoved/src/Second.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-namespace Debug\Sample {
+namespace Debug\Sample;
 
     class RenamedSecond { }
 
diff -Nru phpdox-0.11.2/tests/data/collector/test4.php phpdox-0.12.0/tests/data/collector/test4.php
--- phpdox-0.11.2/tests/data/collector/test4.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/collector/test4.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,6 +1,6 @@
 <?php
 
-namespace u\v\w {
+namespace u\v\w;
 
    interface interfaceB {
 
@@ -66,4 +66,4 @@
 }
 
 
-?>
\ No newline at end of file
+?>
diff -Nru phpdox-0.11.2/tests/data/issue170/src/Sample.php phpdox-0.12.0/tests/data/issue170/src/Sample.php
--- phpdox-0.11.2/tests/data/issue170/src/Sample.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/issue170/src/Sample.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,5 +1,5 @@
 <?php
-namespace data\issue170\src {
+namespace data\issue170\src;
 
     /**
      * @method string getSomeString()
diff -Nru phpdox-0.11.2/tests/data/issue172/src/code.php phpdox-0.12.0/tests/data/issue172/src/code.php
--- phpdox-0.11.2/tests/data/issue172/src/code.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/data/issue172/src/code.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,7 +1,7 @@
 <?php
 
 
-namespace Foo\Bar {
+namespace Foo\Bar;
 
     trait BarTrait {
         public function fooA() {}
@@ -9,7 +9,7 @@
 
 }
 
-namespace TheSeer\Test\Fixtures {
+namespace TheSeer\Test\Fixtures;
 
     use Foo\Bar;
 
diff -Nru phpdox-0.11.2/tests/Integration/docblock/factoryTest.php phpdox-0.12.0/tests/Integration/docblock/factoryTest.php
--- phpdox-0.11.2/tests/Integration/docblock/factoryTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Integration/docblock/factoryTest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-<?php
-/**
- * Copyright (c) 2010-2015 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @subpackage Tests
- * @author     Bastian Feder <phpdox@bastian-feder.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Tests\Integration\DocBlock {
-
-    use TheSeer\phpDox\DocBlock\Factory;
-    use TheSeer\phpDox\FactoryInterface;
-
-    /**
-     * Class FactoryTest
-     *
-     * @covers TheSeer\phpDox\DocBlock\Factory
-     */
-    class FactoryTest extends \PHPUnit\Framework\TestCase {
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::getElementInstanceFor
-         * @uses TheSeer\phpDox\DocBlock\GenericElement
-         */
-        public function testGetElementInstanceFor() {
-            $factory = new Factory();
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\GenericElement',
-                $factory->getElementInstanceFor('Tux')
-            );
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::getParserInstanceFor
-         * @uses TheSeer\phpDox\DocBlock\GenericParser
-         */
-        public function testGetParserInstanceFor() {
-            $factory = new Factory();
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\GenericParser',
-                $factory->getParserInstanceFor('Tux')
-            );
-        }
-
-        /**
-         * @dataProvider getInstanceMapDataprovider
-         * @covers TheSeer\phpDox\DocBlock\Factory::getInstanceByMap
-         *
-         * @uses TheSeer\phpDox\Tests\Integration\DocBlock\FactoryProxy
-         * @uses TheSeer\fDOM\fDOMDocument
-         * @uses TheSeer\fDOM\fDOMElement
-         *
-         * @uses TheSeer\phpDox\DocBlock\GenericElement
-         * @uses TheSeer\phpDox\DocBlock\InvalidElement
-         * @uses TheSeer\phpDox\DocBlock\InvalidParser
-         * @uses TheSeer\phpDox\DocBlock\GenericParser
-         * @uses TheSeer\phpDox\DocBlock\DescriptionParser
-         * @uses TheSeer\phpDox\DocBlock\ParamParser
-         * @uses TheSeer\phpDox\DocBlock\VarParser
-         * @uses TheSeer\phpDox\DocBlock\VarParser
-         * @uses TheSeer\phpDox\DocBlock\LicenseParser
-         * @uses TheSeer\phpDox\DocBlock\InternalParser
-         */
-        public function testGetInstanceByMap($expected, $name, $elementMap) {
-            $factory = new FactoryProxy();
-            $this->assertInstanceOf(
-                $expected,
-                $factory->getInstanceByMap($elementMap, $name)
-            );
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::getInstanceByMap
-         * @uses TheSeer\phpDox\Tests\Integration\DocBlock\FactoryProxy
-         */
-        public function testGetInstanceByMapHandlingAFactory() {
-
-            $factoryMock = $this->createMock(FactoryInterface::class);
-            $factoryMock
-                ->expects($this->once())
-                ->method('getInstanceFor')
-                ->will($this->returnValue(new \stdClass));
-
-            $factory = new FactoryProxy();
-
-            $this->assertInstanceOf(
-                '\stdClass',
-                $factory->getInstanceByMap(array('GnuFactory' => $factoryMock), 'GnuFactory')
-            );
-        }
-
-        /*********************************************************************/
-        /* Dataprovider                                                      */
-        /*********************************************************************/
-
-        public static function getInstanceMapDataprovider() {
-            $elementMap = array(
-                'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidElement',
-                'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericElement'
-            );
-
-            $parserMap = array(
-                'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidParser',
-                'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericParser',
-
-                'description' => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
-                'param' => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
-                'var' => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-                'return' => 'TheSeer\\phpDox\\DocBlock\\VarParser',
-                'license' => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
-
-                'internal' => 'TheSeer\\phpDox\\DocBlock\\InternalParser'
-            );
-            return array(
-                'GenericElement by name from elementMap' => array (
-                    'TheSeer\\phpDox\\DocBlock\\GenericElement',
-                    'generic',
-                    $elementMap
-                ),
-                'GenericElement by unkown name from elementMap' => array (
-                    'TheSeer\\phpDox\\DocBlock\\GenericElement',
-                    'Tux',
-                    $elementMap
-                ),
-                'InvalidElement by name from elementMap' => array (
-                    'TheSeer\\phpDox\\DocBlock\\InvalidElement',
-                    'invalid',
-                    $elementMap
-                ),
-                'InvalidParser by name from parserMap' => array (
-                    'TheSeer\\phpDox\\DocBlock\\InvalidParser',
-                    'invalid',
-                    $parserMap
-                ),
-                'GenericParser by unkown name from parserMap' => array (
-                    'TheSeer\\phpDox\\DocBlock\\GenericParser',
-                    'Tux',
-                    $parserMap
-                ),
-            );
-        }
-    }
-
-    class FactoryProxy extends Factory {
-        public function getInstanceByMap($map, $name, $annotation = null) {
-            return parent::getInstanceByMap($map, $name, $annotation);
-        }
-    }
-
-}
diff -Nru phpdox-0.11.2/tests/Integration/docblock/FactoryTest.php phpdox-0.12.0/tests/Integration/docblock/FactoryTest.php
--- phpdox-0.11.2/tests/Integration/docblock/FactoryTest.php	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/tests/Integration/docblock/FactoryTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,143 @@
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Tests\Integration\DocBlock;
+
+use TheSeer\phpDox\DocBlock\Factory;
+use TheSeer\phpDox\FactoryInterface;
+
+/**
+ * Class FactoryTest
+ *
+ * @covers \TheSeer\phpDox\DocBlock\Factory
+ */
+class FactoryTest extends \PHPUnit\Framework\TestCase {
+
+    /**/
+    /* Dataprovider                                                      */
+    /**/
+
+    public static function getInstanceMapDataprovider() {
+        $elementMap = [
+            'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidElement',
+            'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericElement'
+        ];
+
+        $parserMap = [
+            'invalid' => 'TheSeer\\phpDox\\DocBlock\\InvalidParser',
+            'generic' => 'TheSeer\\phpDox\\DocBlock\\GenericParser',
+
+            'description' => 'TheSeer\\phpDox\\DocBlock\\DescriptionParser',
+            'param'       => 'TheSeer\\phpDox\\DocBlock\\ParamParser',
+            'var'         => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+            'return'      => 'TheSeer\\phpDox\\DocBlock\\VarParser',
+            'license'     => 'TheSeer\\phpDox\\DocBlock\\LicenseParser',
+
+            'internal' => 'TheSeer\\phpDox\\DocBlock\\InternalParser'
+        ];
+
+        return [
+            'GenericElement by name from elementMap'        => [
+                'TheSeer\\phpDox\\DocBlock\\GenericElement',
+                'generic',
+                $elementMap
+            ],
+            'GenericElement by unkown name from elementMap' => [
+                'TheSeer\\phpDox\\DocBlock\\GenericElement',
+                'Tux',
+                $elementMap
+            ],
+            'InvalidElement by name from elementMap'        => [
+                'TheSeer\\phpDox\\DocBlock\\InvalidElement',
+                'invalid',
+                $elementMap
+            ],
+            'InvalidParser by name from parserMap'          => [
+                'TheSeer\\phpDox\\DocBlock\\InvalidParser',
+                'invalid',
+                $parserMap
+            ],
+            'GenericParser by unkown name from parserMap'   => [
+                'TheSeer\\phpDox\\DocBlock\\GenericParser',
+                'Tux',
+                $parserMap
+            ],
+        ];
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\Factory::getElementInstanceFor
+     *
+     * @uses   \TheSeer\phpDox\DocBlock\GenericElement
+     */
+    public function testGetElementInstanceFor(): void {
+        $factory = new Factory();
+        $this->assertInstanceOf(
+            'TheSeer\\phpDox\\DocBlock\\GenericElement',
+            $factory->getElementInstanceFor('Tux')
+        );
+    }
+
+    /**
+     * @covers TheSeer\phpDox\DocBlock\Factory::getParserInstanceFor
+     *
+     * @uses   TheSeer\phpDox\DocBlock\GenericParser
+     */
+    public function testGetParserInstanceFor(): void {
+        $factory = new Factory();
+        $this->assertInstanceOf(
+            'TheSeer\\phpDox\\DocBlock\\GenericParser',
+            $factory->getParserInstanceFor('Tux')
+        );
+    }
+
+    /**
+     * @dataProvider getInstanceMapDataprovider
+     * @covers       TheSeer\phpDox\DocBlock\Factory::getInstanceByMap
+     *
+     * @uses         TheSeer\phpDox\Tests\Integration\DocBlock\FactoryProxy
+     * @uses         TheSeer\fDOM\fDOMDocument
+     * @uses         TheSeer\fDOM\fDOMElement
+     * @uses         TheSeer\phpDox\DocBlock\GenericElement
+     * @uses         TheSeer\phpDox\DocBlock\InvalidElement
+     * @uses         TheSeer\phpDox\DocBlock\InvalidParser
+     * @uses         TheSeer\phpDox\DocBlock\GenericParser
+     * @uses         TheSeer\phpDox\DocBlock\DescriptionParser
+     * @uses         TheSeer\phpDox\DocBlock\ParamParser
+     * @uses         TheSeer\phpDox\DocBlock\VarParser
+     * @uses         TheSeer\phpDox\DocBlock\VarParser
+     * @uses         TheSeer\phpDox\DocBlock\LicenseParser
+     * @uses         TheSeer\phpDox\DocBlock\InternalParser
+     */
+    public function testGetInstanceByMap($expected, $name, $elementMap): void {
+        $factory = new FactoryProxy();
+        $this->assertInstanceOf(
+            $expected,
+            $factory->getInstanceByMap($elementMap, $name)
+        );
+    }
+
+    /**
+     * @covers TheSeer\phpDox\DocBlock\Factory::getInstanceByMap
+     *
+     * @uses   TheSeer\phpDox\Tests\Integration\DocBlock\FactoryProxy
+     */
+    public function testGetInstanceByMapHandlingAFactory(): void {
+        $factoryMock = $this->createMock(FactoryInterface::class);
+        $factoryMock
+            ->expects($this->once())
+            ->method('getInstanceFor')
+            ->will($this->returnValue(new \stdClass));
+
+        $factory = new FactoryProxy();
+
+        $this->assertInstanceOf(
+            '\stdClass',
+            $factory->getInstanceByMap(['GnuFactory' => $factoryMock], 'GnuFactory')
+        );
+    }
+}
+
+class FactoryProxy extends Factory {
+    public function getInstanceByMap($map, $name, $annotation = null) {
+        return parent::getInstanceByMap($map, $name, $annotation);
+    }
+}
diff -Nru phpdox-0.11.2/tests/Integration/docblock/parserTest.php phpdox-0.12.0/tests/Integration/docblock/parserTest.php
--- phpdox-0.11.2/tests/Integration/docblock/parserTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Integration/docblock/parserTest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,105 +0,0 @@
-<?php
-/**
- * Copyright (c) 2010-2011 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Tests\Integration\DocBlock {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\DocBlock\Factory;
-    use TheSeer\phpDox\DocBlock\Parser;
-
-    /**
-     * Class ParserTest
-     *
-     * @ uses TheSeer\phpDox\DocBlock\Factory
-     * @ covers TheSeer\phpDox\DocBlock\Parser
-     */
-    class ParserTest extends \PHPUnit\Framework\TestCase {
-
-        /**
-         * @ covers TheSeer\phpDox\DocBlock\Parser::__construct
-         * @ covers TheSeer\phpDox\DocBlock\Parser::parse
-         *
-         * @dataProvider docblockSources
-         */
-        public function testParse($src) {
-            $expected = new fDOMDocument();
-            $dir = __DIR__.'/../../data/docbock/';
-            $block = file_get_contents($dir . $src);
-            $expected->load($dir . $src . '.xml');
-
-            $factory = new Factory();
-            $parser = new Parser($factory);
-            $result = $parser->parse($block, array());
-
-            $this->assertInstanceOf('TheSeer\\phpDox\\DocBlock\\DocBlock', $result);
-
-            $dom = new fDOMDocument();
-            $dom->appendChild($result->asDom($dom));
-
-            $this->assertEquals($expected->documentElement, $dom->documentElement);
-        }
-
-        public function docblockSources() {
-            return array(
-                array('author'),
-                array('body'),
-                array('complex'),
-                array('deprecated'),
-                array('docblock'),
-                array('docblock_compact'),
-                array('docblock_compact_multiline_short'),
-                array('empty'),
-                array('exception'),
-                array('global'),
-                array('heading'),
-                array('multiat'),
-                array('multiline_body'),
-                array('param_without_description'),
-                array('param_without_varname'),
-                array('param_without_varname_and_description'),
-                array('see'),
-                array('since'),
-                array('throws'),
-                array('var_full'),
-                array('var_no_body'),
-                array('var_only'),
-                array('var_only_single_line'),
-                array('version'),
-                array('multiline_annotation')
-            );
-        }
-    }
-}
diff -Nru phpdox-0.11.2/tests/Integration/docblock/ParserTest.php phpdox-0.12.0/tests/Integration/docblock/ParserTest.php
--- phpdox-0.11.2/tests/Integration/docblock/ParserTest.php	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/tests/Integration/docblock/ParserTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,70 @@
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Tests\Integration\DocBlock;
+
+use PHPUnit\Framework\TestCase;
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\DocBlock\DocBlock;
+use TheSeer\phpDox\DocBlock\Factory;
+use TheSeer\phpDox\DocBlock\Parser;
+
+/**
+ * Class ParserTest
+ *
+ * @ uses \TheSeer\phpDox\DocBlock\Factory
+ * @ covers \TheSeer\phpDox\DocBlock\Parser
+ */
+class ParserTest extends TestCase {
+    /**
+     * @ covers TheSeer\phpDox\DocBlock\Parser::__construct
+     * @ covers TheSeer\phpDox\DocBlock\Parser::parse
+     *
+     * @dataProvider docblockSources
+     */
+    public function testParse($src): void {
+        $expected = new fDOMDocument();
+        $dir      = __DIR__ . '/../../data/docbock/';
+        $block    = \file_get_contents($dir . $src);
+        $expected->load($dir . $src . '.xml');
+
+        $factory = new Factory();
+        $parser  = new Parser($factory);
+        $result  = $parser->parse($block, []);
+
+        $this->assertInstanceOf(DocBlock::class, $result);
+
+        $dom = new fDOMDocument();
+        $dom->appendChild($result->asDom($dom));
+
+        $this->assertEquals($expected->documentElement, $dom->documentElement);
+    }
+
+    public function docblockSources() {
+        return [
+            ['author'],
+            ['body'],
+            ['complex'],
+            ['deprecated'],
+            ['docblock'],
+            ['docblock_compact'],
+            ['docblock_compact_multiline_short'],
+            ['empty'],
+            ['exception'],
+            ['global'],
+            ['heading'],
+            ['multiat'],
+            ['multiline_body'],
+            ['param_without_description'],
+            ['param_without_varname'],
+            ['param_without_varname_and_description'],
+            ['see'],
+            ['since'],
+            ['throws'],
+            ['var_full'],
+            ['var_no_body'],
+            ['var_only'],
+            ['var_only_single_line'],
+            ['version'],
+            ['multiline_annotation']
+        ];
+    }
+}
diff -Nru phpdox-0.11.2/tests/Integration/factoryTest.php phpdox-0.12.0/tests/Integration/factoryTest.php
--- phpdox-0.11.2/tests/Integration/factoryTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Integration/factoryTest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,155 +0,0 @@
-<?php
-/**
- * Copyright (c) 2010-2015 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @subpackage Tests
- * @author     Bastian Feder <phpdox@bastian-feder.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\Tests\Integration {
-
-    use TheSeer\phpDox\CollectorConfig;
-    use TheSeer\phpDox\Factory;
-    use TheSeer\phpDox\FileInfo;
-    use TheSeer\phpDox\Version;
-
-    /**
-     * Class FactoryTest
-     *
-     * @covers TheSeer\phpDox\Factory
-     * @uses TheSeer\phpDox\version
-     */
-    class FactoryTest extends \PHPUnit\Framework\TestCase {
-
-        /**
-         * @var Factory
-         */
-        private $factory;
-
-        protected function setUp() {
-            $this->factory = new Factory(new FileInfo(__DIR__), new Version('0.0'));
-        }
-
-        /**
-         * @covers TheSeer\phpDox\Factory::getApplication
-         * @uses TheSeer\phpDox\Application
-         * @uses TheSeer\phpDox\SilentProgressLogger
-         */
-        public function testGetApplication() {
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\Application',
-                $this->factory->getApplication()
-            );
-        }
-
-        /**
-         * @covers TheSeer\phpDox\Factory::getCollector
-         * @uses TheSeer\phpDox\SilentProgressLogger
-         * @uses TheSeer\phpDox\FileInfo
-         * @uses TheSeer\phpDox\Collector\Collector
-         * @uses TheSeer\phpDox\Collector\IndexCollection
-         * @uses TheSeer\phpDox\Collector\SourceCollection
-         * @uses TheSeer\phpDox\Collector\Project
-         * @uses TheSeer\phpDox\Collector\Backend\Factory
-         * @uses TheSeer\phpDox\Collector\Backend\PHPParser
-         * @uses TheSeer\phpDox\DocBlock\Parser
-         */
-        public function testGetCollector() {
-            $config = $this->getMockBuilder(CollectorConfig::class)
-                    ->disableOriginalConstructor()
-                    ->getMock();
-
-            $config->expects($this->once())
-                ->method('getSourceDirectory')
-                ->will($this->returnValue(new FileInfo('')));
-
-            $config->expects($this->once())
-                ->method('getWorkDirectory')
-                ->will($this->returnValue(new FileInfo('')));
-
-            $config->expects($this->once())
-                ->method('getBackend')
-                ->will($this->returnValue('parser'));
-
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\Collector\\Collector',
-                $this->factory->getCollector($config)
-            );
-        }
-
-        /**
-         * @covers TheSeer\phpDox\Factory::getGenerator
-         * @uses TheSeer\phpDox\Generator\Generator
-         * @uses TheSeer\phpDox\SilentProgressLogger
-         */
-        public function testGetGenerator() {
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\Generator\\Generator',
-                $this->factory->getGenerator()
-            );
-        }
-
-        /**
-         * @covers TheSeer\phpDox\Factory::getDocblockFactory
-         * @uses TheSeer\phpDox\DocBlock\Factory
-         */
-        public function testgetDoclockFactory() {
-            $docBlock = $this->factory->getDocblockFactory();
-
-            // lazy initialization included
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\Factory',
-                $docBlock
-            );
-
-            $this->assertSame($docBlock, $this->factory->getDocblockFactory());
-        }
-
-        /**
-         * @covers TheSeer\phpDox\Factory::getDocblockParser
-         * @uses TheSeer\phpDox\DocBlock\Parser
-         */
-        public function testgetDoclockParser() {
-            $docBlock = $this->factory->getDocblockParser();
-
-            // lazy initialization included
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\Parser',
-                $docBlock
-            );
-
-            $this->assertSame($docBlock, $this->factory->getDocblockParser());
-        }
-
-    }
-
-}
diff -Nru phpdox-0.11.2/tests/Integration/FactoryTest.php phpdox-0.12.0/tests/Integration/FactoryTest.php
--- phpdox-0.11.2/tests/Integration/FactoryTest.php	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/tests/Integration/FactoryTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,129 @@
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Tests\Integration;
+
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+use TheSeer\phpDox\Application;
+use TheSeer\phpDox\Collector\Collector;
+use TheSeer\phpDox\CollectorConfig;
+use TheSeer\phpDox\DocBlock\Parser;
+use TheSeer\phpDox\Factory;
+use TheSeer\phpDox\FileInfo;
+use TheSeer\phpDox\Generator\Generator;
+use TheSeer\phpDox\Version;
+
+/**
+ * Class FactoryTest
+ *
+ * @covers \TheSeer\phpDox\Factory
+ *
+ * @uses   \TheSeer\phpDox\version
+ */
+class FactoryTest extends TestCase {
+    /**
+     * @var Factory
+     */
+    private $factory;
+
+    protected function setUp(): void {
+        $this->factory = new Factory(new FileInfo(__DIR__), new Version('0.0'));
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\Factory::getApplication
+     *
+     * @uses   \TheSeer\phpDox\Application
+     * @uses   \TheSeer\phpDox\ShellProgressLogger
+     */
+    public function testGetApplication(): void {
+        $this->assertInstanceOf(
+            Application::class,
+            $this->factory->getApplication()
+        );
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\Factory::getCollector
+     *
+     * @uses   \TheSeer\phpDox\ShellProgressLogger
+     * @uses   \TheSeer\phpDox\FileInfo
+     * @uses   \TheSeer\phpDox\Collector\Collector
+     * @uses   \TheSeer\phpDox\Collector\IndexCollection
+     * @uses   \TheSeer\phpDox\Collector\SourceCollection
+     * @uses   \TheSeer\phpDox\Collector\Project
+     * @uses   \TheSeer\phpDox\Collector\Backend\Factory
+     * @uses   \TheSeer\phpDox\Collector\Backend\PHPParser
+     * @uses   \TheSeer\phpDox\DocBlock\Parser
+     * @uses   \TheSeer\phpDox\ErrorHandler
+     */
+    public function testGetCollector(): void {
+        /** @var CollectorConfig|MockObject $config */
+        $config = $this->getMockBuilder(CollectorConfig::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $config->expects($this->once())
+            ->method('getSourceDirectory')
+            ->willReturn(new FileInfo(''));
+
+        $config->expects($this->once())
+            ->method('getWorkDirectory')
+            ->willReturn(new FileInfo(''));
+
+        $config->expects($this->once())
+            ->method('getBackend')
+            ->willReturn('parser');
+
+        $this->assertInstanceOf(
+            Collector::class,
+            $this->factory->getCollector($config)
+        );
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\Factory::getGenerator
+     *
+     * @uses   \TheSeer\phpDox\Generator\Generator
+     * @uses   \TheSeer\phpDox\ShellProgressLogger
+     */
+    public function testGetGenerator(): void {
+        $this->assertInstanceOf(
+            Generator::class,
+            $this->factory->getGenerator()
+        );
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\Factory::getDocblockFactory
+     *
+     * @uses   \TheSeer\phpDox\DocBlock\Factory
+     */
+    public function testgetDoclockFactory(): void {
+        $docBlock = $this->factory->getDocblockFactory();
+
+        // lazy initialization included
+        $this->assertInstanceOf(
+            \TheSeer\phpDox\DocBlock\Factory::class,
+            $docBlock
+        );
+
+        $this->assertSame($docBlock, $this->factory->getDocblockFactory());
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\Factory::getDocblockParser
+     *
+     * @uses   \TheSeer\phpDox\DocBlock\Parser
+     */
+    public function testgetDoclockParser(): void {
+        $docBlock = $this->factory->getDocblockParser();
+
+        // lazy initialization included
+        $this->assertInstanceOf(
+            Parser::class,
+            $docBlock
+        );
+
+        $this->assertSame($docBlock, $this->factory->getDocblockParser());
+    }
+}
diff -Nru phpdox-0.11.2/tests/Unit/config/GlobalConfigTest.php phpdox-0.12.0/tests/Unit/config/GlobalConfigTest.php
--- phpdox-0.11.2/tests/Unit/config/GlobalConfigTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/config/GlobalConfigTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,255 +1,223 @@
-<?php
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
+
+use TheSeer\fDOM\fDOMDocument;
+
 /**
- * Copyright (c) 2010-2015 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
+ * Class GlobalConfigTest
  *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
+ * @covers \TheSeer\phpDox\GlobalConfig
  *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
+ * @uses   \TheSeer\fDom\fDOMDocument
+ * @uses   \TheSeer\phpDox\FileInfo
+ * @uses   \TheSeer\phpDox\Version
  */
-namespace TheSeer\phpDox {
+class GlobalConfigTest extends \PHPUnit\Framework\TestCase {
+    private $baseDir;
 
-    use TheSeer\fDOM\fDOMDocument;
+    /**
+     * @var FileInfo
+     */
+    private $fileInfo;
 
     /**
-     * Class GlobalConfigTest
-     *
-     * @covers TheSeer\phpDox\GlobalConfig
-     * @uses TheSeer\fDom\fDOMDocument
-     * @uses TheSeer\phpDox\FileInfo
-     * @uses TheSeer\phpDox\Version
+     * @var fDOMDocument
      */
-    class GlobalConfigTest extends \PHPUnit\Framework\TestCase {
+    private $cfgDom;
 
-        private $baseDir;
+    /**
+     * @var GlobalConfig
+     */
+    private $config;
 
-        /**
-         * @var FileInfo
-         */
-        private $fileInfo;
-
-        /**
-         * @var fDOMDocument
-         */
-        private $cfgDom;
-
-        /**
-         * @var GlobalConfig
-         */
-        private $config;
-
-        /**
-         * @var Version
-         */
-        private $version;
-
-        public function __construct($name = NULL, array $data = array(), $dataName = '') {
-            parent::__construct($name, $data, $dataName);
-            $this->baseDir = realpath(__DIR__ . '/../../data/config') . '/';
-        }
+    /**
+     * @var Version
+     */
+    private $version;
 
-        private function init($cfgName) {
-            $this->version = new Version('0.0');
-            $this->fileInfo = new FileInfo($this->baseDir . $cfgName . '.xml');
-            $this->cfgDom = new fDOMDocument();
-            $this->cfgDom->load($this->fileInfo->getPathname());
-            $this->cfgDom->registerNamespace('cfg', 'http://xml.phpdox.net/config');
-            $this->config = new GlobalConfig($this->version, new FileInfo('/tmp'), $this->cfgDom, $this->fileInfo);
-        }
+    public function __construct($name = null, array $data = [], $dataName = '') {
+        parent::__construct($name, $data, $dataName);
+        $this->baseDir = \realpath(__DIR__ . '/../../data/config') . '/';
+    }
 
-        /**
-         * @expectedException \TheSeer\phpDox\ConfigException
-         * @expectedExceptionCode \TheSeer\phpDox\ConfigException::InvalidDataStructure
-         */
-        public function testTryingToLoadInvalidConfigThrowsException() {
-            $this->init('broken');
-        }
+    /**
+     * @expectedException \TheSeer\phpDox\ConfigException
+     * @expectedExceptionCode \TheSeer\phpDox\ConfigException::InvalidDataStructure
+     */
+    public function testTryingToLoadInvalidConfigThrowsException(): void {
+        $this->init('broken');
+    }
 
-        public function testConfigFileCanBeRetrieved() {
-            $this->init('empty');
-            $this->assertSame(
-                $this->fileInfo,
-                $this->config->getConfigFile()
-            );
-        }
+    public function testConfigFileCanBeRetrieved(): void {
+        $this->init('empty');
+        $this->assertSame(
+            $this->fileInfo,
+            $this->config->getConfigFile()
+        );
+    }
 
-        public function testSilentModeDefaultsToFalse() {
-            $this->init('empty');
-            $this->assertFalse($this->config->isSilentMode());
-        }
+    public function testSilentModeDefaultsToFalse(): void {
+        $this->init('empty');
+        $this->assertFalse($this->config->isSilentMode());
+    }
 
-        public function testSilentModeCanBeEnabled() {
-            $this->init('empty');
-            $this->cfgDom->documentElement->setAttribute('silent', 'true');
-            $this->assertTrue($this->config->isSilentMode());
-        }
+    public function testSilentModeCanBeEnabled(): void {
+        $this->init('empty');
+        $this->cfgDom->documentElement->setAttribute('silent', 'true');
+        $this->assertTrue($this->config->isSilentMode());
+    }
 
-        public function testSilentModeCanBeDisabled() {
-            $this->init('empty');
-            $this->cfgDom->documentElement->setAttribute('silent', 'false');
-            $this->assertFalse($this->config->isSilentMode());
-        }
+    public function testSilentModeCanBeDisabled(): void {
+        $this->init('empty');
+        $this->cfgDom->documentElement->setAttribute('silent', 'false');
+        $this->assertFalse($this->config->isSilentMode());
+    }
 
-        /**
-         * @uses TheSeer\phpDox\FileInfoCollection
-         */
-        public function testGetCustomBootstrapFilesReturnsEmptyCollectionByDefault() {
-            $this->init('empty');
-            $result = $this->config->getCustomBootstrapFiles();
-            $this->assertInstanceOf('TheSeer\\phpDox\\FileInfoCollection', $result);
-            $this->assertEmpty($result);
-        }
+    /**
+     * @uses TheSeer\phpDox\FileInfoCollection
+     */
+    public function testGetCustomBootstrapFilesReturnsEmptyCollectionByDefault(): void {
+        $this->init('empty');
+        $result = $this->config->getCustomBootstrapFiles();
+        $this->assertInstanceOf('TheSeer\\phpDox\\FileInfoCollection', $result);
+        $this->assertEmpty($result);
+    }
 
-        /**
-         * @uses TheSeer\phpDox\FileInfoCollection
-         */
-        public function testCustomBootstrapFilesCanBeRetrieved() {
-            $this->init('bootstrap');
-            $result = $this->config->getCustomBootstrapFiles();
-            $this->assertCount(2, $result);
-            $expected = array('/path/to/fileA.php', '/path/to/fileB.php');
-            foreach($result as $pos => $entry) {
-                $this->assertEquals($expected[$pos], $entry->getPathname());
-            }
-        }
+    /**
+     * @uses TheSeer\phpDox\FileInfoCollection
+     */
+    public function testCustomBootstrapFilesCanBeRetrieved(): void {
+        $this->init('bootstrap');
+        $result = $this->config->getCustomBootstrapFiles();
+        $this->assertCount(2, $result);
+        $expected = ['/path/to/fileA.php', '/path/to/fileB.php'];
 
-        /**
-         * @uses TheSeer\phpDox\ProjectConfig
-         * @uses TheSeer\phpDox\Version
-         */
-        public function testNamedProjectlistCanBeRetrieved() {
-            $this->init('named-projects');
-            $results = $this->config->getProjects();
-            $this->assertCount(2, $results);
-            $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results['a']);
-            $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results['b']);
+        foreach ($result as $pos => $entry) {
+            $this->assertEquals($expected[$pos], $entry->getPathname());
         }
+    }
 
-        /**
-         * @uses TheSeer\phpDox\ProjectConfig
-         * @uses TheSeer\phpDox\Version
-         */
-        public function testIndexedProjectListCanBeRetrieved() {
-            $this->init('indexed-projects');
-            $results = $this->config->getProjects();
-            $this->assertCount(2, $results);
-            $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results[0]);
-            $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results[1]);
-        }
+    /**
+     * @uses TheSeer\phpDox\ProjectConfig
+     * @uses TheSeer\phpDox\Version
+     */
+    public function testNamedProjectlistCanBeRetrieved(): void {
+        $this->init('named-projects');
+        $results = $this->config->getProjects();
+        $this->assertCount(2, $results);
+        $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results['a']);
+        $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results['b']);
+    }
 
-        /**
-         * @uses TheSeer\phpDox\ProjectConfig
-         * @uses TheSeer\phpDox\Version
-         */
-            public function testProjectListDoesNotIncludeDisabledProjects() {
-            $this->init('disabled-projects');
-            $results = $this->config->getProjects();
-            $this->assertCount(1, $results);
-            $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results['a']);
-        }
+    /**
+     * @uses TheSeer\phpDox\ProjectConfig
+     * @uses TheSeer\phpDox\Version
+     */
+    public function testIndexedProjectListCanBeRetrieved(): void {
+        $this->init('indexed-projects');
+        $results = $this->config->getProjects();
+        $this->assertCount(2, $results);
+        $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results[0]);
+        $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results[1]);
+    }
 
-        /**
-         * @dataProvider resolverSrcProvider
-         * @uses TheSeer\phpDox\ProjectConfig
-         * @uses TheSeer\phpDox\Version
-         */
-        public function testSourceVariableGetsResolvedCorrectly($expected, $file) {
-            $this->init('resolver/' .  $file);
-            /** @var ProjectConfig[] $projects */
-            $projects = $this->config->getProjects();
-            $this->assertEquals($expected, current($projects)->getWorkDirectory()->getPathname());
-        }
+    /**
+     * @uses TheSeer\phpDox\ProjectConfig
+     * @uses TheSeer\phpDox\Version
+     */
+    public function testProjectListDoesNotIncludeDisabledProjects(): void {
+        $this->init('disabled-projects');
+        $results = $this->config->getProjects();
+        $this->assertCount(1, $results);
+        $this->assertInstanceOf('TheSeer\\phpDox\\ProjectConfig', $results['a']);
+    }
 
-        public function resolverSrcProvider() {
-            return array(
-                'phpDox.project.source' => array('source','src'),
-                'phpDox.project.source[undefined]' => array('src','src-undefined'),
-            );
-        }
+    /**
+     * @dataProvider resolverSrcProvider
+     *
+     * @uses         TheSeer\phpDox\ProjectConfig
+     * @uses         TheSeer\phpDox\Version
+     */
+    public function testSourceVariableGetsResolvedCorrectly($expected, $file): void {
+        $this->init('resolver/' . $file);
+        /** @var ProjectConfig[] $projects */
+        $projects = $this->config->getProjects();
+        $this->assertEquals($expected, \current($projects)->getWorkDirectory()->getPathname());
+    }
 
-        /**
-         * @dataProvider resolverProvider
-         * @uses TheSeer\phpDox\ProjectConfig
-         * @uses TheSeer\phpDox\Version
-         */
-        public function testVariablesGetResolvedCorrectly($expected, $file) {
-            $this->init('resolver/' .  $file);
-            /** @var ProjectConfig[] $projects */
-            $projects = $this->config->getProjects();
-            $this->assertEquals($expected, current($projects)->getSourceDirectory()->getPathname());
-        }
+    public function resolverSrcProvider() {
+        return [
+            'phpDox.project.source'            => ['source', 'src'],
+            'phpDox.project.source[undefined]' => ['src', 'src-undefined'],
+        ];
+    }
 
-        public function resolverProvider() {
-            $version = new Version('0.0');
-            return array(
-                'basedir' => array( $this->baseDir . 'resolver', 'basedir'),
+    /**
+     * @dataProvider resolverProvider
+     *
+     * @uses         TheSeer\phpDox\ProjectConfig
+     * @uses         TheSeer\phpDox\Version
+     */
+    public function testVariablesGetResolvedCorrectly($expected, $file): void {
+        $this->init('resolver/' . $file);
+        /** @var ProjectConfig[] $projects */
+        $projects = $this->config->getProjects();
+        $this->assertEquals($expected, \current($projects)->getSourceDirectory()->getPathname());
+    }
 
-                'phpDox.home' => array( '/tmp', 'home'),
-                'phpDox.file' => array( $this->baseDir . 'resolver/file.xml', 'file'),
-                'phpDox.version' => array($version->getVersion(), 'phpdox-version'),
+    public function resolverProvider() {
+        $version = new Version('0.0');
 
-                'multi' => array( '/tmp ' . $version->getVersion(), 'multi'),
+        return [
+            'basedir' => [$this->baseDir . 'resolver', 'basedir'],
 
-                'phpDox.project.name' => array('projectname', 'named'),
-                'phpDox.project.name[undefined]' => array('unnamed', 'named-undefined'),
+            'phpDox.home'    => ['/tmp', 'home'],
+            'phpDox.file'    => [$this->baseDir . 'resolver/file.xml', 'file'],
+            'phpDox.version' => [$version->getVersion(), 'phpdox-version'],
 
-                'phpDox.project.workdir' => array('output','workdir'),
-                'phpDox.project.workdir[undefined]' => array('xml','workdir-undefined'),
+            'multi' => ['/tmp ' . $version->getVersion(), 'multi'],
 
-                'phpDox.php.version' => array(PHP_VERSION, 'php-version'),
+            'phpDox.project.name'            => ['projectname', 'named'],
+            'phpDox.project.name[undefined]' => ['unnamed', 'named-undefined'],
 
-                'property-global' => array('propvalue', 'property-global'),
-                'property-project' => array('propvalue', 'property-project'),
+            'phpDox.project.workdir'            => ['output', 'workdir'],
+            'phpDox.project.workdir[undefined]' => ['xml', 'workdir-undefined'],
 
-                'property-recursive' => array($version->getVersion(), 'property-recursive'),
-                'property-recursive-recursive' => array( $this->baseDir . 'resolver/xml', 'property-recursive-recursive')
-            );
-        }
+            'phpDox.php.version' => [\PHP_VERSION, 'php-version'],
 
-        /**
-         * @dataProvider exceptionProvider
-         * @uses TheSeer\phpDox\Version
-         */
-        public function testInvalidPropertyRequestThrowsException($file, $code) {
-            $this->init('resolver/' .  $file);
-            $this->expectException('TheSeer\\phpDox\\ConfigException', $code);
-            $this->config->getProjects();
-        }
+            'property-global'  => ['propvalue', 'property-global'],
+            'property-project' => ['propvalue', 'property-project'],
 
-        public function exceptionProvider() {
-            return array(
-                'property-internal' => array('property-internal', ConfigException::OverrideNotAllowed),
-                'property-overwrite' => array('property-overwrite', ConfigException::OverrideNotAllowed),
-                'property-undefined' => array('property-undefined', ConfigException::PropertyNotFound)
-            );
-        }
+            'property-recursive'           => [$version->getVersion(), 'property-recursive'],
+            'property-recursive-recursive' => [$this->baseDir . 'resolver/xml', 'property-recursive-recursive']
+        ];
+    }
+
+    /**
+     * @dataProvider exceptionProvider
+     *
+     * @uses         TheSeer\phpDox\Version
+     */
+    public function testInvalidPropertyRequestThrowsException($file, $code): void {
+        $this->init('resolver/' . $file);
+        $this->expectException('TheSeer\\phpDox\\ConfigException', $code);
+        $this->config->getProjects();
+    }
+
+    public function exceptionProvider() {
+        return [
+            'property-internal'  => ['property-internal', ConfigException::OverrideNotAllowed],
+            'property-overwrite' => ['property-overwrite', ConfigException::OverrideNotAllowed],
+            'property-undefined' => ['property-undefined', ConfigException::PropertyNotFound]
+        ];
+    }
 
+    private function init($cfgName): void {
+        $this->version  = new Version('0.0');
+        $this->fileInfo = new FileInfo($this->baseDir . $cfgName . '.xml');
+        $this->cfgDom   = new fDOMDocument();
+        $this->cfgDom->load($this->fileInfo->getPathname());
+        $this->cfgDom->registerNamespace('cfg', 'http://xml.phpdox.net/config');
+        $this->config = new GlobalConfig($this->version, new FileInfo('/tmp'), $this->cfgDom, $this->fileInfo);
     }
 }
diff -Nru phpdox-0.11.2/tests/Unit/DirectoryCleanerTest.php phpdox-0.12.0/tests/Unit/DirectoryCleanerTest.php
--- phpdox-0.11.2/tests/Unit/DirectoryCleanerTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/DirectoryCleanerTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -1,84 +1,43 @@
-<?php
-/**
- * Copyright (c) 2015 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox {
-
-    class DirectoryCleanerTest extends \PHPUnit\Framework\TestCase {
-
-        /**
-         * @var DirectoryCleaner
-         */
-        private $cleaner;
-
-        protected function setUp() {
-            $this->cleaner = new DirectoryCleaner();
-        }
-
-        /**
-         * @expectedException \TheSeer\phpDox\DirectoryCleanerException
-         * @expectedExceptionCode \TheSeer\phpDox\DirectoryCleanerException::SecurityLimitation
-         */
-        public function testTryingToDeleteAShortPathThrowsException() {
-            $this->cleaner->process(new FileInfo('/tmp'));
-        }
-
-        public function testTryingToDeleteNonExistingDirectoryJustReturns() {
-            $this->cleaner->process(new FileInfo('/not/existing/directory'));
-            $this->assertTrue(true);
-        }
-
-        public function testCanDeleteRecursiveDirectoryStructure() {
-            $base = '/tmp/'. uniqid('dctest-');
-            $path = $base . '/a/b/c/d/e/f/g/h';
-            mkdir( $path, 0700, true);
-            touch( $path . '/test-h.txt' );
-            touch( $path . '/../test-g.txt' );
-            touch( $path . '/../../test-f.txt' );
-
-            $this->assertFileExists($path. '/test-h.txt');
-            $this->assertDirectoryExists($path);
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox;
 
-            $this->cleaner->process(new FileInfo($base));
+class DirectoryCleanerTest extends \PHPUnit\Framework\TestCase {
+    /**
+     * @var DirectoryCleaner
+     */
+    private $cleaner;
 
-            $this->assertFileNotExists($path. '/test-h.txt', 'File vanished');
-            $this->assertDirectoryNotExists($base, 'Directory vanished');
-
-        }
+    protected function setUp(): void {
+        $this->cleaner = new DirectoryCleaner();
+    }
 
+    /**
+     * @expectedException \TheSeer\phpDox\DirectoryCleanerException
+     * @expectedExceptionCode \TheSeer\phpDox\DirectoryCleanerException::SecurityLimitation
+     */
+    public function testTryingToDeleteAShortPathThrowsException(): void {
+        $this->cleaner->process(new FileInfo('/tmp'));
+    }
 
+    public function testTryingToDeleteNonExistingDirectoryJustReturns(): void {
+        $this->cleaner->process(new FileInfo('/not/existing/directory'));
+        $this->assertTrue(true);
     }
 
+    public function testCanDeleteRecursiveDirectoryStructure(): void {
+        $base = '/tmp/' . \uniqid('dctest-');
+        $path = $base . '/a/b/c/d/e/f/g/h';
+        \mkdir($path, 0700, true);
+        \touch($path . '/test-h.txt');
+        \touch($path . '/../test-g.txt');
+        \touch($path . '/../../test-f.txt');
+
+        $this->assertFileExists($path . '/test-h.txt');
+        $this->assertDirectoryExists($path);
+
+        $this->cleaner->process(new FileInfo($base));
+
+        $this->assertFileNotExists($path . '/test-h.txt', 'File vanished');
+        $this->assertDirectoryNotExists($base, 'Directory vanished');
+    }
 }
diff -Nru phpdox-0.11.2/tests/Unit/docblock/docblockTest.php phpdox-0.12.0/tests/Unit/docblock/docblockTest.php
--- phpdox-0.11.2/tests/Unit/docblock/docblockTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/docblock/docblockTest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,152 +0,0 @@
-<?php
-/**
- * Copyright (c) 2010-2015 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-namespace TheSeer\phpDox\DocBlock {
-
-    use TheSeer\fDOM\fDOMDocument;
-
-    /**
-     * Class DocBlockTest
-     *
-     * @covers TheSeer\phpDox\DocBlock\DocBlock
-     * @uses TheSeer\phpDox\DocBlock\GenericElement
-     */
-    class DocBlockTest extends \PHPUnit\Framework\TestCase {
-
-        /**
-         * @var DocBlock
-         */
-        private $docBlock;
-
-        /**
-         * @var GenericElement
-         */
-        private $element;
-
-        protected function setUp() {
-            $this->docBlock = new DocBlock();
-
-            $this->element = $this->getMockBuilder('TheSeer\\phpDox\\DocBlock\\GenericElement')
-                ->disableOriginalConstructor()
-                ->getMock();
-
-            $this->element->expects($this->any())
-                            ->method('getAnnotationName')
-                            ->will($this->returnValue('stub'));
-        }
-
-        public function testHasElementByNameReturnsFalseIfNotPresent() {
-            $this->assertFalse($this->docBlock->hasElementByName('not-set'));
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\DocBlock::appendElement
-         * @covers TheSeer\phpDox\DocBlock\DocBlock::hasElementByName
-         */
-        public function testElementCanBeAdded() {
-            $this->docBlock->appendElement($this->element);
-            $this->assertTrue($this->docBlock->hasElementByName('stub'));
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\DocBlock::appendElement
-         */
-        public function testSameTypeElementCanBeAddedMultipleTimes() {
-            $this->docBlock->appendElement($this->element);
-            $this->docBlock->appendElement($this->element);
-            $this->assertTrue($this->docBlock->hasElementByName('stub'));
-            $this->assertCount(2, $this->docBlock->getElementByName('stub'));
-        }
-
-        /**
-         * @expectedException \TheSeer\phpDox\DocBlock\DocBlockException
-         * @covers TheSeer\phpDox\DocBlock\DocBlock::getElementByName
-         */
-        public function testTryingToGetANonExistingElementThrowsException() {
-            $this->docBlock->getElementByName('non-set');
-        }
-
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\DocBlock::getElementByName
-         */
-        public function testElementCanBeRetreived() {
-            $this->docBlock->appendElement($this->element);
-            $this->assertEquals($this->element, $this->docBlock->getElementByName('stub'));
-        }
-
-        public function testDocBlockCanBeSerializedToDom() {
-            $dom = new fDOMDocument();
-            $dom->registerNamespace('test', 'http://xml.phpdox.net/src');
-            $this->element->expects($this->once())
-                ->method('asDom')
-                ->will($this->returnValue($dom->createElementNS('http://xml.phpdox.net/src', 'stub')));
-
-            $this->docBlock->appendElement($this->element);
-            $node = $this->docBlock->asDom($dom);
-
-            $this->assertEquals(
-                '<docblock xmlns="http://xml.phpdox.net/src"><stub/></docblock>',
-                $dom->saveXML($node)
-            );
-        }
-
-        public function testDocBlockWithMultipleOccurencesOfAnnotationCanBeSerializedToDom() {
-            $dom = new fDOMDocument();
-            $dom->registerNamespace('test', 'http://xml.phpdox.net/src');
-
-            $element2 = clone $this->element;
-            $this->element->expects($this->once())
-                ->method('asDom')
-                ->will($this->returnValue($dom->createElementNS('http://xml.phpdox.net/src', 'stub')));
-
-            $element2->expects($this->once())
-                ->method('asDom')
-                ->will($this->returnValue($dom->createElementNS('http://xml.phpdox.net/src', 'stub')));
-
-            $this->docBlock->appendElement($this->element);
-            $this->docBlock->appendElement($element2);
-
-            $node = $this->docBlock->asDom($dom);
-
-            $this->assertEquals(
-                '<docblock xmlns="http://xml.phpdox.net/src"><stub/><stub/></docblock>',
-                $dom->saveXML($node)
-            );
-        }
-    }
-
-}
diff -Nru phpdox-0.11.2/tests/Unit/docblock/DocBlockTest.php phpdox-0.12.0/tests/Unit/docblock/DocBlockTest.php
--- phpdox-0.11.2/tests/Unit/docblock/DocBlockTest.php	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/docblock/DocBlockTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,115 @@
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\DocBlock;
+
+use PHPUnit\Framework\TestCase;
+use TheSeer\fDOM\fDOMDocument;
+
+/**
+ * Class DocBlockTest
+ *
+ * @covers \TheSeer\phpDox\DocBlock\DocBlock
+ *
+ * @uses   \TheSeer\phpDox\DocBlock\GenericElement
+ */
+class DocBlockTest extends TestCase {
+    /**
+     * @var DocBlock
+     */
+    private $docBlock;
+
+    /**
+     * @var GenericElement
+     */
+    private $element;
+
+    protected function setUp(): void {
+        $this->docBlock = new DocBlock();
+
+        $this->element = $this->getMockBuilder('TheSeer\\phpDox\\DocBlock\\GenericElement')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $this->element->expects($this->any())
+            ->method('getAnnotationName')
+            ->willReturn('stub');
+    }
+
+    public function testHasElementByNameReturnsFalseIfNotPresent(): void {
+        $this->assertFalse($this->docBlock->hasElementByName('not-set'));
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\DocBlock::appendElement
+     * @covers \TheSeer\phpDox\DocBlock\DocBlock::hasElementByName
+     */
+    public function testElementCanBeAdded(): void {
+        $this->docBlock->appendElement($this->element);
+        $this->assertTrue($this->docBlock->hasElementByName('stub'));
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\DocBlock::appendElement
+     */
+    public function testSameTypeElementCanBeAddedMultipleTimes(): void {
+        $this->docBlock->appendElement($this->element);
+        $this->docBlock->appendElement($this->element);
+        $this->assertTrue($this->docBlock->hasElementByName('stub'));
+        $this->assertCount(2, $this->docBlock->getElementByName('stub'));
+    }
+
+    /**
+     * @expectedException \TheSeer\phpDox\DocBlock\DocBlockException
+     * @covers \TheSeer\phpDox\DocBlock\DocBlock::getElementByName
+     */
+    public function testTryingToGetANonExistingElementThrowsException(): void {
+        $this->docBlock->getElementByName('non-set');
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\DocBlock::getElementByName
+     */
+    public function testElementCanBeRetreived(): void {
+        $this->docBlock->appendElement($this->element);
+        $this->assertEquals($this->element, $this->docBlock->getElementByName('stub'));
+    }
+
+    public function testDocBlockCanBeSerializedToDom(): void {
+        $dom = new fDOMDocument();
+        $dom->registerNamespace('test', 'http://xml.phpdox.net/src');
+        $this->element->expects($this->once())
+            ->method('asDom')
+            ->will($this->returnValue($dom->createElementNS('http://xml.phpdox.net/src', 'stub')));
+
+        $this->docBlock->appendElement($this->element);
+        $node = $this->docBlock->asDom($dom);
+
+        $this->assertEquals(
+            '<docblock xmlns="http://xml.phpdox.net/src"><stub/></docblock>',
+            $dom->saveXML($node)
+        );
+    }
+
+    public function testDocBlockWithMultipleOccurencesOfAnnotationCanBeSerializedToDom(): void {
+        $dom = new fDOMDocument();
+        $dom->registerNamespace('test', 'http://xml.phpdox.net/src');
+
+        $element2 = clone $this->element;
+        $this->element->expects($this->once())
+            ->method('asDom')
+            ->willReturn($dom->createElementNS('http://xml.phpdox.net/src', 'stub'));
+
+        $element2->expects($this->once())
+            ->method('asDom')
+            ->willReturn($dom->createElementNS('http://xml.phpdox.net/src', 'stub'));
+
+        $this->docBlock->appendElement($this->element);
+        $this->docBlock->appendElement($element2);
+
+        $node = $this->docBlock->asDom($dom);
+
+        $this->assertEquals(
+            '<docblock xmlns="http://xml.phpdox.net/src"><stub/><stub/></docblock>',
+            $dom->saveXML($node)
+        );
+    }
+}
diff -Nru phpdox-0.11.2/tests/Unit/docblock/factoryTest.php phpdox-0.12.0/tests/Unit/docblock/factoryTest.php
--- phpdox-0.11.2/tests/Unit/docblock/factoryTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/docblock/factoryTest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-<?php
-/**
- * Copyright (c) 2010-2015 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @subpackage Tests
- * @author     Bastian Feder <phpdox@bastian-feder.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Tests\Unit\DocBlock {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\DocBlock\Factory;
-    use TheSeer\phpDox\FactoryInterface;
-
-    /**
-     * Class FactoryTest
-     *
-     * @covers TheSeer\phpDox\DocBlock\Factory
-     */
-    class FactoryTest extends \PHPUnit\Framework\TestCase {
-
-        private $factory;
-
-        protected function setUp() {
-            $this->factory = new Factory();
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::addParserFactory
-         */
-        public function testAddParserFactory() {
-            $mock = $this->createMock(FactoryInterface::class);
-            $this->factory->addParserFactory('Tux', $mock);
-            $this->assertAttributeContains($mock, 'parserMap', $this->factory);
-        }
-
-        /**
-         * @expectedException \TheSeer\phpDox\DocBlock\FactoryException
-         * @covers TheSeer\phpDox\DocBlock\Factory::addParserFactory
-         */
-        public function testAddParserFactoryExpectingFactoryException() {
-            $mock = $this->createMock(FactoryInterface::class);
-            $this->factory->addParserFactory(array(), $mock);
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::addParserClass
-         */
-        public function testAddParserClass() {
-            $this->factory->addParserClass('Tux', 'Gnu');
-            $this->assertAttributeContains('Gnu', 'parserMap', $this->factory);
-        }
-
-        /**
-         * @dataProvider addParserClassDataprovider
-         * @expectedException \TheSeer\phpDox\DocBlock\FactoryException
-         * @covers TheSeer\phpDox\DocBlock\Factory::addParserClass
-         */
-        public function testAddParserClassExpectingFactoryException($annotation, $classname) {
-            $this->factory->addParserClass($annotation, $classname);
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::getDocBlock
-         * @uses TheSeer\phpDox\DocBlock\DocBlock
-         */
-        public function testGetInstanceForDocBlock() {
-            $factory = new Factory();
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\DocBlock',
-                $factory->getDocBlock()
-            );
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::getInlineProcessor
-         * @uses TheSeer\phpDox\DocBlock\InlineProcessor
-         */
-        public function testGetInstanceForInlineProcessor() {
-            $factory = new Factory();
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\InlineProcessor',
-                $factory->getInlineProcessor(new fDOMDocument()));
-        }
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\Factory::getParserInstanceFor
-         * @uses TheSeer\phpDox\DocBlock\GenericParser
-         */
-        public function testGetParserInstanceForUnknownNameReturnsGenericParser() {
-            $factory = new Factory();
-            $this->assertInstanceOf(
-                'TheSeer\\phpDox\\DocBlock\\GenericParser',
-                $factory->getParserInstanceFor('Unknown Name Parser')
-            );
-        }
-
-        /*********************************************************************/
-        /* Dataprovider                                                      */
-        /*********************************************************************/
-
-        public static function addParserClassDataprovider() {
-            return array(
-                'wrong annotation type' => array(array(), 'Gnu'),
-                'wrong classname type' => array('Tux', array()),
-            );
-        }
-    }
-
-}
diff -Nru phpdox-0.11.2/tests/Unit/docblock/FactoryTest.php phpdox-0.12.0/tests/Unit/docblock/FactoryTest.php
--- phpdox-0.11.2/tests/Unit/docblock/FactoryTest.php	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/docblock/FactoryTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,104 @@
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Tests\Unit\DocBlock;
+
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\DocBlock\Factory;
+use TheSeer\phpDox\DocBlock\GenericParser;
+use TheSeer\phpDox\DocBlock\InlineProcessor;
+use TheSeer\phpDox\FactoryInterface;
+
+/**
+ * @covers \TheSeer\phpDox\DocBlock\Factory
+ */
+class FactoryTest extends \PHPUnit\Framework\TestCase {
+    private $factory;
+
+    /**/
+    /* Dataprovider                                                      */
+    /**/
+
+    public static function addParserClassDataprovider() {
+        return [
+            'wrong annotation type' => [[], 'Gnu'],
+            'wrong classname type'  => ['Tux', []],
+        ];
+    }
+
+    protected function setUp(): void {
+        $this->factory = new Factory();
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\Factory::addParserFactory
+     */
+    public function testAddParserFactory(): void {
+        $mock = $this->createMock(FactoryInterface::class);
+        $this->factory->addParserFactory('Tux', $mock);
+        $this->assertAttributeContains($mock, 'parserMap', $this->factory);
+    }
+
+    /**
+     * @expectedException \TheSeer\phpDox\DocBlock\FactoryException
+     * @covers \TheSeer\phpDox\DocBlock\Factory::addParserFactory
+     */
+    public function testAddParserFactoryExpectingFactoryException(): void {
+        $mock = $this->createMock(FactoryInterface::class);
+        $this->factory->addParserFactory([], $mock);
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\Factory::addParserClass
+     */
+    public function testAddParserClass(): void {
+        $this->factory->addParserClass('Tux', 'Gnu');
+        $this->assertAttributeContains('Gnu', 'parserMap', $this->factory);
+    }
+
+    /**
+     * @dataProvider addParserClassDataprovider
+     * @expectedException \TheSeer\phpDox\DocBlock\FactoryException
+     * @covers       \TheSeer\phpDox\DocBlock\Factory::addParserClass
+     */
+    public function testAddParserClassExpectingFactoryException($annotation, $classname): void {
+        $this->factory->addParserClass($annotation, $classname);
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\Factory::getDocBlock
+     *
+     * @uses   \TheSeer\phpDox\DocBlock\DocBlock
+     */
+    public function testGetInstanceForDocBlock(): void {
+        $factory = new Factory();
+        $this->assertInstanceOf(
+            'TheSeer\\phpDox\\DocBlock\\DocBlock',
+            $factory->getDocBlock()
+        );
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\Factory::getInlineProcessor
+     *
+     * @uses   \TheSeer\phpDox\DocBlock\InlineProcessor
+     */
+    public function testGetInstanceForInlineProcessor(): void {
+        $factory = new Factory();
+        $this->assertInstanceOf(
+            InlineProcessor::class,
+            $factory->getInlineProcessor(new fDOMDocument())
+        );
+    }
+
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\Factory::getParserInstanceFor
+     *
+     * @uses   \TheSeer\phpDox\DocBlock\GenericParser
+     */
+    public function testGetParserInstanceForUnknownNameReturnsGenericParser(): void {
+        $factory = new Factory();
+        $this->assertInstanceOf(
+            GenericParser::class,
+            $factory->getParserInstanceFor('Unknown Name Parser')
+        );
+    }
+}
diff -Nru phpdox-0.11.2/tests/Unit/docblock/invalidelementTest.php phpdox-0.12.0/tests/Unit/docblock/invalidelementTest.php
--- phpdox-0.11.2/tests/Unit/docblock/invalidelementTest.php	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/docblock/invalidelementTest.php	1970-01-01 00:00:00.000000000 +0000
@@ -1,67 +0,0 @@
-<?php
-/**
- * Copyright (c) 2010-2013 Arne Blankerts <arne@blankerts.de>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- *   * Redistributions of source code must retain the above copyright notice,
- *     this list of conditions and the following disclaimer.
- *
- *   * Redistributions in binary form must reproduce the above copyright notice,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *
- *   * Neither the name of Arne Blankerts nor the names of contributors
- *     may be used to endorse or promote products derived from this software
- *     without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT  * NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER ORCONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
- * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- * @package    phpDox
- * @subpackage Tests
- * @author     Arne Blankerts <arne@blankerts.de>
- * @copyright  Arne Blankerts <arne@blankerts.de>, All rights reserved.
- * @license    BSD License
- */
-
-namespace TheSeer\phpDox\Tests\Unit\DocBlock {
-
-    use TheSeer\fDOM\fDOMDocument;
-    use TheSeer\phpDox\DocBlock\InvalidElement;
-
-    /**
-     * Class InvalidElementTest
-     *
-     * @covers TheSeer\phpDox\DocBlock\InvalidElement
-     * @uses TheSeer\phpDox\DocBlock\InvalidElement
-     * @uses TheSeer\phpDox\DocBlock\GenericElement
-     */
-    class InvalidElementTest extends \PHPUnit\Framework\TestCase {
-
-        /**
-         * @covers TheSeer\phpDox\DocBlock\InvalidElement::asDom
-         */
-        public function testElementCanBeSerializedToDom() {
-            $dom = new fDOMDocument();
-            $element = new InvalidElement($this->createMock(\TheSeer\phpDox\DocBlock\Factory::class), 'test');
-
-            $this->assertEquals(
-                '<invalid xmlns="http://xml.phpdox.net/src" annotation="test"/>',
-                $dom->saveXML($element->asDom($dom))
-            );
-        }
-
-    }
-}
diff -Nru phpdox-0.11.2/tests/Unit/docblock/InvalidElementTest.php phpdox-0.12.0/tests/Unit/docblock/InvalidElementTest.php
--- phpdox-0.11.2/tests/Unit/docblock/InvalidElementTest.php	1970-01-01 00:00:00.000000000 +0000
+++ phpdox-0.12.0/tests/Unit/docblock/InvalidElementTest.php	2019-03-13 09:34:17.000000000 +0000
@@ -0,0 +1,31 @@
+<?php declare(strict_types = 1);
+namespace TheSeer\phpDox\Tests\Unit\DocBlock;
+
+use TheSeer\fDOM\fDOMDocument;
+use TheSeer\phpDox\DocBlock\InvalidElement;
+
+/**
+ * Class InvalidElementTest
+ *
+ * @covers \TheSeer\phpDox\DocBlock\InvalidElement
+ *
+ * @uses   \TheSeer\phpDox\DocBlock\InvalidElement
+ * @uses   \TheSeer\phpDox\DocBlock\GenericElement
+ */
+class InvalidElementTest extends \PHPUnit\Framework\TestCase {
+    /**
+     * @covers \TheSeer\phpDox\DocBlock\InvalidElement::asDom
+     */
+    public function testElementCanBeSerializedToDom(): void {
+        $dom     = new fDOMDocument();
+        $element = new InvalidElement(
+            $this->createMock(\TheSeer\phpDox\DocBlock\Factory::class),
+            'test'
+        );
+
+        $this->assertEquals(
+            '<invalid xmlns="http://xml.phpdox.net/src" annotation="test"/>',
+            $dom->saveXML($element->asDom($dom))
+        );
+    }
+}
diff -Nru phpdox-0.11.2/.travis.yml phpdox-0.12.0/.travis.yml
--- phpdox-0.11.2/.travis.yml	2018-05-22 16:43:30.000000000 +0000
+++ phpdox-0.12.0/.travis.yml	2019-03-13 09:34:17.000000000 +0000
@@ -1,34 +1,36 @@
 os:
 - linux
-
 language: php
-
 php:
-  - 5.6
-  - 7.0
-  - 7.1
-  - 7.0snapshot
-  - 7.1snapshot
-  - master
-
+- 7.1.26
+- 7.2
+- 7.3
+- 7.1snapshot
+- 7.2snapshot
+- 7.3snapshot
+- master
 matrix:
   allow_failures:
-    - php: master
-
+  - php: master
 before_install:
-  - composer self-update
-  - wget https://phar.io/releases/phive.phar
-  - wget https://phar.io/releases/phive.phar.asc
-  - gpg --keyserver hkps.pool.sks-keyservers.net --recv-keys 0x9B2D5D79
-  - gpg --verify phive.phar.asc phive.phar
-  - chmod +x phive.phar
-  - sudo mv phive.phar /usr/bin/phive
-
+- composer self-update
+- if [ ! -d $HOME/.phive ]; then mkdir $HOME/.phive ; fi
+- if [ ! -f $HOME/.phive/phive.phar ]; then ant getphive ; mv phive.phar $HOME/.phive
+  ; fi
+- sudo cp $HOME/.phive/phive.phar /usr/local/bin/phive
+cache:
+  directories:
+  - "$HOME/.phive"
+  - "$HOME/.phive/phars"
+  - "$HOME/.cache/composer"
+  - "$HOME/.composer/cache"
+  - "$HOME/.gnupg"
 install:
-  - travis_retry composer install --no-interaction --prefer-source
-  - phive install --trust-gpg-keys 4AA394086372C20A,2A8299CE842DD38C phpab phpunit@^5.7
-
-script: ./tools/phpunit
-
+- travis_retry composer install --no-interaction --prefer-source
+- phive --no-progress install --trust-gpg-keys 4AA394086372C20A,2A8299CE842DD38C,E82B2FB314E9906E
+script: "./tools/phpunit"
 notifications:
   email: false
+env:
+  global:
+    secure: ou+icphdwzdA9o9xVN/dQEAdos03LuP3CPNz6wzRwaqeHq4KEVOCMdPaVs9Gyf+YAqS/xMGx15TNE5QK7+y1PE9tn7hhBtDunNIZU9n4g1OeC06hjm4eMg+8CwTZlXlAiDuDa5TC18vMMXFpVxL8NxyNVM1AdCrDg95Mx4+7YQY=