Some fixes for HandleReferences (for zircote#301 starts work as assume)

Dezzpil · Aug 14, 2017 · 5d333a5 · 5d333a5
1 parent 56b0d87
commit 5d333a5
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/src/Annotations/Operation.php b/src/Annotations/Operation.php
@@ -158,8 +158,8 @@ public function validate($parents = [], $skip = [], $ref = '')
         $valid = parent::validate($parents, $skip);
         if ($this->responses !== null) {
             foreach ($this->responses as $response) {
-                if ($response->response !== 'default' && preg_match('/^[12345]{1}[0-9]{2}$/', $response->response) === 0) {
-                    Logger::notice('Invalid value "' . $response->response . '" for ' . $response->_identity([]) . '->response, expecting "default" or a HTTP Status Code in ' . $response->_context);
+                if ($response->response !== 'default' && preg_match('/^[12345]{1}[0-9]{2}$/', $response->response) === 0 && (strpos($response->response, '$') === false)) {
+                    Logger::notice('Invalid value "' . $response->response . '" for ' . $response->_identity([]) . '->response, expecting "default" or a HTTP Status Code or $linkName in ' . $response->_context);
                 }
             }
         }

diff --git a/src/Processors/HandleReferences.php b/src/Processors/HandleReferences.php
@@ -30,7 +30,7 @@ public function __invoke(Analysis $analysis)
     {
         $this->getAllImports($analysis);
         $this->mapReferences();
-        $this->importReferences();
+        $this->importReferences($analysis);
     }
 
     /**
@@ -89,9 +89,10 @@ private function loadResponses(Operation $operation)
     {
         if (!is_null($operation->responses)) {
             foreach ($operation->responses as $item) {
-                if ($this->checkSyntax($item->ref)) {
-                    $this->references[$this->import_in_order['response']][] = $this->link($item);
-                }
+//                if ($this->checkSyntax($item->ref)) {
+//                    $this->references[$this->import_in_order['response']][] = $this->link($item);
+//                }
+                $this->references[$this->import_in_order['response']][$item->response] = $this->link($item);
             }
         }
     }
@@ -176,7 +177,7 @@ private function mapReferences()
                 $item = $data[1];
 
 
-                if (!isset($item->ref)) {
+                if (!isset($item->ref) || empty($item->ref)) {
                     $this->head_references[$import_name][] = &$data;
                 } elseif ($this->checkSyntax($item->ref)) {
                     $params = explode("/", $item->ref);
@@ -218,7 +219,7 @@ private function loadParent(&$child, $type, $parent_name)
     /**
      * Imports the references from all of the responses
      */
-    private function importReferences()
+    private function importReferences(Analysis $analysis)
     {
         foreach ($this->import_in_order as $key => $import_name) {
             //get the list to import from
@@ -228,6 +229,12 @@ private function importReferences()
             while (count($queue)) {
                 $this->iterateQueue($queue, $key);
             }
+
+            // import, copy to swagger object
+            $analysis->swagger->$import_name = [];
+            foreach ($this->references[$import_name] as $item) {
+                $analysis->swagger->$import_name[] = $item[1];
+            }
         }
     }
 

diff --git a/tests/ResponseTest.php b/tests/ResponseTest.php
@@ -11,7 +11,7 @@ class ResponseTest extends SwaggerTestCase
     public function testMisspelledDefault()
     {
         $annotations = $this->parseComment('@SWG\Get(@SWG\Response(response="Default", description="description"))');
-        $this->assertSwaggerLogEntryStartsWith('Invalid value "Default" for @SWG\Response()->response, expecting "default" or a HTTP Status Code in ');
+        $this->assertSwaggerLogEntryStartsWith('Invalid value "Default" for @SWG\Response()->response, expecting "default" or a HTTP Status Code or $linkName in ');
         $annotations[0]->validate();
     }
 }