Merge pull request #259 from bighappyface/application-json

feat(UriRetriever): application/json support

Author: bighappyface

src/JsonSchema/Uri/UriRetriever.php

@@ -51,7 +51,7 @@ public function confirmMediaType($uriRetriever, $uri)
             return;
         }
 
-        if (Validator::SCHEMA_MEDIA_TYPE === $contentType) {
+        if (in_array($contentType, array(Validator::SCHEMA_MEDIA_TYPE, 'application/json'))) {
             return;
         }
 

tests/JsonSchema/Tests/Uri/UriRetrieverTest.php

@@ -222,7 +222,7 @@ public function testResolvePointerFragmentNoArray()
             $schema, 'http://example.org/schema.json#/definitions/foo'
         );
     }
-    
+
     /**
      * @expectedException JsonSchema\Exception\UriResolverException
      */
@@ -233,4 +233,40 @@ public function testResolveExcessLevelUp()
             '../schema.json#', 'http://example.org/schema.json#'
         );
     }
+
+    public function testConfirmMediaTypeAcceptsJsonSchemaType()
+    {
+      $retriever = $this->getMock('JsonSchema\Uri\UriRetriever', array('getContentType'));
+
+      $retriever->expects($this->at(0))
+                ->method('getContentType')
+                ->will($this->returnValue('application/schema+json'));
+
+      $this->assertEquals(null, $retriever->confirmMediaType($retriever, null));
+    }
+
+    public function testConfirmMediaTypeAcceptsJsonType()
+    {
+      $retriever = $this->getMock('JsonSchema\Uri\UriRetriever', array('getContentType'));
+
+      $retriever->expects($this->at(0))
+                ->method('getContentType')
+                ->will($this->returnValue('application/json'));
+
+      $this->assertEquals(null, $retriever->confirmMediaType($retriever, null));
+    }
+
+    /**
+     * @expectedException \JsonSchema\Exception\InvalidSchemaMediaTypeException
+     */
+    public function testConfirmMediaTypeThrowsExceptionForUnsupportedTypes()
+    {
+      $retriever = $this->getMock('JsonSchema\Uri\UriRetriever', array('getContentType'));
+
+      $retriever->expects($this->at(0))
+                ->method('getContentType')
+                ->will($this->returnValue('text/html'));
+
+      $this->assertEquals(null, $retriever->confirmMediaType($retriever, null));
+    }
 }