From 961cd61eca3e940f2f4563ab7edbc6f6a311afac Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 14:52:42 +0200 Subject: [PATCH 1/3] v3.5.6 (cherry picked from commit 7e57057b845c187582ae34a7af797362bdc2f651) --- .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 a0fe648..2ef7917 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 b2f32114127c900407f708c7ee3552f4ecad1b31 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Oct 2020 14:42:49 +0200 Subject: [PATCH 2/3] 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 2ef7917..a3ad448 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 From 5972715b998a71d1a1a8189660b3e1b0c3d2ac61 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Apr 2021 10:11:25 +0200 Subject: [PATCH 3/3] v3.6.0 (cherry picked from commit 57592805ee68362e0bc9b3f2564802fb5a5360d0) (cherry picked from commit 457f52fdbe288f383c515f82b9b1fdec09fc2ab5) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 17 ++++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e3dc017..836ca3c 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /PHP_CodeSniffer-3.5.5.tgz /PHP_CodeSniffer-3.5.6.tgz /PHP_CodeSniffer-3.5.8.tgz +/PHP_CodeSniffer-3.6.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index a3ad448..820a717 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-2020 Remi Collet +# Copyright (c) 2013-2021 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.8 +Version: 3.6.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -89,10 +89,14 @@ cd %{pear_name}-%{version} # fails with js: Couldn't read source file rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* -# Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. +# Fix current date +YEAR=$(date +%Y) +sed -e "/@copyright/s/2020/${YEAR}/" \ + -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed + +# Version 3.6.0: Tests: 1183, Assertions: 8128, Skipped: 8. ret=0 -# TODO php80 -for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ @@ -124,6 +128,9 @@ fi %changelog +* Fri Apr 9 2021 Remi Collet - 3.6.0-1 +- update to 3.6.0 + * Fri Oct 23 2020 Remi Collet - 3.5.8-1 - update to 3.5.8 diff --git a/sources b/sources index 7321209..31aa47b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.8.tgz) = 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e +SHA512 (PHP_CodeSniffer-3.6.0.tgz) = 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8