Merge pull request #271 from justinrainbow/revert-262-uri-retriever-e…

…rror-handler Revert "Do not override error handler"
jsonrainbow · May 23, 2016 · 449bb4d · 449bb4d
2 parents 6dad7bf + 5292a93
commit 449bb4d
Showing 1 changed file with 17 additions and 12 deletions.
diff --git a/src/JsonSchema/Uri/Retrievers/FileGetContents.php b/src/JsonSchema/Uri/Retrievers/FileGetContents.php
@@ -14,29 +14,34 @@
 
 /**
  * Tries to retrieve JSON schemas from a URI using file_get_contents()
- *
- * @author Sander Coolen <sander@jibber.nl>
+ * 
+ * @author Sander Coolen <sander@jibber.nl> 
  */
 class FileGetContents extends AbstractRetriever
 {
     protected $messageBody;
-
+    
     /**
      * {@inheritDoc}
      * @see \JsonSchema\Uri\Retrievers\UriRetrieverInterface::retrieve()
      */
     public function retrieve($uri)
     {
-        if (!file_exists($uri)) {
-            throw new ResourceNotFoundException('JSON schema not found at ' . $uri);
-        }
+        $context = stream_context_create(array(
+            'http' => array(
+                'method' => 'GET',
+                'header' => "Accept: " . Validator::SCHEMA_MEDIA_TYPE
+            )));
 
+        set_error_handler(function() use ($uri) {
+            throw new ResourceNotFoundException('JSON schema not found at ' . $uri);
+        });
         $response = file_get_contents($uri);
+        restore_error_handler();
 
         if (false === $response) {
-            throw new ResourceNotFoundException('JSON schema was not retrieved at ' . $uri);
+            throw new ResourceNotFoundException('JSON schema not found at ' . $uri);
         }
-
         if ($response == ''
             && substr($uri, 0, 7) == 'file://' && substr($uri, -1) == '/'
         ) {
@@ -50,10 +55,10 @@ public function retrieve($uri)
             // Could be a "file://" url or something else - fake up the response
             $this->contentType = null;
         }
-
+        
         return $this->messageBody;
     }
-
+    
     /**
      * @param array $headers HTTP Response Headers
      * @return boolean Whether the Content-Type header was found or not
@@ -65,10 +70,10 @@ private function fetchContentType(array $headers)
                 return true;
             }
         }
-
+        
         return false;
     }
-
+    
     /**
      * @param string $header
      * @return string|null