diff --git a/.gitignore b/.gitignore index 89868e1..8345dc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,6 @@ -PHP_CodeSniffer-1.3.0a1.tgz -/PHP_CodeSniffer-1.3.0RC1.tgz -/PHP_CodeSniffer-1.3.0.tgz -/PHP_CodeSniffer-1.3.1.tgz -/PHP_CodeSniffer-1.3.3.tgz -/PHP_CodeSniffer-1.3.4.tgz -/PHP_CodeSniffer-1.3.5.tgz -/PHP_CodeSniffer-1.3.6.tgz -/PHP_CodeSniffer-1.4.0.tgz -/PHP_CodeSniffer-1.4.3.tgz -/PHP_CodeSniffer-1.4.4.tgz -/PHP_CodeSniffer-1.4.5.tgz -/PHP_CodeSniffer-1.5.5.tgz +clog +/PHP_CodeSniffer-3.*tgz +/PHP_CodeSniffer-2.8.0.tgz +/PHP_CodeSniffer-2.8.1.tgz +/PHP_CodeSniffer-2.9.0.tgz +/PHP_CodeSniffer-2.9.1.tgz diff --git a/PHP_CodeSniffer-licence.txt b/PHP_CodeSniffer-licence.txt deleted file mode 100644 index b2f2ab1..0000000 --- a/PHP_CodeSniffer-licence.txt +++ /dev/null @@ -1,28 +0,0 @@ -PHP_CodeSniffer Licence - -Copyright (c) 2006, Squiz Pty Ltd (ABN 77 084 670 600) All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of Squiz Pty Ltd nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/PHP_CodeSniffer-role.patch b/PHP_CodeSniffer-role.patch new file mode 100644 index 0000000..6a7d5f8 --- /dev/null +++ b/PHP_CodeSniffer-role.patch @@ -0,0 +1,10 @@ +--- 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 ae80242..e5a382a 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-2014 Remi Collet +# Copyright (c) 2013-2017 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -10,11 +10,10 @@ # Please, preserve the changelog entries # %{!?__pear: %global __pear %{_bindir}/pear} -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 1.5.5 +Version: 2.9.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -22,8 +21,8 @@ Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -# https://github.com/squizlabs/PHP_CodeSniffer/issues/273 -Source1: PHP_CodeSniffer-licence.txt + +Patch0: %{pear_name}-role.patch BuildArch: noarch BuildRequires: php-pear @@ -34,16 +33,14 @@ Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From package.xml - optional -Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 -# From phpcompatinfo report for version 1.5.5 +# From phpcompatinfo report for version 2.8.0 Requires: php-ctype Requires: php-date Requires: php-dom Requires: php-iconv Requires: php-pcre Requires: php-reflection -Requires: php-simplexml +Requires: php-soap Requires: php-spl Requires: php-tokenizer Requires: php-xmlwriter @@ -62,8 +59,11 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c -sed -e '/phpcs-svn-pre-commit/s/role="script"/role="doc"/' \ - package.xml >%{pear_name}-%{version}/%{pear_name}.xml +# install scripts/phpcs-svn-pre-commit properly +%patch0 -p0 -b .old + +cd %{pear_name}-%{version} +mv ../package.xml %{pear_name}.xml %build @@ -82,17 +82,18 @@ rm -rf %{buildroot}%{pear_metadir}/.??* mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} -install -pm 644 %{SOURCE1} %{buildroot}%{pear_docdir}/%{pear_name}/LICENSE - %check cd %{pear_name}-%{version}/tests -# Version 1.5.5 : 216, Assertions: 57, Skipped: 4. -%{_bindir}/phpunit \ - -d date.timezone=UTC \ - --verbose \ - AllTests.php +# Version 2.8.0: Tests: 238, Assertions: 92, Skipped: 3. +ret=0 +for cmd in php php56 php70 php71; do + if which $cmd; then + $cmd %{_bindir}/phpunit AllTests.php || ret=1 + fi +done +exit $ret %post @@ -112,10 +113,61 @@ fi %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} %{pear_phpdir}/PHP +%{_bindir}/phpcbf %{_bindir}/phpcs +%{_bindir}/phpcs-svn-pre-commit %changelog +* Mon May 22 2017 Remi Collet - 2.9.1-1 +- Update to 2.9.1 + +* Thu May 4 2017 Remi Collet - 2.9.0-1 +- Update to 2.9.0 + +* Thu Mar 02 2017 Remi Collet - 2.8.1-1 +- Update to 2.8.1 + +* Thu Feb 02 2017 Remi Collet - 2.8.0-1 +- Update to 2.8.0 + +* Wed Nov 30 2016 Remi Collet - 2.7.1-1 +- Update to 2.7.1 + +* Fri Sep 02 2016 Remi Collet - 2.7.0-1 +- Update to 2.7.0 + +* Mon Jul 18 2016 Remi Collet - 2.6.2-1 +- Update to 2.6.2 + +* Tue May 31 2016 Remi Collet - 2.6.1-1 +- Update to 2.6.1 + +* Mon Apr 04 2016 Remi Collet - 2.6.0-1 +- Update to 2.6.0 + +* Wed Jan 20 2016 Remi Collet - 2.5.1-1 +- Update to 2.5.1 (stable) + +* Fri Dec 11 2015 Remi Collet - 2.5.0-1 +- Update to 2.5.0 (stable) + +* Wed Sep 9 2015 Remi Collet - 2.3.4-1 +- Update to 2.3.4 + +* Wed Jun 24 2015 Remi Collet - 2.3.3-1 +- Update to 2.3.3 (stable) + +* Thu Jun 18 2015 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 29 2015 Remi Collet - 2.3.2-1 +- Update to 2.3.2 + +* Thu Apr 23 2015 Remi Collet - 2.3.1-1 +- Update to 2.3.1 (stable) +- add phpcbf and phpcs-svn-pre-commit commands + * Thu Oct 9 2014 Remi Collet - 1.5.5 - Update to 1.5.5 - cleanup + changes from remi repo diff --git a/sources b/sources index cb59f72..35e412e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -157b659379676741db692de5ec151c33 PHP_CodeSniffer-1.5.5.tgz +SHA512 (PHP_CodeSniffer-2.9.1.tgz) = bdda0a3cf3dc0b0fbccaf058798520a6a93cb76058977a59c7926945f7a5503750415d515270f4ebc7f3bb2f020f6aaaa88b563899bd7258c71ae4299fa5d634