Merge branch 'update-fractal' into main

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Release Notes for Element API
 
+## Unreleased
+
+- Updated Fractal to 0.20. ([#183](https://github.com/craftcms/element-api/pull/183))
+
 ## 3.0.1.1 - 2022-07-07
 
 ### Fixed

composer.json

@@ -27,7 +27,7 @@
   "prefer-stable": true,
   "require": {
     "craftcms/cms": "^4.0.0-RC3",
-    "league/fractal": "^0.18.0"
+    "league/fractal": "^0.20.1"
   },
   "require-dev": {
     "craftcms/ecs": "dev-main",

src/JsonFeedV1Serializer.php

@@ -17,15 +17,15 @@ class JsonFeedV1Serializer extends ArraySerializer
     /**
      * @inheritdoc
      */
-    public function collection($resourceKey, array $data)
+    public function collection($resourceKey, array $data): array
     {
         return ['items' => $data];
     }
 
     /**
      * @inheritdoc
      */
-    public function meta(array $meta)
+    public function meta(array $meta): array
     {
         return array_merge([
             'version' => 'https://jsonfeed.org/version/1.1',
@@ -38,7 +38,7 @@ public function meta(array $meta)
     /**
      * @inheritdoc
      */
-    public function paginator(PaginatorInterface $paginator)
+    public function paginator(PaginatorInterface $paginator): array
     {
         $currentPage = (int)$paginator->getCurrentPage();
         $lastPage = (int)$paginator->getLastPage();

src/PaginatorAdapter.php

@@ -65,7 +65,7 @@ public function __construct($elementsPerPage, $totalElements, $pageParam)
      *
      * @return int
      */
-    public function getCurrentPage()
+    public function getCurrentPage(): int
     {
         return $this->currentPage;
     }
@@ -75,7 +75,7 @@ public function getCurrentPage()
      *
      * @return int
      */
-    public function getLastPage()
+    public function getLastPage(): int
     {
         return $this->totalPages;
     }
@@ -85,7 +85,7 @@ public function getLastPage()
      *
      * @return int
      */
-    public function getTotal()
+    public function getTotal(): int
     {
         return $this->totalElements;
     }
@@ -95,7 +95,7 @@ public function getTotal()
      *
      * @return int
      */
-    public function getCount()
+    public function getCount(): int
     {
         return $this->count;
     }
@@ -115,7 +115,7 @@ public function setCount($count)
      *
      * @return int
      */
-    public function getPerPage()
+    public function getPerPage(): int
     {
         return $this->elementsPerPage;
     }
@@ -126,7 +126,7 @@ public function getPerPage()
      * @param int $page
      * @return string
      */
-    public function getUrl($page)
+    public function getUrl($page): string
     {
         $request = Craft::$app->getRequest();