Merge branch 'release/3.0.0'

Author: lindyhopchris

.github/workflows/tests.yml

@@ -14,15 +14,12 @@ jobs:
     strategy:
       fail-fast: true
       matrix:
-        php: [7.4, '8.0', 8.1]
-        laravel: [8, 9]
-        exclude:
-          - php: 7.4
-            laravel: 9
+        php: [8.1, 8.2]
+        laravel: [10]
 
     steps:
     - name: Checkout Code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup PHP
       uses: shivammathur/setup-php@v2
@@ -37,7 +34,7 @@ jobs:
       run: composer require "illuminate/database:^${{ matrix.laravel }}" --no-update
 
     - name: Install dependencies
-      uses: nick-invision/retry@v1
+      uses: nick-fields/retry@v2
       with:
         timeout_minutes: 5
         max_attempts: 5

CHANGELOG.md

@@ -3,6 +3,14 @@
 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/).
 
+## [3.0.0] - 2023-02-14
+
+### Changed
+
+- Upgrade to Laravel 10 and set minimum PHP version to 8.1.
+- **BREAKING**: The schema's id field must now always be provided to the `CursorPagination::make()` method and/or
+  constructor.
+
 ## [2.1.0] - 2023-01-24
 
 ### Added

composer.json

@@ -23,16 +23,16 @@
         }
     ],
     "require": {
-        "php": "^7.4|^8.0",
+        "php": "^8.1",
         "ext-json": "*",
-        "illuminate/database": "^8.0|^9.0",
-        "illuminate/pagination": "^8.0|^9.0",
-        "illuminate/support": "^8.0|^9.0",
-        "laravel-json-api/eloquent": "^2.0"
+        "illuminate/database": "^10.0",
+        "illuminate/pagination": "^10.0",
+        "illuminate/support": "^10.0",
+        "laravel-json-api/eloquent": "^3.0"
     },
     "require-dev": {
-        "orchestra/testbench": "^6.23|^7.0",
-        "phpunit/phpunit": "^9.5.10"
+        "orchestra/testbench": "^8.0",
+        "phpunit/phpunit": "^9.5.28"
     },
     "autoload": {
         "psr-4": {
@@ -48,7 +48,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-develop": "2.x-dev"
+            "dev-develop": "3.x-dev"
         }
     },
     "minimum-stability": "stable",

src/Cursor/Cursor.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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 2022 Cloud Creativity Limited
+ * Copyright 2023 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 2022 Cloud Creativity Limited
+ * Copyright 2023 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/CursorPage.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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/CursorPagination.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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.
@@ -31,11 +31,6 @@ class CursorPagination implements Paginator
 {
     use HasPageMeta;
 
-    /**
-     * @var ID|null
-     */
-    private ?ID $id;
-
     /**
      * @var string
      */
@@ -79,22 +74,21 @@ class CursorPagination implements Paginator
     /**
      * Fluent constructor.
      *
-     * @param ID|null $id
+     * @param ID $id
      * @return CursorPagination
      */
-    public static function make(ID $id = null): self
+    public static function make(ID $id): self
     {
         return new static($id);
     }
 
     /**
      * CursorPagination constructor.
      *
-     * @param ID|null $id
+     * @param ID $id
      */
-    public function __construct(ID $id = null)
+    public function __construct(private readonly ID $id)
     {
-        $this->id = $id;
         $this->before = 'before';
         $this->after = 'after';
         $this->limit = 'limit';

tests/app/Video.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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/VideoSchema.php

@@ -1,6 +1,6 @@
 <?php
 /*
- * Copyright 2022 Cloud Creativity Limited
+ * Copyright 2023 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.