Fix issue #232

Author: theseer

src/docblock/elements/VarElement.php

@@ -45,7 +45,8 @@ class VarElement extends GenericElement {
          * @var string[]
          */
         private $types = array(
-            '', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int', 'float', 'string', 'boolean', 'resource'
+            '', 'null', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int',
+            'float', 'string', 'boolean', 'resource'
         );
 
         public function asDom(\TheSeer\fDOM\fDOMDocument $ctx) {

src/docblock/parser/GenericParser.php

@@ -45,7 +45,8 @@ class GenericParser {
         protected $payload;
 
         private $types = array(
-            '', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int', 'float', 'string', 'boolean', 'resource', 'static'
+            '', 'null', 'mixed', '{unknown}', 'object', 'array', 'integer', 'int',
+            'float', 'string', 'boolean', 'resource'
         );
 
         public function __construct(Factory $factory, $name) {

tests/data/docbock/docblock.xml

@@ -1 +1 @@
-<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading">the body</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="object"><type full="null" namespace="" name="null"/></return></docblock>
+<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading">the body</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="null"/></docblock>

tests/data/docbock/docblock_compact.xml

@@ -1 +1 @@
-<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading.">the body</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="object"><type full="null" namespace="" name="null"/></return></docblock>
+<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading.">the body</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="null" /></docblock>

tests/data/docbock/docblock_compact_multiline_short.xml

@@ -1 +1 @@
-<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading that spans multiple lines.">the body</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="object"><type full="null" namespace="" name="null"/></return></docblock>
+<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading that spans multiple lines.">the body</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="null" /></docblock>

tests/data/docbock/heading.xml

@@ -1 +1 @@
-<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading"/><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="object"><type full="null" namespace="" name="null"/></return></docblock>
+<docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading"/><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="null" /></docblock>

tests/data/docbock/multiline_body.xml

@@ -1,3 +1,3 @@
 <docblock xmlns="http://xml.phpdox.net/src"><description compact="the heading">this body
 spans multiple
-lines</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="object"><type full="null" namespace="" name="null"/></return></docblock>
+lines</description><param description="The foo parameter" type="string" variable="$foo"/><param description="Number of bars" type="int" variable="$bar"/><return type="null" /></docblock>

tests/data/issue232/src/StrangeClass.php

@@ -0,0 +1,9 @@
+<?php
+
+class StrangeClass
+{
+    /**
+     * @return null
+     */
+    public function doNothing(){}
+}

tests/data/issue232/test.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpdox xmlns="http://xml.phpdox.net/config">
+    <project name="Example" source="${basedir}/src" workdir="${basedir}/xml">
+        <collector backend="parser" />
+    </project>
+</phpdox>