diff options
| author | Remi Collet <remi@remirepo.net> | 2025-09-15 14:56:28 +0200 |
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2025-09-15 14:56:28 +0200 |
| commit | 7afd1651ae477bb7ad25a73d282b385a2d91edac (patch) | |
| tree | 1ffee5844ec692222e6459f0e3f69d33476a3047 | |
| parent | 25e4c8ca7c317eb389144223d3ce31ea3cf85b7b (diff) | |
| -rw-r--r-- | composer.json | 7 | ||||
| -rw-r--r-- | php-pear-PHP-CodeSniffer-rpm.patch | 16 | ||||
| -rw-r--r-- | php-pear-PHP-CodeSniffer.spec | 10 |
3 files changed, 16 insertions, 17 deletions
diff --git a/composer.json b/composer.json index b0c1fcf..f0f23d1 100644 --- a/composer.json +++ b/composer.json @@ -36,7 +36,7 @@ "ext-xmlwriter": "*" }, "require-dev": { - "phpunit/phpunit": "^8.0 || ^9.3.4 || ^10.5.32 || ^11.3.3" + "phpunit/phpunit": "^8.4.0 || ^9.3.4 || ^10.5.32 || 11.3.3 - 11.5.28 || ^11.5.31" }, "bin": [ "bin/phpcbf", @@ -45,11 +45,6 @@ "config": { "lock": false }, - "extra": { - "branch-alias": { - "dev-master": "3.x-dev" - } - }, "scripts": { "cs": [ "@php ./bin/phpcs" diff --git a/php-pear-PHP-CodeSniffer-rpm.patch b/php-pear-PHP-CodeSniffer-rpm.patch index 633683c..1d7032e 100644 --- a/php-pear-PHP-CodeSniffer-rpm.patch +++ b/php-pear-PHP-CodeSniffer-rpm.patch @@ -1,31 +1,31 @@ diff -up ./bin/phpcbf.rpm ./bin/phpcbf ---- ./bin/phpcbf.rpm 2025-05-15 17:05:46.172842261 +0200 -+++ ./bin/phpcbf 2025-05-15 17:08:49.304811533 +0200 +--- ./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 @@ */ // Check if the PHP version and extensions comply with the minimum requirements before anything else. --require_once dirname(__DIR__).'/requirements.php'; +-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 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 2025-05-15 17:05:46.172939301 +0200 -+++ ./bin/phpcs 2025-05-15 17:09:11.329680370 +0200 +--- ./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 @@ */ // Check if the PHP version and extensions comply with the minimum requirements before anything else. --require_once dirname(__DIR__).'/requirements.php'; +-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 dirname(__DIR__) . '/autoload.php'; +require_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 590d4dd..4754ca4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -16,7 +16,7 @@ %bcond_without tests -%global gh_commit ed5e2c22f52c03c63f886ec67dbc697efa0c3f63 +%global gh_commit 06113cfdaf117fc2165f9cd040bd0f17fcd5242d %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_date 2025-06-17 %global gh_owner PHPCSStandards @@ -25,7 +25,7 @@ %global pear_phpdir %{_datadir}/pear %global upstream_version 4.0.0 -%global upstream_prever rc1 +#global upstream_prever rc1 Name: php-pear-PHP-CodeSniffer Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} @@ -125,7 +125,8 @@ for cmdarg in \ "php81 %{_bindir}/phpunit10" \ "php82 %{_bindir}/phpunit11" \ "php83 %{_bindir}/phpunit11" \ - "php84 %{_bindir}/phpunit11" + "php84 %{_bindir}/phpunit11" \ + "php85 %{_bindir}/phpunit11" do if which $cmdarg; then set $cmdarg $1 -d memory_limit=-1 $2 \ @@ -146,6 +147,9 @@ exit $ret %changelog +* Mon Sep 15 2025 Remi Collet <remi@remirepo.net> - 4.0.0-1 +- update to 4.0.0 + * Wed Jun 18 2025 Remi Collet <remi@remirepo.net> - 4.0.0~rc1-1 - update to 4.0.0-RC1 |