fix error with resolving references in objects that implement ArrayAccess

Author: cebe

src/json/JsonPointer.php

@@ -102,8 +102,20 @@ public function evaluate($jsonDocument)
 
         foreach ($this->getPath() as $part) {
 
-            if (is_array($currentReference) || $currentReference instanceof \ArrayAccess) {
-                if (!array_key_exists($part, $currentReference)) {
+            if (is_array($currentReference)) {
+//                if (!preg_match('~^([1-9]*[0-9]|-)$~', $part)) {
+//                    throw new NonexistentJsonPointerReferenceException(
+//                        "Failed to evaluate pointer '$this->_pointer'. Invalid pointer path '$part' for Array at path '$currentPath'."
+//                    );
+//                }
+                if ($part === '-' || !array_key_exists($part, $currentReference)) {
+                    throw new NonexistentJsonPointerReferenceException(
+                        "Failed to evaluate pointer '$this->_pointer'. Array has no member $part at path '$currentPath'."
+                    );
+                }
+                $currentReference = $currentReference[$part];
+            } elseif ($currentReference instanceof \ArrayAccess) {
+                if (!$currentReference->offsetExists($part)) {
                     throw new NonexistentJsonPointerReferenceException(
                         "Failed to evaluate pointer '$this->_pointer'. Array has no member $part at path '$currentPath'."
                     );

tests/spec/ReferenceTest.php

@@ -3,6 +3,7 @@
 use cebe\openapi\Reader;
 use cebe\openapi\spec\OpenApi;
 use cebe\openapi\spec\Reference;
+use cebe\openapi\spec\RequestBody;
 use cebe\openapi\spec\Response;
 use cebe\openapi\spec\Schema;
 use cebe\openapi\spec\Example;
@@ -193,4 +194,26 @@ public function testResolveFileHttp()
         $this->assertArrayHasKey('name', $openapi->components->schemas['Dog']->properties);
     }
 
+    public function testResolvePaths()
+    {
+        /** @var $openapi OpenApi */
+        $openapi = Reader::readFromJsonFile(__DIR__ . '/data/reference/playlist.json', OpenApi::class, false);
+
+        $result = $openapi->validate();
+        $this->assertEquals([], $openapi->getErrors());
+        $this->assertTrue($result);
+
+        $playlistsBody = $openapi->paths['/playlist']->post->requestBody;
+        $playlistBody = $openapi->paths['/playlist/{id}']->patch->requestBody;
+
+        $this->assertInstanceOf(RequestBody::class, $playlistsBody);
+        $this->assertInstanceOf(Reference::class, $playlistBody);
+
+        $openapi->resolveReferences();
+
+        $newPlaylistBody = $openapi->paths['/playlist/{id}']->patch->requestBody;
+        $this->assertInstanceOf(RequestBody::class, $playlistsBody);
+        $this->assertInstanceOf(RequestBody::class, $newPlaylistBody);
+        $this->assertSame($playlistsBody, $newPlaylistBody);
+    }
 }