Upgrade framework

vendor/symfony/http-foundation/AcceptHeader.php

@@ -11,6 +11,9 @@
 
 namespace Symfony\Component\HttpFoundation;
 
+// Help opcache.preload discover always-needed symbols
+class_exists(AcceptHeaderItem::class);
+
 /**
  * Represents an Accept-* header.
  *
@@ -24,16 +27,11 @@ class AcceptHeader
     /**
      * @var AcceptHeaderItem[]
      */
-    private $items = array();
+    private array $items = [];
+
+    private bool $sorted = true;
 
     /**
-     * @var bool
-     */
-    private $sorted = true;
-
-    /**
-     * Constructor.
-     *
      * @param AcceptHeaderItem[] $items
      */
     public function __construct(array $items)
@@ -45,65 +43,54 @@ class AcceptHeader
 
     /**
      * Builds an AcceptHeader instance from a string.
-     *
-     * @param string $headerValue
-     *
-     * @return self
      */
-    public static function fromString($headerValue)
+    public static function fromString(?string $headerValue): self
     {
         $index = 0;
 
-        return new self(array_map(function ($itemValue) use (&$index) {
-            $item = AcceptHeaderItem::fromString($itemValue);
+        $parts = HeaderUtils::split($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));
     }
 
     /**
      * Returns header value's string representation.
-     *
-     * @return string
      */
-    public function __toString()
+    public function __toString(): string
     {
         return implode(',', $this->items);
     }
 
     /**
      * Tests if header has given value.
-     *
-     * @param string $value
-     *
-     * @return bool
      */
-    public function has($value)
+    public function has(string $value): bool
     {
         return isset($this->items[$value]);
     }
 
     /**
      * Returns given value's item, if exists.
-     *
-     * @param string $value
-     *
-     * @return AcceptHeaderItem|null
      */
-    public function get($value)
+    public function get(string $value): ?AcceptHeaderItem
     {
-        return isset($this->items[$value]) ? $this->items[$value] : null;
+        return $this->items[$value] ?? $this->items[explode('/', $value)[0].'/*'] ?? $this->items['*/*'] ?? $this->items['*'] ?? null;
     }
 
     /**
      * Adds an item.
      *
-     * @param AcceptHeaderItem $item
-     *
      * @return $this
      */
-    public function add(AcceptHeaderItem $item)
+    public function add(AcceptHeaderItem $item): static
     {
         $this->items[$item->getValue()] = $item;
         $this->sorted = false;
@@ -116,7 +103,7 @@ class AcceptHeader
      *
      * @return AcceptHeaderItem[]
      */
-    public function all()
+    public function all(): array
     {
         $this->sort();
 
@@ -125,12 +112,8 @@ class AcceptHeader
 
     /**
      * Filters items on their value using given regex.
-     *
-     * @param string $pattern
-     *
-     * @return self
      */
-    public function filter($pattern)
+    public function filter(string $pattern): self
     {
         return new self(array_filter($this->items, function (AcceptHeaderItem $item) use ($pattern) {
             return preg_match($pattern, $item->getValue());
@@ -139,10 +122,8 @@ class AcceptHeader
 
     /**
      * Returns first item.
-     *
-     * @return AcceptHeaderItem|null
      */
-    public function first()
+    public function first(): ?AcceptHeaderItem
     {
         $this->sort();
 
@@ -152,10 +133,10 @@ class AcceptHeader
     /**
      * Sorts items by descending quality.
      */
-    private function sort()
+    private function sort(): void
     {
         if (!$this->sorted) {
-            uasort($this->items, function ($a, $b) {
+            uasort($this->items, function (AcceptHeaderItem $a, AcceptHeaderItem $b) {
                 $qA = $a->getQuality();
                 $qB = $b->getQuality();