From daccaf810621f4c293ee5603d2e90a00b0491677 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2016 07:23:41 +0200 Subject: [PATCH 1/4] v 2.6.0 (cherry picked from commit 78f88b49c393157986bba37a4c2e6f84fac71346) --- .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 0303e0e..8020d53 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 fb938f98a6ce227bffb97d20405f531d8df0131e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 May 2016 08:57:49 +0200 Subject: [PATCH 2/4] 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 8020d53..074e3df 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 b25eb5de31b051a3be30febd17382afb7df8033c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Jul 2016 14:37:47 +0200 Subject: [PATCH 3/4] 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 074e3df..cf32693 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 e5b203247bb1ee1fe69456a41f03a9c84f0ec87b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Sep 2016 09:24:46 +0200 Subject: [PATCH 4/4] 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 cf32693..b9b4b71 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