Fix php 8 build (Bump willdurand/negotiation + Update tokens used for namespaces)

Author: GuilhemN

Negotiation/FormatNegotiator.php

@@ -19,11 +19,9 @@
 use Symfony\Component\HttpFoundation\RequestStack;
 
 /**
- * @author Ener-Getick <[email protected]>
- *
- * @final since 2.8
+ * @internal
  */
-class FormatNegotiator extends BaseNegotiator
+class BaseFormatNegotiator extends BaseNegotiator
 {
     private $map = [];
     private $requestStack;
@@ -40,7 +38,10 @@ public function add(RequestMatcherInterface $requestMatcher, array $options = []
         $this->map[] = [$requestMatcher, $options];
     }
 
-    public function getBest($header, array $priorities = [])
+    /**
+     * @internal
+     */
+    protected function doGetBest($header, array $priorities = [])
     {
         $request = $this->getRequest();
         $header = $header ?: $request->headers->get('Accept');
@@ -153,3 +154,31 @@ private function getRequest(): Request
         return $request;
     }
 }
+
+if (method_exists(BaseNegotiator::class, 'getOrderedElements')) {
+    /**
+     * @author Guilhem Niot <[email protected]>
+     *
+     * @final since 2.8
+     */
+    class FormatNegotiator extends BaseFormatNegotiator
+    {
+        public function getBest($header, array $priorities = [], $strict = false)
+        {
+            return $this->doGetBest($header, $priorities);
+        }
+    }
+} else {
+    /**
+     * @author Guilhem Niot <[email protected]>
+     *
+     * @final since 2.8
+     */
+    class FormatNegotiator extends BaseFormatNegotiator
+    {
+        public function getBest($header, array $priorities = [])
+        {
+            return $this->doGetBest($header, $priorities);
+        }
+    }
+}

Routing/Loader/ClassUtils.php

@@ -23,6 +23,13 @@ public static function findClassInFile(string $file): ?string
         $class = false;
         $namespace = false;
         $tokens = token_get_all(file_get_contents($file));
+
+        if (defined('T_NAME_QUALIFIED')) {
+            $namespaceToken = T_NAME_QUALIFIED;
+        } else {
+            $namespaceToken = T_STRING;
+        }
+
         for ($i = 0, $count = count($tokens); $i < $count; ++$i) {
             $token = $tokens[$i];
 
@@ -34,12 +41,12 @@ public static function findClassInFile(string $file): ?string
                 return $namespace.'\\'.$token[1];
             }
 
-            if (true === $namespace && T_STRING === $token[0]) {
+            if (true === $namespace && $namespaceToken === $token[0]) {
                 $namespace = '';
                 do {
                     $namespace .= $token[1];
                     $token = $tokens[++$i];
-                } while ($i < $count && is_array($token) && in_array($token[0], [T_NS_SEPARATOR, T_STRING]));
+                } while ($i < $count && is_array($token) && in_array($token[0], [T_NS_SEPARATOR, $namespaceToken]));
             }
 
             if (T_CLASS === $token[0]) {

composer.json

@@ -42,7 +42,7 @@
         "symfony/routing": "^3.4|^4.3",
         "symfony/security-core": "^3.4|^4.3",
         "doctrine/inflector": "^1.0",
-        "willdurand/negotiation": "^2.0",
+        "willdurand/negotiation": "^2.0|^3.0",
         "willdurand/jsonp-callback-validator": "^1.0"
     },
     "require-dev": {