Merge branch 'release/2.0.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -10,12 +10,15 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
-    
+
     strategy:
       fail-fast: true
       matrix:
-        php: ['7.4', '8.0']
-        laravel: ['^8.0']
+        php: [7.4, '8.0', 8.1]
+        laravel: [8, 9]
+        exclude:
+          - php: 7.4
+            laravel: 9
 
     steps:
     - name: Checkout Code
@@ -28,16 +31,17 @@ jobs:
         extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, gd
         tools: composer:v2
         coverage: none
+        ini-values: error_reporting=E_ALL
 
     - name: Set Laravel Version
-      run: composer require "laravel/framework:${{ matrix.laravel }}" --no-update -n
+      run: composer require "illuminate/database:^${{ matrix.laravel }}" --no-update
 
     - name: Install dependencies
       uses: nick-invision/retry@v1
       with:
         timeout_minutes: 5
         max_attempts: 5
-        command: composer install --no-suggest --prefer-dist -n -o
-        
+        command: composer update --prefer-dist --no-interaction --no-progress
+
     - name: Execute tests
       run: vendor/bin/phpunit

CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file. This project adheres to
 [Semantic Versioning](http://semver.org/) and [this changelog format](http://keepachangelog.com/).
 
+## [2.0.0] - 2022-02-09
+
+### Added
+
+- Package now supports Laravel 9.
+- Package now supports PHP 8.1.
+- Upgraded to v2 of the `laravel-json-api/eloquent` dependency.
+
+### Changed
+
+- Added return types to internal methods to remove deprecation messages in PHP 8.1.
+
 ## [1.0.0] - 2021-07-21
 
 Initial release. This brought in the code from `laravel-json-api/eloquent:1.0.0-beta.6`, with the only changes being new

composer.json

@@ -25,14 +25,14 @@
     "require": {
         "php": "^7.4|^8.0",
         "ext-json": "*",
-        "illuminate/database": "^8.0",
-        "illuminate/pagination": "^8.0",
-        "illuminate/support": "^8.0",
-        "laravel-json-api/eloquent": "^1.0.0"
+        "illuminate/database": "^8.0|^9.0",
+        "illuminate/pagination": "^8.0|^9.0",
+        "illuminate/support": "^8.0|^9.0",
+        "laravel-json-api/eloquent": "^2.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.9",
-        "phpunit/phpunit": "^9.5"
+        "orchestra/testbench": "^6.23|^7.0",
+        "phpunit/phpunit": "^9.5.10"
     },
     "autoload": {
         "psr-4": {
@@ -48,7 +48,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "1.x-dev"
+            "dev-develop": "2.x-dev"
         }
     },
     "minimum-stability": "stable",

phpunit.xml

@@ -8,6 +8,7 @@
          convertErrorsToExceptions="true"
          convertNoticesToExceptions="true"
          convertWarningsToExceptions="true"
+         convertDeprecationsToExceptions="true"
          processIsolation="false"
          stopOnError="false"
          stopOnFailure="false"
@@ -31,6 +32,7 @@
         </testsuite>
     </testsuites>
     <php>
+        <ini name="error_reporting" value="E_ALL"/>
         <env name="DB_CONNECTION" value="testing"/>
     </php>
 </phpunit>

src/Cursor/Cursor.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Cursor/CursorBuilder.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

src/Cursor/CursorPaginator.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 use Illuminate\Pagination\Paginator;
 use IteratorAggregate;
 use LogicException;
+use Traversable;
 
 class CursorPaginator implements IteratorAggregate, Countable
 {
@@ -154,15 +155,15 @@ public function getTo(): ?string
     /**
      * @inheritDoc
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         yield from $this->items;
     }
 
     /**
      * @inheritDoc
      */
-    public function count()
+    public function count(): int
     {
         return $this->items->count();
     }

src/CursorPage.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 use LaravelJsonApi\Core\Document\Link;
 use LaravelJsonApi\Core\Pagination\AbstractPage;
 use LaravelJsonApi\CursorPagination\Cursor\CursorPaginator;
+use Traversable;
 
 class CursorPage extends AbstractPage
 {
@@ -179,15 +180,15 @@ public function url(array $page): string
     /**
      * @inheritDoc
      */
-    public function getIterator()
+    public function getIterator(): Traversable
     {
         yield from $this->paginator;
     }
 
     /**
      * @inheritDoc
      */
-    public function count()
+    public function count(): int
     {
         return $this->paginator->count();
     }

src/CursorPagination.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

tests/app/Video.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2021 Cloud Creativity Limited
+ * Copyright 2022 Cloud Creativity Limited
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.