DocGen Updates so ReturnTypes are now covered.

Author: photonstorm

docgen/export.php

@@ -46,9 +46,9 @@
     echo "There are " . count($gen->uniqueTypes) . " unique data types \n\n";
     print_r($gen->uniqueTypes);
 
-    // $gen->extend('Phaser.Sprite');
-    // $sprite = $gen->get('Phaser.Sprite');
-    // $sprite->export('output/');
+    $gen->extend('Phaser.Sprite');
+    $sprite = $gen->get('Phaser.Sprite');
+    $sprite->export('output/');
 
 
     // echo $sprite;

docgen/output/Phaser.Sprite.json

@@ -87,7 +87,7 @@ public function __construct($processor, $block)
 
             if ($block->getTypeBoolean('@return'))
             {
-                $this->returns = new ReturnType($block->getLine('@return'));
+                $this->returns = new ReturnType($this->processor, $block->getLine('@return'));
             }
 
         }

docgen/src/Method.php

@@ -221,6 +221,11 @@ public function parseTypes($output, $pixi, $name)
 
             $types = explode('|', $output);
 
+            if (!is_array($types))
+            {
+                $types = array($output);
+            }
+
             //  @param {number[]|string[]} frames - An array of numbers or strings indicating which frames to play in which order.
             //  @param {(number[]|...number)} points - An array of 2d vectors that form the convex or concave polygon.
             //      Either [[0,0], [0,1],...] or a flat array of numbers that will be interpreted as [x,y, x,y, ...],
@@ -331,21 +336,33 @@ public function parseTypes($output, $pixi, $name)
                     //  Valid DOM types?
                     if (!in_array($type, $this->domTypes) && !in_array($type, $this->dataTypes))
                     {
-                        //  Not a DOM type, shall we add PIXI to the front?
-                        if ($pixi)
+                        if ($pixi === null)
                         {
-                            if (substr($type, 0, 5) !== 'PIXI.')
+                            //  It's a ReturnType but we don't know which sort
+                            if (substr($type, 0, 7) !== 'Phaser.' && substr($type, 0, 5) !== 'PIXI.' && substr($type, 0, 3) !== 'p2.')
                             {
+                                //  Going to assume PIXI here as Phaser has the return types properly namespaced
                                 $types[$key] = "PIXI.$type";
                             }
                         }
                         else
                         {
-                            if (substr($type, 0, 7) !== 'Phaser.' && substr($type, 0, 5) !== 'PIXI.' && substr($type, 0, 3) !== 'p2.')
+                            //  Not a DOM type, shall we add PIXI to the front?
+                            if ($pixi)
+                            {
+                                if (substr($type, 0, 5) !== 'PIXI.')
+                                {
+                                    $types[$key] = "PIXI.$type";
+                                }
+                            }
+                            else
                             {
-                                $types[$key] = "wtf.$type";
-                                echo($name . '=');
-                                var_dump($type);
+                                if (substr($type, 0, 7) !== 'Phaser.' && substr($type, 0, 5) !== 'PIXI.' && substr($type, 0, 3) !== 'p2.')
+                                {
+                                    $types[$key] = "wtf.$type";
+                                    echo($name . '=');
+                                    var_dump($type);
+                                }
                             }
                         }
                     }

docgen/src/Processor.php

@@ -1,14 +1,21 @@
 <?php
     class ReturnType
     {
+        public $processor;
         public $types = []; // an array containing all possible types it can be: string, number, etc
         public $help = [];
 
-        public function __construct($line)
+        public function __construct($processor, $line)
         {
+            $this->processor = $processor;
+
             if (preg_match("/.*@return\s?{(\S*)} ?(.*)/", $line, $output))
             {
-                $this->types = explode('|', $output[1]);
+                // $this->types = explode('|', $output[1]);
+
+                //  Don't know if this is a Pixi or a Phaser return type
+                $this->types = $this->processor->parseTypes($output[1], null, '');
+
                 $this->help = $output[2];
             }
         }