From 617f1a33d2113ffae33c5b343557617010eeca14 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 27 Sep 2019 07:45:01 +0200 Subject: [PATCH 1/6] v3.5.0 (cherry picked from commit 85e1fddd33c0c2548341bfefe252a27140686d3d) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aab10e4..07654dd 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /PHP_CodeSniffer-3.4.0.tgz /PHP_CodeSniffer-3.4.1.tgz /PHP_CodeSniffer-3.4.2.tgz +/PHP_CodeSniffer-3.5.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 529a63c..8c5ffb1 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.4.2 +Version: 3.5.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,9 +86,12 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check 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. ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do +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 @@ -119,6 +122,9 @@ fi %changelog +* Fri Sep 27 2019 Remi Collet - 3.5.0-1 +- update to 3.5.0 + * Thu Apr 11 2019 Remi Collet - 3.4.2-1 - update to 3.4.2 diff --git a/sources b/sources index 22e4008..e58d8c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.4.2.tgz) = 6236e3f9899d8f4637314f359a8db44835140d0292ea02b56b5e2e55ea8739841648ee03c3f25bf4df64577237b6bc1c3d0999d5452b9f292ef019347ecd41f5 +SHA512 (PHP_CodeSniffer-3.5.0.tgz) = 4990c4c02237d004af58af73fa09f2459cd0dae685afa2b01c42500b97135bd0fe9574290524a235e59e6ea225cebdb9537769dd4487c43cf8829a2cda6031c4 From 7bb6286531b22b15d3029da0f9642662b247d6bb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Oct 2019 09:44:48 +0200 Subject: [PATCH 2/6] v3.5.1 (cherry picked from commit 740f1bf320bb577c2b63974818b9e79148df3438) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07654dd..b440d58 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /PHP_CodeSniffer-3.4.1.tgz /PHP_CodeSniffer-3.4.2.tgz /PHP_CodeSniffer-3.5.0.tgz +/PHP_CodeSniffer-3.5.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8c5ffb1..aeb5027 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.0 +Version: 3.5.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -122,6 +122,9 @@ fi %changelog +* Thu Oct 17 2019 Remi Collet - 3.5.1-1 +- update to 3.5.1 + * Fri Sep 27 2019 Remi Collet - 3.5.0-1 - update to 3.5.0 diff --git a/sources b/sources index e58d8c2..e7bde11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.0.tgz) = 4990c4c02237d004af58af73fa09f2459cd0dae685afa2b01c42500b97135bd0fe9574290524a235e59e6ea225cebdb9537769dd4487c43cf8829a2cda6031c4 +SHA512 (PHP_CodeSniffer-3.5.1.tgz) = d5849891429aef93e14b21c359b0a05b91ba74900aa79990293b111e42aa0ad9c612fce3a6a7700508f249a20358c9b9c12f4f113648a45d83fb977880127f6f From 02d439257c479f41ed744773bf0740980f2f6e78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Oct 2019 09:40:04 +0100 Subject: [PATCH 3/6] v3.5.2 (cherry picked from commit 0a72faa46c6fb0fdfc0e47ac00a81e52c5b6bac7) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b440d58..3367f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /PHP_CodeSniffer-3.4.2.tgz /PHP_CodeSniffer-3.5.0.tgz /PHP_CodeSniffer-3.5.1.tgz +/PHP_CodeSniffer-3.5.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index aeb5027..12f9859 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.1 +Version: 3.5.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -122,6 +122,9 @@ fi %changelog +* Mon Oct 28 2019 Remi Collet - 3.5.2-1 +- update to 3.5.2 + * Thu Oct 17 2019 Remi Collet - 3.5.1-1 - update to 3.5.1 diff --git a/sources b/sources index e7bde11..6ad0603 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.1.tgz) = d5849891429aef93e14b21c359b0a05b91ba74900aa79990293b111e42aa0ad9c612fce3a6a7700508f249a20358c9b9c12f4f113648a45d83fb977880127f6f +SHA512 (PHP_CodeSniffer-3.5.2.tgz) = 3ae8d484b7725ee5b15f44b6338310aee0ef23a689c76b6c968861a33532c089b0601ba04069e054695def245314f3913998b4d61f0b9c3daa92e624e2aea0e1 From 5bec9efe96b4b2942ef6d57597561f815a3a6ce3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Dec 2019 09:43:47 +0100 Subject: [PATCH 4/6] v3.5.3 (cherry picked from commit efb57d6a7c1be6a02fc3d42e18d8b12acaf789d0) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3367f5f..3ee9c52 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /PHP_CodeSniffer-3.5.0.tgz /PHP_CodeSniffer-3.5.1.tgz /PHP_CodeSniffer-3.5.2.tgz +/PHP_CodeSniffer-3.5.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 12f9859..6871811 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.2 +Version: 3.5.3 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -122,6 +122,9 @@ fi %changelog +* Wed Dec 4 2019 Remi Collet - 3.5.3-1 +- update to 3.5.3 + * Mon Oct 28 2019 Remi Collet - 3.5.2-1 - update to 3.5.2 diff --git a/sources b/sources index 6ad0603..15187d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.2.tgz) = 3ae8d484b7725ee5b15f44b6338310aee0ef23a689c76b6c968861a33532c089b0601ba04069e054695def245314f3913998b4d61f0b9c3daa92e624e2aea0e1 +SHA512 (PHP_CodeSniffer-3.5.3.tgz) = 16f786f6f34827b1e489cd6df4ad9a4ffa281a6e23930af343fe49473c96f5dc28f9b0b27d3b639962ea483426453dc9b9538ede77246e33ae74705102553c94 From 91a429833f53a00a3271a432433afc80f3d532da Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Jan 2020 13:24:12 +0100 Subject: [PATCH 5/6] update to 3.5.4 fix test suite from https://github.com/squizlabs/PHP_CodeSniffer/pull/2847 (cherry picked from commit 3a852c4dbc8f1cf43adf551e5bbaa7286b1bed85) (cherry picked from commit 11befcc79e3b81534bda0f215b75cf5235827023) --- .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 6871811..cb4835b 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 e8e50d657db011d82a446d37e068019224010d78 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Apr 2020 07:58:24 +0200 Subject: [PATCH 6/6] 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 cb4835b..d4a74be 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