summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2022-01-10 09:31:53 +0100
committerRemi Collet <remi@php.net>2022-01-10 09:31:53 +0100
commit930ca23816602a0a097c5b24db39aa29dd6250f2 (patch)
tree59301ad79482682f774870495df70c3572a10678
parent2faf04946aac85de08964a0c11f9bb8f90d1d8a5 (diff)
update to 3.4.0HEADmaster
raise dependency on laminas-http 2.15.1 raise dependency on laminas-json 3.3.0 raise dependency on laminas-server 2.11.0 keep compatibility using laminas-zendframework-bridge as this is only used using compat autolader
-rw-r--r--composer.json14
-rw-r--r--php-laminas-json-server.spec41
2 files changed, 32 insertions, 23 deletions
diff --git a/composer.json b/composer.json
index ed683ca..ba53418 100644
--- a/composer.json
+++ b/composer.json
@@ -20,19 +20,18 @@
"config": {
"sort-packages": true
},
- "extra": {
- },
"require": {
"php": "^7.3 || ~8.0.0",
- "laminas/laminas-http": "^2.7",
- "laminas/laminas-json": "^2.6.1 || ^3.0",
- "laminas/laminas-server": "^2.7",
- "laminas/laminas-zendframework-bridge": "^1.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": "~1.0.0",
- "phpunit/phpunit": "^9.3.0"
+ "phpunit/phpunit": "^9.5.11",
+ "psalm/plugin-phpunit": "^0.16.1",
+ "vimeo/psalm": "^4.18.0"
},
"conflict": {
"laminas/laminas-stdlib": "<3.2.1"
@@ -57,6 +56,7 @@
],
"cs-check": "phpcs",
"cs-fix": "phpcbf",
+ "static-analysis": "psalm --shepherd --stats",
"test": "phpunit --colors=always",
"test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
},
diff --git a/php-laminas-json-server.spec b/php-laminas-json-server.spec
index dfb4386..4178329 100644
--- a/php-laminas-json-server.spec
+++ b/php-laminas-json-server.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-laminas-json-server
#
-# Copyright (c) 2015-2021 Remi Collet
+# Copyright (c) 2015-2022 Remi Collet
# License: CC-BY-SA
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 45a55cbdcec6806c6f8cc81e40df5c9738269a0f
+%global gh_commit 436b1375d3fd6ea58919881d9ec9d3652156ef24
%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.3.0
+Version: 3.4.0
Release: 1%{?dist}
Summary: %{namespace} Json-Server is a JSON-RPC server implementation
@@ -41,14 +41,16 @@ BuildRequires: php-reflection
BuildRequires: php-spl
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.7 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.0 with php-autoloader(%{gh_owner}/laminas-json) < 4)
-BuildRequires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.7 with php-autoloader(%{gh_owner}/laminas-server) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15.1 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.3 with php-autoloader(%{gh_owner}/laminas-json) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.11 with php-autoloader(%{gh_owner}/laminas-server) < 3)
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": "~1.0.0",
-# "phpunit/phpunit": "^9.3.0"
+# "phpunit/phpunit": "^9.5.11",
+# "psalm/plugin-phpunit": "^0.16.1",
+# "vimeo/psalm": "^4.18.0"
# remirepo:6
%else
BuildRequires: php-laminas-http
@@ -58,23 +60,22 @@ BuildRequires: php-laminas-zendframework-bridge
%endif
BuildRequires: php-json
%global phpunit %{_bindir}/phpunit9
-BuildRequires: phpunit9 >= 9.3.0
+BuildRequires: phpunit9 >= 9.5.11
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
# "php": "^7.3 || ~8.0.0",
-# "laminas/laminas-http": "^2.7",
-# "laminas/laminas-json": "^2.6.1 || ^3.0",
-# "laminas/laminas-server": "^2.7",
-# "laminas/laminas-zendframework-bridge": "^1.0"
+# "laminas/laminas-http": "^2.15.1",
+# "laminas/laminas-json": "^3.3.0",
+# "laminas/laminas-server": "^2.11.0",
Requires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.7 with php-autoloader(%{gh_owner}/laminas-http) < 3)
-Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.0 with php-autoloader(%{gh_owner}/laminas-json) < 4)
-Requires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.7 with php-autoloader(%{gh_owner}/laminas-server) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-http) >= 2.15.1 with php-autoloader(%{gh_owner}/laminas-http) < 3)
+Requires: (php-autoloader(%{gh_owner}/laminas-json) >= 3.3 with php-autoloader(%{gh_owner}/laminas-json) < 4)
+Requires: (php-autoloader(%{gh_owner}/laminas-server) >= 2.11 with php-autoloader(%{gh_owner}/laminas-server) < 4)
Requires: (php-autoloader(%{gh_owner}/laminas-zendframework-bridge) >= 1.0 with php-autoloader(%{gh_owner}/laminas-zendframework-bridge) < 2)
# remirepo:6
%else
@@ -160,7 +161,7 @@ exit (class_exists("\\Zend\\%{library}\\%{subproj}\\Response") ? 0 : 1);
: upstream test suite
ret=0
-for cmdarg in "php %{phpunit}" php73 php74 php80; do
+for cmdarg in "php %{phpunit}" php74 php80 php81; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit9} --verbose || ret=1
@@ -183,6 +184,14 @@ exit $ret
%changelog
+* Mon Jan 10 2022 Remi Collet <remi@remirepo.net> - 3.4.0-1
+- update to 3.4.0
+- raise dependency on laminas-http 2.15.1
+- raise dependency on laminas-json 3.3.0
+- raise dependency on laminas-server 2.11.0
+- keep compatibility using laminas-zendframework-bridge
+ as this is only used using compat autolader
+
* Thu Apr 8 2021 Remi Collet <remi@remirepo.net> - 3.3.0-1
- update to 3.3.0 (no change)
- raise dependency on PHP 7.3