From 325c799cf0e2448bfe5eb108ef2f73c8326bc366 Mon Sep 17 00:00:00 2001 From: Gediminas Kersys Date: Thu, 18 Apr 2024 11:34:55 +0300 Subject: [PATCH 1/2] Add PHP 8.3 support - Adds PHP 8.3 support - Drops PHP 8.0 support Signed-off-by: Gediminas Kersys --- composer.json | 31 +++++++++++++++++-------------- composer.lock | 7 +++++-- 2 files changed, 22 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index a31a117..34a556d 100644 --- a/composer.json +++ b/composer.json @@ -22,6 +22,9 @@ "sort-packages": true, "allow-plugins": { "dealerdirect/phpcodesniffer-composer-installer": true + }, + "platform": { + "php": "8.1.99" } }, "extra": { @@ -30,26 +33,26 @@ } }, "require": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0", "laminas-api-tools/api-tools-api-problem": "^1.6.0", "laminas-api-tools/api-tools-content-negotiation": "^1.8.0", - "laminas-api-tools/api-tools-hal": "^1.7", + "laminas-api-tools/api-tools-hal": "^1.8", "laminas-api-tools/api-tools-mvc-auth": "^1.8", - "laminas/laminas-eventmanager": "^3.2", - "laminas/laminas-mvc": "^2.7.14 || ^3.0.2", - "laminas/laminas-paginator": "^2.7", - "laminas/laminas-stdlib": "^2.7.8 || ^3.3" + "laminas/laminas-eventmanager": "^3.4", + "laminas/laminas-mvc": "^2.7.14 || ^3.3.0", + "laminas/laminas-paginator": "^2.11", + "laminas/laminas-stdlib": "^2.7.8 || ^3.6.1" }, "require-dev": { "laminas/laminas-coding-standard": "~2.3.0", - "laminas/laminas-escaper": "^2.5.2", - "laminas/laminas-http": "^2.5.4", - "laminas/laminas-inputfilter": "^2.7.2", - "laminas/laminas-servicemanager": "^3.11", - "laminas/laminas-uri": "^2.5.2", - "laminas/laminas-validator": "^2.8.1", - "laminas/laminas-view": "^2.11.3", - "phpspec/prophecy-phpunit": "^2.0", + "laminas/laminas-escaper": "^2.9.0", + "laminas/laminas-http": "^2.15.1", + "laminas/laminas-inputfilter": "^2.13.0", + "laminas/laminas-servicemanager": "^3.11.1", + "laminas/laminas-uri": "^2.9.1", + "laminas/laminas-validator": "^2.15.0", + "laminas/laminas-view": "^2.14.0", + "phpspec/prophecy-phpunit": "^2.0.1", "phpunit/phpunit": "^9.5.10", "psalm/plugin-phpunit": "^0.16.1", "vimeo/psalm": "^4.7" diff --git a/composer.lock b/composer.lock index 4f654e9..e81908e 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": "9a943fe10663c4390d631539b9ff71a9", + "content-hash": "06885053d0dda149c2833d3c82efbf0f", "packages": [ { "name": "brick/varexporter", @@ -6785,8 +6785,11 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "~8.0.0 || ~8.1.0 || ~8.2.0" + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" }, "platform-dev": [], + "platform-overrides": { + "php": "8.1.99" + }, "plugin-api-version": "2.3.0" } From 91f4e3b4703bc28df16d0fbfcfab05fadc4f655e Mon Sep 17 00:00:00 2001 From: Gediminas Kersys Date: Thu, 18 Apr 2024 16:25:07 +0300 Subject: [PATCH 2/2] Fix phpcs and psalm errors - Adds missing dependency laminas/laminas-db - Adds correct return type for jsonSerialize() implementation Signed-off-by: Gediminas Kersys --- composer.json | 1 + composer.lock | 73 ++++++++++++++++++++++++++++- test/TestAsset/JsonSerializable.php | 2 +- 3 files changed, 74 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 34a556d..93e0ab8 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,7 @@ }, "require-dev": { "laminas/laminas-coding-standard": "~2.3.0", + "laminas/laminas-db": "^2.20", "laminas/laminas-escaper": "^2.9.0", "laminas/laminas-http": "^2.15.1", "laminas/laminas-inputfilter": "^2.13.0", diff --git a/composer.lock b/composer.lock index e81908e..c4bb9ac 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": "06885053d0dda149c2833d3c82efbf0f", + "content-hash": "e325ae06126c0c025e0ebd6870dbae6d", "packages": [ { "name": "brick/varexporter", @@ -3475,6 +3475,77 @@ ], "time": "2021-05-29T15:53:59+00:00" }, + { + "name": "laminas/laminas-db", + "version": "2.20.0", + "source": { + "type": "git", + "url": "https://github.com/laminas/laminas-db.git", + "reference": "207b9ee70a8b518913c1fad688d7a64fe89a8b91" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/laminas/laminas-db/zipball/207b9ee70a8b518913c1fad688d7a64fe89a8b91", + "reference": "207b9ee70a8b518913c1fad688d7a64fe89a8b91", + "shasum": "" + }, + "require": { + "laminas/laminas-stdlib": "^3.7.1", + "php": "~8.1.0 || ~8.2.0 || ~8.3.0" + }, + "conflict": { + "zendframework/zend-db": "*" + }, + "require-dev": { + "laminas/laminas-coding-standard": "^2.4.0", + "laminas/laminas-eventmanager": "^3.6.0", + "laminas/laminas-hydrator": "^4.7", + "laminas/laminas-servicemanager": "^3.19.0", + "phpunit/phpunit": "^9.5.25" + }, + "suggest": { + "laminas/laminas-eventmanager": "Laminas\\EventManager component", + "laminas/laminas-hydrator": "(^3.2 || ^4.3) Laminas\\Hydrator component for using HydratingResultSets", + "laminas/laminas-servicemanager": "Laminas\\ServiceManager component" + }, + "type": "library", + "extra": { + "laminas": { + "component": "Laminas\\Db", + "config-provider": "Laminas\\Db\\ConfigProvider" + } + }, + "autoload": { + "psr-4": { + "Laminas\\Db\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "description": "Database abstraction layer, SQL abstraction, result set abstraction, and RowDataGateway and TableDataGateway implementations", + "homepage": "https://laminas.dev", + "keywords": [ + "db", + "laminas" + ], + "support": { + "chat": "https://laminas.dev/chat", + "docs": "https://docs.laminas.dev/laminas-db/", + "forum": "https://discourse.laminas.dev", + "issues": "https://github.com/laminas/laminas-db/issues", + "rss": "https://github.com/laminas/laminas-db/releases.atom", + "source": "https://github.com/laminas/laminas-db" + }, + "funding": [ + { + "url": "https://funding.communitybridge.org/projects/laminas-project", + "type": "community_bridge" + } + ], + "time": "2024-04-02T01:04:56+00:00" + }, { "name": "laminas/laminas-inputfilter", "version": "2.24.1", diff --git a/test/TestAsset/JsonSerializable.php b/test/TestAsset/JsonSerializable.php index 1509d2b..9f3f55b 100644 --- a/test/TestAsset/JsonSerializable.php +++ b/test/TestAsset/JsonSerializable.php @@ -9,7 +9,7 @@ class JsonSerializable implements JsonSerializableInterface { /** @return array */ - public function jsonSerialize() + public function jsonSerialize(): mixed { return ['foo' => 'bar']; }