diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e020be..abb1a58 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/composer.json b/composer.json index d6e5a9c..dce219c 100644 --- a/composer.json +++ b/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", diff --git a/composer.lock b/composer.lock index 0a7d20a..d208f5b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "553f3d22886acd3bf5effdc3056868b8", + "content-hash": "393695a3b1d1e9e19ee64298aa11306f", "packages": [ { "name": "cebe/markdown", @@ -2090,28 +2090,30 @@ }, { "name": "league/fractal", - "version": "0.18.0", + "version": "0.20.1", "source": { "type": "git", "url": "https://github.com/thephpleague/fractal.git", - "reference": "4e553dae1a9402adbe11c81430a64675dc97b4fc" + "reference": "8b9d39b67624db9195c06f9c1ffd0355151eaf62" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/fractal/zipball/4e553dae1a9402adbe11c81430a64675dc97b4fc", - "reference": "4e553dae1a9402adbe11c81430a64675dc97b4fc", + "url": "https://api.github.com/repos/thephpleague/fractal/zipball/8b9d39b67624db9195c06f9c1ffd0355151eaf62", + "reference": "8b9d39b67624db9195c06f9c1ffd0355151eaf62", "shasum": "" }, "require": { - "php": ">=5.4" + "php": ">=7.4" }, "require-dev": { "doctrine/orm": "^2.5", "illuminate/contracts": "~5.0", - "mockery/mockery": "~0.9", + "mockery/mockery": "^1.3", "pagerfanta/pagerfanta": "~1.0.0", - "phpunit/phpunit": "^4.8.35 || ^7.5", - "squizlabs/php_codesniffer": "~1.5", + "phpstan/phpstan": "^1.4", + "phpunit/phpunit": "^9.5", + "squizlabs/php_codesniffer": "~3.4", + "vimeo/psalm": "^4.22", "zendframework/zend-paginator": "~2.3" }, "suggest": { @@ -2122,7 +2124,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "0.13-dev" + "dev-master": "0.20.x-dev" } }, "autoload": { @@ -2152,9 +2154,9 @@ ], "support": { "issues": "https://github.com/thephpleague/fractal/issues", - "source": "https://github.com/thephpleague/fractal/tree/master" + "source": "https://github.com/thephpleague/fractal/tree/0.20.1" }, - "time": "2019-05-10T02:16:43+00:00" + "time": "2022-04-11T12:47:17+00:00" }, { "name": "mikehaertl/php-shellcommand", diff --git a/src/JsonFeedV1Serializer.php b/src/JsonFeedV1Serializer.php index 746c395..f48072e 100644 --- a/src/JsonFeedV1Serializer.php +++ b/src/JsonFeedV1Serializer.php @@ -17,7 +17,7 @@ class JsonFeedV1Serializer extends ArraySerializer /** * @inheritdoc */ - public function collection($resourceKey, array $data) + public function collection($resourceKey, array $data): array { return ['items' => $data]; } @@ -25,7 +25,7 @@ public function collection($resourceKey, array $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(); diff --git a/src/PaginatorAdapter.php b/src/PaginatorAdapter.php index 3533250..236a7b4 100644 --- a/src/PaginatorAdapter.php +++ b/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();