From abadaf7cc93f4c27ce00e8709ecfb4f49df1fdab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 May 2017 07:55:39 +0200 Subject: [PATCH] Update to 3.0.0 raise dependency on PHP >= 5.4 drop phpcs-svn-pre-commit command --- .gitignore | 1 + PHP_CodeSniffer-role.patch | 10 ---------- php-pear-PHP-CodeSniffer.spec | 30 +++++++++++++++++------------- sources | 2 +- 4 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 PHP_CodeSniffer-role.patch diff --git a/.gitignore b/.gitignore index 56a1a9e..0fc5675 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /PHP_CodeSniffer-2.7.1.tgz /PHP_CodeSniffer-2.8.0.tgz /PHP_CodeSniffer-2.8.1.tgz +/PHP_CodeSniffer-3.0.0.tgz diff --git a/PHP_CodeSniffer-role.patch b/PHP_CodeSniffer-role.patch deleted file mode 100644 index 6a7d5f8..0000000 --- a/PHP_CodeSniffer-role.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- package.xml.old 2014-12-05 12:39:59.000000000 +0100 -+++ package.xml 2014-12-05 12:40:45.000000000 +0100 -@@ -1949,6 +1949,7 @@ - - - -+ - - - diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 29c3aca..5b2b51a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.8.1 +Version: 3.0.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -22,28 +22,31 @@ License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Patch0: %{pear_name}-role.patch - BuildArch: noarch +BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -BuildRequires: php-phpunit-PHPUnit >= 3.5.0 +BuildRequires: php-phpunit-PHPUnit Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.8.0 +Requires: php(language) >= 5.4 +Requires: php-tokenizer +Requires: php-xmlwriter +Requires: php-simplexml +# From phpcompatinfo report for version 3.0.0 +Requires: php-reflection Requires: php-ctype Requires: php-date Requires: php-dom +Requires: php-json Requires: php-iconv +Requires: php-pcntl Requires: php-pcre -Requires: php-reflection Requires: php-soap Requires: php-spl -Requires: php-tokenizer -Requires: php-xmlwriter Provides: php-pear(%{pear_name}) = %{version} Provides: php-composer(squizlabs/php_codesniffer) = %{version} @@ -59,9 +62,6 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c -# install scripts/phpcs-svn-pre-commit properly -%patch0 -p0 -b .old - cd %{pear_name}-%{version} mv ../package.xml %{pear_name}.xml @@ -88,7 +88,7 @@ cd %{pear_name}-%{version}/tests # Version 2.8.0: Tests: 238, Assertions: 92, Skipped: 3. ret=0 -for cmd in php php56 php70 php71; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit AllTests.php || ret=1 fi @@ -115,10 +115,14 @@ fi %{pear_phpdir}/PHP %{_bindir}/phpcbf %{_bindir}/phpcs -%{_bindir}/phpcs-svn-pre-commit %changelog +* Thu May 4 2017 Remi Collet - 3.0.0-1 +- Update to 3.0.0 +- raise dependency on PHP >= 5.4 +- drop phpcs-svn-pre-commit command + * Thu Mar 02 2017 Remi Collet - 2.8.1-1 - Update to 2.8.1 diff --git a/sources b/sources index 7ecb8d7..68cb799 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-2.8.1.tgz) = ef6c2c41428319d1149d4ff551b4586ac45f8baddbecf470ba28f3f0a03646568333b1e09e1475e28be08854105a3e85e21c6a400f45af916db8d47eec23d93d +SHA512 (PHP_CodeSniffer-3.0.0.tgz) = 1f24c2e5c86b988084f1dedb8a6958d27e95c9bbd9524418da9bc2fe7603e403784a959d49e8481db1d38e9ed40bc368b73f75385b5d0ccb86f550eb24e154a9