Merge pull request #1927 from jaapio/feature/multi-type-array

Adds testcase for complex return type

Author: jaapio

src/phpDocumentor/Application/Stage/Parser.php

@@ -18,12 +18,12 @@
 use Exception;
 use InvalidArgumentException;
 use phpDocumentor\Descriptor\Cache\ProjectDescriptorMapper;
+use phpDocumentor\Descriptor\Collection as PartialsCollection;
 use phpDocumentor\Descriptor\ProjectDescriptor;
 use phpDocumentor\Descriptor\ProjectDescriptorBuilder;
 use phpDocumentor\DomainModel\Parser\FileCollector;
 use phpDocumentor\Event\LogEvent;
 use phpDocumentor\Parser\Parser as DocParser;
-use phpDocumentor\Descriptor\Collection as PartialsCollection;
 use phpDocumentor\Reflection\DocBlock\ExampleFinder;
 use Psr\Log\LogLevel;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;

src/phpDocumentor/Plugin/Core/Transformer/Writer/Sourcecode.php

@@ -36,8 +36,7 @@ public function transform(ProjectDescriptor $project, Transformation $transforma
         $artifact = $transformation->getTransformer()->getTarget()
             . DIRECTORY_SEPARATOR
             . ($transformation->getArtifact()
-                ? $transformation->getArtifact()
-                : 'source');
+                ?: 'source');
 
         /** @var FileDescriptor $file */
         foreach ($project->getFiles() as $file) {

src/phpDocumentor/Plugin/Core/Transformer/Writer/Xml.php

@@ -287,8 +287,7 @@ public function buildFunction(\DOMElement $parent, FunctionDescriptor $function,
         }
 
         $namespace = $function->getNamespace()
-            ? $function->getNamespace()
-            : $parent->getAttribute('namespace');
+            ?: $parent->getAttribute('namespace');
         $child->setAttribute('namespace', ltrim($namespace, '\\'));
         $child->setAttribute('line', $function->getLine());
 

src/phpDocumentor/Plugin/Scrybe/ServiceProvider.php

@@ -58,7 +58,7 @@ public function register(Container $app): void
         };
 
         $app[self::CONVERTER_DEFINITION_FACTORY] = function ($container) {
-            return new Factory($container[ServiceProvider::FORMATS]);
+            return new Factory($container[self::FORMATS]);
         };
 
         $app[self::CONVERTER_FACTORY] = function ($container) {
@@ -71,7 +71,7 @@ public function register(Container $app): void
 
         $app[self::TEMPLATE_FACTORY] = function ($app) {
             return new Template\Factory(
-                ['twig' => new Template\Twig($app[ServiceProvider::TEMPLATE_FOLDER])]
+                ['twig' => new Template\Twig($app[self::TEMPLATE_FOLDER])]
             );
         };
 

tests/features/assets/singlefile/tags/return.php

@@ -33,6 +33,13 @@ public function getReturnWithoutAny()
     public function getReturnDescription()
     {
     }
+
+    /**
+     * @return (integer|string)[]
+     */
+    public function getMultiTypeArray()
+    {
+    }
 }
 
 function get(): int

tests/features/core/tags/return.feature

@@ -22,6 +22,10 @@ Feature: The @return tag is used to document the return value of functions or me
     some value
     """
 
+  Scenario: method without docblock with return type
+    Then class "\ReturnTag" has a method "getMultiTypeArray"
+    And class "\ReturnTag" has a method "getMultiTypeArray" with returntype '(int|string)[]' without description
+
   Scenario: method with docblock without return type
     Then class "\ReturnTag" has a method "getReturnWithDefinedReturn"
     And class "\ReturnTag" has a method "getReturnWithDefinedReturn" with returntype 'string' with description: