Updated unit tests

Author: MaximilianKresse

.travis.coverage.sh

@@ -0,0 +1,5 @@
+set -x
+if [ "$TRAVIS_PHP_VERSION" = '7.1' ] ; then
+    wget https://scrutinizer-ci.com/ocular.phar
+    php ocular.phar code-coverage:upload --format=php-clover ./clover.xml
+fi

.travis.yml

@@ -0,0 +1,13 @@
+language: php
+
+php:
+  - '7.1'
+
+before_script:
+  - composer install
+
+script:
+  - vendor/bin/phpunit --verbose --coverage-text --coverage-clover=clover.xml --colors
+
+after_script:
+  - sh .travis.coverage.sh

src/Formatter/ClassFormatter.php

@@ -81,11 +81,12 @@ public function format(bool $ignoreSubElements = false): string
 
         // remove sub interfaces of other interfaces
         $interfaces = array_filter($interfaces, function (ReflectionClass $interface) use ($interfaces) {
+            $interfaceName = $interface->getName();
             foreach ($interfaces as $compareInterface) {
                 /**
                  * @var ReflectionClass $compareInterface
                  */
-                if ($interface->implementsInterface($compareInterface->getName())) {
+                if ($compareInterface->implementsInterface($interfaceName)) {
                     return false;
                 }
             }

src/Formatter/ConstantFormatter.php

@@ -37,6 +37,9 @@ public function format(): string
     {
         $n = PhpStubGenerator::$eol;
         $t = PhpStubGenerator::$tab;
+        if (!$this->class->hasConstant($this->constantName)) {
+            return '';
+        }
 
         $parentClass = null;
         try {

src/Formatter/FunctionFormatter.php

@@ -27,12 +27,16 @@ protected function formatParams(): string
         $params = [];
         foreach ($this->function->getParameters() as $parameter) {
             $param = '';
-            $type = (string) $parameter->getType();
+            $type = $parameter->getType();
+            if ($type instanceof ReflectionType) {
+                $typeAllowsNull = $type->allowsNull();
+                $type = (string) $type;
+            } else {
+                $type = '';
+            }
 
             if ($type !== '') {
-                if ($parameter->allowsNull() &&
-                    (!$parameter->isDefaultValueAvailable() || $parameter->getDefaultValue() !== null)
-                ) {
+                if ($typeAllowsNull) {
                     $param .= '?';
                 }
 
@@ -73,6 +77,7 @@ protected function formatReturnType(): string
 
         if ($this->function->hasReturnType()) {
             $returnType = $this->function->getReturnType();
+
             if ($returnType instanceof ReflectionType) {
                 $allowsNull = $returnType->allowsNull();
                 $returnType = (string) $returnType;
@@ -95,11 +100,13 @@ public function format(): string
         $t = PhpStubGenerator::$tab;
 
         $result = '';
-        $result .= FormatHelper::indentDocBlock((string) $this->function->getDocComment(), 1, $t) . $n
-            . $t;
+        $doc = $this->function->getDocComment();
+        if (is_string($doc)) {
+            $result .= FormatHelper::indentDocBlock($doc, 1, $t) . $n;
+        }
 
-        $result .= 'function ' . $this->function->getName() . '(' . $this->formatParams() . ')';
-        $this->formatReturnType();
+        $result .= $t . 'function ' . $this->function->getName() . '(' . $this->formatParams() . ')';
+        $result .= $this->formatReturnType();
 
         $result .= ' {}' . $n . $n;
 

src/Formatter/MethodFormatter.php

@@ -17,8 +17,6 @@
  */
 class MethodFormatter extends FunctionFormatter
 {
-    const DEFAULT_TYPES = ['int', 'float', 'bool', 'string', 'self', 'callable', 'array', 'object'];
-
     /**
      * @var string
      */
@@ -46,9 +44,12 @@ public function format(): string
         }
 
         $result = '';
-        $result .= FormatHelper::indentDocBlock((string) $this->function->getDocComment(), 2, $t) . $n
-            . $t . $t;
+        $doc = $this->function->getDocComment();
+        if (is_string($doc)) {
+            $result .= FormatHelper::indentDocBlock($doc, 2, $t) . $n;
+        }
 
+        $result .= $t . $t;
         if (!$this->classIsInterface && $this->function->isAbstract()) {
             $result .= 'abstract ';
         } elseif ($this->function->isFinal()) {
@@ -59,7 +60,7 @@ public function format(): string
             $result .= 'public ';
         } elseif ($this->function->isProtected()) {
             $result .= 'protected ';
-        } else {
+        } elseif ($this->function->isPrivate()) {
             $result .= 'private ';
         }
 

src/Formatter/PropertyFormatter.php

@@ -3,7 +3,6 @@
 
 namespace setasign\PhpStubGenerator\Formatter;
 
-use ReflectionClass;
 use ReflectionProperty;
 use setasign\PhpStubGenerator\Helper\FormatHelper;
 use setasign\PhpStubGenerator\PhpStubGenerator;
@@ -38,14 +37,17 @@ public function format(): string
         }
 
         $result = '';
-        $result .= FormatHelper::indentDocBlock((string) $this->property->getDocComment(), 2, $t) . $n
-            . $t . $t;
+        $doc = $this->property->getDocComment();
+        if (is_string($doc)) {
+            $result .= FormatHelper::indentDocBlock($doc, 2, $t) . $n;
+        }
 
+        $result .= $t . $t;
         if ($this->property->isPublic()) {
             $result .= 'public ';
         } elseif ($this->property->isProtected()) {
             $result .= 'protected ';
-        } else {
+        } elseif ($this->property->isPrivate()) {
             $result .= 'private ';
         }
 

src/PhpStubGenerator.php

@@ -74,7 +74,7 @@ public function generate(): string
              * @var ReflectionFunction[] $functions
              */
             foreach ($functions as $function) {
-                $isGlobalNamespace = $namespace === '';
+                $isGlobalNamespace = ($namespace === '');
                 $result .= 'namespace' . (!$isGlobalNamespace ? ' ' . $namespace : '') . $n
                     . '{' . $n;
                 $result .= $this->formatAliases(