From 3a852c4dbc8f1cf43adf551e5bbaa7286b1bed85 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Fri, 31 Jan 2020 13:24:12 +0100
Subject: [PATCH] update to 3.5.4 fix test suite from  
 https://github.com/squizlabs/PHP_CodeSniffer/pull/2847

---
 .gitignore                    |  1 +
 php-pear-PHP-CodeSniffer.spec | 18 ++++++++++++++----
 sources                       |  2 +-
 3 files changed, 16 insertions(+), 5 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 07b3cbc..6e378c3 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,8 +13,8 @@
 %global pear_name     PHP_CodeSniffer
 
 Name:           php-pear-PHP-CodeSniffer
-Version:        3.5.3
-Release:        2%{?dist}
+Version:        3.5.4
+Release:        1%{?dist}
 Summary:        PHP coding standards enforcement tool
 
 License:        BSD
@@ -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 <remi@remirepo.net> - 3.5.4-1
+- update to 3.5.4
+- fix test suite from
+  https://github.com/squizlabs/PHP_CodeSniffer/pull/2847
+
 * Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
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