Merge branch 'hotfix/2615'

Introduce AcceptableViewModelSelector, and remove Accept matching from
JsonStrategy and FeedStrategy

Close zendframework/zendframework#2615
Close zendframework/zendframework#2410

Author: weierophinney

src/Header/AbstractAccept.php

@@ -291,7 +291,7 @@ protected function hasType($matchAgainst)
      * Match a media string against this header
      *
      * @param array|string $matchAgainst
-     * @return array|boolean The matched value or false
+     * @return AcceptFieldValuePart|boolean The matched value or false
      */
     public function match($matchAgainst)
     {
@@ -302,8 +302,10 @@ public function match($matchAgainst)
         foreach ($this->getPrioritized() as $left) {
             foreach ($matchAgainst as $right) {
                 if ($right->type == '*' || $left->type == '*') {
-                    if ($res = $this->matchAcceptParams($left, $right)) {
-                        return $res;
+                    if ($this->matchAcceptParams($left, $right)) {
+                        $left->setMatchedAgainst($right);
+
+                        return $left;
                     }
                 }
 
@@ -313,8 +315,10 @@ public function match($matchAgainst)
                             ($left->format == $right->format ||
                                     $right->format == '*' || $left->format == '*')))
                     {
-                        if ($res = $this->matchAcceptParams($left, $right)) {
-                            return $res;
+                        if ($this->matchAcceptParams($left, $right)) {
+                            $left->setMatchedAgainst($right);
+
+                            return $left;
                         }
                     }
                 }

src/Header/Accept/FieldValuePart/AbstractFieldValuePart.php

@@ -27,6 +27,12 @@ abstract class AbstractFieldValuePart
      */
     private $internalValues;
 
+    /**
+     * A Field Value Part this Field Value Part matched against.
+     * @var AbstractFieldValuePart
+     */
+    protected $matchedAgainst;
+
     /**
      *
      * @param object $internalValues
@@ -36,6 +42,28 @@ public function __construct($internalValues)
         $this->internalValues = $internalValues;
     }
 
+    /**
+     * Set a Field Value Part this Field Value Part matched against.
+     *
+     * @param AbstractFieldValuePart $matchedPart
+     * @return AbstractFieldValuePart provides fluent interface
+     */
+    public function setMatchedAgainst(AbstractFieldValuePart $matchedAgainst)
+    {
+        $this->matchedAgainst = $matchedAgainst;
+        return $this;
+    }
+
+    /**
+     * Get a Field Value Part this Field Value Part matched against.
+     *
+     * @return AbstractFieldValuePart|null
+     */
+    public function getMatchedAgainst()
+    {
+        return $this->matchedAgainst;
+    }
+
     /**
      *
      * @return object

test/Header/AcceptTest.php

@@ -193,6 +193,38 @@ public function testParsingAndAssemblingQuotedStrings()
     }
 
 
+    public function testMatchReturnsMatchedAgainstObject()
+    {
+        $acceptStr = 'Accept: text/html;q=1; version=23; level=5, text/json;level=1,' .
+                'text/xml;level=2;q=0.4';
+        $acceptHeader = Accept::fromString($acceptStr);
+
+        $res = $acceptHeader->match('text/html; _randomValue=foobar');
+        $this->assertInstanceOf(
+                'Zend\Http\Header\Accept\FieldValuePart\AbstractFieldValuePart',
+                $res->getMatchedAgainst()
+        );
+        $this->assertEquals(
+                'foobar',
+                $res->getMatchedAgainst()->getParams()->_randomValue
+        );
+
+        $acceptStr = 'Accept: */*; ';
+        $acceptHeader = Accept::fromString($acceptStr);
+
+        $res = $acceptHeader->match('text/html; _foo=bar');
+        $this->assertInstanceOf(
+                'Zend\Http\Header\Accept\FieldValuePart\AbstractFieldValuePart',
+                $res->getMatchedAgainst()
+        );
+
+        $this->assertEquals(
+                'bar',
+                $res->getMatchedAgainst()->getParams()->_foo
+        );
+    }
+
+
     public function testVersioning()
     {
         $acceptStr = 'Accept: text/html;q=1; version=23; level=5, text/json;level=1,' .