From 11befcc79e3b81534bda0f215b75cf5235827023 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Jan 2020 13:24:12 +0100 Subject: [PATCH 1/4] update to 3.5.4 fix test suite from https://github.com/squizlabs/PHP_CodeSniffer/pull/2847 (cherry picked from commit 3a852c4dbc8f1cf43adf551e5bbaa7286b1bed85) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 16 +++++++++++++--- sources | 2 +- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3ee9c52..1fae088 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ clog /PHP_CodeSniffer-3.5.1.tgz /PHP_CodeSniffer-3.5.2.tgz /PHP_CodeSniffer-3.5.3.tgz +/PHP_CodeSniffer-3.5.4.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index be022dd..264f44b 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-2019 Remi Collet +# Copyright (c) 2013-2020 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: 3.5.3 +Version: 3.5.4 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,6 +86,10 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} +# fix broken pear detection (may use export PHP_CODESNIFFER_PEAR=1 if PR accepted) +# https://github.com/squizlabs/PHP_CodeSniffer/pull/2847 +sed -e '/PHP_CODESNIFFER_PEAR/s/false/true/' -i tests/AllTests.php + # fails with js: Couldn't read source file rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* @@ -94,7 +98,8 @@ ret=0 for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg - $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} --verbose || ret=1 + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ + --verbose || ret=1 fi done exit $ret @@ -122,6 +127,11 @@ fi %changelog +* Fri Jan 31 2020 Remi Collet - 3.5.4-1 +- update to 3.5.4 +- fix test suite from + https://github.com/squizlabs/PHP_CodeSniffer/pull/2847 + * Wed Dec 4 2019 Remi Collet - 3.5.3-1 - update to 3.5.3 diff --git a/sources b/sources index 15187d3..d0f19e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.3.tgz) = 16f786f6f34827b1e489cd6df4ad9a4ffa281a6e23930af343fe49473c96f5dc28f9b0b27d3b639962ea483426453dc9b9538ede77246e33ae74705102553c94 +SHA512 (PHP_CodeSniffer-3.5.4.tgz) = 3e8024aac18111741637f014629eeaf5863b2f080a673e5b379a676fafb69859d1889ae13289b0149a9810641b0a140123a970ae1178fcd2cf6da1c414233bfd From a2f1fc22a95d4c9889d731808f78cbc6f38b2560 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Apr 2020 07:58:24 +0200 Subject: [PATCH 2/4] v3.5.5 (cherry picked from commit de698e48782a06a75375afa5ccd5d3a74c3691d0) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1fae088..39a07fe 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /PHP_CodeSniffer-3.5.2.tgz /PHP_CodeSniffer-3.5.3.tgz /PHP_CodeSniffer-3.5.4.tgz +/PHP_CodeSniffer-3.5.5.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 264f44b..eeefe49 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: 3.5.4 +Version: 3.5.5 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -127,6 +127,9 @@ fi %changelog +* Mon Apr 20 2020 Remi Collet - 3.5.5-1 +- update to 3.5.5 + * Fri Jan 31 2020 Remi Collet - 3.5.4-1 - update to 3.5.4 - fix test suite from diff --git a/sources b/sources index d0f19e4..e80bf94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.4.tgz) = 3e8024aac18111741637f014629eeaf5863b2f080a673e5b379a676fafb69859d1889ae13289b0149a9810641b0a140123a970ae1178fcd2cf6da1c414233bfd +SHA512 (PHP_CodeSniffer-3.5.5.tgz) = dad676069122d879b8afb665d661bcd1c810c762b44738765231f8c8cc90d20e7e581690b7e725cdc24438be26fa3185f3556a300798ed5a03cff51f5cbb5d4d From c35c180c71998544dda94236e0a21fce618ae856 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 14:52:42 +0200 Subject: [PATCH 3/4] v3.5.6 (cherry picked from commit 7e57057b845c187582ae34a7af797362bdc2f651) (cherry picked from commit 961cd61eca3e940f2f4563ab7edbc6f6a311afac) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 39a07fe..f2a22ca 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /PHP_CodeSniffer-3.5.3.tgz /PHP_CodeSniffer-3.5.4.tgz /PHP_CodeSniffer-3.5.5.tgz +/PHP_CodeSniffer-3.5.6.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index eeefe49..321d67f 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: 3.5.5 +Version: 3.5.6 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -95,6 +95,7 @@ rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* # Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. ret=0 +# TODO php80 for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg @@ -127,6 +128,9 @@ fi %changelog +* Tue Aug 11 2020 Remi Collet - 3.5.6-1 +- update to 3.5.6 + * Mon Apr 20 2020 Remi Collet - 3.5.5-1 - update to 3.5.5 diff --git a/sources b/sources index e80bf94..6f9f4e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.5.tgz) = dad676069122d879b8afb665d661bcd1c810c762b44738765231f8c8cc90d20e7e581690b7e725cdc24438be26fa3185f3556a300798ed5a03cff51f5cbb5d4d +SHA512 (PHP_CodeSniffer-3.5.6.tgz) = 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7 From 0833d4431f06e8a57eb2fc7c65aa21d675150bd8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Oct 2020 14:42:49 +0200 Subject: [PATCH 4/4] v3.5.8 (cherry picked from commit f81c2c88eb349140b40ac4dac7b0b00587c75bf4) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f2a22ca..e3dc017 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /PHP_CodeSniffer-3.5.4.tgz /PHP_CodeSniffer-3.5.5.tgz /PHP_CodeSniffer-3.5.6.tgz +/PHP_CodeSniffer-3.5.8.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 321d67f..0986ecf 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: 3.5.6 +Version: 3.5.8 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,10 +86,6 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} -# fix broken pear detection (may use export PHP_CODESNIFFER_PEAR=1 if PR accepted) -# https://github.com/squizlabs/PHP_CodeSniffer/pull/2847 -sed -e '/PHP_CODESNIFFER_PEAR/s/false/true/' -i tests/AllTests.php - # fails with js: Couldn't read source file rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* @@ -128,6 +124,9 @@ fi %changelog +* Fri Oct 23 2020 Remi Collet - 3.5.8-1 +- update to 3.5.8 + * Tue Aug 11 2020 Remi Collet - 3.5.6-1 - update to 3.5.6 diff --git a/sources b/sources index 6f9f4e3..7321209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.6.tgz) = 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7 +SHA512 (PHP_CodeSniffer-3.5.8.tgz) = 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e