From fd446d2d0a96f575c2af26e37da936028c8dba8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:07:41 +0000 Subject: [PATCH 01/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- php-pear-PHP-CodeSniffer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 68e0c4f..623750d 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -24,7 +24,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause @@ -141,6 +141,9 @@ fi %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 3.10.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu May 23 2024 Remi Collet - 3.10.1-1 - update to 3.10.1 From dac4b5583b54bfaedb881018fdad78893acb3b80 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jul 2024 07:59:34 +0200 Subject: [PATCH 02/29] v3.10.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 9f712fc..7a6af7a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.0-57e0980.tgz /roundcubemail-1.5.7-complete.tar.gz /php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz +/php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 623750d..8bec845 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 8f90f7a53ce271935282967f53d0894f8f1ff877 +%global gh_commit 86e5f5dd9a840c46810ebe5ff1885581c42a3017 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-05-22 +%global gh_date 2024-07-21 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,8 +23,8 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.10.1 -Release: 2%{?dist} +Version: 3.10.2 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause @@ -141,6 +141,9 @@ fi %changelog +* Mon Jul 22 2024 Remi Collet - 3.10.2-1 +- update to 3.10.2 + * Fri Jul 19 2024 Fedora Release Engineering - 3.10.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 5a2cc0c..61ddab6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz) = 00e972de684d7655b894212962aa49bb5c89899d01dcbb6eb0fb929bd5dc0553c7dd9542e017b22262564137dc2fb545ea8e055d8a6b3c79261d7ce85096432c +SHA512 (php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz) = 376d75a347cb130ab3128634c9332295597431b0a01fbdc234129e2ec4eef89916e64675aaa9fe850c43fd27a651c0b0fd8a5b15a784713dd77fbc058af6ca18 From c20d5e3cb77920925a83911362879ef4ffc1d510 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 22 Jul 2024 07:59:34 +0200 Subject: [PATCH 03/29] v3.10.2 (cherry picked from commit dac4b5583b54bfaedb881018fdad78893acb3b80) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 9f712fc..7a6af7a 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.0-57e0980.tgz /roundcubemail-1.5.7-complete.tar.gz /php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz +/php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 68e0c4f..26e2776 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 8f90f7a53ce271935282967f53d0894f8f1ff877 +%global gh_commit 86e5f5dd9a840c46810ebe5ff1885581c42a3017 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-05-22 +%global gh_date 2024-07-21 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.10.1 +Version: 3.10.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* Mon Jul 22 2024 Remi Collet - 3.10.2-1 +- update to 3.10.2 + * Thu May 23 2024 Remi Collet - 3.10.1-1 - update to 3.10.1 diff --git a/sources b/sources index 5a2cc0c..61ddab6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz) = 00e972de684d7655b894212962aa49bb5c89899d01dcbb6eb0fb929bd5dc0553c7dd9542e017b22262564137dc2fb545ea8e055d8a6b3c79261d7ce85096432c +SHA512 (php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz) = 376d75a347cb130ab3128634c9332295597431b0a01fbdc234129e2ec4eef89916e64675aaa9fe850c43fd27a651c0b0fd8a5b15a784713dd77fbc058af6ca18 From 9222b878e84d0d65d14760b8a171f10e358c0b8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 17 Sep 2024 03:39:08 +0000 Subject: [PATCH 04/29] Correct SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 If there will be no comments in two weeks, I will merge this. --- php-pear-PHP-CodeSniffer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8bec845..640d0c0 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -27,7 +27,7 @@ Version: 3.10.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool -License: BSD 3-Clause +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} # git snapshot to retrieve test suite Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz From bcdd00f96baa4055897c293582bbfaede7b05839 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Sep 2024 14:50:06 +0200 Subject: [PATCH 05/29] v3.10.3 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a6af7a..6bcab39 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ clog /roundcubemail-1.5.7-complete.tar.gz /php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz /php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz +/php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 640d0c0..8689e63 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 86e5f5dd9a840c46810ebe5ff1885581c42a3017 +%global gh_commit 62d32998e820bddc40f99f8251958aed187a5c9c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-07-21 +%global gh_date 2024-09-18 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.10.2 +Version: 3.10.3 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* Wed Sep 18 2024 Remi Collet - 3.10.3-1 +- update to 3.10.3 + * Mon Jul 22 2024 Remi Collet - 3.10.2-1 - update to 3.10.2 diff --git a/sources b/sources index 61ddab6..d8709a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz) = 376d75a347cb130ab3128634c9332295597431b0a01fbdc234129e2ec4eef89916e64675aaa9fe850c43fd27a651c0b0fd8a5b15a784713dd77fbc058af6ca18 +SHA512 (php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz) = 5d3ad84e8a67cdc9b30ff807232923a022cd5e4149a770c02ff36d54fca4959d1cae7bd00cf11b948b4d2df0f7a345b36cfc950d15258dab966472554ca0557d From 76a1f360ce2ca9878f72c016779af44cfd5cee04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Tue, 17 Sep 2024 03:39:08 +0000 Subject: [PATCH 06/29] Correct SPDX license This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 If there will be no comments in two weeks, I will merge this. (cherry picked from commit 9222b878e84d0d65d14760b8a171f10e358c0b8a) --- php-pear-PHP-CodeSniffer.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 26e2776..00608c9 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -27,7 +27,7 @@ Version: 3.10.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool -License: BSD 3-Clause +License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} # git snapshot to retrieve test suite Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz From ed1cc9c1cbb7af744bd2c367135cf5d1cbd9bf53 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Sep 2024 14:50:06 +0200 Subject: [PATCH 07/29] v3.10.3 (cherry picked from commit bcdd00f96baa4055897c293582bbfaede7b05839) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7a6af7a..6bcab39 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ clog /roundcubemail-1.5.7-complete.tar.gz /php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz /php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz +/php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 00608c9..8a7cf94 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 86e5f5dd9a840c46810ebe5ff1885581c42a3017 +%global gh_commit 62d32998e820bddc40f99f8251958aed187a5c9c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-07-21 +%global gh_date 2024-09-18 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.10.2 +Version: 3.10.3 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* Wed Sep 18 2024 Remi Collet - 3.10.3-1 +- update to 3.10.3 + * Mon Jul 22 2024 Remi Collet - 3.10.2-1 - update to 3.10.2 diff --git a/sources b/sources index 61ddab6..d8709a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz) = 376d75a347cb130ab3128634c9332295597431b0a01fbdc234129e2ec4eef89916e64675aaa9fe850c43fd27a651c0b0fd8a5b15a784713dd77fbc058af6ca18 +SHA512 (php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz) = 5d3ad84e8a67cdc9b30ff807232923a022cd5e4149a770c02ff36d54fca4959d1cae7bd00cf11b948b4d2df0f7a345b36cfc950d15258dab966472554ca0557d From 4ed1e86361a73abf5d1b1e091c5f82a96c7f1201 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2024 12:46:45 +0100 Subject: [PATCH 08/29] v3.11.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6bcab39..d27709f 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz /php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz /php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz +/php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8689e63..2b9142b 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 62d32998e820bddc40f99f8251958aed187a5c9c +%global gh_commit 70c08f8d20c0eb4fe56f26644dd94dae76a7f450 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-09-18 +%global gh_date 2024-11-12 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.10.3 +Version: 3.11.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -113,7 +113,7 @@ sed -e "/@copyright/s/2021/${YEAR}/" \ # Version 3.9.0: Tests: 2276, Assertions: 10969, Warnings: 4, Skipped: 12. ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=-1 ${2:-%{_bindir}/phpunit9} \ @@ -141,6 +141,9 @@ fi %changelog +* Tue Nov 12 2024 Remi Collet - 3.11.0-1 +- update to 3.11.0 + * Wed Sep 18 2024 Remi Collet - 3.10.3-1 - update to 3.10.3 diff --git a/sources b/sources index d8709a5..9ac7bae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz) = 5d3ad84e8a67cdc9b30ff807232923a022cd5e4149a770c02ff36d54fca4959d1cae7bd00cf11b948b4d2df0f7a345b36cfc950d15258dab966472554ca0557d +SHA512 (php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz) = c12f22e7b5e219ea10edcca3188eb3a294b37a538ec47d44c9b6191092f8a7313c90e30926ef7a3713d452209e8ff214c5e016b432719a8b442be8f7a78fe1e6 From 02e760c8731c4af8e546abf65aa2e729044210f2 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2024 12:46:45 +0100 Subject: [PATCH 09/29] v3.11.0 (cherry picked from commit 4ed1e86361a73abf5d1b1e091c5f82a96c7f1201) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6bcab39..d27709f 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz /php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz /php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz +/php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8a7cf94..cbb6f18 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 62d32998e820bddc40f99f8251958aed187a5c9c +%global gh_commit 70c08f8d20c0eb4fe56f26644dd94dae76a7f450 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-09-18 +%global gh_date 2024-11-12 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.10.3 +Version: 3.11.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -113,7 +113,7 @@ sed -e "/@copyright/s/2021/${YEAR}/" \ # Version 3.9.0: Tests: 2276, Assertions: 10969, Warnings: 4, Skipped: 12. ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83; do +for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=-1 ${2:-%{_bindir}/phpunit9} \ @@ -141,6 +141,9 @@ fi %changelog +* Tue Nov 12 2024 Remi Collet - 3.11.0-1 +- update to 3.11.0 + * Wed Sep 18 2024 Remi Collet - 3.10.3-1 - update to 3.10.3 diff --git a/sources b/sources index d8709a5..9ac7bae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz) = 5d3ad84e8a67cdc9b30ff807232923a022cd5e4149a770c02ff36d54fca4959d1cae7bd00cf11b948b4d2df0f7a345b36cfc950d15258dab966472554ca0557d +SHA512 (php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz) = c12f22e7b5e219ea10edcca3188eb3a294b37a538ec47d44c9b6191092f8a7313c90e30926ef7a3713d452209e8ff214c5e016b432719a8b442be8f7a78fe1e6 From bbfa53333887ff1e6e3622098850a3b9df480a5b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Nov 2024 10:01:24 +0100 Subject: [PATCH 10/29] v3.11.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d27709f..bab5621 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz /php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz /php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz +/php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 2b9142b..b08fde6 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 70c08f8d20c0eb4fe56f26644dd94dae76a7f450 +%global gh_commit 19473c30efe4f7b3cd42522d0b2e6e7f243c6f87 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-11-12 +%global gh_date 2024-11-16 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.0 +Version: 3.11.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* Mon Nov 18 2024 Remi Collet - 3.11.1-1 +- update to 3.11.1 + * Tue Nov 12 2024 Remi Collet - 3.11.0-1 - update to 3.11.0 diff --git a/sources b/sources index 9ac7bae..d2ae863 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz) = c12f22e7b5e219ea10edcca3188eb3a294b37a538ec47d44c9b6191092f8a7313c90e30926ef7a3713d452209e8ff214c5e016b432719a8b442be8f7a78fe1e6 +SHA512 (php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz) = 52f18f27dbe83b59f8f1d09dc0d68d4a53a78ee0828d901b7a3b9e521e3854e69df4c026220ce15ed1047acbc627b7fd7013405dd16f8176e2bd72b576512a41 From 2b6357fdce2526cf94bfd39a0ec9223a490f92d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Nov 2024 10:01:24 +0100 Subject: [PATCH 11/29] v3.11.1 (cherry picked from commit bbfa53333887ff1e6e3622098850a3b9df480a5b) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index d27709f..bab5621 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz /php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz /php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz +/php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index cbb6f18..9071a87 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 70c08f8d20c0eb4fe56f26644dd94dae76a7f450 +%global gh_commit 19473c30efe4f7b3cd42522d0b2e6e7f243c6f87 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-11-12 +%global gh_date 2024-11-16 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.0 +Version: 3.11.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* Mon Nov 18 2024 Remi Collet - 3.11.1-1 +- update to 3.11.1 + * Tue Nov 12 2024 Remi Collet - 3.11.0-1 - update to 3.11.0 diff --git a/sources b/sources index 9ac7bae..d2ae863 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz) = c12f22e7b5e219ea10edcca3188eb3a294b37a538ec47d44c9b6191092f8a7313c90e30926ef7a3713d452209e8ff214c5e016b432719a8b442be8f7a78fe1e6 +SHA512 (php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz) = 52f18f27dbe83b59f8f1d09dc0d68d4a53a78ee0828d901b7a3b9e521e3854e69df4c026220ce15ed1047acbc627b7fd7013405dd16f8176e2bd72b576512a41 From 7426c9065a2c8af45025982d80d349407d89a823 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Dec 2024 08:21:13 +0100 Subject: [PATCH 12/29] v3.11.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bab5621..41c403b 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz /php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz /php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz +/php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index b08fde6..1cdb90c 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 19473c30efe4f7b3cd42522d0b2e6e7f243c6f87 +%global gh_commit 1368f4a58c3c52114b86b1abe8f4098869cb0079 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-11-16 +%global gh_date 2024-12-11 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.1 +Version: 3.11.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -45,6 +45,7 @@ BuildRequires: php-dom BuildRequires: php-iconv BuildRequires: php-intl %if %{with tests} +BuildRequires: php-bcmath # to run test suite, from composer.json "require-dev" # "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" %global phpunit %{_bindir}/phpunit9 @@ -111,12 +112,14 @@ YEAR=$(date +%Y) sed -e "/@copyright/s/2021/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed -# Version 3.9.0: Tests: 2276, Assertions: 10969, Warnings: 4, Skipped: 12. +# Version 3.11.2: Tests: 3174, Assertions: 18639, Warnings: 3, Skipped: 19. +# testBrokenRulesetMultiError failing reported as https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/767 ret=0 for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=-1 ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(testBrokenRulesetMultiError)).)*$' \ || ret=1 fi done @@ -141,6 +144,9 @@ fi %changelog +* Thu Dec 12 2024 Remi Collet - 3.11.2-1 +- update to 3.11.2 + * Mon Nov 18 2024 Remi Collet - 3.11.1-1 - update to 3.11.1 diff --git a/sources b/sources index d2ae863..f7e5eb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz) = 52f18f27dbe83b59f8f1d09dc0d68d4a53a78ee0828d901b7a3b9e521e3854e69df4c026220ce15ed1047acbc627b7fd7013405dd16f8176e2bd72b576512a41 +SHA512 (php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz) = 2e490407d80d8f235d81c4dde1503eb2722bcb7bf6753e7d9d13017fb84cdbbaf51a15e7613295e1f00eb7097fcb070dfa7861309d8805a22df0a852cd9f7901 From ddb15f4117b97aad08579bdb9a4d73e08e0d074c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Dec 2024 08:21:13 +0100 Subject: [PATCH 13/29] v3.11.2 (cherry picked from commit 7426c9065a2c8af45025982d80d349407d89a823) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bab5621..41c403b 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ clog /php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz /php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz /php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz +/php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 9071a87..72c2258 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 19473c30efe4f7b3cd42522d0b2e6e7f243c6f87 +%global gh_commit 1368f4a58c3c52114b86b1abe8f4098869cb0079 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-11-16 +%global gh_date 2024-12-11 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.1 +Version: 3.11.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -45,6 +45,7 @@ BuildRequires: php-dom BuildRequires: php-iconv BuildRequires: php-intl %if %{with tests} +BuildRequires: php-bcmath # to run test suite, from composer.json "require-dev" # "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" %global phpunit %{_bindir}/phpunit9 @@ -111,12 +112,14 @@ YEAR=$(date +%Y) sed -e "/@copyright/s/2021/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed -# Version 3.9.0: Tests: 2276, Assertions: 10969, Warnings: 4, Skipped: 12. +# Version 3.11.2: Tests: 3174, Assertions: 18639, Warnings: 3, Skipped: 19. +# testBrokenRulesetMultiError failing reported as https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/767 ret=0 for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=-1 ${2:-%{_bindir}/phpunit9} \ + --filter '^((?!(testBrokenRulesetMultiError)).)*$' \ || ret=1 fi done @@ -141,6 +144,9 @@ fi %changelog +* Thu Dec 12 2024 Remi Collet - 3.11.2-1 +- update to 3.11.2 + * Mon Nov 18 2024 Remi Collet - 3.11.1-1 - update to 3.11.1 diff --git a/sources b/sources index d2ae863..f7e5eb0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz) = 52f18f27dbe83b59f8f1d09dc0d68d4a53a78ee0828d901b7a3b9e521e3854e69df4c026220ce15ed1047acbc627b7fd7013405dd16f8176e2bd72b576512a41 +SHA512 (php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz) = 2e490407d80d8f235d81c4dde1503eb2722bcb7bf6753e7d9d13017fb84cdbbaf51a15e7613295e1f00eb7097fcb070dfa7861309d8805a22df0a852cd9f7901 From 8dd336ce026c73fe8cd25253f7d688e37d2fc9b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:19:54 +0000 Subject: [PATCH 14/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- php-pear-PHP-CodeSniffer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 1cdb90c..af01203 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -24,7 +24,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD-3-Clause @@ -144,6 +144,9 @@ fi %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 3.11.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Dec 12 2024 Remi Collet - 3.11.2-1 - update to 3.11.2 From b21aca429a5e60792af381dc6b99f1d8eb09e1dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 Jan 2025 15:35:26 +0100 Subject: [PATCH 15/29] fix tests failing because of new year --- php-pear-PHP-CodeSniffer.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index af01203..eca35d9 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-2024 Remi Collet +# Copyright (c) 2013-2025 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -109,7 +109,8 @@ rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* # Fix current date YEAR=$(date +%Y) -sed -e "/@copyright/s/2021/${YEAR}/" \ +PREV=$(expr $YEAR - 1) +sed -e "/@copyright/s/${PREV}/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed # Version 3.11.2: Tests: 3174, Assertions: 18639, Warnings: 3, Skipped: 19. @@ -144,6 +145,9 @@ fi %changelog +* Wed Jan 22 2025 Remi Collet - 3.11.2-2 +- fix tests failing because of new year + * Sat Jan 18 2025 Fedora Release Engineering - 3.11.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 360553de8ad3e930aa04adc361d3aab494f9abce Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jan 2025 07:50:30 +0100 Subject: [PATCH 16/29] v3.11.3 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 41c403b..3d1d52e 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz /php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz /php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz +/php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index eca35d9..7272fa7 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 1368f4a58c3c52114b86b1abe8f4098869cb0079 +%global gh_commit ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-12-11 +%global gh_date 2025-01-23 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,8 +23,8 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.2 -Release: 2%{?dist} +Version: 3.11.3 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD-3-Clause @@ -145,6 +145,9 @@ fi %changelog +* Fri Jan 24 2025 Remi Collet - 3.11.3-1 +- update to 3.11.3 + * Wed Jan 22 2025 Remi Collet - 3.11.2-2 - fix tests failing because of new year diff --git a/sources b/sources index f7e5eb0..c14a20c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz) = 2e490407d80d8f235d81c4dde1503eb2722bcb7bf6753e7d9d13017fb84cdbbaf51a15e7613295e1f00eb7097fcb070dfa7861309d8805a22df0a852cd9f7901 +SHA512 (php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz) = 359397a569fb71d6636124bf0226799dbd6bbf84e3aa7d2f64bc9adbde729973299f8664a32f901963e5e552f1474378f5ca87d1386baff7b7311c2386e77980 From b244a555fad21efeb345723c39968b72481bd43a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Jan 2025 07:50:30 +0100 Subject: [PATCH 17/29] v3.11.3 (cherry picked from commit 360553de8ad3e930aa04adc361d3aab494f9abce) (cherry picked from commit e8f463df8526000b979dff1df6e7d8446c78c73b) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 41c403b..3d1d52e 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz /php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz /php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz +/php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 72c2258..dd39be4 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-2024 Remi Collet +# Copyright (c) 2013-2025 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 1368f4a58c3c52114b86b1abe8f4098869cb0079 +%global gh_commit ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-12-11 +%global gh_date 2025-01-23 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.2 +Version: 3.11.3 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -109,7 +109,8 @@ rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* # Fix current date YEAR=$(date +%Y) -sed -e "/@copyright/s/2021/${YEAR}/" \ +PREV=$(expr $YEAR - 1) +sed -e "/@copyright/s/${PREV}/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed # Version 3.11.2: Tests: 3174, Assertions: 18639, Warnings: 3, Skipped: 19. @@ -144,6 +145,9 @@ fi %changelog +* Fri Jan 24 2025 Remi Collet - 3.11.3-1 +- update to 3.11.3 + * Thu Dec 12 2024 Remi Collet - 3.11.2-1 - update to 3.11.2 diff --git a/sources b/sources index f7e5eb0..c14a20c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz) = 2e490407d80d8f235d81c4dde1503eb2722bcb7bf6753e7d9d13017fb84cdbbaf51a15e7613295e1f00eb7097fcb070dfa7861309d8805a22df0a852cd9f7901 +SHA512 (php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz) = 359397a569fb71d6636124bf0226799dbd6bbf84e3aa7d2f64bc9adbde729973299f8664a32f901963e5e552f1474378f5ca87d1386baff7b7311c2386e77980 From 2a1edf8f00b0cc6d82ae44bbafd4c956377d743e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Mar 2025 09:03:06 +0100 Subject: [PATCH 18/29] v3.12.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d1d52e..c854aea 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz /php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz /php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz +/php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 7272fa7..8a25742 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10 +%global gh_commit 2d1b63db139c3c6ea0c927698e5160f8b3b8d630 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-23 +%global gh_date 2025-03-18 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.3 +Version: 3.12.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Tue Mar 18 2025 Remi Collet - 3.12.0-1 +- update to 3.12.0 + * Fri Jan 24 2025 Remi Collet - 3.11.3-1 - update to 3.11.3 diff --git a/sources b/sources index c14a20c..9d3c9b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz) = 359397a569fb71d6636124bf0226799dbd6bbf84e3aa7d2f64bc9adbde729973299f8664a32f901963e5e552f1474378f5ca87d1386baff7b7311c2386e77980 +SHA512 (php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz) = bb60634b82b410c1ec6a53c19eda4d4f9baad0ca71280b3dda2754d6aa1d83649763c7b31ee2ffe5b3a0cc6ef829dc8cebbae668646c93cc27b2e3f53c054c66 From a96450c60fa818c9b875c92198088cf2fdca9de4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Mar 2025 09:03:06 +0100 Subject: [PATCH 19/29] v3.12.0 (cherry picked from commit 2a1edf8f00b0cc6d82ae44bbafd4c956377d743e) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3d1d52e..c854aea 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz /php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz /php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz +/php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index dd39be4..c0756c6 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit ba05f990e79cbe69b9f35c8c1ac8dca7eecc3a10 +%global gh_commit 2d1b63db139c3c6ea0c927698e5160f8b3b8d630 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-01-23 +%global gh_date 2025-03-18 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.11.3 +Version: 3.12.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Tue Mar 18 2025 Remi Collet - 3.12.0-1 +- update to 3.12.0 + * Fri Jan 24 2025 Remi Collet - 3.11.3-1 - update to 3.11.3 diff --git a/sources b/sources index c14a20c..9d3c9b8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz) = 359397a569fb71d6636124bf0226799dbd6bbf84e3aa7d2f64bc9adbde729973299f8664a32f901963e5e552f1474378f5ca87d1386baff7b7311c2386e77980 +SHA512 (php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz) = bb60634b82b410c1ec6a53c19eda4d4f9baad0ca71280b3dda2754d6aa1d83649763c7b31ee2ffe5b3a0cc6ef829dc8cebbae668646c93cc27b2e3f53c054c66 From 711b33f980c0f67d0fe6aedbf3617def12b757c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2025 11:19:44 +0200 Subject: [PATCH 20/29] v3.12.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c854aea..791bf65 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz /php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz /php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz +/php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 8a25742..c43365a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 2d1b63db139c3c6ea0c927698e5160f8b3b8d630 +%global gh_commit ea16a1f3719783345febd3aab41beb55c8c84bfd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-03-18 +%global gh_date 2025-04-04 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.12.0 +Version: 3.12.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Mon Apr 7 2025 Remi Collet - 3.12.1-1 +- update to 3.12.1 + * Tue Mar 18 2025 Remi Collet - 3.12.0-1 - update to 3.12.0 diff --git a/sources b/sources index 9d3c9b8..2125d91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz) = bb60634b82b410c1ec6a53c19eda4d4f9baad0ca71280b3dda2754d6aa1d83649763c7b31ee2ffe5b3a0cc6ef829dc8cebbae668646c93cc27b2e3f53c054c66 +SHA512 (php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz) = 983f63a8b2d2eb938c7621fb979c90d20ac7ba3375e33e2b139571a289f2efb925581343e123cb11f8281198927fa8caef8a93eee8ca00411ea0910fbb3d5611 From ccd25247c887f4abb0665720f85772686a50d92f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2025 11:19:44 +0200 Subject: [PATCH 21/29] v3.12.1 (cherry picked from commit 711b33f980c0f67d0fe6aedbf3617def12b757c9) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c854aea..791bf65 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz /php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz /php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz +/php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c0756c6..0e9a12a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 2d1b63db139c3c6ea0c927698e5160f8b3b8d630 +%global gh_commit ea16a1f3719783345febd3aab41beb55c8c84bfd %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-03-18 +%global gh_date 2025-04-04 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.12.0 +Version: 3.12.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Mon Apr 7 2025 Remi Collet - 3.12.1-1 +- update to 3.12.1 + * Tue Mar 18 2025 Remi Collet - 3.12.0-1 - update to 3.12.0 diff --git a/sources b/sources index 9d3c9b8..2125d91 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz) = bb60634b82b410c1ec6a53c19eda4d4f9baad0ca71280b3dda2754d6aa1d83649763c7b31ee2ffe5b3a0cc6ef829dc8cebbae668646c93cc27b2e3f53c054c66 +SHA512 (php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz) = 983f63a8b2d2eb938c7621fb979c90d20ac7ba3375e33e2b139571a289f2efb925581343e123cb11f8281198927fa8caef8a93eee8ca00411ea0910fbb3d5611 From bd66e5bd2ec598862b66ac9d38262ba8cd0d3d23 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Apr 2025 09:52:03 +0200 Subject: [PATCH 22/29] v3.12.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 791bf65..474d92e 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz /php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz /php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz +/php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c43365a..837e202 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit ea16a1f3719783345febd3aab41beb55c8c84bfd +%global gh_commit 6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-04-04 +%global gh_date 2025-04-13 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.12.1 +Version: 3.12.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Mon Apr 14 2025 Remi Collet - 3.12.2-1 +- update to 3.12.2 + * Mon Apr 7 2025 Remi Collet - 3.12.1-1 - update to 3.12.1 diff --git a/sources b/sources index 2125d91..c871598 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz) = 983f63a8b2d2eb938c7621fb979c90d20ac7ba3375e33e2b139571a289f2efb925581343e123cb11f8281198927fa8caef8a93eee8ca00411ea0910fbb3d5611 +SHA512 (php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz) = 9c61b2b336a0bc838e79b1ddb1f12ce9550476e1104c13fb1bc38d6d15787a5ba82106f1a48250cb32a63d2e0d007f17f10b9305a57b88ba1de91c979dfc8a1e From 369abf37c8d0108b487240308dcf0af4efd1d894 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Apr 2025 09:52:03 +0200 Subject: [PATCH 23/29] v3.12.2 (cherry picked from commit bd66e5bd2ec598862b66ac9d38262ba8cd0d3d23) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 791bf65..474d92e 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ clog /php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz /php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz /php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz +/php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0e9a12a..a0b75ba 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit ea16a1f3719783345febd3aab41beb55c8c84bfd +%global gh_commit 6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-04-04 +%global gh_date 2025-04-13 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.12.1 +Version: 3.12.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Mon Apr 14 2025 Remi Collet - 3.12.2-1 +- update to 3.12.2 + * Mon Apr 7 2025 Remi Collet - 3.12.1-1 - update to 3.12.1 diff --git a/sources b/sources index 2125d91..c871598 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz) = 983f63a8b2d2eb938c7621fb979c90d20ac7ba3375e33e2b139571a289f2efb925581343e123cb11f8281198927fa8caef8a93eee8ca00411ea0910fbb3d5611 +SHA512 (php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz) = 9c61b2b336a0bc838e79b1ddb1f12ce9550476e1104c13fb1bc38d6d15787a5ba82106f1a48250cb32a63d2e0d007f17f10b9305a57b88ba1de91c979dfc8a1e From c04214bbca2cc00ffb1046d45dabba48d3e27c7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 May 2025 16:52:46 +0200 Subject: [PATCH 24/29] v3.13.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 474d92e..f669159 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ clog /php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz /php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz /php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz +/php-pear-PHP-CodeSniffer-3.13.0-65ff248.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 837e202..5e41bd9 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 6d4cf6032d4b718f168c90a96e36c7d0eaacb2aa +%global gh_commit 65ff2489553b83b4597e89c3b8b721487011d186 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-04-13 +%global gh_date 2025-05-11 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.12.2 +Version: 3.13.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Thu May 15 2025 Remi Collet - 3.13.0-1 +- update to 3.13.0 + * Mon Apr 14 2025 Remi Collet - 3.12.2-1 - update to 3.12.2 diff --git a/sources b/sources index c871598..eb5ff28 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz) = 9c61b2b336a0bc838e79b1ddb1f12ce9550476e1104c13fb1bc38d6d15787a5ba82106f1a48250cb32a63d2e0d007f17f10b9305a57b88ba1de91c979dfc8a1e +SHA512 (php-pear-PHP-CodeSniffer-3.13.0-65ff248.tgz) = ded4aeafeb7bb0e46bd133e77f7115ecd384b9965051ce8c832c6ccdec764c0674eff410fcd0d3f0ce8d508592cd3217f9a2620d1d0bd574acb9e7a9202366e8 From f2144483bfea73196a8575f7cbbb3a446aa197c8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 18 Jun 2025 10:18:58 +0200 Subject: [PATCH 25/29] v3.13.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f669159..5b71888 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ clog /php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz /php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz /php-pear-PHP-CodeSniffer-3.13.0-65ff248.tgz +/php-pear-PHP-CodeSniffer-3.13.2-5b5e382.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 5e41bd9..0410feb 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 65ff2489553b83b4597e89c3b8b721487011d186 +%global gh_commit 5b5e3821314f947dd040c70f7992a64eac89025c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-05-11 +%global gh_date 2025-06-17 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.13.0 +Version: 3.13.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -145,6 +145,9 @@ fi %changelog +* Wed Jun 18 2025 Remi Collet - 3.13.2-1 +- update to 3.13.2 + * Thu May 15 2025 Remi Collet - 3.13.0-1 - update to 3.13.0 diff --git a/sources b/sources index eb5ff28..a651988 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.13.0-65ff248.tgz) = ded4aeafeb7bb0e46bd133e77f7115ecd384b9965051ce8c832c6ccdec764c0674eff410fcd0d3f0ce8d508592cd3217f9a2620d1d0bd574acb9e7a9202366e8 +SHA512 (php-pear-PHP-CodeSniffer-3.13.2-5b5e382.tgz) = 24ec9e9770103a46aecc8433b973bc496847f5e4be9c3b94a5184e5af62b4db1084053669ce7b4ac263b71166cbc2f8477862f1c9c5d406764001beaa412eedc From 19acc12cc0496ff069ef1608308bd31338f43c62 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 05:20:01 +0000 Subject: [PATCH 26/29] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- php-pear-PHP-CodeSniffer.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0410feb..c6aab30 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -24,7 +24,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.13.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD-3-Clause @@ -145,6 +145,9 @@ fi %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 3.13.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jun 18 2025 Remi Collet - 3.13.2-1 - update to 3.13.2 From 52d2d3edc1866453b4f6cc111090950751ca1100 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 8 Sep 2025 10:20:22 +0200 Subject: [PATCH 27/29] v3.13.4 --- .gitignore | 65 +---------------------------------- php-pear-PHP-CodeSniffer.spec | 11 +++--- sources | 2 +- 3 files changed, 9 insertions(+), 69 deletions(-) diff --git a/.gitignore b/.gitignore index 5b71888..56db86d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,65 +1,2 @@ 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-2.8.0.tgz -/PHP_CodeSniffer-2.8.1.tgz -/PHP_CodeSniffer-3.0.0.tgz -/PHP_CodeSniffer-3.0.1.tgz -/PHP_CodeSniffer-3.0.2.tgz -/PHP_CodeSniffer-3.1.0.tgz -/PHP_CodeSniffer-3.1.1.tgz -/PHP_CodeSniffer-3.2.0.tgz -/PHP_CodeSniffer-3.2.1.tgz -/PHP_CodeSniffer-3.2.2.tgz -/PHP_CodeSniffer-3.2.3.tgz -/PHP_CodeSniffer-3.3.0.tgz -/PHP_CodeSniffer-3.3.1.tgz -/PHP_CodeSniffer-3.3.2.tgz -/PHP_CodeSniffer-3.4.0.tgz -/PHP_CodeSniffer-3.4.1.tgz -/PHP_CodeSniffer-3.4.2.tgz -/PHP_CodeSniffer-3.5.0.tgz -/PHP_CodeSniffer-3.5.1.tgz -/PHP_CodeSniffer-3.5.2.tgz -/PHP_CodeSniffer-3.5.3.tgz -/PHP_CodeSniffer-3.5.4.tgz -/PHP_CodeSniffer-3.5.5.tgz -/PHP_CodeSniffer-3.5.6.tgz -/PHP_CodeSniffer-3.5.8.tgz -/PHP_CodeSniffer-3.6.0.tgz -/PHP_CodeSniffer-3.6.1.tgz -/PHP_CodeSniffer-3.6.2.tgz -/PHP_CodeSniffer-3.7.0.tgz -/PHP_CodeSniffer-3.7.1.tgz -/PHP_CodeSniffer-3.7.2.tgz -/php-pear-PHP-CodeSniffer-3.8.0-5805f7a.tgz -/php-pear-PHP-CodeSniffer-3.8.1-14f5fff.tgz -/php-pear-PHP-CodeSniffer-3.9.0-d63cee4.tgz -/php-pear-PHP-CodeSniffer-3.9.1-267a440.tgz -/php-pear-PHP-CodeSniffer-3.9.2-aac1f6f.tgz -/php-pear-PHP-CodeSniffer-3.10.0-57e0980.tgz -/roundcubemail-1.5.7-complete.tar.gz -/php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz -/php-pear-PHP-CodeSniffer-3.10.2-86e5f5d.tgz -/php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz -/php-pear-PHP-CodeSniffer-3.11.0-70c08f8.tgz -/php-pear-PHP-CodeSniffer-3.11.1-19473c3.tgz -/php-pear-PHP-CodeSniffer-3.11.2-1368f4a.tgz -/php-pear-PHP-CodeSniffer-3.11.3-ba05f99.tgz -/php-pear-PHP-CodeSniffer-3.12.0-2d1b63d.tgz -/php-pear-PHP-CodeSniffer-3.12.1-ea16a1f.tgz -/php-pear-PHP-CodeSniffer-3.12.2-6d4cf60.tgz -/php-pear-PHP-CodeSniffer-3.13.0-65ff248.tgz -/php-pear-PHP-CodeSniffer-3.13.2-5b5e382.tgz +/php-pear-PHP-CodeSniffer-3.13.4-ad545ea.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c6aab30..4357ec8 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 5b5e3821314f947dd040c70f7992a64eac89025c +%global gh_commit ad545ea9c1b7d270ce0fc9cbfb884161cd706119 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-06-17 +%global gh_date 2025-09-05 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -23,8 +23,8 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.13.2 -Release: 2%{?dist} +Version: 3.13.4 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD-3-Clause @@ -145,6 +145,9 @@ fi %changelog +* Mon Sep 8 2025 Remi Collet - 3.13.4-1 +- update to 3.13.4 + * Fri Jul 25 2025 Fedora Release Engineering - 3.13.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild diff --git a/sources b/sources index a651988..8a08523 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.13.2-5b5e382.tgz) = 24ec9e9770103a46aecc8433b973bc496847f5e4be9c3b94a5184e5af62b4db1084053669ce7b4ac263b71166cbc2f8477862f1c9c5d406764001beaa412eedc +SHA512 (php-pear-PHP-CodeSniffer-3.13.4-ad545ea.tgz) = 2506f26e13632b84ac655ac3f5b993bf2227439dba5df528062a68feb8cc0c08724903932176e71b4148b514dd2facc8d226a99b4f046165b28b33b44c0c012f From 02dc3e6e4b9bb82a83e031c14543bba21c6494ba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 15 Sep 2025 15:02:19 +0200 Subject: [PATCH 28/29] update to 4.0.0 raise dependency on PHP 7.2 switch to phpunit10 --- .gitignore | 2 +- ...-skip-tests-requiring-git-repository.patch | 41 ------------ php-pear-PHP-CodeSniffer-rpm.patch | 32 +++++---- php-pear-PHP-CodeSniffer.spec | 66 ++++++++++--------- sources | 2 +- 5 files changed, 57 insertions(+), 86 deletions(-) delete mode 100644 0001-skip-tests-requiring-git-repository.patch diff --git a/.gitignore b/.gitignore index 56db86d..83c478c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ clog -/php-pear-PHP-CodeSniffer-3.13.4-ad545ea.tgz +/php-pear-PHP-CodeSniffer-4.0.0-06113cf.tgz diff --git a/0001-skip-tests-requiring-git-repository.patch b/0001-skip-tests-requiring-git-repository.patch deleted file mode 100644 index d79dbd5..0000000 --- a/0001-skip-tests-requiring-git-repository.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 472b4f7c56dd95ca4469ed5aad6d6620aa13e03e Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Fri, 12 Jan 2024 08:25:58 +0100 -Subject: [PATCH] skip tests requiring git repository - ---- - tests/Core/Filters/GitModifiedTest.php | 3 +++ - tests/Core/Filters/GitStagedTest.php | 3 +++ - 2 files changed, 6 insertions(+) - -diff --git a/tests/Core/Filters/GitModifiedTest.php b/tests/Core/Filters/GitModifiedTest.php -index 626fb6531..ca068e144 100644 ---- a/tests/Core/Filters/GitModifiedTest.php -+++ b/tests/Core/Filters/GitModifiedTest.php -@@ -211,6 +211,9 @@ final class GitModifiedTest extends AbstractFilterTestCase - */ - public function testExecAlwaysReturnsArray($cmd, $expected) - { -+ if (!is_dir(__DIR__ . '/../../../.git')) { -+ $this->markTestSkipped('Not a git repository'); -+ } - $fakeDI = new RecursiveArrayIterator(self::getFakeFileList()); - $filter = new GitModified($fakeDI, '/', self::$config, self::$ruleset); - -diff --git a/tests/Core/Filters/GitStagedTest.php b/tests/Core/Filters/GitStagedTest.php -index 0009aefa7..cf5f69765 100644 ---- a/tests/Core/Filters/GitStagedTest.php -+++ b/tests/Core/Filters/GitStagedTest.php -@@ -211,6 +211,9 @@ final class GitStagedTest extends AbstractFilterTestCase - */ - public function testExecAlwaysReturnsArray($cmd, $expected) - { -+ if (!is_dir(__DIR__ . '/../../../.git')) { -+ $this->markTestSkipped('Not a git repository'); -+ } - $fakeDI = new RecursiveArrayIterator(self::getFakeFileList()); - $filter = new GitStaged($fakeDI, '/', self::$config, self::$ruleset); - --- -2.43.0 - diff --git a/php-pear-PHP-CodeSniffer-rpm.patch b/php-pear-PHP-CodeSniffer-rpm.patch index 082cf2d..1d7032e 100644 --- a/php-pear-PHP-CodeSniffer-rpm.patch +++ b/php-pear-PHP-CodeSniffer-rpm.patch @@ -1,24 +1,32 @@ diff -up ./bin/phpcbf.rpm ./bin/phpcbf ---- ./bin/phpcbf.rpm 2024-04-02 07:58:25.996735959 +0200 -+++ ./bin/phpcbf 2024-04-02 07:59:09.906379098 +0200 -@@ -8,7 +8,7 @@ - * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence +--- ./bin/phpcbf.rpm 2025-09-15 14:51:59.780439106 +0200 ++++ ./bin/phpcbf 2025-09-15 14:53:16.065234768 +0200 +@@ -21,10 +21,10 @@ */ --require_once __DIR__.'/../autoload.php'; -+include_once '/usr/share/pear/PHP/CodeSniffer/autoload.php'; + // Check if the PHP version and extensions comply with the minimum requirements before anything else. +-require_once dirname(__DIR__) . '/requirements.php'; ++require_once '/usr/share/pear/PHP/CodeSniffer/requirements.php'; + PHP_CodeSniffer\checkRequirements(); + +-require_once dirname(__DIR__) . '/autoload.php'; ++require_once '/usr/share/pear/PHP/CodeSniffer/autoload.php'; $runner = new PHP_CodeSniffer\Runner(); $exitCode = $runner->runPHPCBF(); diff -up ./bin/phpcs.rpm ./bin/phpcs ---- ./bin/phpcs.rpm 2024-04-02 07:58:25.996735959 +0200 -+++ ./bin/phpcs 2024-04-02 07:59:18.295693037 +0200 -@@ -8,7 +8,7 @@ - * @license https://github.com/PHPCSStandards/PHP_CodeSniffer/blob/master/licence.txt BSD Licence +--- ./bin/phpcs.rpm 2025-09-15 14:51:59.780522757 +0200 ++++ ./bin/phpcs 2025-09-15 14:52:52.535306647 +0200 +@@ -21,10 +21,10 @@ */ --require_once __DIR__.'/../autoload.php'; -+include_once '/usr/share/pear/PHP/CodeSniffer/autoload.php'; + // Check if the PHP version and extensions comply with the minimum requirements before anything else. +-require_once dirname(__DIR__) . '/requirements.php'; ++require_once '/usr/share/pear/PHP/CodeSniffer/requirements.php'; + PHP_CodeSniffer\checkRequirements(); + +-require_once dirname(__DIR__) . '/autoload.php'; ++require_once '/usr/share/pear/PHP/CodeSniffer/autoload.php'; $runner = new PHP_CodeSniffer\Runner(); $exitCode = $runner->runPHPCS(); diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 4357ec8..5606a7c 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,31 +13,34 @@ %bcond_without tests -%global gh_commit ad545ea9c1b7d270ce0fc9cbfb884161cd706119 +%global gh_commit 06113cfdaf117fc2165f9cd040bd0f17fcd5242d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-09-05 +%global gh_date 2025-06-17 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree %global pear_phpdir %{_datadir}/pear +%global upstream_version 4.0.0 +#global upstream_prever rc1 Name: php-pear-PHP-CodeSniffer -Version: 3.13.4 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} # git snapshot to retrieve test suite -Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz Source1: makesrc.sh # RPM installation path Patch0: %{name}-rpm.patch BuildArch: noarch -BuildRequires: php(language) >= 5.4 +# 8.1 because of phpunit10 +BuildRequires: php(language) >= 8.1 BuildRequires: php-tokenizer BuildRequires: php-xmlwriter BuildRequires: php-simplexml @@ -47,17 +50,17 @@ BuildRequires: php-intl %if %{with tests} BuildRequires: php-bcmath # to run test suite, from composer.json "require-dev" -# "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" -%global phpunit %{_bindir}/phpunit9 -BuildRequires: phpunit9 >= 9.3.4 +# "phpunit/phpunit": "^8.0 || ^9.3.4 || ^10.5.32 || ^11.3.3" +%global phpunit %{_bindir}/phpunit10 +BuildRequires: phpunit10 >= 10.5.32 %endif # from composer.json "require": { -# "php": ">=5.4.0", +# "php": ">=7.2.0", # "ext-tokenizer": "*", # "ext-xmlwriter": "*", # "ext-simplexml": "*" -Requires: php(language) >= 5.4 +Requires: php(language) >= 7.2 Requires: php-tokenizer Requires: php-xmlwriter Requires: php-simplexml @@ -88,11 +91,12 @@ certain standards, such as PEAR, or user-defined. %install : Install the library -mkdir -p %{buildroot}%{pear_phpdir}/PHP/CodeSniffer -cp -pr src %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/src/ -cp -pr autoload.php %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ -cp -p phpcs.xml.dist %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ -cp -p phpcs.xsd %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ +mkdir -p %{buildroot}%{pear_phpdir}/PHP/CodeSniffer +cp -pr src %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/src/ +cp -pr autoload.php %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ +cp -pr requirements.php %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ +cp -p phpcs.xml.dist %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ +cp -p phpcs.xsd %{buildroot}%{pear_phpdir}/PHP/CodeSniffer/ : Cleanup find %{buildroot}%{pear_phpdir}/PHP/CodeSniffer -depth -type d -name Tests -exec rm -r {} \; -print @@ -104,39 +108,34 @@ install -Dpm 755 bin/phpcbf %{buildroot}%{_bindir}/phpcbf %if %{with tests} %check -# fails with js: Couldn't read source file -rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* - # Fix current date YEAR=$(date +%Y) PREV=$(expr $YEAR - 1) sed -e "/@copyright/s/${PREV}/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed -# Version 3.11.2: Tests: 3174, Assertions: 18639, Warnings: 3, Skipped: 19. +# Version 4.0.0beta1: Tests: 3871, Assertions: 23018, PHPUnit Deprecations: 777, Skipped: 16. # testBrokenRulesetMultiError failing reported as https://github.com/PHPCSStandards/PHP_CodeSniffer/issues/767 ret=0 -for cmdarg in "php %{phpunit}" php81 php82 php83 php84; do - if which $cmdarg; then +for cmdarg in \ + "php %{phpunit}" \ + "php81 %{_bindir}/phpunit10" \ + "php82 %{_bindir}/phpunit11" \ + "php83 %{_bindir}/phpunit11" \ + "php84 %{_bindir}/phpunit11" \ + "php85 %{_bindir}/phpunit11" + do if which $cmdarg; then set $cmdarg - $1 -d memory_limit=-1 ${2:-%{_bindir}/phpunit9} \ + $1 -d memory_limit=-1 $2 \ --filter '^((?!(testBrokenRulesetMultiError)).)*$' \ - || ret=1 + --no-coverage || ret=1 fi done exit $ret %endif -%post -# no more from pear channel -if [ -x %{_bindir}/pear ]; then - %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only %{gh_project} >/dev/null || : -fi - - %files -%{!?_licensedir:%global license %%doc} %license licence.txt %doc *.md %{pear_phpdir}/PHP @@ -145,6 +144,11 @@ fi %changelog +* Mon Sep 15 2025 Remi Collet - 4.0.0-1 +- update to 4.0.0 +- raise dependency on PHP 7.2 +- switch to phpunit10 + * Mon Sep 8 2025 Remi Collet - 3.13.4-1 - update to 3.13.4 diff --git a/sources b/sources index 8a08523..7d442b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.13.4-ad545ea.tgz) = 2506f26e13632b84ac655ac3f5b993bf2227439dba5df528062a68feb8cc0c08724903932176e71b4148b514dd2facc8d226a99b4f046165b28b33b44c0c012f +SHA512 (php-pear-PHP-CodeSniffer-4.0.0-06113cf.tgz) = d82e79b05a1dd05638b71d4631b9b868987f581d200603725a91327b5b5dc8f20872910a5ec47c739662152d791cf99d930012c3ea63b549bbae210bd98c968c From e13e8ad2f6bddf7ca8fcf6095417826dcdcb0b4a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 12 Nov 2025 09:48:03 +0100 Subject: [PATCH 29/29] v4.0.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 83c478c..713d614 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /php-pear-PHP-CodeSniffer-4.0.0-06113cf.tgz +/php-pear-PHP-CodeSniffer-4.0.1-0525c73.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 5606a7c..1cc4cf5 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,15 +13,15 @@ %bcond_without tests -%global gh_commit 06113cfdaf117fc2165f9cd040bd0f17fcd5242d +%global gh_commit 0525c73950de35ded110cffafb9892946d7771b5 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2025-06-17 +%global gh_date 2025-11-10 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree %global pear_phpdir %{_datadir}/pear -%global upstream_version 4.0.0 +%global upstream_version 4.0.1 #global upstream_prever rc1 Name: php-pear-PHP-CodeSniffer @@ -144,6 +144,9 @@ exit $ret %changelog +* Wed Nov 12 2025 Remi Collet - 4.0.1-1 +- update to 4.0.1 + * Mon Sep 15 2025 Remi Collet - 4.0.0-1 - update to 4.0.0 - raise dependency on PHP 7.2 diff --git a/sources b/sources index 7d442b2..9acd652 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-4.0.0-06113cf.tgz) = d82e79b05a1dd05638b71d4631b9b868987f581d200603725a91327b5b5dc8f20872910a5ec47c739662152d791cf99d930012c3ea63b549bbae210bd98c968c +SHA512 (php-pear-PHP-CodeSniffer-4.0.1-0525c73.tgz) = 384867fff733de98f3a0cd7105776aa571389e8f11a2d95ba51139a682778650900028722352779bb3b6986f61fa123ceded3d9496de0a05e0872ac21bb1329e