JavaDevl
diff --git a/‎src/Illuminate/Http/Request.php‎
Lines changed: 4 additions & 4 deletions b/‎src/Illuminate/Http/Request.php‎
Lines changed: 4 additions & 4 deletions
diff --git a/‎tests/Http/HttpRequestTest.php‎
Lines changed: 16 additions & 1 deletion b/‎tests/Http/HttpRequestTest.php‎
Lines changed: 16 additions & 1 deletion
@@ -604,14 +604,14 @@ public function accepts($contentTypes)
 
 			foreach ((array) $contentTypes as $type)
 			{
-				$split = explode('/', $type);
-
-				if ($accept === $type || $accept === $split[0].'/*')
+				if ($accept === $type || $accept === strtok('/', $type).'/*')
 				{
 					return true;
 				}
 
-				if (preg_match('/'.$split[0].'\/.+\+'.$split[1].'/', $accept))
+				$split = explode('/', $accept);
+
+				if (preg_match('/'.$split[0].'\/.+\+'.$split[1].'/', $type))
 				{
 					return true;
 				}
 
@@ -450,12 +450,14 @@ public function testFormatReturnsAcceptsJson()
 		$request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'application/json']);
 		$this->assertEquals('json', $request->format());
 		$this->assertTrue($request->accepts('application/json'));
+		$this->assertTrue($request->accepts('application/baz+json'));
 		$this->assertTrue($request->acceptsJson());
 		$this->assertFalse($request->acceptsHtml());
 
 		$request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'application/foo+json']);
 		$this->assertTrue($request->accepts('application/foo+json'));
-		$this->assertTrue($request->accepts('application/json'));
+		$this->assertFalse($request->accepts('application/bar+json'));
+		$this->assertFalse($request->accepts('application/json'));
 
 		$request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'application/*']);
 		$this->assertTrue($request->accepts('application/xml'));
@@ -477,13 +479,26 @@ public function testFormatReturnsAcceptsHtml()
 	}
 
 
+	public function testFormatReturnsAcceptsAll()
+	{
+		$request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => '*/*']);
+		$this->assertEquals('html', $request->format());
+		$this->assertTrue($request->accepts('text/html'));
+		$this->assertTrue($request->accepts('foo/bar'));
+		$this->assertTrue($request->accepts('application/baz+xml'));
+		$this->assertTrue($request->acceptsHtml());
+		$this->assertTrue($request->acceptsJson());
+	}
+
+
 	public function testFormatReturnsAcceptsMultiple()
 	{
 		$request = Request::create('/', 'GET', [], [], [], ['HTTP_ACCEPT' => 'application/json,text/*']);
 		$this->assertTrue($request->accepts(['text/html', 'application/json']));
 		$this->assertTrue($request->accepts('text/html'));
 		$this->assertTrue($request->accepts('text/foo'));
 		$this->assertTrue($request->accepts('application/json'));
+		$this->assertTrue($request->accepts('application/baz+json'));
 	}
Original file line number	Diff line number	Diff line change
@@ -604,14 +604,14 @@ public function accepts($contentTypes)
604	604
605	605	foreach ((array) $contentTypes as $type)
606	606	{
607		- $split = explode('/', $type);
608		-
609		- if ($accept === $type \|\| $accept === $split[0].'/*')
	607	+ if ($accept === $type \|\| $accept === strtok('/', $type).'/*')
610	608	{
611	609	return true;
612	610	}
613	611
614		- if (preg_match('/'.$split[0].'\/.+\+'.$split[1].'/', $accept))
	612	+ $split = explode('/', $accept);
	613	+
	614	+ if (preg_match('/'.$split[0].'\/.+\+'.$split[1].'/', $type))
615	615	{
616	616	return true;
617	617	}