Change links format

Author: meyerbaptiste

src/JsonApi/Serializer/CollectionNormalizer.php

@@ -70,7 +70,7 @@ public function normalize($object, $format = null, array $context = [])
 
         $resourceClass = $this->resourceClassResolver->getResourceClass($object, $context['resource_class'] ?? null, true);
         $context = $this->initContext($resourceClass, $context);
-        $parsed = IriHelper::parseIri($context['uri'] ?? '/', $this->pageParameterName);
+        $parsed = IriHelper::parseIri($context['request_uri'] ?? '/', $this->pageParameterName);
 
         $currentPage = $lastPage = $itemsPerPage = $pageTotalItems = null;
         if ($paginated = $isPaginator = $object instanceof PartialPaginatorInterface) {
@@ -87,22 +87,22 @@ public function normalize($object, $format = null, array $context = [])
         $data = [
             'data' => [],
             'links' => [
-                'self' => IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $paginated ? $currentPage : null, true),
+                'self' => IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $paginated ? $currentPage : null),
             ],
         ];
 
         if ($paginated) {
             if (null !== $lastPage) {
-                $data['links']['first'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, 1., true);
-                $data['links']['last'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $lastPage, true);
+                $data['links']['first'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, 1.);
+                $data['links']['last'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $lastPage);
             }
 
             if (1. !== $currentPage) {
-                $data['links']['prev'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $currentPage - 1., true);
+                $data['links']['prev'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $currentPage - 1.);
             }
 
             if (null !== $lastPage && $currentPage !== $lastPage || null === $lastPage && $pageTotalItems >= $itemsPerPage) {
-                $data['links']['next'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $currentPage + 1., true);
+                $data['links']['next'] = IriHelper::createIri($parsed['parts'], $parsed['parameters'], $this->pageParameterName, $currentPage + 1.);
             }
         }
 

tests/JsonApi/Serializer/CollectionNormalizerTest.php

@@ -59,7 +59,7 @@ public function testNormalizePaginator()
                 'foo',
                 CollectionNormalizer::FORMAT,
                 [
-                    'uri' => 'http://localhost/foos?page=3',
+                    'request_uri' => '/foos?page=3',
                     'api_sub_level' => true,
                     'resource_class' => 'Foo',
                 ]
@@ -80,11 +80,11 @@ public function testNormalizePaginator()
 
         $expected = [
             'links' => [
-                'self' => 'http://localhost/foos?page=3',
-                'first' => 'http://localhost/foos?page=1',
-                'last' => 'http://localhost/foos?page=7',
-                'prev' => 'http://localhost/foos?page=2',
-                'next' => 'http://localhost/foos?page=4',
+                'self' => '/foos?page=3',
+                'first' => '/foos?page=1',
+                'last' => '/foos?page=7',
+                'prev' => '/foos?page=2',
+                'next' => '/foos?page=4',
             ],
             'data' => [
                 [
@@ -103,7 +103,7 @@ public function testNormalizePaginator()
             ],
         ];
 
-        $this->assertEquals($expected, $normalizer->normalize($paginator, CollectionNormalizer::FORMAT, ['uri' => 'http://localhost/foos?page=3']));
+        $this->assertEquals($expected, $normalizer->normalize($paginator, CollectionNormalizer::FORMAT, ['request_uri' => '/foos?page=3']));
     }
 
     public function testNormalizeArray()
@@ -119,7 +119,7 @@ public function testNormalizeArray()
                 'foo',
                 CollectionNormalizer::FORMAT,
                 [
-                    'uri' => 'http://localhost/foos',
+                    'request_uri' => '/foos',
                     'api_sub_level' => true,
                     'resource_class' => 'Foo',
                 ]
@@ -139,7 +139,7 @@ public function testNormalizeArray()
         $normalizer->setNormalizer($itemNormalizer->reveal());
 
         $expected = [
-            'links' => ['self' => 'http://localhost/foos'],
+            'links' => ['self' => '/foos'],
             'data' => [
                 [
                     'type' => 'Foo',
@@ -153,7 +153,7 @@ public function testNormalizeArray()
             'meta' => ['totalItems' => 1],
         ];
 
-        $this->assertEquals($expected, $normalizer->normalize($data, CollectionNormalizer::FORMAT, ['uri' => 'http://localhost/foos']));
+        $this->assertEquals($expected, $normalizer->normalize($data, CollectionNormalizer::FORMAT, ['request_uri' => '/foos']));
     }
 
     /**
@@ -173,7 +173,7 @@ public function testNormalizeWithoutDataKey()
                 'foo',
                 CollectionNormalizer::FORMAT,
                 [
-                    'uri' => 'http://localhost/foos',
+                    'request_uri' => '/foos',
                     'api_sub_level' => true,
                     'resource_class' => 'Foo',
                 ]
@@ -183,6 +183,6 @@ public function testNormalizeWithoutDataKey()
         $normalizer = new CollectionNormalizer($resourceClassResolverProphecy->reveal(), 'page');
         $normalizer->setNormalizer($itemNormalizer->reveal());
 
-        $normalizer->normalize($data, CollectionNormalizer::FORMAT, ['uri' => 'http://localhost/foos']);
+        $normalizer->normalize($data, CollectionNormalizer::FORMAT, ['request_uri' => '/foos']);
     }
 }