From f62ee646a23c982a6fcbc81ac54dcdaa046453b4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Apr 2015 14:37:47 +0200 Subject: [PATCH 01/15] update to 2.3.1 --- .gitignore | 17 ++++------------- PHP_CodeSniffer-licence.txt | 28 --------------------------- PHP_CodeSniffer-role.patch | 10 ++++++++++ php-pear-PHP-CodeSniffer.spec | 36 ++++++++++++++++++----------------- sources | 2 +- 5 files changed, 34 insertions(+), 59 deletions(-) delete mode 100644 PHP_CodeSniffer-licence.txt create mode 100644 PHP_CodeSniffer-role.patch diff --git a/.gitignore b/.gitignore index 89868e1..81b0fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,4 @@ -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-2.2.0.tgz +/PHP_CodeSniffer-2.3.0.tgz +/PHP_CodeSniffer-2.3.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..ae4436a 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-2015 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 1.5.5 +Version: 2.3.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -22,8 +22,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 +34,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.0.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 +60,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 +83,12 @@ 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.2.0: Tests: 219, Assertions: 69, Skipped: 4. +%{_bindir}/phpunit AllTests.php %post @@ -112,10 +108,16 @@ fi %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} %{pear_phpdir}/PHP +%{_bindir}/phpcbf %{_bindir}/phpcs +%{_bindir}/phpcs-svn-pre-commit %changelog +* 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..85eca90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -157b659379676741db692de5ec151c33 PHP_CodeSniffer-1.5.5.tgz +10241b74aaa31b65982ea8575fc2a765 PHP_CodeSniffer-2.3.1.tgz From d1233a7bea1ddae79266f77e9a61f51e5e0bc584 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Apr 2015 07:17:24 +0200 Subject: [PATCH 02/15] Update to 2.3.2 (cherry picked from commit e396ad7cbfa0ffe8127044707ef9b2b6223c0e80) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81b0fc1..7358191 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ clog /PHP_CodeSniffer-2.2.0.tgz /PHP_CodeSniffer-2.3.0.tgz /PHP_CodeSniffer-2.3.1.tgz +/PHP_CodeSniffer-2.3.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index ae4436a..78f98bd 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 85eca90..c54d0c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10241b74aaa31b65982ea8575fc2a765 PHP_CodeSniffer-2.3.1.tgz +6ca8e1e63bed36204035fed4905511ce PHP_CodeSniffer-2.3.2.tgz From 2092cdfddbf03e1ddb4c78f3bb565a5884542201 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jun 2015 15:37:10 +0200 Subject: [PATCH 03/15] v2.3.3 (cherry picked from commit 783c29032086dbf1a908d9a9dbaf709372a4a5fb) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 8 +++++++- sources | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7358191..e246986 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /PHP_CodeSniffer-2.3.0.tgz /PHP_CodeSniffer-2.3.1.tgz /PHP_CodeSniffer-2.3.2.tgz +/PHP_CodeSniffer-2.3.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 78f98bd..ebbe88e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.2 +Version: 2.3.3 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,12 @@ fi %changelog +* 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 diff --git a/sources b/sources index c54d0c0..d0b7847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ca8e1e63bed36204035fed4905511ce PHP_CodeSniffer-2.3.2.tgz +78cf9df871bfe925640a8d7310d466de PHP_CodeSniffer-2.3.3.tgz From 0f70ea8308431f5794e7d79052e69d236db3c69e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2015 15:05:18 +0200 Subject: [PATCH 04/15] v2.3.4 (cherry picked from commit 4a3bd4de8a2fab32229b11c70dbb79ff1a880c5e) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e246986..28304ea 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /PHP_CodeSniffer-2.3.1.tgz /PHP_CodeSniffer-2.3.2.tgz /PHP_CodeSniffer-2.3.3.tgz +/PHP_CodeSniffer-2.3.4.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index ebbe88e..2be8d23 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -34,7 +34,7 @@ Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.0.0 +# From phpcompatinfo report for version 2.3.4 Requires: php-ctype Requires: php-date Requires: php-dom @@ -87,7 +87,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.2.0: Tests: 219, Assertions: 69, Skipped: 4. +# Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php @@ -114,6 +114,9 @@ fi %changelog +* 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) diff --git a/sources b/sources index d0b7847..6429e25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78cf9df871bfe925640a8d7310d466de PHP_CodeSniffer-2.3.3.tgz +024479013541e5423cda862c1901b74e PHP_CodeSniffer-2.3.4.tgz From 467e974ac95a59515b0c0ff0ad5cfc905507426c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Dec 2015 09:25:21 +0100 Subject: [PATCH 05/15] v2.5.0 (cherry picked from commit 0bdb6821ff752bf6c258cbe0eb4371c704cb392f) --- .gitignore | 2 ++ php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 28304ea..6adc6b9 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,5 @@ clog /PHP_CodeSniffer-2.3.2.tgz /PHP_CodeSniffer-2.3.3.tgz /PHP_CodeSniffer-2.3.4.tgz +/PHP_CodeSniffer-2.4.0.tgz +/PHP_CodeSniffer-2.5.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 2be8d23..a0df005 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.4 +Version: 2.5.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 6429e25..646a95e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -024479013541e5423cda862c1901b74e PHP_CodeSniffer-2.3.4.tgz +d95e00d920587db785195f1c5f1ea532 PHP_CodeSniffer-2.5.0.tgz From f7bae80f347b7b14a1cd996964be4ca2dcc35b14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Jan 2016 14:23:50 +0100 Subject: [PATCH 06/15] v2.5.1 (cherry picked from commit d4072f1d8ebd09e08e24182f6953eda891a953dd) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6adc6b9..319ae31 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /PHP_CodeSniffer-2.3.4.tgz /PHP_CodeSniffer-2.4.0.tgz /PHP_CodeSniffer-2.5.0.tgz +/PHP_CodeSniffer-2.5.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index a0df005..8daa2a9 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-2015 Remi Collet +# Copyright (c) 2013-2016 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.5.0 +Version: 2.5.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* 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) diff --git a/sources b/sources index 646a95e..c2c8cb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d95e00d920587db785195f1c5f1ea532 PHP_CodeSniffer-2.5.0.tgz +ecfc639369bddd2d5e920e0d6ba6d652 PHP_CodeSniffer-2.5.1.tgz From ea7ab64cc186071aa5431b12ae66204968fd3564 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2016 07:23:41 +0200 Subject: [PATCH 07/15] v 2.6.0 (cherry picked from commit 78f88b49c393157986bba37a4c2e6f84fac71346) (cherry picked from commit daccaf810621f4c293ee5603d2e90a00b0491677) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 319ae31..d93b345 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /PHP_CodeSniffer-2.4.0.tgz /PHP_CodeSniffer-2.5.0.tgz /PHP_CodeSniffer-2.5.1.tgz +/PHP_CodeSniffer-2.6.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8daa2a9..e568c37 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -9,12 +9,12 @@ # # Please, preserve the changelog entries # -%{!?__pear: %global __pear %{_bindir}/pear} %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.5.1 +Version: 2.6.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -90,6 +90,10 @@ cd %{pear_name}-%{version}/tests # Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php +if which php70; then + php70 %{_bindir}/phpunit AllTests.php +fi + %post %{__pear} install --nodeps --soft --force --register-only \ @@ -114,6 +118,9 @@ fi %changelog +* 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) diff --git a/sources b/sources index c2c8cb8..d6591a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecfc639369bddd2d5e920e0d6ba6d652 PHP_CodeSniffer-2.5.1.tgz +59635235cfbe18a5ada186fceea5d992 PHP_CodeSniffer-2.6.0.tgz From 94588de5186aaa11e49ce567c13f50ca318a2d17 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 May 2016 08:57:49 +0200 Subject: [PATCH 08/15] v2.6.1 (cherry picked from commit a69fea8b2cadadb168faa2dec7fe7ee4edade22b) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d93b345..ebdab17 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /PHP_CodeSniffer-2.5.0.tgz /PHP_CodeSniffer-2.5.1.tgz /PHP_CodeSniffer-2.6.0.tgz +/PHP_CodeSniffer-2.6.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index e568c37..aa55f73 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -9,12 +9,11 @@ # # Please, preserve the changelog entries # -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %global __pear %{_bindir}/pear} %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -118,6 +117,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index d6591a0..51de52d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59635235cfbe18a5ada186fceea5d992 PHP_CodeSniffer-2.6.0.tgz +eccb4343021a043a56e2006092df65a6 PHP_CodeSniffer-2.6.1.tgz From 80c56f6921e9f444754f321638996acae379a28e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Jul 2016 14:37:47 +0200 Subject: [PATCH 09/15] v2.6.2 (cherry picked from commit 8fd8946dde4a2a1981fb63f327f47b67def06702) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ebdab17..4be4c2e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /PHP_CodeSniffer-2.5.1.tgz /PHP_CodeSniffer-2.6.0.tgz /PHP_CodeSniffer-2.6.1.tgz +/PHP_CodeSniffer-2.6.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index aa55f73..2d040b9 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.6.1 +Version: 2.6.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -89,10 +89,6 @@ cd %{pear_name}-%{version}/tests # Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php -if which php70; then - php70 %{_bindir}/phpunit AllTests.php -fi - %post %{__pear} install --nodeps --soft --force --register-only \ @@ -117,6 +113,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 51de52d..269cc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eccb4343021a043a56e2006092df65a6 PHP_CodeSniffer-2.6.1.tgz +44feaafe673cd6e0c89dc6fc65a6cf56 PHP_CodeSniffer-2.6.2.tgz From e832f942a2c4313ee074c66a5b138d452371b292 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Sep 2016 09:24:46 +0200 Subject: [PATCH 10/15] v2.7.0 (cherry picked from commit 617788b7202779f09bc39cc5aff07558c27aae81) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4be4c2e..79044c2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /PHP_CodeSniffer-2.6.0.tgz /PHP_CodeSniffer-2.6.1.tgz /PHP_CodeSniffer-2.6.2.tgz +/PHP_CodeSniffer-2.7.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 2d040b9..f3b0988 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.6.2 +Version: 2.7.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,7 +86,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. +# Version 2.7.0: Tests: 236, Assertions: 90, Skipped: 3. %{_bindir}/phpunit AllTests.php @@ -113,6 +113,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 269cc4b..742a7f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44feaafe673cd6e0c89dc6fc65a6cf56 PHP_CodeSniffer-2.6.2.tgz +40e5d70ab9aa4cc1a15091ddcc14c609 PHP_CodeSniffer-2.7.0.tgz From abe1500a11acf28d4de1739d60cdd88f4f70d112 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Nov 2016 07:06:00 +0100 Subject: [PATCH 11/15] v2.7.1 (cherry picked from commit 8ea723c2e99ab2fc753fe305ebb97a8074905f69) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 79044c2..f1d8fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /PHP_CodeSniffer-2.6.1.tgz /PHP_CodeSniffer-2.6.2.tgz /PHP_CodeSniffer-2.7.0.tgz +/PHP_CodeSniffer-2.7.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index f3b0988..67cf6c5 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.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -113,6 +113,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 742a7f3..4113c7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40e5d70ab9aa4cc1a15091ddcc14c609 PHP_CodeSniffer-2.7.0.tgz +fd6bded59396b8842f969620bfc1e9aa PHP_CodeSniffer-2.7.1.tgz From 8383c47fab3b050e172d3a7a98ff631a23c7b1ac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Feb 2017 15:31:51 +0100 Subject: [PATCH 12/15] v2.8.0 (cherry picked from commit 5948e3e23db513a374db7577d379cc66b0a47f02) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f1d8fc1..a33d534 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /PHP_CodeSniffer-2.6.2.tgz /PHP_CodeSniffer-2.7.0.tgz /PHP_CodeSniffer-2.7.1.tgz +/PHP_CodeSniffer-2.8.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 67cf6c5..225c78e 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-2016 Remi Collet +# Copyright (c) 2013-2017 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.7.1 +Version: 2.8.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -33,7 +33,7 @@ Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.3.4 +# From phpcompatinfo report for version 2.8.0 Requires: php-ctype Requires: php-date Requires: php-dom @@ -86,8 +86,14 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.7.0: Tests: 236, Assertions: 90, Skipped: 3. -%{_bindir}/phpunit 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 @@ -113,6 +119,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 4113c7d..b91bf33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd6bded59396b8842f969620bfc1e9aa PHP_CodeSniffer-2.7.1.tgz +SHA512 (PHP_CodeSniffer-2.8.0.tgz) = afbfd1121f67989d442ae2529081ea41a735cecee1aeb335f2a235a94bddeb92d6939bc5fb13b7a07466428e585e2b816d6ee06731595693ca594f28fec65a12 From 99829bd140e0793c18ea6f95285c140ac0203574 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Mar 2017 07:37:55 +0100 Subject: [PATCH 13/15] v2.8.1 (cherry picked from commit f782951d6142af7f1dfcb5e98c1457aa420cee6c) (cherry picked from commit 11731130a19fb11bd0abd0b6204c8c2a5345c030) (cherry picked from commit 3843ec2e39a17395c0145f284dc797fe5d619740) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index a33d534..56a1a9e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /PHP_CodeSniffer-2.7.0.tgz /PHP_CodeSniffer-2.7.1.tgz /PHP_CodeSniffer-2.8.0.tgz +/PHP_CodeSniffer-2.8.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 225c78e..c39e01a 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.0 +Version: 2.8.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -119,6 +119,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index b91bf33..7ecb8d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-2.8.0.tgz) = afbfd1121f67989d442ae2529081ea41a735cecee1aeb335f2a235a94bddeb92d6939bc5fb13b7a07466428e585e2b816d6ee06731595693ca594f28fec65a12 +SHA512 (PHP_CodeSniffer-2.8.1.tgz) = ef6c2c41428319d1149d4ff551b4586ac45f8baddbecf470ba28f3f0a03646568333b1e09e1475e28be08854105a3e85e21c6a400f45af916db8d47eec23d93d From f7549be65d4e04559129b774b1330f9c13f874dc Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 May 2017 08:09:14 +0200 Subject: [PATCH 14/15] v2.9.0 (cherry picked from commit 64872a15000b8065f72bf5db2cd0115fbef7866d) --- .gitignore | 16 ++-------------- php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 56a1a9e..832b917 100644 --- a/.gitignore +++ b/.gitignore @@ -1,17 +1,5 @@ clog -/PHP_CodeSniffer-2.2.0.tgz -/PHP_CodeSniffer-2.3.0.tgz -/PHP_CodeSniffer-2.3.1.tgz -/PHP_CodeSniffer-2.3.2.tgz -/PHP_CodeSniffer-2.3.3.tgz -/PHP_CodeSniffer-2.3.4.tgz -/PHP_CodeSniffer-2.4.0.tgz -/PHP_CodeSniffer-2.5.0.tgz -/PHP_CodeSniffer-2.5.1.tgz -/PHP_CodeSniffer-2.6.0.tgz -/PHP_CodeSniffer-2.6.1.tgz -/PHP_CodeSniffer-2.6.2.tgz -/PHP_CodeSniffer-2.7.0.tgz -/PHP_CodeSniffer-2.7.1.tgz +/PHP_CodeSniffer-3.*tgz /PHP_CodeSniffer-2.8.0.tgz /PHP_CodeSniffer-2.8.1.tgz +/PHP_CodeSniffer-2.9.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c39e01a..8b6d9d6 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: 2.9.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -119,6 +119,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 7ecb8d7..3249317 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-2.8.1.tgz) = ef6c2c41428319d1149d4ff551b4586ac45f8baddbecf470ba28f3f0a03646568333b1e09e1475e28be08854105a3e85e21c6a400f45af916db8d47eec23d93d +SHA512 (PHP_CodeSniffer-2.9.0.tgz) = 901d70da5895e3165ed27b0e0bdcc09f07a34e8318dc25c333d289d9edc8272090f318c2104d3658d07f9db09c745d670d519b6629f09d96a8391727e6c29e05 From f99cd30a19e3e0d3487628361d1d70e5be74da9f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 May 2017 17:00:46 +0200 Subject: [PATCH 15/15] v2.9.1 (cherry picked from commit 05246807f6dfee0c51900d67a900dd753425fc59) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 832b917..8345dc2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /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-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8b6d9d6..e5a382a 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.9.0 +Version: 2.9.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -119,6 +119,9 @@ fi %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 diff --git a/sources b/sources index 3249317..35e412e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-2.9.0.tgz) = 901d70da5895e3165ed27b0e0bdcc09f07a34e8318dc25c333d289d9edc8272090f318c2104d3658d07f9db09c745d670d519b6629f09d96a8391727e6c29e05 +SHA512 (PHP_CodeSniffer-2.9.1.tgz) = bdda0a3cf3dc0b0fbccaf058798520a6a93cb76058977a59c7926945f7a5503750415d515270f4ebc7f3bb2f020f6aaaa88b563899bd7258c71ae4299fa5d634