summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json7
-rw-r--r--php-zendframework-zend-form.spec13
2 files changed, 11 insertions, 9 deletions
diff --git a/composer.json b/composer.json
index e76be2f..a4470fd 100644
--- a/composer.json
+++ b/composer.json
@@ -66,8 +66,8 @@
},
"extra": {
"branch-alias": {
- "dev-master": "2.11.x-dev",
- "dev-develop": "2.12.x-dev"
+ "dev-master": "2.12.x-dev",
+ "dev-develop": "2.13.x-dev"
},
"zf": {
"component": "Zend\\Form",
@@ -82,7 +82,6 @@
"cs-check": "phpcs",
"cs-fix": "phpcbf",
"test": "phpunit --colors=always",
- "test-coverage": "phpunit --colors=always --coverage-clover clover.xml",
- "upload-coverage": "coveralls -v"
+ "test-coverage": "phpunit --colors=always --coverage-clover clover.xml"
}
}
diff --git a/php-zendframework-zend-form.spec b/php-zendframework-zend-form.spec
index 7e26b13..6bca6f2 100644
--- a/php-zendframework-zend-form.spec
+++ b/php-zendframework-zend-form.spec
@@ -1,13 +1,13 @@
# remirepo/Fedora spec file for php-zendframework-zend-form
#
-# 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 b68a9f07d93381613b68817091d0505ca94d3363
+%global gh_commit 565fb4f4bb3e0dbeea0173c923c4a8be77de9441
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner zendframework
%global gh_project zend-form
@@ -22,8 +22,8 @@
# TODO: re-enable phpunit6 when 6.5 will be available
Name: php-%{gh_owner}-%{gh_project}
-Version: 2.11.0
-Release: 3%{?dist}
+Version: 2.12.0
+Release: 2%{?dist}
Summary: Zend Framework %{library} component
Group: Development/Libraries
@@ -201,7 +201,7 @@ require_once '%{buildroot}%{php_home}/Zend/%{library}/autoload.php';
EOF
ret=0
-for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do
+for cmdarg in "php %{phpunit}" php70 php71 php72; do
if which $cmdarg; then
set $cmdarg
$1 ${2:-%{_bindir}/phpunit6} -d memory_limit=1G || ret=1
@@ -223,6 +223,9 @@ exit $ret
%changelog
+* Wed May 23 2018 Remi Collet <remi@remirepo.net> - 2.12.0-2
+- update to 2.12.0
+
* Tue Dec 12 2017 Remi Collet <remi@remirepo.net> - 2.11.0-3
- zend-servicemanager is mandatory