Fix #309

Author: theseer

src/collector/backend/parser/UnitCollectingVisitor.php

@@ -272,11 +272,27 @@ private function processMethodReturnType(MethodObject $method, $returnType) {
             }
 
             if ($returnType instanceof \PhpParser\Node\NullableType) {
-                $returnTypeObject = $method->setReturnType($returnType->type);
+                if ((string)$returnType->type === 'self') {
+                    $returnTypeObject = $method->setReturnType($this->unit->getName());
+                } else {
+                    $returnTypeObject = $method->setReturnType($returnType->type);
+                }
                 $returnTypeObject->setNullable(true);
                 return;
             }
-            throw new ParseErrorException("Unexpected return type definition", ParseErrorException::UnexpectedExpr);
+
+            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) {

tests/data/issue309/src/foo.php

@@ -0,0 +1,14 @@
+<?php declare(strict_types=1);
+namespace some\test;
+
+class foo {
+
+    public static function createFromFoo(): self {
+        return new self;
+    }
+
+    public static function createFromBar(): ?self {
+        return new self;
+    }
+
+}

tests/data/issue309/test.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<phpdox xmlns="http://xml.phpdox.net/config" silent="false">
+
+    <project name="phpDox-issue300" source="${basedir}/src" workdir="${basedir}/xml">
+
+        <collector publiconly="false" backend="parser" />
+
+        <generator output="${basedir}/docs">
+            <build engine="html" enabled="true" output="html" />
+            <build engine="xml" enabled="true" output="xml" />
+        </generator>
+
+    </project>
+
+</phpdox>