summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-05-02 15:00:08 +0200
committerRemi Collet <remi@remirepo.net>2018-05-02 15:00:08 +0200
commitaa3a06786a5498c75a6d2185735ad10338f3b53d (patch)
treeee3ddfb2d99dc85ba4abcb4f4c6c5332487d5549
parent60c980201d9b9ad6f7d4fdb9a9ab1c99e94b5103 (diff)
update to 2.6.0HEADmaster
raise dependency on PHP 5.6 add dependency on zend-escaper use range dependencies on f27+ switch to phpunit6 or phpunit7
-rw-r--r--composer.json58
-rw-r--r--php-zendframework-zend-debug.spec59
2 files changed, 80 insertions, 37 deletions
diff --git a/composer.json b/composer.json
index 1cc6250..8ddbc8c 100644
--- a/composer.json
+++ b/composer.json
@@ -1,40 +1,58 @@
{
"name": "zendframework/zend-debug",
- "description": " ",
+ "description": "Safely dump debug information to HTML",
"license": "BSD-3-Clause",
"keywords": [
- "zf2",
+ "zf",
+ "zendframework",
"debug"
],
- "homepage": "https://github.com/zendframework/zend-debug",
- "autoload": {
- "psr-4": {
- "Zend\\Debug\\": "src/"
- }
+ "support": {
+ "docs": "https://docs.zendframework.com/zend-debug/",
+ "issues": "https://github.com/zendframework/zend-debug/issues",
+ "source": "https://github.com/zendframework/zend-debug",
+ "rss": "https://github.com/zendframework/zend-debug/releases.atom",
+ "chat": "https://zendframework-slack.herokuapp.com",
+ "forum": "https://discourse.zendframework.com/c/questions/components"
},
"require": {
- "php": ">=5.3.23"
+ "php": "^5.6 || ^7.0",
+ "zendframework/zend-escaper": "^2.0"
},
"require-dev": {
- "zendframework/zend-escaper": "2.*",
- "fabpot/php-cs-fixer": "1.7.*",
- "phpunit/PHPUnit": "~4.0"
+ "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+ "zendframework/zend-coding-standard": "~1.0.0"
},
"suggest": {
- "ext/xdebug": "XDebug, for better backtrace output",
- "zendframework/zend-escaper": "To support escaped output"
+ "ext-xdebug": "XDebug, for better backtrace output"
},
- "minimum-stability": "dev",
- "prefer-stable": true,
- "extra": {
- "branch-alias": {
- "dev-master": "2.5-dev",
- "dev-develop": "2.6-dev"
+ "autoload": {
+ "psr-4": {
+ "Zend\\Debug\\": "src/"
}
},
"autoload-dev": {
"psr-4": {
"ZendTest\\Debug\\": "test/"
}
+ },
+ "config": {
+ "sort-packages": true
+ },
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.6.x-dev",
+ "dev-develop": "2.7.x-dev"
+ }
+ },
+ "scripts": {
+ "check": [
+ "@cs-check",
+ "@test"
+ ],
+ "cs-check": "phpcs",
+ "cs-fix": "phpcbf",
+ "test": "phpunit --colors=always",
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
-} \ No newline at end of file
+}
diff --git a/php-zendframework-zend-debug.spec b/php-zendframework-zend-debug.spec
index 4fecf41..246a7b0 100644
--- a/php-zendframework-zend-debug.spec
+++ b/php-zendframework-zend-debug.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-debug
#
-# Copyright (c) 2015-2017 Remi Collet
+# Copyright (c) 2015-2018 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 b6f9df59155391ca683c479a0d758f66ef73b3b3
+%global gh_commit cb423facd6f2e875a3cb44cf992b6bd1f5fd1a96
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-debug
@@ -20,8 +20,8 @@
%endif
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.5.1
-Release: 5%{?dist}
+Version: 2.6.0
+Release: 2%{?dist}
Summary: Zend Framework %{library} component
Group: Development/Libraries
@@ -33,29 +33,46 @@ Source1: makesrc.sh
BuildArch: noarch
# Tests
%if %{with_tests}
-BuildRequires: php(language) >= 5.3.23
+BuildRequires: php(language) >= 5.6
BuildRequires: php-pcre
# From composer, "require-dev": {
-# "zendframework/zend-escaper": "2.*",
-# "fabpot/php-cs-fixer": "1.7.*",
-# "phpunit/PHPUnit": "~4.0"
-BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.5
+# "phpunit/phpunit": "^5.7.27 || ^6.5.8 || ^7.1.5",
+# "zendframework/zend-coding-standard": "~1.0.0"
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires: (php-autoloader(%{gh_owner}/zend-escaper) >= 2.0 with php-autoloader(%{gh_owner}/zend-escaper) < 3)
+%global phpunit %{_bindir}/phpunit7
+BuildRequires: phpunit7 >= 7.1.4
+# remirepo:6
+%else
+BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) < 3
+BuildRequires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.0
+%global phpunit %{_bindir}/phpunit6
+BuildRequires: phpunit6 >= 6.5.8
+%endif
+
BuildRequires: php-composer(phpunit/phpunit) >= 4.0
%endif
# Autoloader
BuildRequires: php-fedora-autoloader-devel
# From composer, "require": {
-# "php": ">=5.3.23"
-Requires: php(language) >= 5.3.23
+# "php": "^5.6 || ^7.0",
+# "zendframework/zend-escaper": "^2.0"
+Requires: php(language) >= 5.6
%if ! %{bootstrap}
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires: (php-autoloader(%{gh_owner}/zend-escaper) >= 2.0 with php-autoloader(%{gh_owner}/zend-escaper) < 3)
+# remirepo:4
+%else
+Requires: php-autoloader(%{gh_owner}/zend-escaper) < 3
+Requires: php-autoloader(%{gh_owner}/zend-escaper) >= 2.0
+%endif
# From composer, "suggest": {
# "ext/xdebug": "XDebug, for better backtrace output",
# "zendframework/zend-escaper": "To support escaped output"
-%if 0%{?fedora} >= 21
Suggests: php-pecl(xdebug)
-Suggests: php-autoloader(%{gh_owner}/zend-escaper)
-%endif
%endif
# From phpcompatinfo report for version 2.5.2
Requires: php-pcre
@@ -109,9 +126,10 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
EOF
ret=0
-for cmd in php php56 php70 php71 php72; do
- if which $cmd; then
- $cmd %{_bindir}/phpunit --verbose || ret=1
+for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do
+ if which $cmdarg; then
+ set $cmdarg
+ $1 ${2:-%{_bindir}/phpunit7} --verbose || ret=1
fi
done
exit $ret
@@ -129,6 +147,13 @@ exit $ret
%changelog
+* Wed May 2 2018 Remi Collet <remi@remirepo.net> - 2.6.0-2
+- update to 2.6.0
+- raise dependency on PHP 5.6
+- add dependency on zend-escaper
+- use range dependencies on f27+
+- switch to phpunit6 or phpunit7
+
* Tue Dec 5 2017 Remi Collet <remi@remirepo.net> - 2.5.1-5
- switch from zend-loader to fedora/autoloader