summaryrefslogtreecommitdiff
path: root/vendor/symfony/http-foundation/AcceptHeader.php
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@webtrees.net>2018-12-01 17:57:53 +0000
committerGreg Roach <fisharebest@webtrees.net>2018-12-01 18:56:03 +0000
commite70f282ef978b175c5529f439f3b572c5b8531a2 (patch)
treecc022e973d89a5507dcbb35561ef93852c551dff /vendor/symfony/http-foundation/AcceptHeader.php
parentc16be598f1a8d42127bd64c4878bd92297e18f3b (diff)
downloadwebtrees-e70f282ef978b175c5529f439f3b572c5b8531a2.tar.gz
webtrees-e70f282ef978b175c5529f439f3b572c5b8531a2.tar.bz2
webtrees-e70f282ef978b175c5529f439f3b572c5b8531a2.zip
Update minimum version of PHP to 7.1
Diffstat (limited to 'vendor/symfony/http-foundation/AcceptHeader.php')
-rw-r--r--vendor/symfony/http-foundation/AcceptHeader.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/vendor/symfony/http-foundation/AcceptHeader.php b/vendor/symfony/http-foundation/AcceptHeader.php
index d1740266b7..c702371f81 100644
--- a/vendor/symfony/http-foundation/AcceptHeader.php
+++ b/vendor/symfony/http-foundation/AcceptHeader.php
@@ -52,12 +52,17 @@ class AcceptHeader
{
$index = 0;
- return new self(array_map(function ($itemValue) use (&$index) {
- $item = AcceptHeaderItem::fromString($itemValue);
+ $parts = HeaderUtils::split((string) $headerValue, ',;=');
+
+ return new self(array_map(function ($subParts) use (&$index) {
+ $part = array_shift($subParts);
+ $attributes = HeaderUtils::combine($subParts);
+
+ $item = new AcceptHeaderItem($part[0], $attributes);
$item->setIndex($index++);
return $item;
- }, preg_split('/\s*(?:,*("[^"]+"),*|,*(\'[^\']+\'),*|,+)\s*/', $headerValue, 0, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE)));
+ }, $parts));
}
/**
@@ -91,7 +96,7 @@ class AcceptHeader
*/
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;
}
/**