From 35353df23f255e9b616954390157bdcc29031e56 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 May 2018 14:56:52 +0200 Subject: v2.12.0 --- composer.json | 7 +++---- php-zendframework-zend-form.spec | 9 ++++++--- 2 files changed, 9 insertions(+), 7 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 3a813ab..83af254 100644 --- a/php-zendframework-zend-form.spec +++ b/php-zendframework-zend-form.spec @@ -7,7 +7,7 @@ # 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,7 +22,7 @@ # TODO: re-enable phpunit6 when 6.5 will be available Name: php-%{gh_owner}-%{gh_project} -Version: 2.11.0 +Version: 2.12.0 Release: 1%{?dist} Summary: Zend Framework %{library} component @@ -177,7 +177,7 @@ require_once '%{php_home}/Zend/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 @@ -199,6 +199,9 @@ exit $ret %changelog +* Wed May 23 2018 Remi Collet - 2.12.0-1 +- update to 2.12.0 + * Thu Dec 7 2017 Remi Collet - 2.11.0-1 - Update to 2.11.0 - temporarily switch back to phpunit v5 -- cgit