diff --git a/.gitignore b/.gitignore index 07b117a..6bcab39 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,11 @@ clog /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 diff --git a/php-pear-PHP-CodeSniffer-rpm.patch b/php-pear-PHP-CodeSniffer-rpm.patch index 66736db..082cf2d 100644 --- a/php-pear-PHP-CodeSniffer-rpm.patch +++ b/php-pear-PHP-CodeSniffer-rpm.patch @@ -1,31 +1,23 @@ diff -up ./bin/phpcbf.rpm ./bin/phpcbf ---- ./bin/phpcbf.rpm 2023-12-11 09:46:17.920584703 +0100 -+++ ./bin/phpcbf 2023-12-11 09:46:27.469951577 +0100 -@@ -8,11 +8,7 @@ +--- ./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 */ --if (is_file(__DIR__.'/../autoload.php') === true) { -- include_once __DIR__.'/../autoload.php'; --} else { -- include_once 'PHP/CodeSniffer/autoload.php'; --} +-require_once __DIR__.'/../autoload.php'; +include_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 2023-12-11 09:45:10.918010545 +0100 -+++ ./bin/phpcs 2023-12-11 09:46:03.104015468 +0100 -@@ -8,11 +8,7 @@ +--- ./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 */ --if (is_file(__DIR__.'/../autoload.php') === true) { -- include_once __DIR__.'/../autoload.php'; --} else { -- include_once 'PHP/CodeSniffer/autoload.php'; --} +-require_once __DIR__.'/../autoload.php'; +include_once '/usr/share/pear/PHP/CodeSniffer/autoload.php'; $runner = new PHP_CodeSniffer\Runner(); diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 6e6d839..9a1ac51 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,9 @@ %bcond_without tests -%global gh_commit 14f5fff1e64118595db5408e946f3a22c75807f7 +%global gh_commit 62d32998e820bddc40f99f8251958aed187a5c9c %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_date 2024-09-18 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -22,11 +23,11 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.8.1 +Version: 3.10.3 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 @@ -34,7 +35,6 @@ Source1: makesrc.sh # RPM installation path Patch0: %{name}-rpm.patch -Patch1: 0001-skip-tests-requiring-git-repository.patch BuildArch: noarch BuildRequires: php(language) >= 5.4 @@ -79,7 +79,6 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -n %{gh_project}-%{gh_commit} %patch -P0 -p1 -b .rpm -%patch -P1 -p1 -b .nogit %build @@ -112,12 +111,12 @@ YEAR=$(date +%Y) sed -e "/@copyright/s/2021/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed -# Version 3.6.2: Tests: 1327, Assertions: 8476, Skipped: 8. +# Version 3.9.0: Tests: 2276, Assertions: 10969, Warnings: 4, Skipped: 12. ret=0 for cmdarg in "php %{phpunit}" php81 php82 php83; do if which $cmdarg; then set $cmdarg - $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ + $1 -d memory_limit=-1 ${2:-%{_bindir}/phpunit9} \ || ret=1 fi done @@ -142,6 +141,28 @@ 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 + +* Thu May 23 2024 Remi Collet - 3.10.1-1 +- update to 3.10.1 + +* Wed May 22 2024 Remi Collet - 3.10.0-1 +- update to 3.10.0 + +* Wed Apr 24 2024 Remi Collet - 3.9.2-1 +- update to 3.9.2 + +* Tue Apr 2 2024 Remi Collet - 3.9.1-1 +- update to 3.9.1 + +* Sat Feb 17 2024 Remi Collet - 3.9.0-1 +- update to 3.9.0 +- drop patch merged upstream + * Fri Jan 12 2024 Remi Collet - 3.8.1-1 - update to 3.8.1 - add patch for test suite from diff --git a/sources b/sources index af78dc6..d8709a5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.8.1-14f5fff.tgz) = f3d219c9520c134061994ee36a44ac3aff8aaf311495eefd4f0fc7489d3e9473283b69a4cc4cd6df8e352a1ed3d8bdc177b4ecec5bab59f25cee13cbeb9fe162 +SHA512 (php-pear-PHP-CodeSniffer-3.10.3-62d3299.tgz) = 5d3ad84e8a67cdc9b30ff807232923a022cd5e4149a770c02ff36d54fca4959d1cae7bd00cf11b948b4d2df0f7a345b36cfc950d15258dab966472554ca0557d