From 27ea7e48d03fb788ddfde7711d6fab989fac5bf5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 13 Dec 2022 15:39:48 +0100 Subject: update to 3.7.0 --- composer.json | 10 +++++----- php-laminas-json-server.spec | 25 ++++++++++++++----------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/composer.json b/composer.json index 34f6a29..b03083c 100644 --- a/composer.json +++ b/composer.json @@ -27,17 +27,17 @@ } }, "require": { - "php": "^7.4 || ~8.0.0 || ~8.1.0", + "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0", "laminas/laminas-http": "^2.15.1", "laminas/laminas-json": "^3.3.0", "laminas/laminas-server": "^2.11.0" }, "require-dev": { "ext-json": "*", - "laminas/laminas-coding-standard": "^2.3", - "phpunit/phpunit": "^9.5.11", - "psalm/plugin-phpunit": "^0.17.0", - "vimeo/psalm": "^4.18.0" + "laminas/laminas-coding-standard": "^2.4.0", + "phpunit/phpunit": "^9.5.26", + "psalm/plugin-phpunit": "^0.18.0", + "vimeo/psalm": "^5.0.0" }, "conflict": { "laminas/laminas-stdlib": "<3.2.1" diff --git a/php-laminas-json-server.spec b/php-laminas-json-server.spec index ccab492..3bea012 100644 --- a/php-laminas-json-server.spec +++ b/php-laminas-json-server.spec @@ -7,7 +7,7 @@ # Please, preserve the changelog entries # %global bootstrap 0 -%global gh_commit 3768ee566399572da524e2e0930624bbc143b016 +%global gh_commit 5c07f08c91ea2d7f6b58b1aeb32aa4bb281b81cd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner laminas %global gh_project laminas-json-server @@ -23,7 +23,7 @@ %endif Name: php-%{gh_project} -Version: 3.6.0 +Version: 3.7.0 Release: 1%{?dist} Summary: %{namespace} Json-Server is a JSON-RPC server implementation @@ -35,7 +35,7 @@ Source1: makesrc.sh BuildArch: noarch # Tests %if %{with_tests} -BuildRequires: php(language) >= 7.3 +BuildRequires: php(language) >= 7.4 BuildRequires: php-pcre BuildRequires: php-reflection BuildRequires: php-spl @@ -47,10 +47,10 @@ BuildRequires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.11 BuildRequires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2) # From composer, "require-dev": { # "ext-json": "*", -# "laminas/laminas-coding-standard": "^2.3", -# "phpunit/phpunit": "^9.5.11", -# "psalm/plugin-phpunit": "^0.17.0", -# "vimeo/psalm": "^4.18.0" +# "laminas/laminas-coding-standard": "^2.4.0", +# "phpunit/phpunit": "^9.5.26", +# "psalm/plugin-phpunit": "^0.18.0", +# "vimeo/psalm": "^5.0.0" # remirepo:6 %else BuildRequires: php-laminas-http @@ -60,17 +60,17 @@ BuildRequires: php-laminas-zendframework-bridge %endif BuildRequires: php-json %global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.5.11 +BuildRequires: phpunit9 >= 9.5.26 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer, "require": { -# "php": "^7.3 || ~8.0.0 || ~8.1.0", +# "php": "^7.4 || ~8.0.0 || ~8.1.0 || ~8.2.0", # "laminas/laminas-http": "^2.15.1", # "laminas/laminas-json": "^3.3.0", # "laminas/laminas-server": "^2.11.0", -Requires: php(language) >= 7.3 +Requires: php(language) >= 7.4 # remirepo:1 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15.1 with php-autoloader(%{gh_owner}/laminas-http) < 3) @@ -161,7 +161,7 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\Response") ? 0 : 1); : upstream test suite ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81 php82; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1 @@ -184,6 +184,9 @@ exit $ret %changelog +* Tue Dec 13 2022 Remi Collet - 3.7.0-1 +- update to 3.7.0 + * Tue Sep 20 2022 Remi Collet - 3.6.0-1 - update to 3.6.0 -- cgit