Added support for getting default values in Accept headers
This commit is contained in:
parent
9be03d8911
commit
7e31fd94df
@ -91,7 +91,7 @@ class AcceptHeader
|
|||||||
*/
|
*/
|
||||||
public function get($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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -9,6 +9,10 @@ CHANGELOG
|
|||||||
|
|
||||||
* The `getClientSize()` method of the `UploadedFile` class is deprecated. Use `getSize()` instead.
|
* The `getClientSize()` method of the `UploadedFile` class is deprecated. Use `getSize()` instead.
|
||||||
|
|
||||||
|
* 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
|
4.0.0
|
||||||
-----
|
-----
|
||||||
|
|
||||||
@ -26,8 +30,8 @@ CHANGELOG
|
|||||||
method (by not passing `false` as its argument) is not supported anymore and
|
method (by not passing `false` as its argument) is not supported anymore and
|
||||||
throws a `\BadMethodCallException`
|
throws a `\BadMethodCallException`
|
||||||
* the `WriteCheckSessionHandler`, `NativeSessionHandler` and `NativeProxy` classes have been removed
|
* the `WriteCheckSessionHandler`, `NativeSessionHandler` and `NativeProxy` classes have been removed
|
||||||
* setting session save handlers that do not implement `\SessionHandlerInterface` in
|
* setting session save handlers that do not implement `\SessionHandlerInterface` in
|
||||||
`NativeSessionStorage::setSaveHandler()` is not supported anymore and throws a
|
`NativeSessionStorage::setSaveHandler()` is not supported anymore and throws a
|
||||||
`\TypeError`
|
`\TypeError`
|
||||||
|
|
||||||
3.4.0
|
3.4.0
|
||||||
|
@ -100,4 +100,31 @@ class AcceptHeaderTest extends TestCase
|
|||||||
'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', '*')),
|
'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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user