Merge pull request #1893 from akrabat/fix-determine-content-type

Ensure determineContentType() returns a valid result

Slim/Handlers/AbstractHandler.php

@@ -43,7 +43,7 @@ protected function determineContentType(ServerRequestInterface $request)
         $selectedContentTypes = array_intersect(explode(',', $acceptHeader), $this->knownContentTypes);
 
         if (count($selectedContentTypes)) {
-            return $selectedContentTypes[0];
+            return current($selectedContentTypes);
         }
 
         // handle +json and +xml specially

tests/Handlers/AbstractHandlerTest.php

@@ -39,4 +39,32 @@ public function testHalfValidContentType()
 
         $this->assertEquals('text/html', $return);
     }
+
+    /**
+     * Ensure that an acceptable media-type is found in the Accept header even
+     * if it's not the first in the list.
+     */
+    public function testAcceptableMediaTypeIsNotFirstInList()
+    {
+        $request = $this->getMockBuilder('Slim\Http\Request')
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $request->expects($this->any())
+            ->method('getHeaderLine')
+            ->willReturn('text/plain,text/html');
+
+        // provide access to the determineContentType() as it's a protected method
+        $class = new \ReflectionClass(AbstractHandler::class);
+        $method = $class->getMethod('determineContentType');
+        $method->setAccessible(true);
+
+        // use a mock object here as AbstractHandler cannot be directly instantiated
+        $abstractHandler = $this->getMockForAbstractClass(AbstractHandler::class);
+
+        // call determineContentType()
+        $return = $method->invoke($abstractHandler, $request);
+
+        $this->assertEquals('text/html', $return);
+    }
 }