From 6856178c072c23ac6a909865002ae09bf4867ff3 Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Fri, 29 Nov 2024 16:55:26 +0000 Subject: [PATCH 1/5] build: update branch alias for 4.x --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 16e6df1..cad7a51 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ }, "extra": { "branch-alias": { - "dev-develop": "4.x-dev" + "dev-4.x": "4.x-dev" } }, "minimum-stability": "stable", From 692ed3b789ce0e79a035adb227d7c27765345ad4 Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Fri, 29 Nov 2024 16:57:32 +0000 Subject: [PATCH 2/5] fix: remove more php 8.4 deprecation notices --- CHANGELOG.md | 4 ++++ src/Core/Document/ErrorSource.php | 3 +-- src/Core/JsonApiService.php | 2 +- src/Core/Schema/Schema.php | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2f187fd..3d01d42 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,10 @@ All notable changes to this project will be documented in this file. This projec ## Unreleased +### Fixed + +- Remove more PHP 8.4 deprecation notices. + ## [4.3.1] - 2024-11-29 ### Fixed diff --git a/src/Core/Document/ErrorSource.php b/src/Core/Document/ErrorSource.php index 95fed0a..0b84555 100644 --- a/src/Core/Document/ErrorSource.php +++ b/src/Core/Document/ErrorSource.php @@ -19,7 +19,6 @@ class ErrorSource implements Serializable { - use Concerns\Serializable; /** @@ -71,7 +70,7 @@ public static function fromArray(array $source): self * @param string|null $pointer * @param string|null $parameter */ - public function __construct(string $pointer = null, string $parameter = null) + public function __construct(?string $pointer = null, ?string $parameter = null) { $this->pointer = $pointer; $this->parameter = $parameter; diff --git a/src/Core/JsonApiService.php b/src/Core/JsonApiService.php index ee89b5b..bf1a8cc 100644 --- a/src/Core/JsonApiService.php +++ b/src/Core/JsonApiService.php @@ -63,7 +63,7 @@ public function route(): Route * @param string|null $name * @return Server */ - public function server(string $name = null): Server + public function server(?string $name = null): Server { if (is_string($name)) { return $this->servers()->server($name); diff --git a/src/Core/Schema/Schema.php b/src/Core/Schema/Schema.php index 3abc358..467c6f7 100644 --- a/src/Core/Schema/Schema.php +++ b/src/Core/Schema/Schema.php @@ -223,7 +223,7 @@ public function uriType(): string /** * @inheritDoc */ - public function url($extra = [], bool $secure = null): string + public function url($extra = [], ?bool $secure = null): string { $extra = Arr::wrap($extra); From 3b73db2666d377ce95e15d99210cbcbcd6902841 Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sat, 30 Nov 2024 16:21:53 +0000 Subject: [PATCH 3/5] build: add 4.x branch to automated tests --- .github/workflows/tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index c1fed25..bed8493 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -2,9 +2,9 @@ name: Tests on: push: - branches: [ main, develop ] + branches: [ main, develop, 4.x ] pull_request: - branches: [ main, develop ] + branches: [ main, develop, 4.x ] jobs: build: From 9227259244ddc61cffd85e33102a91a5b25d7d70 Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sat, 30 Nov 2024 16:23:18 +0000 Subject: [PATCH 4/5] docs: update changelog and bump version --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d01d42..3587901 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ All notable changes to this project will be documented in this file. This projec ## Unreleased +## [4.3.2] - 2024-11-30 + ### Fixed - Remove more PHP 8.4 deprecation notices. From 342a7aa637b3c41da49f40a71e2caf29eef008a0 Mon Sep 17 00:00:00 2001 From: Christopher Gammie Date: Sat, 30 Nov 2024 16:31:29 +0000 Subject: [PATCH 5/5] docs: update changelog and bump version --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index a1f8848..7adb0ed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. This projec ## Unreleased +## [5.0.1] - 2024-11-30 + +### Fixed + +- Removed more PHP 8.4 deprecation notices. + ## [5.0.0] - 2024-11-29 ### Added