Merge pull request #60 from lode/fix-request-with-partial-server-context

lode · web-flow · commit e802d27c0224 · 2021-04-07T15:39:18.000+02:00
diff --git a/src/helpers/RequestParser.php b/src/helpers/RequestParser.php
@@ -46,12 +46,15 @@ public function __construct($selfLink='', array $queryParameters=[], array $docu
 	 * @return self
 	 */
 	public static function fromSuperglobals() {
-		$selfLink = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+		$selfLink = '';
+		if (isset($_SERVER['REQUEST_SCHEME']) && isset($_SERVER['HTTP_HOST']) && isset($_SERVER['REQUEST_URI'])) {
+			$selfLink = $_SERVER['REQUEST_SCHEME'].'://'.$_SERVER['HTTP_HOST'].$_SERVER['REQUEST_URI'];
+		}
 		
 		$queryParameters = $_GET;
 		
 		$document = $_POST;
-		if ($document === []) {
+		if ($document === [] && isset($_SERVER['CONTENT_TYPE'])) {
 			$documentIsJsonapi = (strpos($_SERVER['CONTENT_TYPE'], Document::CONTENT_TYPE_OFFICIAL) !== false);
 			$documentIsJson    = (strpos($_SERVER['CONTENT_TYPE'], Document::CONTENT_TYPE_DEBUG)    !== false);
 			
diff --git a/tests/helpers/RequestParserTest.php b/tests/helpers/RequestParserTest.php
@@ -90,6 +90,20 @@ public function testFromSuperglobals_WithPhpInputStream() {
 		$this->assertSame([], $requestParser->getDocument());
 	}
 	
+	public function testFromSuperglobals_WithoutServerContext() {
+		unset($_SERVER['REQUEST_SCHEME']);
+		unset($_SERVER['HTTP_HOST']);
+		unset($_SERVER['REQUEST_URI']);
+		unset($_SERVER['CONTENT_TYPE']);
+		
+		$_GET    = [];
+		$_POST   = [];
+		
+		$requestParser = RequestParser::fromSuperglobals();
+		
+		$this->assertSame([], $requestParser->getDocument());
+	}
+	
 	public function testFromPsrRequest_WithRequestInterface() {
 		$queryParameters = [
 			'include' => 'ship,ship.wing',
