feature #26036 Added support for getting default values in Accept headers (javiereguiluz)

fabpot · fabpot · commit c557327d54a2 · 2018-02-07T05:37:38.000+01:00
This PR was squashed before being merged into the 4.1-dev branch (closes #26036). Discussion ---------- Added support for getting default values in Accept headers | Q | A | ------------- | --- | Branch? | master | Bug fix? | no | New feature? | yes | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #25877 | License | MIT | Doc PR | - Commits ------- 7e31fd9 Added support for getting default values in Accept headers
diff --git a/src/Symfony/Component/HttpFoundation/AcceptHeader.php b/src/Symfony/Component/HttpFoundation/AcceptHeader.php
@@ -91,7 +91,7 @@ public function has($value)
      */
     public function get($value)
     {
-        return isset($this->items[$value]) ? $this->items[$value] : null;
+        return $this->items[$value] ?? $this->items[explode('/', $value)[0].'/*'] ?? $this->items['*/*'] ?? $this->items['*'] ?? null;
     }
 
     /**
diff --git a/src/Symfony/Component/HttpFoundation/CHANGELOG.md b/src/Symfony/Component/HttpFoundation/CHANGELOG.md
@@ -10,6 +10,10 @@ CHANGELOG
  * The `getClientSize()` method of the `UploadedFile` class is deprecated. Use `getSize()` instead.
  * added `RedisSessionHandler` to use Redis as a session storage
 
+* The `get()` method of the `AcceptHeader` class now takes into account the
+  `*` and `*/*` default values (if they are present in the Accept HTTP header)
+  when looking for items.
+
 4.0.0
 -----
 
@@ -27,8 +31,8 @@ CHANGELOG
    method (by not passing `false` as its argument) is not supported anymore and
    throws a `\BadMethodCallException`
  * the `WriteCheckSessionHandler`, `NativeSessionHandler` and `NativeProxy` classes have been removed
- * setting session save handlers that do not implement `\SessionHandlerInterface` in 
-   `NativeSessionStorage::setSaveHandler()` is not supported anymore and throws a 
+ * setting session save handlers that do not implement `\SessionHandlerInterface` in
+   `NativeSessionStorage::setSaveHandler()` is not supported anymore and throws a
    `\TypeError`
 
 3.4.0
diff --git a/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php b/src/Symfony/Component/HttpFoundation/Tests/AcceptHeaderTest.php
@@ -100,4 +100,31 @@ public function provideSortingData()
             'order matters when q is equal2' => array('*;q=0.3,utf-8;q=0.7,ISO-8859-1;q=0.7',  array('utf-8', 'ISO-8859-1', '*')),
         );
     }
+
+    /**
+     * @dataProvider provideDefaultValueData
+     */
+    public function testDefaultValue($acceptHeader, $value, $expectedQuality)
+    {
+        $header = AcceptHeader::fromString($acceptHeader);
+        $this->assertSame($expectedQuality, $header->get($value)->getQuality());
+    }
+
+    public function provideDefaultValueData()
+    {
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, *;q=0.3', 'text/xml', 0.3);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/xml', 0.3);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/html', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', 'text/plain', 0.5);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*;q=0.3', '*', 0.3);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', '*', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/xml', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/x-dvi;q=0.8, */*', 'text/*', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/*', 0.8);
+        yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/html', 1.0);
+        yield array('text/plain;q=0.5, text/html, text/*;q=0.8, */*', 'text/x-dvi', 0.8);
+        yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', '*', 0.3);
+        yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'utf-8', 0.7);
+        yield array('*;q=0.3, ISO-8859-1;q=0.7, utf-8;q=0.7', 'SHIFT_JIS', 0.3);
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,7 @@ public function has($value)`
`91`	`91`	`*/`
`92`	`92`	`public function get($value)`
`93`	`93`	`{`
`94`		`- return isset($this->items[$value]) ? $this->items[$value] : null;`
	`94`	`+ return $this->items[$value] ?? $this->items[explode('/', $value)[0].'/'] ?? $this->items['/'] ?? $this->items[''] ?? null;`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`