diff --git a/.gitignore b/.gitignore index 10b5e3a..4eef538 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /PHP_CodeSniffer-3.2.0.tgz /PHP_CodeSniffer-3.2.1.tgz /PHP_CodeSniffer-3.2.2.tgz +/PHP_CodeSniffer-3.2.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 99dd462..7667511 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,6 +1,6 @@ # spec file for php-pear-PHP-CodeSniffer # -# Copyright (c) 2013-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,11 +13,10 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.2.2 -Release: 2%{?dist} +Version: 3.2.3 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool -Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz @@ -26,10 +25,10 @@ BuildArch: noarch BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -%if 0%{?fedora} >= 26 -%global phpunit %{_bindir}/phpunit6 +%if 0%{?fedora} >= 28 +%global phpunit %{_bindir}/phpunit7 %else -%global phpunit %{_bindir}/phpunit +%global phpunit %{_bindir}/phpunit6 %endif BuildRequires: %{phpunit} @@ -91,12 +90,12 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} -# Version 3.1.0: Tests: 242, Assertions: 88, Skipped: 3. +# Version 3.2.3: Tests: 294, Assertions: 320, Skipped: 3. ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -124,6 +123,10 @@ fi %changelog +* Wed Feb 21 2018 Remi Collet - 3.2.3-1 +- Update to 3.2.3 +- use phpunit7 on F28+ + * Fri Feb 09 2018 Fedora Release Engineering - 3.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 2b02e4f..ef2c0d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.2.2.tgz) = 4dcd8055e1a3208ff098bc94aa5d47cd37f36f6f47edd1e5ed7984c4ec639e964ef8e8cf4f3a890023514df70878d3aa0e896c60a364708c8062afd83bc4fd57 +SHA512 (PHP_CodeSniffer-3.2.3.tgz) = 42589a516e68d3dad3136ac32124954d19450e4125905e162c024062d604ecc1d0d0a2283882c6365952c6d88437ec195d16d81fcc23634e3f69f90b36433c28