Merge pull request #262 from dmitry-varennikov-eventbase/uri-retriever-error-handler

Do not override error handler

Author: bighappyface

src/JsonSchema/Uri/Retrievers/FileGetContents.php

@@ -14,34 +14,29 @@
 
 /**
  * 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)
     {
-        $context = stream_context_create(array(
-            'http' => array(
-                'method' => 'GET',
-                'header' => "Accept: " . Validator::SCHEMA_MEDIA_TYPE
-            )));
-
-        set_error_handler(function() use ($uri) {
+        if (!file_exists($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 not found at ' . $uri);
+            throw new ResourceNotFoundException('JSON schema was not retrieved at ' . $uri);
         }
+
         if ($response == ''
             && substr($uri, 0, 7) == 'file://' && substr($uri, -1) == '/'
         ) {
@@ -55,10 +50,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
@@ -70,10 +65,10 @@ private function fetchContentType(array $headers)
                 return true;
             }
         }
-        
+
         return false;
     }
-    
+
     /**
      * @param string $header
      * @return string|null