added failing test

cebe · cebe · commit 518a3d330676 · 2020-03-26T10:46:03.000+01:00
diff --git a/src/ReferenceContext.php b/src/ReferenceContext.php
@@ -51,6 +51,11 @@ public function __construct(?SpecObjectInterface $base, string $uri, $cache = nu
         $this->_cache = $cache ?? new ReferenceContextCache();
     }
 
+    public function getCache(): ReferenceContextCache
+    {
+        return $this->_cache;
+    }
+
     /**
      * @throws UnresolvableReferenceException in case an invalid or non-absolute URI is provided.
      */
@@ -150,8 +155,6 @@ private function dirname($path)
         return '';
     }
 
-    private $_fileCache;
-
     /**
      * Fetch referenced file by URI.
      *
@@ -203,7 +206,7 @@ public function resolveReferenceData($uri, JsonPointer $pointer, $data, $toType)
 
         // transitive reference
         if (isset($referencedData['$ref'])) {
-            return (new Reference($referencedData, $toType))->resolve(new ReferenceContext(null, $uri));
+            return (new Reference($referencedData, $toType))->resolve(new ReferenceContext(null, $uri, $this->_cache));
         }
         /** @var SpecObjectInterface|array $referencedObject */
         $referencedObject = $toType !== null ? new $toType($referencedData) : $referencedData;
diff --git a/src/spec/Reference.php b/src/spec/Reference.php
@@ -220,15 +220,15 @@ public function resolve(ReferenceContext $context = null)
             $referencedObject = $context->resolveReferenceData($file, $jsonReference->getJsonPointer(), $referencedDocument, $this->_to);
 
             if ($jsonReference->getJsonPointer()->getPointer() === '') {
-                $newContext = new ReferenceContext($referencedObject instanceof SpecObjectInterface ? $referencedObject : null, $file);
+                $newContext = new ReferenceContext($referencedObject instanceof SpecObjectInterface ? $referencedObject : null, $file, $context->getCache());
                 if ($referencedObject instanceof DocumentContextInterface) {
                     $referencedObject->setDocumentContext($referencedObject, $jsonReference->getJsonPointer());
                 }
             } else {
                 // resolving references recursively does not work the same if we have not referenced
                 // the whole document. We do not know the base type of the file at this point,
                 // so base document must be null.
-                $newContext = new ReferenceContext(null, $file);
+                $newContext = new ReferenceContext(null, $file, $context->getCache());
             }
             $newContext->throwException = $context->throwException;
             if ($referencedObject instanceof SpecObjectInterface) {
diff --git a/tests/spec/ReferenceTest.php b/tests/spec/ReferenceTest.php
@@ -416,4 +416,48 @@ public function testTransitiveReferenceCyclic()
 
         $openapi->resolveReferences(new \cebe\openapi\ReferenceContext($openapi, 'file:///tmp/openapi.yaml'));
     }
+
+    public function testResolveRelativePath()
+    {
+        $openapi = Reader::readFromYamlFile(__DIR__ . '/data/reference/openapi_models.yaml');
+
+        $yaml = \cebe\openapi\Writer::writeToYaml($openapi);
+
+        $this->assertEquals(
+<<<YAML
+openapi: 3.0.3
+info:
+  title: 'Link Example'
+  version: 1.0.0
+paths:
+  /pet:
+    get:
+      responses:
+        '200':
+          description: 'return a pet'
+components:
+  schemas:
+    Pet:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        cat:
+          \$ref: '#/components/schemas/Cat' 
+      description: 'A Pet'
+    Cat:
+      type: object
+      properties:
+        id:
+          type: integer
+          format: int64
+        name:
+          type: string
+          description: 'the cats name'
+      description: 'A Cat'
+
+YAML
+            , $yaml);
+    }
 }
diff --git a/tests/spec/data/reference/models/Cat.yaml b/tests/spec/data/reference/models/Cat.yaml
@@ -0,0 +1,11 @@
+type: object
+description: "A Cat"
+properties:
+  id:
+    type: integer
+    format: int64
+  name:
+    type: string
+    description: the cats name
+  pet:
+    $ref: '../openapi_models.yaml#/components/schemas/Pet'
diff --git a/tests/spec/data/reference/models/Pet.yaml b/tests/spec/data/reference/models/Pet.yaml
@@ -0,0 +1,8 @@
+type: object
+description: "A Pet"
+properties:
+  id:
+    type: integer
+    format: int64
+  cat:
+    $ref: '../openapi_models.yaml#/components/schemas/Cat'
diff --git a/tests/spec/data/reference/openapi_models.yaml b/tests/spec/data/reference/openapi_models.yaml
@@ -0,0 +1,16 @@
+openapi: 3.0.3
+info:
+  title: Link Example
+  version: 1.0.0
+components:
+  schemas:
+    Pet:
+      $ref: models/Pet.yaml
+    Cat:
+      $ref: models/Cat.yaml
+paths:
+  '/pet':
+    get:
+      responses:
+        200:
+          description: return a pet
