From 8363f924fdf638f5f887158306f72902766e20ab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 14 May 2018 06:40:25 +0200 Subject: update to 1.12.10 (no change) switch to phpunit7 --- composer.json | 12 ++++++------ php-tecnickcom-tc-lib-color.spec | 16 ++++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 9646b62..bf1f92a 100644 --- a/composer.json +++ b/composer.json @@ -31,13 +31,13 @@ }, "require-dev": { "apigen/apigen": "^4.1.2", - "bartlett/php-compatinfo": "^5.0.4", - "pdepend/pdepend": "^2.5.0", - "phploc/phploc": "^2.1.5 || ^3.0.1", + "bartlett/php-compatinfo": "^5.0.10 || ^5.0.12", + "pdepend/pdepend": "^2.5.2", + "phploc/phploc": "^2.1 || ^3.0 || ^4.0", "phpmd/phpmd": "^2.6.0", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0", - "sebastian/phpcpd": "^2.0.4 || 3.0.0", - "squizlabs/php_codesniffer": "^2.8.0 || ^3.0.0" + "phpunit/phpunit": "^4.8 || ^5.7 || ^6.5 || ^7.1", + "sebastian/phpcpd": "^2.0 || ^3.0 || ^4.0", + "squizlabs/php_codesniffer": "^2.8.0 || ^3.2.0" }, "autoload": { "psr-4": { diff --git a/php-tecnickcom-tc-lib-color.spec b/php-tecnickcom-tc-lib-color.spec index 15ebd70..a0d1923 100644 --- a/php-tecnickcom-tc-lib-color.spec +++ b/php-tecnickcom-tc-lib-color.spec @@ -6,7 +6,7 @@ # # Please, preserve the changelog entries # -%global gh_commit 1d1f9fbb03b6441501326b0ebc41b15dfd058e7b +%global gh_commit 6b22174439020d28554cf7b8d2b6191faf972516 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global c_vendor tecnickcom %global gh_owner tecnickcom @@ -15,7 +15,7 @@ %global with_tests 0%{!?_without_tests:1} Name: php-%{gh_owner}-%{gh_project} -Version: 1.12.8 +Version: 1.12.10 Release: 1%{?dist} Summary: PHP library to manipulate various color representations @@ -27,8 +27,8 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit BuildArch: noarch %if %{with_tests} # For tests -%if 0%{?fedora} >= 26 -%global phpunit %{_bindir}/phpunit6 +%if 0%{?fedora} >= 28 +%global phpunit %{_bindir}/phpunit7 %else %global phpunit %{_bindir}/phpunit %endif @@ -90,10 +90,10 @@ require '%{buildroot}%{php_project}/autoload.php'; EOF ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" "php70 %{_bindir}/phpunit6" php71 php72; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} --no-coverage --verbose || ret=1 + $1 ${2:-%{_bindir}/phpunit7} --no-coverage --verbose || ret=1 fi done exit $ret @@ -113,6 +113,10 @@ exit $ret %changelog +* Mon May 14 2018 Remi Collet - 1.12.10-1 +- update to 1.12.10 (no change) +- switch to phpunit7 + * Tue Jan 2 2018 Remi Collet - 1.12.8-1 - Update to 1.12.8 (no change) -- cgit