summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--composer.json50
-rw-r--r--php-zendframework-zend-json-server.spec74
2 files changed, 82 insertions, 42 deletions
diff --git a/composer.json b/composer.json
index 6e72e7a..485667b 100644
--- a/composer.json
+++ b/composer.json
@@ -3,27 +3,29 @@
"description": "Zend Json-Server is a JSON-RPC server implementation.",
"license": "BSD-3-Clause",
"keywords": [
- "zf2",
+ "zf",
+ "zendframework",
"json",
"server",
"json-server"
],
- "homepage": "https://github.com/zendframework/zend-json-server",
- "extra": {
- "branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
- }
+ "support": {
+ "docs": "https://docs.zendframework.com/zend-json-server/",
+ "issues": "https://github.com/zendframework/zend-json-server/issues",
+ "source": "https://github.com/zendframework/zend-json-server",
+ "rss": "https://github.com/zendframework/zend-json-server/releases.atom",
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
- "php": "^5.5 || ^7.0",
+ "php": "^5.6 || ^7.0",
+ "zendframework/zend-http": "^2.7",
"zendframework/zend-json": "^2.6.1 || ^3.0",
- "zendframework/zend-http": "^2.5.4",
- "zendframework/zend-server": "^2.6.1"
+ "zendframework/zend-server": "^2.7"
},
"require-dev": {
- "squizlabs/php_codesniffer": "^2.3",
- "phpunit/PHPUnit": "~4.0"
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"autoload": {
"psr-4": {
@@ -31,22 +33,30 @@
}
},
"autoload-dev": {
- "psr-4": {
- "ZendTest\\Json\\Server\\": "test/"
- },
"files": [
"test/TestAsset/FooFunc.php"
- ]
+ ],
+ "psr-4": {
+ "ZendTest\\Json\\Server\\": "test/"
+ }
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "3.1.x-dev",
+ "dev-develop": "3.2.x-dev"
+ }
},
"scripts": {
"check": [
"@cs-check",
"@test"
],
- "upload-coverage": "coveralls",
"cs-check": "phpcs",
- "cs-fix": "phpcbf fix -v",
- "test": "phpunit",
- "test-coverage": "phpunit --coverage-clover clover.xml"
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
diff --git a/php-zendframework-zend-json-server.spec b/php-zendframework-zend-json-server.spec
index c9d93de..23b095b 100644
--- a/php-zendframework-zend-json-server.spec
+++ b/php-zendframework-zend-json-server.spec
@@ -7,7 +7,7 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 1dfcb6478952d7e271fbe07a241276b55dca91c5
+%global gh_commit 98b31e114661b2be103c82bd9c593fb027fe2371
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-json-server
@@ -20,11 +20,10 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 3.0.0
-Release: 4%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
Summary: Zend Json-Server is a JSON-RPC server implementation
-Group: Development/Libraries
License: BSD
URL: https://zendframework.github.io/%{gh_project}/
Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz
@@ -33,34 +32,56 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.5
+BuildRequires: php(language) >= 5.6
BuildRequires: php-pcre
BuildRequires: php-reflection
BuildRequires: php-spl
-BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 2.6.1
-BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4
-BuildRequires: php-autoloader(%{gh_owner}/zend-server) >= 2.6.1
# From composer, "require-dev": {
-# "squizlabs/php_codesniffer": "^2.3",
-# "phpunit/PHPUnit": "~4.0"
-BuildRequires: php-composer(phpunit/phpunit) >= 4.0
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.2",
+# "zendframework/zend-coding-standard": "~1.0.0"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-http) >= 2.7 with php-autoloader(%{gh_owner}/zend-http) < 3)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-json) >= 3.0 with php-autoloader(%{gh_owner}/zend-json) < 4)
+BuildRequires: (php-autoloader(%{gh_owner}/zend-server) >= 2.7 with php-autoloader(%{gh_owner}/zend-server) < 3)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.2
+# remirepo:10
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-http) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-http) >= 2.7
+BuildRequires: php-autoloader(%{gh_owner}/zend-json) < 4
+BuildRequires: php-autoloader(%{gh_owner}/zend-json) >= 3.0
+BuildRequires: php-autoloader(%{gh_owner}/zend-server) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-server) >= 2.7
+%global phpunit %{_bindir}/phpunit6
+BuildRequires: phpunit6 >= 6.5.8
+%endif
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": "^5.5 || ^7.0",
+# "php": "^5.6 || ^7.0",
+# "zendframework/zend-http": "^2.7",
# "zendframework/zend-json": "^2.6.1 || ^3.0",
-# "zendframework/zend-http": "^2.5.4",
-# "zendframework/zend-server": "^2.6.1"
-Requires: php(language) >= 5.5
+# "zendframework/zend-server": "^2.7"
+Requires: php(language) >= 5.6
# Require zend-json 3.0.0 as conflicts with previous
-Requires: php-autoloader(%{gh_owner}/zend-json) >= 3.0.0
-Requires: php-autoloader(%{gh_owner}/zend-json) < 4
-Requires: php-autoloader(%{gh_owner}/zend-http) >= 2.5.4
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/zend-http) >= 2.7 with php-autoloader(%{gh_owner}/zend-http) < 3)
+Requires: (php-autoloader(%{gh_owner}/zend-json) >= 3.0 with php-autoloader(%{gh_owner}/zend-json) < 4)
+Requires: (php-autoloader(%{gh_owner}/zend-server) >= 2.7 with php-autoloader(%{gh_owner}/zend-server) < 4)
+# remirepo:8
+%else
Requires: php-autoloader(%{gh_owner}/zend-http) < 3
-Requires: php-autoloader(%{gh_owner}/zend-server) >= 2.6.1
+Requires: php-autoloader(%{gh_owner}/zend-http) >= 2.7
+Requires: php-autoloader(%{gh_owner}/zend-json) < 4
+Requires: php-autoloader(%{gh_owner}/zend-json) >= 3.0
Requires: php-autoloader(%{gh_owner}/zend-server) < 4
+Requires: php-autoloader(%{gh_owner}/zend-server) >= 2.7
+%endif
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 3.0.0
@@ -113,9 +134,10 @@ require_once __DIR__ . '/../test/TestAsset/FooFunc.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit || ret=1
+for cmdarg in "php %{phpunit}" php71 php72; do
+ if which $cmdarg; then
+ set $cmdarg
+ $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
fi
done
exit $ret
@@ -133,6 +155,14 @@ exit $ret
%changelog
+* Thu Apr 26 2018 Remi Collet <remi@remirepo.net> - 3.1.0-1
+- update to 3.1.0
+- raise dependency on PHP 5.6
+- raise dependency on zend-http 2.7
+- raise dependency on zend-server 2.7
+- switch to phpunit6 or phpunit7
+- use range dependencies on F27+
+
* Sat Dec 9 2017 Remi Collet <remi@remirepo.net> - 3.0.0-4
- switch from zend-loader to fedora/autoloader
generated by cgit (git 2.34.1) at 2024-11-17 21:56:46 +0000