From 3666b4ec4cd8e37d72605eb79a03cdddced5c847 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Tue, 2 Apr 2024 08:04:56 +0200
Subject: [PATCH] v3.9.1

---
 .gitignore                         |  1 +
 php-pear-PHP-CodeSniffer-rpm.patch | 24 ++++++++----------------
 php-pear-PHP-CodeSniffer.spec      |  9 ++++++---
 sources                            |  2 +-
 4 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 933ca86..99d439c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,3 +47,4 @@ clog
 /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
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 c42381f..9901ca8 100644
--- a/php-pear-PHP-CodeSniffer.spec
+++ b/php-pear-PHP-CodeSniffer.spec
@@ -13,9 +13,9 @@
 
 %bcond_without       tests
 
-%global gh_commit    d63cee4890a8afaf86a22e51ad4d97c91dd4579b
+%global gh_commit    267a4405fff1d9c847134db3a3c92f1ab7f77909
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
-%global gh_date      2024-02-16
+%global gh_date      2024-03-31
 %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.9.0
+Version:        3.9.1
 Release:        1%{?dist}
 Summary:        PHP coding standards enforcement tool
 
@@ -141,6 +141,9 @@ fi
 
 
 %changelog
+* Tue Apr  2 2024 Remi Collet <remi@remirepo.net> - 3.9.1-1
+- update to 3.9.1
+
 * Sat Feb 17 2024 Remi Collet <remi@remirepo.net> - 3.9.0-1
 - update to 3.9.0
 - drop patch merged upstream
diff --git a/sources b/sources
index d68770b..f9b4ee0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-pear-PHP-CodeSniffer-3.9.0-d63cee4.tgz) = a496f09e2d80a38936eb6117738f0dc41e9b256d67e2a45f2978b7c889b90c35a4c902f3579fa412f96615f86b6b3cb44b9990f5f78d6df21edb78d50a0038d8
+SHA512 (php-pear-PHP-CodeSniffer-3.9.1-267a440.tgz) = 5501d0b3e30c6ac9670921e451f47366c92e98abce80eaaf4e459e8a9752b304f0c31beb1ce5054af964c93e66282bbb20d0c9be22515758817767616e0626ef