Tweaks with updated PSR spec

Author: mbabker

UPGRADE-2.0.md

@@ -9,6 +9,5 @@ The below guide will assist in upgrading from the 1.x versions to 2.0.
 
 ## General Changes
 
-- Uses 1.1 or later of the PSR-13 specification, which requires PHP 8.0
-- The `$attributes` parameter of the PushManager class' methods no longer accepts mixed values, per the PSR these must be strings
+- Uses ^1.1.1 or ^2.0.1 of the PSR-13 specification, which requires PHP 8.0
 - The `PushManager::link()` method's `$rel` param now supports a string or array of strings

composer.json

@@ -5,7 +5,7 @@
     "keywords": ["laravel", "server-push"],
     "require": {
         "php": "^8.0",
-        "fig/link-util": "dev-master",
+        "fig/link-util": "^1.2",
         "illuminate/http": "^8.12",
         "illuminate/support": "^8.12",
         "psr/link": "^1.1.1 || ^2.0.1"

tests/Http/HeaderSerializerTest.php

@@ -20,8 +20,6 @@ protected function setUp(): void
 
     public function testSerialize()
     {
-        $this->markTestSkipped('Broken on newer PSR releases');
-
         $links = [
             new Link('prerender', '/1'),
             (new Link('dns-prefetch', '/2'))->withAttribute('pr', 0.7),

tests/Http/Middleware/ServerPushTest.php

@@ -57,7 +57,7 @@ public function testALinkHeaderIsAddedForPushedResources(): void
         $next = function (): Response {
             $this->pushManager->preload('/css/app.css', ['nopush' => false]);
             $this->pushManager->preload('/css/style.css', ['nopush' => true]);
-            // $this->pushManager->link('/blog/page/2', 'next', ['hreflang' => ['fr', 'de']]);
+            $this->pushManager->link('/blog/page/2', 'next', ['hreflang' => ['fr', 'de']]);
 
             return new Response();
         };
@@ -69,8 +69,7 @@ public function testALinkHeaderIsAddedForPushedResources(): void
 
         $this->assertTrue($response->headers->has('Link'));
         $this->assertSame(
-            //'</css/app.css>; rel="preload",</css/style.css>; rel="preload"; nopush,</blog/page/2>; rel="next"; hreflang="fr"; hreflang="de"',
-            '</css/app.css>; rel="preload",</css/style.css>; rel="preload"; nopush',
+            '</css/app.css>; rel="preload",</css/style.css>; rel="preload"; nopush,</blog/page/2>; rel="next"; hreflang="fr"; hreflang="de"',
             $response->headers->get('Link')
         );
     }