From 65772f9253702e0ec0433e9094614ad7a7533da5 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Thu, 15 Jul 2010 19:52:48 +0000 Subject: [PATCH 001/119] upstream 1.3.0a1 --- .cvsignore | 3 +-- php-pear-PHP-CodeSniffer.spec | 7 ++++++- sources | 3 +-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index daae2bc..73400cb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -PHP_CodeSniffer-1.2.2.tgz -PHP_CodeSniffer-licence.txt +PHP_CodeSniffer-1.3.0a1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index cf0f345..f5104b2 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -2,7 +2,7 @@ %define pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 1.2.2 +Version: 1.3.0a1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -23,6 +23,8 @@ Provides: php-pear(%{pear_name}) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} +# optional: PHP_Timer, which is up for review at the moment + %description PHP_CodeSniffer provides functionality to verify that code conforms to certain standards, such as PEAR, or user-defined. @@ -87,6 +89,9 @@ fi %{_bindir}/phpcs %changelog +* Thu Jul 15 2010 Christof Damian - 1.3.0a1-1 +- upstream 1.3.0a1 + * Wed Jan 27 2010 Christof Damian 1.2.2-1 - upstream 1.2.2 ( bug:559170 ) - move phpcs into main package ( bug: 517775 ) diff --git a/sources b/sources index 88252ba..a854aff 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -b734e066105d052fde564ab5e6be7091 PHP_CodeSniffer-1.2.2.tgz -09df23a638e665feddffb575f7a623dc PHP_CodeSniffer-licence.txt +e1b19d7b793d01bce9241ce5e2254395 PHP_CodeSniffer-1.3.0a1.tgz From b310766d9c97c2398ee314598fccf1ef138b0d3a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 09:05:47 +0000 Subject: [PATCH 002/119] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index 7fd3e60..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: php-pear-PHP-CodeSniffer -# $Id: Makefile,v 1.1 2007/01/30 01:33:58 icon Exp $ -NAME := php-pear-PHP-CodeSniffer -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From fe73e758b4629210a5698a3a7e759f465ac1c9e4 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 4 Dec 2010 10:49:57 +0100 Subject: [PATCH 003/119] 1.3.0RC1 release --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 36 +++++++++++++++++++++++++---------- sources | 2 +- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 73400cb..30e624b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ PHP_CodeSniffer-1.3.0a1.tgz +/PHP_CodeSniffer-1.3.0RC1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index f5104b2..0ee5765 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,15 +1,17 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} -%define pear_name PHP_CodeSniffer +%global pear_name PHP_CodeSniffer +%global pear_version 1.3.0 +%global pear_release RC1 Name: php-pear-PHP-CodeSniffer -Version: 1.3.0a1 -Release: 1%{?dist} +Version: %{pear_version} +Release: 2.%{pear_release}%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/PHP_CodeSniffer-%{version}.tgz +Source0: http://pear.php.net/get/%{pear_name}-%{pear_version}%{pear_release}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -19,6 +21,7 @@ Requires: php-pear(PEAR) Requires: php-common >= 5.1.2 Requires(post): %{__pear} Requires(postun): %{__pear} +Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 Provides: php-pear(%{pear_name}) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} @@ -32,17 +35,23 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{version}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{pear_version}%{pear_release}/%{pear_name}.xml +cd %{pear_name}-%{pear_version}%{pear_release} + +# Create a "localized" php.ini to avoid build warning +cp /etc/php.ini . +echo "date.timezone=UTC" >>php.ini %build # Empty build section, %install -cd %{pear_name}-%{version} +cd %{pear_name}-%{pear_version}%{pear_release} rm -rf $RPM_BUILD_ROOT docdir -%{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml + +PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml # Move documentation mkdir -p docdir @@ -79,9 +88,9 @@ fi %files %defattr(-,root,root,-) -%doc %{pear_name}-%{version}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{version}/phpcs-svn-pre-commit -%doc %{pear_name}-%{version}/docdir/* +%doc %{pear_name}-%{pear_version}%{pear_release}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{pear_version}%{pear_release}/phpcs-svn-pre-commit +%doc %{pear_name}-%{pear_version}%{pear_release}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} @@ -89,6 +98,13 @@ fi %{_bindir}/phpcs %changelog +* Sat Dec 4 2010 Christof Damian - 1.3.0-2.RC1 +- fix version number +- fix timezone warnings + +* Fri Sep 3 2010 Christof Damian - 1.3.0RC1-1 +- upstream 1.3.0RC1 + * Thu Jul 15 2010 Christof Damian - 1.3.0a1-1 - upstream 1.3.0a1 diff --git a/sources b/sources index a854aff..9dc436d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1b19d7b793d01bce9241ce5e2254395 PHP_CodeSniffer-1.3.0a1.tgz +122a7a413866df608d87e0e5a868aeda PHP_CodeSniffer-1.3.0RC1.tgz From 518591997369666e9667dcd7392bc331289fc20b Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 9 Feb 2011 07:16:02 -0600 Subject: [PATCH 004/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_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 0ee5765..fb5542d 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -5,7 +5,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 2.%{pear_release}%{?dist} +Release: 3.%{pear_release}%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -98,6 +98,9 @@ fi %{_bindir}/phpcs %changelog +* Wed Feb 09 2011 Fedora Release Engineering - 1.3.0-3.RC1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Sat Dec 4 2010 Christof Damian - 1.3.0-2.RC1 - fix version number - fix timezone warnings From f5e9d4ad651b193b5ab3452baddff169d968e3e5 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Fri, 18 Mar 2011 20:20:30 +0100 Subject: [PATCH 005/119] upstream 1.3.0 final --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 22 +++++++++++----------- sources | 2 +- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 30e624b..9b20fc3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.0RC1.tgz +/PHP_CodeSniffer-1.3.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index fb5542d..2262f20 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,17 +1,16 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer %global pear_version 1.3.0 -%global pear_release RC1 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 3.%{pear_release}%{?dist} +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/%{pear_name}-%{pear_version}%{pear_release}.tgz +Source0: http://pear.php.net/get/%{pear_name}-%{pear_version}.tgz Source1: PHP_CodeSniffer-licence.txt BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -26,8 +25,6 @@ Provides: php-pear(%{pear_name}) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} -# optional: PHP_Timer, which is up for review at the moment - %description PHP_CodeSniffer provides functionality to verify that code conforms to certain standards, such as PEAR, or user-defined. @@ -35,9 +32,9 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c [ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{pear_version}%{pear_release}/%{pear_name}.xml +mv package2.xml %{pear_name}-%{pear_version}/%{pear_name}.xml -cd %{pear_name}-%{pear_version}%{pear_release} +cd %{pear_name}-%{pear_version} # Create a "localized" php.ini to avoid build warning cp /etc/php.ini . @@ -48,7 +45,7 @@ echo "date.timezone=UTC" >>php.ini %install -cd %{pear_name}-%{pear_version}%{pear_release} +cd %{pear_name}-%{pear_version} rm -rf $RPM_BUILD_ROOT docdir PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml @@ -88,9 +85,9 @@ fi %files %defattr(-,root,root,-) -%doc %{pear_name}-%{pear_version}%{pear_release}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{pear_version}%{pear_release}/phpcs-svn-pre-commit -%doc %{pear_name}-%{pear_version}%{pear_release}/docdir/* +%doc %{pear_name}-%{pear_version}/PHP_CodeSniffer-licence.txt +%doc %{pear_name}-%{pear_version}/phpcs-svn-pre-commit +%doc %{pear_name}-%{pear_version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} @@ -98,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Mar 18 2011 Christof Damian - 1.3.0-1 +- upstream 1.3.0 final + * Wed Feb 09 2011 Fedora Release Engineering - 1.3.0-3.RC1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index 9dc436d..d13b798 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -122a7a413866df608d87e0e5a868aeda PHP_CodeSniffer-1.3.0RC1.tgz +49f1b9dd4e5b0d01703430d361f4c730 PHP_CodeSniffer-1.3.0.tgz From d4eb2d03918e0f38d313c72539fef016a1182f6e Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Fri, 18 Mar 2011 20:37:28 +0100 Subject: [PATCH 006/119] version fix --- 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 2262f20..5b41e41 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -3,7 +3,7 @@ %global pear_version 1.3.0 Name: php-pear-PHP-CodeSniffer -Version: %{pear_version} +Version: %{pear_version}final Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Mar 18 2011 Christof Damian - 1.3.0final-1 +- fix my version foo until 1.3.1 + * Fri Mar 18 2011 Christof Damian - 1.3.0-1 - upstream 1.3.0 final From 1b9417e97c3419e919c8252418735e338f68f2b5 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Thu, 3 Nov 2011 21:41:33 +0100 Subject: [PATCH 007/119] upstream 1.3.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9b20fc3..5b0772a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.0RC1.tgz /PHP_CodeSniffer-1.3.0.tgz +/PHP_CodeSniffer-1.3.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 5b41e41..0ca727b 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,9 +1,9 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer -%global pear_version 1.3.0 +%global pear_version 1.3.1 Name: php-pear-PHP-CodeSniffer -Version: %{pear_version}final +Version: %{pear_version} Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Thu Nov 3 2011 Christof Damian - 1.3.1-1 +- upstream 1.3.1 + * Fri Mar 18 2011 Christof Damian - 1.3.0final-1 - fix my version foo until 1.3.1 diff --git a/sources b/sources index d13b798..dd0744e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -49f1b9dd4e5b0d01703430d361f4c730 PHP_CodeSniffer-1.3.0.tgz +2a1e54fb791545bac0fabc4009e19afb PHP_CodeSniffer-1.3.1.tgz From 3788bb9b6986d5822a2d69ab83a8f36943ae95e4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 13 Jan 2012 18:39:52 -0600 Subject: [PATCH 008/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_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 0ca727b..7f6e214 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -4,7 +4,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.3.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Thu Nov 3 2011 Christof Damian - 1.3.1-1 - upstream 1.3.1 From d1161aa88c7774d30db684e42b2a154ad696cc9f Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 3 Mar 2012 00:27:06 +0100 Subject: [PATCH 009/119] upstream 1.3.3 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5b0772a..cd94252 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.0RC1.tgz /PHP_CodeSniffer-1.3.0.tgz /PHP_CodeSniffer-1.3.1.tgz +/PHP_CodeSniffer-1.3.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0ca727b..37f752a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,6 +1,6 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer -%global pear_version 1.3.1 +%global pear_version 1.3.3 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Mar 2 2012 Christof Damian - 1.3.3-1 +- upstream 1.3.3 + * Thu Nov 3 2011 Christof Damian - 1.3.1-1 - upstream 1.3.1 diff --git a/sources b/sources index dd0744e..4fec3c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2a1e54fb791545bac0fabc4009e19afb PHP_CodeSniffer-1.3.1.tgz +31ab9d59ef349d8fb41b855c1f57806f PHP_CodeSniffer-1.3.3.tgz From a4136bb3bcb7e5de246476dcab97ed52cf242171 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 19 May 2012 17:29:13 +0200 Subject: [PATCH 010/119] upstream 1.3.4 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index cd94252..42b4539 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.0.tgz /PHP_CodeSniffer-1.3.1.tgz /PHP_CodeSniffer-1.3.3.tgz +/PHP_CodeSniffer-1.3.4.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 17be5c7..807fbe9 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,6 +1,6 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer -%global pear_version 1.3.3 +%global pear_version 1.3.4 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Sat May 19 2012 Christof Damian - 1.3.4-1 +- upstream 1.3.4 + * Fri Mar 2 2012 Christof Damian - 1.3.3-1 - upstream 1.3.3 diff --git a/sources b/sources index 4fec3c5..234ae70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31ab9d59ef349d8fb41b855c1f57806f PHP_CodeSniffer-1.3.3.tgz +e4cbfd5188b077e55fd3251ccc305628 PHP_CodeSniffer-1.3.4.tgz From 65088ef15adb50c57f4d7a9a2d6c0d30bdd09bad Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Fri, 13 Jul 2012 20:57:17 +0200 Subject: [PATCH 011/119] upstream 1.3.5 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 42b4539..b3dfcfb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.1.tgz /PHP_CodeSniffer-1.3.3.tgz /PHP_CodeSniffer-1.3.4.tgz +/PHP_CodeSniffer-1.3.5.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 807fbe9..1af33c4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,6 +1,6 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer -%global pear_version 1.3.4 +%global pear_version 1.3.5 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Jul 13 2012 Christof Damian - 1.3.5-1 +- upstream 1.3.5 + * Sat May 19 2012 Christof Damian - 1.3.4-1 - upstream 1.3.4 diff --git a/sources b/sources index 234ae70..9ce1e29 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4cbfd5188b077e55fd3251ccc305628 PHP_CodeSniffer-1.3.4.tgz +776b6e0d5ab666c00e6991ded465f32d PHP_CodeSniffer-1.3.5.tgz From bf106b00dcf484c7de5b3afab4afd6660c0102c2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Fri, 20 Jul 2012 19:23:42 -0500 Subject: [PATCH 012/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_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 1af33c4..ff77ba5 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -4,7 +4,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Sat Jul 21 2012 Fedora Release Engineering - 1.3.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Fri Jul 13 2012 Christof Damian - 1.3.5-1 - upstream 1.3.5 From 468c08af03cc722b2641161f21e467c2691c8992 Mon Sep 17 00:00:00 2001 From: remi Date: Tue, 14 Aug 2012 16:32:24 +0200 Subject: [PATCH 013/119] rebuilt for new pear_testdir --- 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 ff77ba5..a0f99f2 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -4,7 +4,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Tue Aug 14 2012 Remi Collet - 1.3.5-3 +- rebuilt for new pear_testdir + * Sat Jul 21 2012 Fedora Release Engineering - 1.3.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 7592891c2af65ae72b385795bd40e5d9f0220ed3 Mon Sep 17 00:00:00 2001 From: remi Date: Sun, 19 Aug 2012 11:08:05 +0200 Subject: [PATCH 014/119] rebuilt for new pear_datadir --- 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 a0f99f2..b8808e6 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -4,7 +4,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 3%{?dist} +Release: 4%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Sun Aug 19 2012 Remi Collet - 1.3.5-4 +- rebuilt for new pear_datadir + * Tue Aug 14 2012 Remi Collet - 1.3.5-3 - rebuilt for new pear_testdir From 1f889225fa974dbb68c7f1816fff0a16c27387d3 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 8 Sep 2012 20:57:34 +0200 Subject: [PATCH 015/119] upstream 1.3.6 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b3dfcfb..275da68 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.3.tgz /PHP_CodeSniffer-1.3.4.tgz /PHP_CodeSniffer-1.3.5.tgz +/PHP_CodeSniffer-1.3.6.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index b8808e6..b9285a9 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,10 +1,10 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer -%global pear_version 1.3.5 +%global pear_version 1.3.6 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 4%{?dist} +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Sat Sep 8 2012 Christof Damian - 1.3.6-1 +- upstream 1.3.6 + * Sun Aug 19 2012 Remi Collet - 1.3.5-4 - rebuilt for new pear_datadir diff --git a/sources b/sources index 9ce1e29..e1aac31 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -776b6e0d5ab666c00e6991ded465f32d PHP_CodeSniffer-1.3.5.tgz +e716e14517ce3f6cb3a3df0d068570dd PHP_CodeSniffer-1.3.6.tgz From 3f7162b5e4b2b921460bef3baa541898c1007e4b Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Fri, 12 Oct 2012 15:05:17 +0200 Subject: [PATCH 016/119] upstream 1.4.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 275da68..d75cf87 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.4.tgz /PHP_CodeSniffer-1.3.5.tgz /PHP_CodeSniffer-1.3.6.tgz +/PHP_CodeSniffer-1.4.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index b9285a9..0383d69 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,6 +1,6 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %global pear_name PHP_CodeSniffer -%global pear_version 1.3.6 +%global pear_version 1.4.0 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} @@ -95,6 +95,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Oct 12 2012 Christof Damian - 1.4.0-1 +- upstream 1.4.0 + * Sat Sep 8 2012 Christof Damian - 1.3.6-1 - upstream 1.3.6 diff --git a/sources b/sources index e1aac31..e889e5f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e716e14517ce3f6cb3a3df0d068570dd PHP_CodeSniffer-1.3.6.tgz +a299051c1dfa3d10ca198d0523e557e7 PHP_CodeSniffer-1.4.0.tgz From e226460b01c1019fdab2d19688a11b0a656a338f Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Sat, 12 Jan 2013 16:46:01 +0100 Subject: [PATCH 017/119] - upstream 1.4.3 - use php_metadir --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 17 ++++++++--------- sources | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index d75cf87..95ac2e1 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.5.tgz /PHP_CodeSniffer-1.3.6.tgz /PHP_CodeSniffer-1.4.0.tgz +/PHP_CodeSniffer-1.4.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0383d69..ed43567 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,6 +1,7 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_name PHP_CodeSniffer -%global pear_version 1.4.0 +%global pear_version 1.4.3 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} @@ -46,14 +47,10 @@ echo "date.timezone=UTC" >>php.ini %install cd %{pear_name}-%{pear_version} -rm -rf $RPM_BUILD_ROOT docdir +rm -rf $RPM_BUILD_ROOT PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml -# Move documentation -mkdir -p docdir -mv $RPM_BUILD_ROOT%{pear_datadir}/%{pear_name}/*.sample.conf docdir/ - # Remove phpcs-svn-pre-commit: we'll add it to docs mv -f $RPM_BUILD_ROOT%{_bindir}/scripts/phpcs-svn-pre-commit . chmod 0644 phpcs-svn-pre-commit @@ -62,7 +59,7 @@ rm -rf $RPM_BUILD_ROOT%{_bindir}/scripts cp %{SOURCE1} . # Clean up unnecessary files -rm -rf $RPM_BUILD_ROOT%{pear_phpdir}/.??* +rm -rf %{buildroot}/%{pear_metadir}/.??* # Install XML package description mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} @@ -87,14 +84,16 @@ fi %defattr(-,root,root,-) %doc %{pear_name}-%{pear_version}/PHP_CodeSniffer-licence.txt %doc %{pear_name}-%{pear_version}/phpcs-svn-pre-commit -%doc %{pear_name}-%{pear_version}/docdir/* %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} -%{pear_datadir}/%{pear_name} %{pear_phpdir}/PHP %{_bindir}/phpcs %changelog +* Sat Jan 12 2013 Christof Damian - 1.4.3-1 +- upstream 1.4.3 +- use php_metadir + * Fri Oct 12 2012 Christof Damian - 1.4.0-1 - upstream 1.4.0 diff --git a/sources b/sources index e889e5f..561a068 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a299051c1dfa3d10ca198d0523e557e7 PHP_CodeSniffer-1.4.0.tgz +5183c6f31cb154f4adbc4f7044a79645 PHP_CodeSniffer-1.4.3.tgz From 91d39b239e611b33af20db63c6e2191b1628ca1c Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 14 Feb 2013 11:27:24 -0600 Subject: [PATCH 018/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_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 ed43567..71583b6 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -5,7 +5,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -90,6 +90,9 @@ fi %{_bindir}/phpcs %changelog +* Thu Feb 14 2013 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Sat Jan 12 2013 Christof Damian - 1.4.3-1 - upstream 1.4.3 - use php_metadir From 70397535099759c46c843cafa70f427f92c9b607 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Mon, 25 Feb 2013 02:19:26 +0100 Subject: [PATCH 019/119] upstream 1.4.4 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 95ac2e1..85342a6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.6.tgz /PHP_CodeSniffer-1.4.0.tgz /PHP_CodeSniffer-1.4.3.tgz +/PHP_CodeSniffer-1.4.4.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 71583b6..6c3cc7e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,11 +1,11 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_name PHP_CodeSniffer -%global pear_version 1.4.3 +%global pear_version 1.4.4 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -90,6 +90,9 @@ fi %{_bindir}/phpcs %changelog +* Mon Feb 25 2013 Christof Damian - 1.4.4-1 +- upstream 1.4.4 + * Thu Feb 14 2013 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 561a068..561a0dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5183c6f31cb154f4adbc4f7044a79645 PHP_CodeSniffer-1.4.3.tgz +cf6e9a74ac10c1a61106257be27a322c PHP_CodeSniffer-1.4.4.tgz From 9bcc82f397c99f74473fa5d07af1e7cc0a9e8301 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Mon, 25 Feb 2013 02:19:26 +0100 Subject: [PATCH 020/119] upstream 1.4.4 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 95ac2e1..85342a6 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.3.6.tgz /PHP_CodeSniffer-1.4.0.tgz /PHP_CodeSniffer-1.4.3.tgz +/PHP_CodeSniffer-1.4.4.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 71583b6..fc3b79b 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,11 +1,11 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_name PHP_CodeSniffer -%global pear_version 1.4.3 +%global pear_version 1.4.4 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 2%{?dist} +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -87,9 +87,13 @@ fi %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} %{pear_phpdir}/PHP +%{pear_datadir}/%{pear_name}/CodeSniffer.conf.dist %{_bindir}/phpcs %changelog +* Mon Feb 25 2013 Christof Damian - 1.4.4-1 +- upstream 1.4.4 + * Thu Feb 14 2013 Fedora Release Engineering - 1.4.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild diff --git a/sources b/sources index 561a068..561a0dd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5183c6f31cb154f4adbc4f7044a79645 PHP_CodeSniffer-1.4.3.tgz +cf6e9a74ac10c1a61106257be27a322c PHP_CodeSniffer-1.4.4.tgz From b0c7d0bd482f0575e984e3688064965e1dc5b427 Mon Sep 17 00:00:00 2001 From: Christof Damian Date: Fri, 19 Apr 2013 19:44:12 +0200 Subject: [PATCH 021/119] upstream 1.4.5 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85342a6..e2d9090 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.4.0.tgz /PHP_CodeSniffer-1.4.3.tgz /PHP_CodeSniffer-1.4.4.tgz +/PHP_CodeSniffer-1.4.5.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index fc3b79b..6cb0bf0 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,7 +1,7 @@ %{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_name PHP_CodeSniffer -%global pear_version 1.4.4 +%global pear_version 1.4.5 Name: php-pear-PHP-CodeSniffer Version: %{pear_version} @@ -91,6 +91,9 @@ fi %{_bindir}/phpcs %changelog +* Fri Apr 19 2013 Christof Damian - 1.4.5-1 +- upstream 1.4.5 + * Mon Feb 25 2013 Christof Damian - 1.4.4-1 - upstream 1.4.4 diff --git a/sources b/sources index 561a0dd..bfb61a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf6e9a74ac10c1a61106257be27a322c PHP_CodeSniffer-1.4.4.tgz +2df688272699710cd0e028a04933f3e0 PHP_CodeSniffer-1.4.5.tgz From e468f8172c25c95604fa95ca6146a92c92d8596f Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 22:23:21 -0500 Subject: [PATCH 022/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_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 6cb0bf0..a7c059f 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -5,7 +5,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -91,6 +91,9 @@ fi %{_bindir}/phpcs %changelog +* Sun Aug 04 2013 Fedora Release Engineering - 1.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Fri Apr 19 2013 Christof Damian - 1.4.5-1 - upstream 1.4.5 From 286bb3220f86efcd9dcc9351bbe16f9681f205b9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 09:59:09 -0500 Subject: [PATCH 023/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_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 a7c059f..0dbdd79 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -5,7 +5,7 @@ Name: php-pear-PHP-CodeSniffer Version: %{pear_version} -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -91,6 +91,9 @@ fi %{_bindir}/phpcs %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 1.4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Sun Aug 04 2013 Fedora Release Engineering - 1.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From 4dd97444b974b2539053fadc6eeb63468aee8b52 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 9 Oct 2014 16:26:34 +0200 Subject: [PATCH 024/119] Update to 1.5.5 - cleanup + changes from remi repo - add explicit dependencies on need extensions - run test suite during build - provide php-composer(squizlabs/php_codesniffer) - request LICENSE to be part of upstream tarball https://github.com/squizlabs/PHP_CodeSniffer/issues/273 - add spec License header --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 103 +++++++++++++++++++++++----------- sources | 2 +- 3 files changed, 71 insertions(+), 35 deletions(-) diff --git a/.gitignore b/.gitignore index e2d9090..89868e1 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.4.3.tgz /PHP_CodeSniffer-1.4.4.tgz /PHP_CodeSniffer-1.4.5.tgz +/PHP_CodeSniffer-1.5.5.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0dbdd79..ae80242 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -1,73 +1,99 @@ -%{!?__pear: %{expand: %%global __pear %{_bindir}/pear}} +# spec file for php-pear-PHP-CodeSniffer +# +# Copyright (c) 2013-2014 Remi Collet +# Copyright (c) 2009-2013 Christof Damian +# Copyright (c) 2006-2009 Konstantin Ryabitsev +# +# License: MIT +# http://opensource.org/licenses/MIT +# +# Please, preserve the changelog entries +# +%{!?__pear: %global __pear %{_bindir}/pear} %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %global pear_name PHP_CodeSniffer -%global pear_version 1.4.5 Name: php-pear-PHP-CodeSniffer -Version: %{pear_version} -Release: 3%{?dist} +Version: 1.5.5 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/%{pear_name}-%{pear_version}.tgz +Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz +# https://github.com/squizlabs/PHP_CodeSniffer/issues/273 Source1: PHP_CodeSniffer-licence.txt -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -BuildRequires: php-pear >= 1:1.4.9-1.2 -Requires: php-pear(PEAR) -Requires: php-common >= 5.1.2 +BuildRequires: php-pear +# to run test suite +BuildRequires: php-phpunit-PHPUnit >= 3.5.0 + Requires(post): %{__pear} Requires(postun): %{__pear} +# From package.xml +Requires: php-pear(PEAR) +# From package.xml - optional Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 +# From phpcompatinfo report for version 1.5.5 +Requires: php-ctype +Requires: php-date +Requires: php-dom +Requires: php-iconv +Requires: php-pcre +Requires: php-reflection +Requires: php-simplexml +Requires: php-spl +Requires: php-tokenizer +Requires: php-xmlwriter + Provides: php-pear(%{pear_name}) = %{version} +Provides: php-composer(squizlabs/php_codesniffer) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} + %description PHP_CodeSniffer provides functionality to verify that code conforms to certain standards, such as PEAR, or user-defined. + %prep %setup -q -c -[ -f package2.xml ] || mv package.xml package2.xml -mv package2.xml %{pear_name}-%{pear_version}/%{pear_name}.xml -cd %{pear_name}-%{pear_version} +sed -e '/phpcs-svn-pre-commit/s/role="script"/role="doc"/' \ + package.xml >%{pear_name}-%{version}/%{pear_name}.xml -# Create a "localized" php.ini to avoid build warning -cp /etc/php.ini . -echo "date.timezone=UTC" >>php.ini %build # Empty build section, %install -cd %{pear_name}-%{pear_version} -rm -rf $RPM_BUILD_ROOT +cd %{pear_name}-%{version} -PHPRC=./php.ini %{__pear} install --nodeps --packagingroot $RPM_BUILD_ROOT %{pear_name}.xml - -# Remove phpcs-svn-pre-commit: we'll add it to docs -mv -f $RPM_BUILD_ROOT%{_bindir}/scripts/phpcs-svn-pre-commit . -chmod 0644 phpcs-svn-pre-commit -rm -rf $RPM_BUILD_ROOT%{_bindir}/scripts - -cp %{SOURCE1} . +%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml # Clean up unnecessary files -rm -rf %{buildroot}/%{pear_metadir}/.??* +rm -rf %{buildroot}%{pear_metadir}/.??* # Install XML package description -mkdir -p $RPM_BUILD_ROOT%{pear_xmldir} -install -pm 644 %{pear_name}.xml $RPM_BUILD_ROOT%{pear_xmldir} +mkdir -p %{buildroot}%{pear_xmldir} +install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} + +install -pm 644 %{SOURCE1} %{buildroot}%{pear_docdir}/%{pear_name}/LICENSE -%clean -rm -rf $RPM_BUILD_ROOT +%check +cd %{pear_name}-%{version}/tests + +# Version 1.5.5 : 216, Assertions: 57, Skipped: 4. +%{_bindir}/phpunit \ + -d date.timezone=UTC \ + --verbose \ + AllTests.php + %post %{__pear} install --nodeps --soft --force --register-only \ @@ -81,16 +107,25 @@ fi %files -%defattr(-,root,root,-) -%doc %{pear_name}-%{pear_version}/PHP_CodeSniffer-licence.txt -%doc %{pear_name}-%{pear_version}/phpcs-svn-pre-commit +%doc %{pear_docdir}/%{pear_name} %{pear_xmldir}/%{pear_name}.xml %{pear_testdir}/%{pear_name} +%{pear_datadir}/%{pear_name} %{pear_phpdir}/PHP -%{pear_datadir}/%{pear_name}/CodeSniffer.conf.dist %{_bindir}/phpcs + %changelog +* Thu Oct 9 2014 Remi Collet - 1.5.5 +- Update to 1.5.5 +- cleanup + changes from remi repo +- add explicit dependencies on need extensions +- run test suite during build +- provide php-composer(squizlabs/php_codesniffer) +- request LICENSE to be part of upstream tarball + https://github.com/squizlabs/PHP_CodeSniffer/issues/273 +- add spec License header + * Sat Jun 07 2014 Fedora Release Engineering - 1.4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index bfb61a8..cb59f72 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2df688272699710cd0e028a04933f3e0 PHP_CodeSniffer-1.4.5.tgz +157b659379676741db692de5ec151c33 PHP_CodeSniffer-1.5.5.tgz From 0c9c0ac8ef7e547a298029650440fd5a5e2bbaeb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Dec 2014 13:09:45 +0100 Subject: [PATCH 025/119] update to 2.0.0 --- .gitignore | 1 + PHP_CodeSniffer-licence.txt | 28 ---------------------------- PHP_CodeSniffer-role.patch | 10 ++++++++++ php-pear-PHP-CodeSniffer.spec | 34 ++++++++++++++++++---------------- sources | 2 +- 5 files changed, 30 insertions(+), 45 deletions(-) delete mode 100644 PHP_CodeSniffer-licence.txt create mode 100644 PHP_CodeSniffer-role.patch diff --git a/.gitignore b/.gitignore index 89868e1..dc14431 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.4.4.tgz /PHP_CodeSniffer-1.4.5.tgz /PHP_CodeSniffer-1.5.5.tgz +/PHP_CodeSniffer-2.0.0.tgz diff --git a/PHP_CodeSniffer-licence.txt b/PHP_CodeSniffer-licence.txt deleted file mode 100644 index b2f2ab1..0000000 --- a/PHP_CodeSniffer-licence.txt +++ /dev/null @@ -1,28 +0,0 @@ -PHP_CodeSniffer Licence - -Copyright (c) 2006, Squiz Pty Ltd (ABN 77 084 670 600) All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - * Neither the name of Squiz Pty Ltd nor the names of its - contributors may be used to endorse or promote products derived - from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS -IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED -TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER -OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF -LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING -NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/PHP_CodeSniffer-role.patch b/PHP_CodeSniffer-role.patch new file mode 100644 index 0000000..7e3ce1d --- /dev/null +++ b/PHP_CodeSniffer-role.patch @@ -0,0 +1,10 @@ +--- package.xml.old 2014-12-05 12:39:59.000000000 +0100 ++++ package.xml 2014-12-05 12:40:45.000000000 +0100 +@@ -1912,6 +1912,7 @@ + + + ++ + + + diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index ae80242..ba32efd 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 1.5.5 +Version: 2.0.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -22,8 +22,8 @@ Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -# https://github.com/squizlabs/PHP_CodeSniffer/issues/273 -Source1: PHP_CodeSniffer-licence.txt + +Patch0: %{pear_name}-role.patch BuildArch: noarch BuildRequires: php-pear @@ -34,16 +34,14 @@ Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From package.xml - optional -Requires: php-pear(pear.phpunit.de/PHP_Timer) >= 1.0.0 -# From phpcompatinfo report for version 1.5.5 +# From phpcompatinfo report for version 2.0.0 Requires: php-ctype Requires: php-date Requires: php-dom Requires: php-iconv Requires: php-pcre Requires: php-reflection -Requires: php-simplexml +Requires: php-soap Requires: php-spl Requires: php-tokenizer Requires: php-xmlwriter @@ -62,8 +60,11 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c -sed -e '/phpcs-svn-pre-commit/s/role="script"/role="doc"/' \ - package.xml >%{pear_name}-%{version}/%{pear_name}.xml +# install scripts/phpcs-svn-pre-commit properly +%patch0 -p0 -b .old + +cd %{pear_name}-%{version} +mv ../package.xml %{pear_name}.xml %build @@ -82,17 +83,12 @@ rm -rf %{buildroot}%{pear_metadir}/.??* mkdir -p %{buildroot}%{pear_xmldir} install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} -install -pm 644 %{SOURCE1} %{buildroot}%{pear_docdir}/%{pear_name}/LICENSE - %check cd %{pear_name}-%{version}/tests -# Version 1.5.5 : 216, Assertions: 57, Skipped: 4. -%{_bindir}/phpunit \ - -d date.timezone=UTC \ - --verbose \ - AllTests.php +# Version 2.0.0: 221, Assertions: 69, Skipped: 4. +%{_bindir}/phpunit AllTests.php %post @@ -112,10 +108,16 @@ fi %{pear_testdir}/%{pear_name} %{pear_datadir}/%{pear_name} %{pear_phpdir}/PHP +%{_bindir}/phpcbf %{_bindir}/phpcs +%{_bindir}/phpcs-svn-pre-commit %changelog +* Fri Dec 05 2014 Remi Collet - 2.0.0-1 +- Update to 2.0.0 +- add phpcbf and phpcs-svn-pre-commit commands + * Thu Oct 9 2014 Remi Collet - 1.5.5 - Update to 1.5.5 - cleanup + changes from remi repo diff --git a/sources b/sources index cb59f72..9cc4d98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -157b659379676741db692de5ec151c33 PHP_CodeSniffer-1.5.5.tgz +92df2d7f59824ab07404a26cbd6ef853 PHP_CodeSniffer-2.0.0.tgz From 2de4e40a27b23a820ab70a70531d7856c2dbfedd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 19 Dec 2014 14:58:30 +0100 Subject: [PATCH 026/119] update to 2.1.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index dc14431..806bcba 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ PHP_CodeSniffer-1.3.0a1.tgz /PHP_CodeSniffer-1.4.5.tgz /PHP_CodeSniffer-1.5.5.tgz /PHP_CodeSniffer-2.0.0.tgz +/PHP_CodeSniffer-2.1.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index ba32efd..28dfb47 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.0.0 +Version: 2.1.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* Thu Dec 18 2014 Remi Collet - 2.1.0-1 +- Update to 2.1.0 (stable) + * Fri Dec 05 2014 Remi Collet - 2.0.0-1 - Update to 2.0.0 - add phpcbf and phpcs-svn-pre-commit commands diff --git a/sources b/sources index 9cc4d98..5e6f829 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -92df2d7f59824ab07404a26cbd6ef853 PHP_CodeSniffer-2.0.0.tgz +584037ad5225bc85790d8c7e9a291981 PHP_CodeSniffer-2.1.0.tgz From 18cf1a9503f54e136c0a1659c581b297d1273a35 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 22 Jan 2015 13:59:17 +0100 Subject: [PATCH 027/119] update to 2.2.0 --- .gitignore | 17 ++--------------- php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 806bcba..2f25ac0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,15 +1,2 @@ -PHP_CodeSniffer-1.3.0a1.tgz -/PHP_CodeSniffer-1.3.0RC1.tgz -/PHP_CodeSniffer-1.3.0.tgz -/PHP_CodeSniffer-1.3.1.tgz -/PHP_CodeSniffer-1.3.3.tgz -/PHP_CodeSniffer-1.3.4.tgz -/PHP_CodeSniffer-1.3.5.tgz -/PHP_CodeSniffer-1.3.6.tgz -/PHP_CodeSniffer-1.4.0.tgz -/PHP_CodeSniffer-1.4.3.tgz -/PHP_CodeSniffer-1.4.4.tgz -/PHP_CodeSniffer-1.4.5.tgz -/PHP_CodeSniffer-1.5.5.tgz -/PHP_CodeSniffer-2.0.0.tgz -/PHP_CodeSniffer-2.1.0.tgz +clog +/PHP_CodeSniffer-2.2.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 28dfb47..78e3c28 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-2014 Remi Collet +# Copyright (c) 2013-2015 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.1.0 +Version: 2.2.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -87,7 +87,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.0.0: 221, Assertions: 69, Skipped: 4. +# Version 2.2.0: Tests: 219, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php @@ -114,6 +114,9 @@ fi %changelog +* Thu Jan 22 2015 Remi Collet - 2.2.0-1 +- Update to 2.2.0 + * Thu Dec 18 2014 Remi Collet - 2.1.0-1 - Update to 2.1.0 (stable) diff --git a/sources b/sources index 5e6f829..7ec2521 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -584037ad5225bc85790d8c7e9a291981 PHP_CodeSniffer-2.1.0.tgz +a8e047c9fced58b3991b0f3066acaf5f PHP_CodeSniffer-2.2.0.tgz From cfc58198e0a10d8657b9f9eb6f9ba5d6f1cbfa41 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Mar 2015 10:14:39 +0100 Subject: [PATCH 028/119] Update to 2.3.0 (stable) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2f25ac0..5cb9cd6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ clog /PHP_CodeSniffer-2.2.0.tgz +/PHP_CodeSniffer-2.3.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 78e3c28..7b9b75e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.2.0 +Version: 2.3.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,8 +114,11 @@ fi %changelog +* Wed Mar 04 2015 Remi Collet - 2.3.0-1 +- Update to 2.3.0 (stable) + * Thu Jan 22 2015 Remi Collet - 2.2.0-1 -- Update to 2.2.0 +- Update to 2.2.0 (stable) * Thu Dec 18 2014 Remi Collet - 2.1.0-1 - Update to 2.1.0 (stable) diff --git a/sources b/sources index 7ec2521..f0bca1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a8e047c9fced58b3991b0f3066acaf5f PHP_CodeSniffer-2.2.0.tgz +7572350670346fe9183259d7c0c91656 PHP_CodeSniffer-2.3.0.tgz From 19e01ab057e3886e4cb197d0af74e54b1993c033 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Apr 2015 14:01:18 +0200 Subject: [PATCH 029/119] update to 2.3.1 --- .gitignore | 1 + PHP_CodeSniffer-role.patch | 2 +- php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5cb9cd6..81b0fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ clog /PHP_CodeSniffer-2.2.0.tgz /PHP_CodeSniffer-2.3.0.tgz +/PHP_CodeSniffer-2.3.1.tgz diff --git a/PHP_CodeSniffer-role.patch b/PHP_CodeSniffer-role.patch index 7e3ce1d..6a7d5f8 100644 --- a/PHP_CodeSniffer-role.patch +++ b/PHP_CodeSniffer-role.patch @@ -1,6 +1,6 @@ --- package.xml.old 2014-12-05 12:39:59.000000000 +0100 +++ package.xml 2014-12-05 12:40:45.000000000 +0100 -@@ -1912,6 +1912,7 @@ +@@ -1949,6 +1949,7 @@ diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 7b9b75e..7453b65 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.0 +Version: 2.3.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* Thu Apr 23 2015 Remi Collet - 2.3.1-1 +- Update to 2.3.1 (stable) + * Wed Mar 04 2015 Remi Collet - 2.3.0-1 - Update to 2.3.0 (stable) diff --git a/sources b/sources index f0bca1c..85eca90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7572350670346fe9183259d7c0c91656 PHP_CodeSniffer-2.3.0.tgz +10241b74aaa31b65982ea8575fc2a765 PHP_CodeSniffer-2.3.1.tgz From e396ad7cbfa0ffe8127044707ef9b2b6223c0e80 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 29 Apr 2015 07:17:24 +0200 Subject: [PATCH 030/119] Update to 2.3.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 81b0fc1..7358191 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ 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 diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 7453b65..adfb6eb 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.1 +Version: 2.3.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* Wed Apr 29 2015 Remi Collet - 2.3.2-1 +- Update to 2.3.2 + * Thu Apr 23 2015 Remi Collet - 2.3.1-1 - Update to 2.3.1 (stable) diff --git a/sources b/sources index 85eca90..c54d0c0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -10241b74aaa31b65982ea8575fc2a765 PHP_CodeSniffer-2.3.1.tgz +6ca8e1e63bed36204035fed4905511ce PHP_CodeSniffer-2.3.2.tgz From 889e02bcd3791c131221605674a97f6c50fd37c9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 18 Jun 2015 14:46:23 +0000 Subject: [PATCH 031/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_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 adfb6eb..ee053c9 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -15,7 +15,7 @@ Name: php-pear-PHP-CodeSniffer Version: 2.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -114,6 +114,9 @@ fi %changelog +* Thu Jun 18 2015 Fedora Release Engineering - 2.3.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Wed Apr 29 2015 Remi Collet - 2.3.2-1 - Update to 2.3.2 From 87d4ff91ae69933c306866ee04d9f1d387e0e5bf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Jun 2015 15:21:37 +0200 Subject: [PATCH 032/119] v2.3.3 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7358191..e246986 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ clog /PHP_CodeSniffer-2.3.0.tgz /PHP_CodeSniffer-2.3.1.tgz /PHP_CodeSniffer-2.3.2.tgz +/PHP_CodeSniffer-2.3.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index ee053c9..c6aa073 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,8 +14,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.2 -Release: 2%{?dist} +Version: 2.3.3 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -114,6 +114,9 @@ fi %changelog +* Wed Jun 24 2015 Remi Collet - 2.3.3-1 +- Update to 2.3.3 (stable) + * Thu Jun 18 2015 Fedora Release Engineering - 2.3.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index c54d0c0..d0b7847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ca8e1e63bed36204035fed4905511ce PHP_CodeSniffer-2.3.2.tgz +78cf9df871bfe925640a8d7310d466de PHP_CodeSniffer-2.3.3.tgz From 4a3bd4de8a2fab32229b11c70dbb79ff1a880c5e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 9 Sep 2015 15:05:18 +0200 Subject: [PATCH 033/119] v2.3.4 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e246986..28304ea 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ clog /PHP_CodeSniffer-2.3.1.tgz /PHP_CodeSniffer-2.3.2.tgz /PHP_CodeSniffer-2.3.3.tgz +/PHP_CodeSniffer-2.3.4.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c6aa073..127c887 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.3 +Version: 2.3.4 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -34,7 +34,7 @@ Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.0.0 +# From phpcompatinfo report for version 2.3.4 Requires: php-ctype Requires: php-date Requires: php-dom @@ -87,7 +87,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.2.0: Tests: 219, Assertions: 69, Skipped: 4. +# Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php @@ -114,6 +114,9 @@ fi %changelog +* Wed Sep 9 2015 Remi Collet - 2.3.4-1 +- Update to 2.3.4 + * Wed Jun 24 2015 Remi Collet - 2.3.3-1 - Update to 2.3.3 (stable) diff --git a/sources b/sources index d0b7847..6429e25 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -78cf9df871bfe925640a8d7310d466de PHP_CodeSniffer-2.3.3.tgz +024479013541e5423cda862c1901b74e PHP_CodeSniffer-2.3.4.tgz From e7e5b6c7d0bd7a6c9ef386aec612a14ae5ed3347 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 26 Nov 2015 13:57:03 +0100 Subject: [PATCH 034/119] v2.4.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 28304ea..0086e67 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ clog /PHP_CodeSniffer-2.3.2.tgz /PHP_CodeSniffer-2.3.3.tgz /PHP_CodeSniffer-2.3.4.tgz +/PHP_CodeSniffer-2.4.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 127c887..facf40a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.3.4 +Version: 2.4.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* Wed Nov 25 2015 Remi Collet - 2.4.0-1 +- Update to 2.4.0 (stable) + * Wed Sep 9 2015 Remi Collet - 2.3.4-1 - Update to 2.3.4 diff --git a/sources b/sources index 6429e25..e99c2af 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -024479013541e5423cda862c1901b74e PHP_CodeSniffer-2.3.4.tgz +27ca408721c52f45b0baa202ba1ef36e PHP_CodeSniffer-2.4.0.tgz From ce23bab27611592b4220af2f0a953e4ba59a4bd6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 11 Dec 2015 09:14:25 +0100 Subject: [PATCH 035/119] v2.5.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 0086e67..6adc6b9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ clog /PHP_CodeSniffer-2.3.3.tgz /PHP_CodeSniffer-2.3.4.tgz /PHP_CodeSniffer-2.4.0.tgz +/PHP_CodeSniffer-2.5.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index facf40a..4dbd4ed 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.4.0 +Version: 2.5.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* Fri Dec 11 2015 Remi Collet - 2.5.0-1 +- Update to 2.5.0 (stable) + * Wed Nov 25 2015 Remi Collet - 2.4.0-1 - Update to 2.4.0 (stable) diff --git a/sources b/sources index e99c2af..646a95e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27ca408721c52f45b0baa202ba1ef36e PHP_CodeSniffer-2.4.0.tgz +d95e00d920587db785195f1c5f1ea532 PHP_CodeSniffer-2.5.0.tgz From d4072f1d8ebd09e08e24182f6953eda891a953dd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Jan 2016 14:23:50 +0100 Subject: [PATCH 036/119] v2.5.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6adc6b9..319ae31 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /PHP_CodeSniffer-2.3.4.tgz /PHP_CodeSniffer-2.4.0.tgz /PHP_CodeSniffer-2.5.0.tgz +/PHP_CodeSniffer-2.5.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 4dbd4ed..0303e0e 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-2015 Remi Collet +# Copyright (c) 2013-2016 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -14,7 +14,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.5.0 +Version: 2.5.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -114,6 +114,9 @@ fi %changelog +* Wed Jan 20 2016 Remi Collet - 2.5.1-1 +- Update to 2.5.1 (stable) + * Fri Dec 11 2015 Remi Collet - 2.5.0-1 - Update to 2.5.0 (stable) diff --git a/sources b/sources index 646a95e..c2c8cb8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d95e00d920587db785195f1c5f1ea532 PHP_CodeSniffer-2.5.0.tgz +ecfc639369bddd2d5e920e0d6ba6d652 PHP_CodeSniffer-2.5.1.tgz From cde0de2b8ee0fe45466541b5d9f0d3e6db25d53a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 4 Feb 2016 17:33:53 +0000 Subject: [PATCH 037/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_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 0303e0e..eb0e6f5 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -15,7 +15,7 @@ Name: php-pear-PHP-CodeSniffer Version: 2.5.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -114,6 +114,9 @@ fi %changelog +* Thu Feb 04 2016 Fedora Release Engineering - 2.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jan 20 2016 Remi Collet - 2.5.1-1 - Update to 2.5.1 (stable) From 78f88b49c393157986bba37a4c2e6f84fac71346 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 4 Apr 2016 07:23:41 +0200 Subject: [PATCH 038/119] v 2.6.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 13 ++++++++++--- sources | 2 +- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 319ae31..d93b345 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /PHP_CodeSniffer-2.4.0.tgz /PHP_CodeSniffer-2.5.0.tgz /PHP_CodeSniffer-2.5.1.tgz +/PHP_CodeSniffer-2.6.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index eb0e6f5..9f60de5 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -9,13 +9,13 @@ # # Please, preserve the changelog entries # -%{!?__pear: %global __pear %{_bindir}/pear} %{!?pear_metadir: %global pear_metadir %{pear_phpdir}} +%{!?__pear: %global __pear %{_bindir}/pear} %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.5.1 -Release: 2%{?dist} +Version: 2.6.0 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -90,6 +90,10 @@ cd %{pear_name}-%{version}/tests # Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php +if which php70; then + php70 %{_bindir}/phpunit AllTests.php +fi + %post %{__pear} install --nodeps --soft --force --register-only \ @@ -114,6 +118,9 @@ fi %changelog +* Mon Apr 04 2016 Remi Collet - 2.6.0-1 +- Update to 2.6.0 + * Thu Feb 04 2016 Fedora Release Engineering - 2.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index c2c8cb8..d6591a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ecfc639369bddd2d5e920e0d6ba6d652 PHP_CodeSniffer-2.5.1.tgz +59635235cfbe18a5ada186fceea5d992 PHP_CodeSniffer-2.6.0.tgz From a69fea8b2cadadb168faa2dec7fe7ee4edade22b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 May 2016 08:57:49 +0200 Subject: [PATCH 039/119] v2.6.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 6 ++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index d93b345..ebdab17 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /PHP_CodeSniffer-2.5.0.tgz /PHP_CodeSniffer-2.5.1.tgz /PHP_CodeSniffer-2.6.0.tgz +/PHP_CodeSniffer-2.6.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 9f60de5..750d0b0 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -9,12 +9,11 @@ # # Please, preserve the changelog entries # -%{!?pear_metadir: %global pear_metadir %{pear_phpdir}} %{!?__pear: %global __pear %{_bindir}/pear} %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.6.0 +Version: 2.6.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -118,6 +117,9 @@ fi %changelog +* Tue May 31 2016 Remi Collet - 2.6.1-1 +- Update to 2.6.1 + * Mon Apr 04 2016 Remi Collet - 2.6.0-1 - Update to 2.6.0 diff --git a/sources b/sources index d6591a0..51de52d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59635235cfbe18a5ada186fceea5d992 PHP_CodeSniffer-2.6.0.tgz +eccb4343021a043a56e2006092df65a6 PHP_CodeSniffer-2.6.1.tgz From 8fd8946dde4a2a1981fb63f327f47b67def06702 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Jul 2016 14:37:47 +0200 Subject: [PATCH 040/119] v2.6.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index ebdab17..4be4c2e 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /PHP_CodeSniffer-2.5.1.tgz /PHP_CodeSniffer-2.6.0.tgz /PHP_CodeSniffer-2.6.1.tgz +/PHP_CodeSniffer-2.6.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 750d0b0..2667693 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.6.1 +Version: 2.6.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -89,10 +89,6 @@ cd %{pear_name}-%{version}/tests # Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. %{_bindir}/phpunit AllTests.php -if which php70; then - php70 %{_bindir}/phpunit AllTests.php -fi - %post %{__pear} install --nodeps --soft --force --register-only \ @@ -117,6 +113,9 @@ fi %changelog +* Mon Jul 18 2016 Remi Collet - 2.6.2-1 +- Update to 2.6.2 + * Tue May 31 2016 Remi Collet - 2.6.1-1 - Update to 2.6.1 diff --git a/sources b/sources index 51de52d..269cc4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eccb4343021a043a56e2006092df65a6 PHP_CodeSniffer-2.6.1.tgz +44feaafe673cd6e0c89dc6fc65a6cf56 PHP_CodeSniffer-2.6.2.tgz From 617788b7202779f09bc39cc5aff07558c27aae81 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 2 Sep 2016 09:24:46 +0200 Subject: [PATCH 041/119] v2.7.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4be4c2e..79044c2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /PHP_CodeSniffer-2.6.0.tgz /PHP_CodeSniffer-2.6.1.tgz /PHP_CodeSniffer-2.6.2.tgz +/PHP_CodeSniffer-2.7.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 2667693..27631ae 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.6.2 +Version: 2.7.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,7 +86,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.3.4: Tests: 222, Assertions: 69, Skipped: 4. +# Version 2.7.0: Tests: 236, Assertions: 90, Skipped: 3. %{_bindir}/phpunit AllTests.php @@ -113,6 +113,9 @@ fi %changelog +* Fri Sep 02 2016 Remi Collet - 2.7.0-1 +- Update to 2.7.0 + * Mon Jul 18 2016 Remi Collet - 2.6.2-1 - Update to 2.6.2 diff --git a/sources b/sources index 269cc4b..742a7f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -44feaafe673cd6e0c89dc6fc65a6cf56 PHP_CodeSniffer-2.6.2.tgz +40e5d70ab9aa4cc1a15091ddcc14c609 PHP_CodeSniffer-2.7.0.tgz From 8ea723c2e99ab2fc753fe305ebb97a8074905f69 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 30 Nov 2016 07:06:00 +0100 Subject: [PATCH 042/119] v2.7.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 79044c2..f1d8fc1 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /PHP_CodeSniffer-2.6.1.tgz /PHP_CodeSniffer-2.6.2.tgz /PHP_CodeSniffer-2.7.0.tgz +/PHP_CodeSniffer-2.7.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 27631ae..397483e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.7.0 +Version: 2.7.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -113,6 +113,9 @@ fi %changelog +* Wed Nov 30 2016 Remi Collet - 2.7.1-1 +- Update to 2.7.1 + * Fri Sep 02 2016 Remi Collet - 2.7.0-1 - Update to 2.7.0 diff --git a/sources b/sources index 742a7f3..4113c7d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -40e5d70ab9aa4cc1a15091ddcc14c609 PHP_CodeSniffer-2.7.0.tgz +fd6bded59396b8842f969620bfc1e9aa PHP_CodeSniffer-2.7.1.tgz From 5948e3e23db513a374db7577d379cc66b0a47f02 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Feb 2017 15:31:51 +0100 Subject: [PATCH 043/119] v2.8.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 19 ++++++++++++++----- sources | 2 +- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f1d8fc1..a33d534 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /PHP_CodeSniffer-2.6.2.tgz /PHP_CodeSniffer-2.7.0.tgz /PHP_CodeSniffer-2.7.1.tgz +/PHP_CodeSniffer-2.8.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 397483e..5010d44 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-2016 Remi Collet +# Copyright (c) 2013-2017 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.7.1 +Version: 2.8.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -33,7 +33,7 @@ Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.3.4 +# From phpcompatinfo report for version 2.8.0 Requires: php-ctype Requires: php-date Requires: php-dom @@ -86,8 +86,14 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.7.0: Tests: 236, Assertions: 90, Skipped: 3. -%{_bindir}/phpunit AllTests.php +# Version 2.8.0: Tests: 238, Assertions: 92, Skipped: 3. +ret=0 +for cmd in php php56 php70 php71; do + if which $cmd; then + $cmd %{_bindir}/phpunit AllTests.php || ret=1 + fi +done +exit $ret %post @@ -113,6 +119,9 @@ fi %changelog +* Thu Feb 02 2017 Remi Collet - 2.8.0-1 +- Update to 2.8.0 + * Wed Nov 30 2016 Remi Collet - 2.7.1-1 - Update to 2.7.1 diff --git a/sources b/sources index 4113c7d..b91bf33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fd6bded59396b8842f969620bfc1e9aa PHP_CodeSniffer-2.7.1.tgz +SHA512 (PHP_CodeSniffer-2.8.0.tgz) = afbfd1121f67989d442ae2529081ea41a735cecee1aeb335f2a235a94bddeb92d6939bc5fb13b7a07466428e585e2b816d6ee06731595693ca594f28fec65a12 From d0e057346e5737df867dd22f9bab1ea7a51b3101 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 11 Feb 2017 06:58:49 +0000 Subject: [PATCH 044/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_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 5010d44..6e86c8f 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -119,6 +119,9 @@ fi %changelog +* Sat Feb 11 2017 Fedora Release Engineering - 2.8.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Thu Feb 02 2017 Remi Collet - 2.8.0-1 - Update to 2.8.0 From f782951d6142af7f1dfcb5e98c1457aa420cee6c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Mar 2017 07:37:55 +0100 Subject: [PATCH 045/119] v2.8.1 --- php-pear-PHP-CodeSniffer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 6e86c8f..29c3aca 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.8.0 -Release: 2%{?dist} +Version: 2.8.1 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -119,6 +119,9 @@ fi %changelog +* Thu Mar 02 2017 Remi Collet - 2.8.1-1 +- Update to 2.8.1 + * Sat Feb 11 2017 Fedora Release Engineering - 2.8.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From 11731130a19fb11bd0abd0b6204c8c2a5345c030 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 2 Mar 2017 07:46:19 +0100 Subject: [PATCH 046/119] v2.8.1 (sources) --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index a33d534..56a1a9e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /PHP_CodeSniffer-2.7.0.tgz /PHP_CodeSniffer-2.7.1.tgz /PHP_CodeSniffer-2.8.0.tgz +/PHP_CodeSniffer-2.8.1.tgz diff --git a/sources b/sources index b91bf33..7ecb8d7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-2.8.0.tgz) = afbfd1121f67989d442ae2529081ea41a735cecee1aeb335f2a235a94bddeb92d6939bc5fb13b7a07466428e585e2b816d6ee06731595693ca594f28fec65a12 +SHA512 (PHP_CodeSniffer-2.8.1.tgz) = ef6c2c41428319d1149d4ff551b4586ac45f8baddbecf470ba28f3f0a03646568333b1e09e1475e28be08854105a3e85e21c6a400f45af916db8d47eec23d93d From abadaf7cc93f4c27ce00e8709ecfb4f49df1fdab Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 May 2017 07:55:39 +0200 Subject: [PATCH 047/119] Update to 3.0.0 raise dependency on PHP >= 5.4 drop phpcs-svn-pre-commit command --- .gitignore | 1 + PHP_CodeSniffer-role.patch | 10 ---------- php-pear-PHP-CodeSniffer.spec | 30 +++++++++++++++++------------- sources | 2 +- 4 files changed, 19 insertions(+), 24 deletions(-) delete mode 100644 PHP_CodeSniffer-role.patch diff --git a/.gitignore b/.gitignore index 56a1a9e..0fc5675 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ clog /PHP_CodeSniffer-2.7.1.tgz /PHP_CodeSniffer-2.8.0.tgz /PHP_CodeSniffer-2.8.1.tgz +/PHP_CodeSniffer-3.0.0.tgz diff --git a/PHP_CodeSniffer-role.patch b/PHP_CodeSniffer-role.patch deleted file mode 100644 index 6a7d5f8..0000000 --- a/PHP_CodeSniffer-role.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- package.xml.old 2014-12-05 12:39:59.000000000 +0100 -+++ package.xml 2014-12-05 12:40:45.000000000 +0100 -@@ -1949,6 +1949,7 @@ - - - -+ - - - diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 29c3aca..5b2b51a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 2.8.1 +Version: 3.0.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -22,28 +22,31 @@ License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz -Patch0: %{pear_name}-role.patch - BuildArch: noarch +BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -BuildRequires: php-phpunit-PHPUnit >= 3.5.0 +BuildRequires: php-phpunit-PHPUnit Requires(post): %{__pear} Requires(postun): %{__pear} # From package.xml Requires: php-pear(PEAR) -# From phpcompatinfo report for version 2.8.0 +Requires: php(language) >= 5.4 +Requires: php-tokenizer +Requires: php-xmlwriter +Requires: php-simplexml +# From phpcompatinfo report for version 3.0.0 +Requires: php-reflection Requires: php-ctype Requires: php-date Requires: php-dom +Requires: php-json Requires: php-iconv +Requires: php-pcntl Requires: php-pcre -Requires: php-reflection Requires: php-soap Requires: php-spl -Requires: php-tokenizer -Requires: php-xmlwriter Provides: php-pear(%{pear_name}) = %{version} Provides: php-composer(squizlabs/php_codesniffer) = %{version} @@ -59,9 +62,6 @@ certain standards, such as PEAR, or user-defined. %prep %setup -q -c -# install scripts/phpcs-svn-pre-commit properly -%patch0 -p0 -b .old - cd %{pear_name}-%{version} mv ../package.xml %{pear_name}.xml @@ -88,7 +88,7 @@ cd %{pear_name}-%{version}/tests # Version 2.8.0: Tests: 238, Assertions: 92, Skipped: 3. ret=0 -for cmd in php php56 php70 php71; do +for cmd in php php56 php70 php71 php72; do if which $cmd; then $cmd %{_bindir}/phpunit AllTests.php || ret=1 fi @@ -115,10 +115,14 @@ fi %{pear_phpdir}/PHP %{_bindir}/phpcbf %{_bindir}/phpcs -%{_bindir}/phpcs-svn-pre-commit %changelog +* Thu May 4 2017 Remi Collet - 3.0.0-1 +- Update to 3.0.0 +- raise dependency on PHP >= 5.4 +- drop phpcs-svn-pre-commit command + * Thu Mar 02 2017 Remi Collet - 2.8.1-1 - Update to 2.8.1 diff --git a/sources b/sources index 7ecb8d7..68cb799 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-2.8.1.tgz) = ef6c2c41428319d1149d4ff551b4586ac45f8baddbecf470ba28f3f0a03646568333b1e09e1475e28be08854105a3e85e21c6a400f45af916db8d47eec23d93d +SHA512 (PHP_CodeSniffer-3.0.0.tgz) = 1f24c2e5c86b988084f1dedb8a6958d27e95c9bbd9524418da9bc2fe7603e403784a959d49e8481db1d38e9ed40bc368b73f75385b5d0ccb86f550eb24e154a9 From 323cd32c2a4f54b802e12d04b1d4e843969c7bf9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 14 Jun 2017 09:41:44 +0200 Subject: [PATCH 048/119] v3.0.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0fc5675..c3edab4 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ clog /PHP_CodeSniffer-2.8.0.tgz /PHP_CodeSniffer-2.8.1.tgz /PHP_CodeSniffer-3.0.0.tgz +/PHP_CodeSniffer-3.0.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 5b2b51a..e78fc89 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.0.0 +Version: 3.0.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,7 +86,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version}/tests -# Version 2.8.0: Tests: 238, Assertions: 92, Skipped: 3. +# Version 3.0.1: Tests: 238, Assertions: 86, Skipped: 3. ret=0 for cmd in php php56 php70 php71 php72; do if which $cmd; then @@ -118,6 +118,9 @@ fi %changelog +* Wed Jun 14 2017 Remi Collet - 3.0.1-1 +- Update to 3.0.1 + * Thu May 4 2017 Remi Collet - 3.0.0-1 - Update to 3.0.0 - raise dependency on PHP >= 5.4 diff --git a/sources b/sources index 68cb799..a3bf5ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.0.0.tgz) = 1f24c2e5c86b988084f1dedb8a6958d27e95c9bbd9524418da9bc2fe7603e403784a959d49e8481db1d38e9ed40bc368b73f75385b5d0ccb86f550eb24e154a9 +SHA512 (PHP_CodeSniffer-3.0.1.tgz) = c8fbefa7a1a32fbcc61069b1fb096f0e781fd4ba079d1b2f3a4d19052866fbbdce95fc6d0fbb532d6fefd7a5b3fd5ec0d60dd627ad4f063206efa37b0798594b From 38a15ecb7310814be760183a984ec656d320d127 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 27 Jul 2017 08:01:53 +0000 Subject: [PATCH 049/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_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 e78fc89..08f591c 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.0.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -118,6 +118,9 @@ fi %changelog +* Thu Jul 27 2017 Fedora Release Engineering - 3.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Wed Jun 14 2017 Remi Collet - 3.0.1-1 - Update to 3.0.1 From 37e401119a2984e12c9d25af809ac7998ce36a65 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Aug 2017 11:50:05 +0200 Subject: [PATCH 050/119] v3.0.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c3edab4..2436fea 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ clog /PHP_CodeSniffer-2.8.1.tgz /PHP_CodeSniffer-3.0.0.tgz /PHP_CodeSniffer-3.0.1.tgz +/PHP_CodeSniffer-3.0.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 08f591c..0dbb6be 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.0.1 -Release: 2%{?dist} +Version: 3.0.2 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -118,6 +118,9 @@ fi %changelog +* Tue Jul 18 2017 Remi Collet - 3.0.2-1 +- Update to 3.0.2 + * Thu Jul 27 2017 Fedora Release Engineering - 3.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild diff --git a/sources b/sources index a3bf5ba..d7ba1e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.0.1.tgz) = c8fbefa7a1a32fbcc61069b1fb096f0e781fd4ba079d1b2f3a4d19052866fbbdce95fc6d0fbb532d6fefd7a5b3fd5ec0d60dd627ad4f063206efa37b0798594b +SHA512 (PHP_CodeSniffer-3.0.2.tgz) = ff32e6e88be1927a662f2d1d453f9c071220e168007ccc3ec7cfd3e766ea68ea0c69d537aa37ddb75d103792d1877e0af2d4710f8f6c6d4e957f0d4c482db68c From ed852b7cbbc4016768e4b0fd041f1515fe339701 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 4 Aug 2017 11:50:57 +0200 Subject: [PATCH 051/119] clean --- php-pear-PHP-CodeSniffer.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0dbb6be..3df829e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -121,9 +121,6 @@ fi * Tue Jul 18 2017 Remi Collet - 3.0.2-1 - Update to 3.0.2 -* Thu Jul 27 2017 Fedora Release Engineering - 3.0.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - * Wed Jun 14 2017 Remi Collet - 3.0.1-1 - Update to 3.0.1 From 631dfbb4da69fc7c8524feb7e2a566ab2703fe08 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Sep 2017 09:10:28 +0200 Subject: [PATCH 052/119] Update to 3.1.0 use phpunit6 on F26+ --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 26 ++++++++++++++++++-------- sources | 2 +- 3 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 2436fea..95275c1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ clog /PHP_CodeSniffer-3.0.0.tgz /PHP_CodeSniffer-3.0.1.tgz /PHP_CodeSniffer-3.0.2.tgz +/PHP_CodeSniffer-3.1.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 3df829e..4b47167 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.0.2 +Version: 3.1.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -26,7 +26,12 @@ BuildArch: noarch BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -BuildRequires: php-phpunit-PHPUnit +%if 0%{?fedora} >= 26 +%global phpunit %{_bindir}/phpunit6 +%else +%global phpunit %{_bindir}/phpunit +%endif +BuildRequires: %{phpunit} Requires(post): %{__pear} Requires(postun): %{__pear} @@ -84,14 +89,15 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check -cd %{pear_name}-%{version}/tests +cd %{pear_name}-%{version} -# Version 3.0.1: Tests: 238, Assertions: 86, Skipped: 3. +# Version 3.1.0: Tests: 242, Assertions: 88, Skipped: 3. ret=0 -for cmd in php php56 php70 php71 php72; do - if which $cmd; then - $cmd %{_bindir}/phpunit AllTests.php || ret=1 - fi +for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do + if which $cmdarg; then + set $cmdarg + $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + fi done exit $ret @@ -118,6 +124,10 @@ fi %changelog +* Wed Sep 20 2017 Remi Collet - 3.1.0-1 +- Update to 3.1.0 +- use phpunit6 on F26+ + * Tue Jul 18 2017 Remi Collet - 3.0.2-1 - Update to 3.0.2 diff --git a/sources b/sources index d7ba1e0..182a613 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.0.2.tgz) = ff32e6e88be1927a662f2d1d453f9c071220e168007ccc3ec7cfd3e766ea68ea0c69d537aa37ddb75d103792d1877e0af2d4710f8f6c6d4e957f0d4c482db68c +SHA512 (PHP_CodeSniffer-3.1.0.tgz) = 8e99a845235ed288035f0941fa5c4ef60809cf55f8c4fdcb0f84682bb4592e45b4c98ef63a1abb183b7a60dc45adbb812015b68cfe038f103e8d29db2f1a3c67 From 35693789e3f17f2cb3ece4f22dc9ad3d85f50232 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 17 Oct 2017 06:13:19 +0200 Subject: [PATCH 053/119] v3.1.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 95275c1..4ba1619 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ clog /PHP_CodeSniffer-3.0.1.tgz /PHP_CodeSniffer-3.0.2.tgz /PHP_CodeSniffer-3.1.0.tgz +/PHP_CodeSniffer-3.1.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 4b47167..9f11de4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.1.0 +Version: 3.1.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -124,6 +124,9 @@ fi %changelog +* Tue Oct 17 2017 Remi Collet - 3.1.1-1 +- Update to 3.1.1 + * Wed Sep 20 2017 Remi Collet - 3.1.0-1 - Update to 3.1.0 - use phpunit6 on F26+ diff --git a/sources b/sources index 182a613..f97590a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.1.0.tgz) = 8e99a845235ed288035f0941fa5c4ef60809cf55f8c4fdcb0f84682bb4592e45b4c98ef63a1abb183b7a60dc45adbb812015b68cfe038f103e8d29db2f1a3c67 +SHA512 (PHP_CodeSniffer-3.1.1.tgz) = d17c501582c132da61ec1350219e82b962f69265f00975cd35dfc1e6da57678a56cb7c9b1c4f5a4e6bbecd553db1159cb7e58d4456948e5bc7874c501f58c7b3 From 816a234fd925895fd54842dabe779201e52863a6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 13 Dec 2017 10:26:28 +0100 Subject: [PATCH 054/119] v3.2.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4ba1619..db9d906 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ clog /PHP_CodeSniffer-3.0.2.tgz /PHP_CodeSniffer-3.1.0.tgz /PHP_CodeSniffer-3.1.1.tgz +/PHP_CodeSniffer-3.2.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 9f11de4..fc44989 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.1.1 +Version: 3.2.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -124,6 +124,9 @@ fi %changelog +* Wed Dec 13 2017 Remi Collet - 3.2.0-1 +- Update to 3.2.0 + * Tue Oct 17 2017 Remi Collet - 3.1.1-1 - Update to 3.1.1 diff --git a/sources b/sources index f97590a..1a8ae27 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.1.1.tgz) = d17c501582c132da61ec1350219e82b962f69265f00975cd35dfc1e6da57678a56cb7c9b1c4f5a4e6bbecd553db1159cb7e58d4456948e5bc7874c501f58c7b3 +SHA512 (PHP_CodeSniffer-3.2.0.tgz) = 60839c3bcdbd30679b0146eaabd8a41d1b1d826970228217a2adaa54eaaf03d56f8e792e10c47448a7e0960e1043d6a008e3b293b5c4886e0febd59da6570241 From e294f10a754348bf2ce581db3b85291aa88cb25b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Dec 2017 07:59:40 +0100 Subject: [PATCH 055/119] v3.2.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index db9d906..d7878ac 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ clog /PHP_CodeSniffer-3.1.0.tgz /PHP_CodeSniffer-3.1.1.tgz /PHP_CodeSniffer-3.2.0.tgz +/PHP_CodeSniffer-3.2.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index fc44989..97cfa84 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.2.0 +Version: 3.2.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -124,6 +124,9 @@ fi %changelog +* Mon Dec 18 2017 Remi Collet - 3.2.1-1 +- Update to 3.2.1 + * Wed Dec 13 2017 Remi Collet - 3.2.0-1 - Update to 3.2.0 diff --git a/sources b/sources index 1a8ae27..fc32e33 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.2.0.tgz) = 60839c3bcdbd30679b0146eaabd8a41d1b1d826970228217a2adaa54eaaf03d56f8e792e10c47448a7e0960e1043d6a008e3b293b5c4886e0febd59da6570241 +SHA512 (PHP_CodeSniffer-3.2.1.tgz) = 69a4d70c6a567d262142f7f3d42507a7501ca3d5213f5b90d5893863e3d75e947a7b41e8bb08e85975677b606522b8f73df33dd35cde85c28016389f3c2ae63c From cc8dea60e653d667faac0391d133cc5dcc27826d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 20 Dec 2017 07:03:44 +0100 Subject: [PATCH 056/119] v3.2.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d7878ac..10b5e3a 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ clog /PHP_CodeSniffer-3.1.1.tgz /PHP_CodeSniffer-3.2.0.tgz /PHP_CodeSniffer-3.2.1.tgz +/PHP_CodeSniffer-3.2.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 97cfa84..d1685f6 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.2.1 +Version: 3.2.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -124,6 +124,9 @@ fi %changelog +* Wed Dec 20 2017 Remi Collet - 3.2.2-1 +- Update to 3.2.2 + * Mon Dec 18 2017 Remi Collet - 3.2.1-1 - Update to 3.2.1 diff --git a/sources b/sources index fc32e33..2b02e4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.2.1.tgz) = 69a4d70c6a567d262142f7f3d42507a7501ca3d5213f5b90d5893863e3d75e947a7b41e8bb08e85975677b606522b8f73df33dd35cde85c28016389f3c2ae63c +SHA512 (PHP_CodeSniffer-3.2.2.tgz) = 4dcd8055e1a3208ff098bc94aa5d47cd37f36f6f47edd1e5ed7984c4ec639e964ef8e8cf4f3a890023514df70878d3aa0e896c60a364708c8062afd83bc4fd57 From e0a1496ecbb4c313c60f033b53b271dba47d8fd6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 9 Feb 2018 04:08:32 +0000 Subject: [PATCH 057/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 d1685f6..99dd462 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.2.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool Group: Development/Tools @@ -124,6 +124,9 @@ fi %changelog +* Fri Feb 09 2018 Fedora Release Engineering - 3.2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Wed Dec 20 2017 Remi Collet - 3.2.2-1 - Update to 3.2.2 From 7b2466ef470482f03e04fabe62e1c10cb28e70f1 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 21 Feb 2018 08:50:34 +0100 Subject: [PATCH 058/119] Update to 3.2.3 use phpunit7 on F28+ --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 23 +++++++++++++---------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 10b5e3a..4eef538 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ clog /PHP_CodeSniffer-3.2.0.tgz /PHP_CodeSniffer-3.2.1.tgz /PHP_CodeSniffer-3.2.2.tgz +/PHP_CodeSniffer-3.2.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 99dd462..7667511 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-2017 Remi Collet +# Copyright (c) 2013-2018 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,11 +13,10 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.2.2 -Release: 2%{?dist} +Version: 3.2.3 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool -Group: Development/Tools License: BSD URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz @@ -26,10 +25,10 @@ BuildArch: noarch BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -%if 0%{?fedora} >= 26 -%global phpunit %{_bindir}/phpunit6 +%if 0%{?fedora} >= 28 +%global phpunit %{_bindir}/phpunit7 %else -%global phpunit %{_bindir}/phpunit +%global phpunit %{_bindir}/phpunit6 %endif BuildRequires: %{phpunit} @@ -91,12 +90,12 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} -# Version 3.1.0: Tests: 242, Assertions: 88, Skipped: 3. +# Version 3.2.3: Tests: 294, Assertions: 320, Skipped: 3. ret=0 -for cmdarg in "php %{phpunit}" "php56 %{_bindir}/phpunit" php70 php71 php72; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do if which $cmdarg; then set $cmdarg - $1 ${2:-%{_bindir}/phpunit6} --verbose || ret=1 + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} --verbose || ret=1 fi done exit $ret @@ -124,6 +123,10 @@ fi %changelog +* Wed Feb 21 2018 Remi Collet - 3.2.3-1 +- Update to 3.2.3 +- use phpunit7 on F28+ + * Fri Feb 09 2018 Fedora Release Engineering - 3.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild diff --git a/sources b/sources index 2b02e4f..ef2c0d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.2.2.tgz) = 4dcd8055e1a3208ff098bc94aa5d47cd37f36f6f47edd1e5ed7984c4ec639e964ef8e8cf4f3a890023514df70878d3aa0e896c60a364708c8062afd83bc4fd57 +SHA512 (PHP_CodeSniffer-3.2.3.tgz) = 42589a516e68d3dad3136ac32124954d19450e4125905e162c024062d604ecc1d0d0a2283882c6365952c6d88437ec195d16d81fcc23634e3f69f90b36433c28 From 70e43dea612aa773e49b74f2b5c3f068905a23c6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 7 Jun 2018 13:47:58 +0200 Subject: [PATCH 059/119] v3.3.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 4eef538..39b3d4b 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ clog /PHP_CodeSniffer-3.2.1.tgz /PHP_CodeSniffer-3.2.2.tgz /PHP_CodeSniffer-3.2.3.tgz +/PHP_CodeSniffer-3.3.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 7667511..4635e9e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.2.3 +Version: 3.3.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -25,7 +25,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -%if 0%{?fedora} >= 28 +%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit7 %else %global phpunit %{_bindir}/phpunit6 @@ -92,7 +92,7 @@ cd %{pear_name}-%{version} # Version 3.2.3: Tests: 294, Assertions: 320, Skipped: 3. ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72; do +for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} --verbose || ret=1 @@ -123,6 +123,9 @@ fi %changelog +* Thu Jun 7 2018 Remi Collet - 3.3.0-1 +- update to 3.3.0 + * Wed Feb 21 2018 Remi Collet - 3.2.3-1 - Update to 3.2.3 - use phpunit7 on F28+ diff --git a/sources b/sources index ef2c0d4..8542cf1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.2.3.tgz) = 42589a516e68d3dad3136ac32124954d19450e4125905e162c024062d604ecc1d0d0a2283882c6365952c6d88437ec195d16d81fcc23634e3f69f90b36433c28 +SHA512 (PHP_CodeSniffer-3.3.0.tgz) = 0996a0837085e478f22042136108eaf8f3a3df96c0bed304aecce35c5da6c700b375dbbc6969bf1bc0fc43a81cf50c54c699bd3eb5b16f5806a2103c06654e9c From e4428a3eb2e977b613bcdf5cb1863c77be43ae9b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 21:50:05 +0000 Subject: [PATCH 060/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 4635e9e..418fb5c 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.3.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -123,6 +123,9 @@ fi %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Jun 7 2018 Remi Collet - 3.3.0-1 - update to 3.3.0 From c56ee13403b3df6ef3559a1ffb0f1bffd12264d6 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Aug 2018 08:02:29 +0200 Subject: [PATCH 061/119] v3.3.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 39b3d4b..b8340f0 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ clog /PHP_CodeSniffer-3.2.2.tgz /PHP_CodeSniffer-3.2.3.tgz /PHP_CodeSniffer-3.3.0.tgz +/PHP_CodeSniffer-3.3.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 418fb5c..c75628c 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.3.0 -Release: 2%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -123,6 +123,9 @@ fi %changelog +* Fri Jul 27 2018 Remi Collet - 3.3.1-1 +- update to 3.3.1 + * Fri Jul 13 2018 Fedora Release Engineering - 3.3.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 8542cf1..f0bbae9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.3.0.tgz) = 0996a0837085e478f22042136108eaf8f3a3df96c0bed304aecce35c5da6c700b375dbbc6969bf1bc0fc43a81cf50c54c699bd3eb5b16f5806a2103c06654e9c +SHA512 (PHP_CodeSniffer-3.3.1.tgz) = 4909fea3361618cecb0bfb1dbec9ca2470c09d2661beaa778a1ee4f58daa4f9161f0f994c47410ee03721a494b5ab126bc4892b98e578e309b87984161372604 From 713c139b8d2ef8b5c26690cc407a85855d46df0f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 24 Sep 2018 08:15:30 +0200 Subject: [PATCH 062/119] v3.3.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b8340f0..01bfdc6 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ clog /PHP_CodeSniffer-3.2.3.tgz /PHP_CodeSniffer-3.3.0.tgz /PHP_CodeSniffer-3.3.1.tgz +/PHP_CodeSniffer-3.3.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c75628c..ea1afed 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.3.1 +Version: 3.3.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -90,7 +90,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} -# Version 3.2.3: Tests: 294, Assertions: 320, Skipped: 3. +# Version 3.3.2: Tests: 354, Assertions: 410, Skipped: 3. ret=0 for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do if which $cmdarg; then @@ -123,6 +123,9 @@ fi %changelog +* Mon Sep 24 2018 Remi Collet - 3.3.2-1 +- update to 3.3.2 + * Fri Jul 27 2018 Remi Collet - 3.3.1-1 - update to 3.3.1 diff --git a/sources b/sources index f0bbae9..8d11b70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.3.1.tgz) = 4909fea3361618cecb0bfb1dbec9ca2470c09d2661beaa778a1ee4f58daa4f9161f0f994c47410ee03721a494b5ab126bc4892b98e578e309b87984161372604 +SHA512 (PHP_CodeSniffer-3.3.2.tgz) = 461253553678fff4521a41883e94cc29558eaa8cd1b36787c115edfe76618da1d8dbfcb4ea421554472c5a6cfa2d22576d1e9f28359b86639c1ed2c4bf3e6d1f From 96db41989068621261ee9e77644d29468b3e73aa Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 20 Dec 2018 09:59:50 +0100 Subject: [PATCH 063/119] v3.4.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 11 +++++------ sources | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 01bfdc6..47aba01 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ clog /PHP_CodeSniffer-3.3.0.tgz /PHP_CodeSniffer-3.3.1.tgz /PHP_CodeSniffer-3.3.2.tgz +/PHP_CodeSniffer-3.4.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index ea1afed..28c85f4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.3.2 +Version: 3.4.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -25,11 +25,7 @@ BuildArch: noarch BuildRequires: php(language) >= 5.4 BuildRequires: php-pear # to run test suite -%if 0%{?fedora} >= 28 || 0%{?rhel} >= 8 %global phpunit %{_bindir}/phpunit7 -%else -%global phpunit %{_bindir}/phpunit6 -%endif BuildRequires: %{phpunit} Requires(post): %{__pear} @@ -90,7 +86,7 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} -# Version 3.3.2: Tests: 354, Assertions: 410, Skipped: 3. +# Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. ret=0 for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do if which $cmdarg; then @@ -123,6 +119,9 @@ fi %changelog +* Thu Dec 20 2018 Remi Collet - 3.4.0-1 +- update to 3.4.0 + * Mon Sep 24 2018 Remi Collet - 3.3.2-1 - update to 3.3.2 diff --git a/sources b/sources index 8d11b70..d97163e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.3.2.tgz) = 461253553678fff4521a41883e94cc29558eaa8cd1b36787c115edfe76618da1d8dbfcb4ea421554472c5a6cfa2d22576d1e9f28359b86639c1ed2c4bf3e6d1f +SHA512 (PHP_CodeSniffer-3.4.0.tgz) = ea5a59de28927895275a4f7959a1dcae7fbaef17a2531046f7e267a63b51a801fc5a926e1fe7ac823f8fcf28f08d0747916b45bebce8424c6320e58388da6b41 From 8c1f02cdf52550706e7fa95ebf416c4b467382a8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 2 Feb 2019 03:13:45 +0000 Subject: [PATCH 064/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 28c85f4..2b7a2d0 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.4.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -119,6 +119,9 @@ fi %changelog +* Sat Feb 02 2019 Fedora Release Engineering - 3.4.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Thu Dec 20 2018 Remi Collet - 3.4.0-1 - update to 3.4.0 From 75ce0a47527f0bb7f0ca30de8846d89fb7b01dd0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Mar 2019 09:06:18 +0100 Subject: [PATCH 065/119] v3.4.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 47aba01..068f0eb 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ clog /PHP_CodeSniffer-3.3.1.tgz /PHP_CodeSniffer-3.3.2.tgz /PHP_CodeSniffer-3.4.0.tgz +/PHP_CodeSniffer-3.4.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 2b7a2d0..20508c5 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-2018 Remi Collet +# Copyright (c) 2013-2019 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.4.0 -Release: 2%{?dist} +Version: 3.4.1 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -119,6 +119,9 @@ fi %changelog +* Tue Mar 19 2019 Remi Collet - 3.4.1-1 +- update to 3.4.1 + * Sat Feb 02 2019 Fedora Release Engineering - 3.4.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index d97163e..a0681e0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.4.0.tgz) = ea5a59de28927895275a4f7959a1dcae7fbaef17a2531046f7e267a63b51a801fc5a926e1fe7ac823f8fcf28f08d0747916b45bebce8424c6320e58388da6b41 +SHA512 (PHP_CodeSniffer-3.4.1.tgz) = 376e7c7e1df81e1b408199ff2d98f007af2b7827dc24f319242b44bf9cf987dd29d3c5f6ee05d9ca5ed1e72ccf0f9329477113489ff8ed302f74972c78e60358 From f030f356a2ad886d56e23c102c2b9c2db72e6ef3 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 11 Apr 2019 08:48:47 +0200 Subject: [PATCH 066/119] v3.4.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 068f0eb..aab10e4 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ clog /PHP_CodeSniffer-3.3.2.tgz /PHP_CodeSniffer-3.4.0.tgz /PHP_CodeSniffer-3.4.1.tgz +/PHP_CodeSniffer-3.4.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 20508c5..529a63c 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.4.1 +Version: 3.4.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -119,6 +119,9 @@ fi %changelog +* Thu Apr 11 2019 Remi Collet - 3.4.2-1 +- update to 3.4.2 + * Tue Mar 19 2019 Remi Collet - 3.4.1-1 - update to 3.4.1 diff --git a/sources b/sources index a0681e0..22e4008 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.4.1.tgz) = 376e7c7e1df81e1b408199ff2d98f007af2b7827dc24f319242b44bf9cf987dd29d3c5f6ee05d9ca5ed1e72ccf0f9329477113489ff8ed302f74972c78e60358 +SHA512 (PHP_CodeSniffer-3.4.2.tgz) = 6236e3f9899d8f4637314f359a8db44835140d0292ea02b56b5e2e55ea8739841648ee03c3f25bf4df64577237b6bc1c3d0999d5452b9f292ef019347ecd41f5 From 569de7526d0f439c5b8bb801bc2048e8ed7a6393 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 26 Jul 2019 09:40:58 +0000 Subject: [PATCH 067/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 529a63c..51011c4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.4.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -119,6 +119,9 @@ fi %changelog +* Fri Jul 26 2019 Fedora Release Engineering - 3.4.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Thu Apr 11 2019 Remi Collet - 3.4.2-1 - update to 3.4.2 From 85e1fddd33c0c2548341bfefe252a27140686d3d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 27 Sep 2019 07:45:01 +0200 Subject: [PATCH 068/119] v3.5.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aab10e4..07654dd 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ clog /PHP_CodeSniffer-3.4.0.tgz /PHP_CodeSniffer-3.4.1.tgz /PHP_CodeSniffer-3.4.2.tgz +/PHP_CodeSniffer-3.5.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 51011c4..48f2ace 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.4.2 -Release: 2%{?dist} +Version: 3.5.0 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -86,9 +86,12 @@ install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} %check cd %{pear_name}-%{version} +# fails with js: Couldn't read source file +rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* + # Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. ret=0 -for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" php71 php72 php73; do +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 @@ -119,6 +122,9 @@ fi %changelog +* Fri Sep 27 2019 Remi Collet - 3.5.0-1 +- update to 3.5.0 + * Fri Jul 26 2019 Fedora Release Engineering - 3.4.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 22e4008..e58d8c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.4.2.tgz) = 6236e3f9899d8f4637314f359a8db44835140d0292ea02b56b5e2e55ea8739841648ee03c3f25bf4df64577237b6bc1c3d0999d5452b9f292ef019347ecd41f5 +SHA512 (PHP_CodeSniffer-3.5.0.tgz) = 4990c4c02237d004af58af73fa09f2459cd0dae685afa2b01c42500b97135bd0fe9574290524a235e59e6ea225cebdb9537769dd4487c43cf8829a2cda6031c4 From 740f1bf320bb577c2b63974818b9e79148df3438 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 17 Oct 2019 09:44:48 +0200 Subject: [PATCH 069/119] v3.5.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 07654dd..b440d58 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ clog /PHP_CodeSniffer-3.4.1.tgz /PHP_CodeSniffer-3.4.2.tgz /PHP_CodeSniffer-3.5.0.tgz +/PHP_CodeSniffer-3.5.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 48f2ace..d4a191b 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.0 +Version: 3.5.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -122,6 +122,9 @@ fi %changelog +* Thu Oct 17 2019 Remi Collet - 3.5.1-1 +- update to 3.5.1 + * Fri Sep 27 2019 Remi Collet - 3.5.0-1 - update to 3.5.0 diff --git a/sources b/sources index e58d8c2..e7bde11 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.0.tgz) = 4990c4c02237d004af58af73fa09f2459cd0dae685afa2b01c42500b97135bd0fe9574290524a235e59e6ea225cebdb9537769dd4487c43cf8829a2cda6031c4 +SHA512 (PHP_CodeSniffer-3.5.1.tgz) = d5849891429aef93e14b21c359b0a05b91ba74900aa79990293b111e42aa0ad9c612fce3a6a7700508f249a20358c9b9c12f4f113648a45d83fb977880127f6f From 0a72faa46c6fb0fdfc0e47ac00a81e52c5b6bac7 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 28 Oct 2019 09:40:04 +0100 Subject: [PATCH 070/119] v3.5.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b440d58..3367f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ clog /PHP_CodeSniffer-3.4.2.tgz /PHP_CodeSniffer-3.5.0.tgz /PHP_CodeSniffer-3.5.1.tgz +/PHP_CodeSniffer-3.5.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index d4a191b..e968bc7 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.1 +Version: 3.5.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -122,6 +122,9 @@ fi %changelog +* Mon Oct 28 2019 Remi Collet - 3.5.2-1 +- update to 3.5.2 + * Thu Oct 17 2019 Remi Collet - 3.5.1-1 - update to 3.5.1 diff --git a/sources b/sources index e7bde11..6ad0603 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.1.tgz) = d5849891429aef93e14b21c359b0a05b91ba74900aa79990293b111e42aa0ad9c612fce3a6a7700508f249a20358c9b9c12f4f113648a45d83fb977880127f6f +SHA512 (PHP_CodeSniffer-3.5.2.tgz) = 3ae8d484b7725ee5b15f44b6338310aee0ef23a689c76b6c968861a33532c089b0601ba04069e054695def245314f3913998b4d61f0b9c3daa92e624e2aea0e1 From efb57d6a7c1be6a02fc3d42e18d8b12acaf789d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 4 Dec 2019 09:43:47 +0100 Subject: [PATCH 071/119] v3.5.3 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3367f5f..3ee9c52 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ clog /PHP_CodeSniffer-3.5.0.tgz /PHP_CodeSniffer-3.5.1.tgz /PHP_CodeSniffer-3.5.2.tgz +/PHP_CodeSniffer-3.5.3.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index e968bc7..be022dd 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.2 +Version: 3.5.3 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -122,6 +122,9 @@ fi %changelog +* Wed Dec 4 2019 Remi Collet - 3.5.3-1 +- update to 3.5.3 + * Mon Oct 28 2019 Remi Collet - 3.5.2-1 - update to 3.5.2 diff --git a/sources b/sources index 6ad0603..15187d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.2.tgz) = 3ae8d484b7725ee5b15f44b6338310aee0ef23a689c76b6c968861a33532c089b0601ba04069e054695def245314f3913998b4d61f0b9c3daa92e624e2aea0e1 +SHA512 (PHP_CodeSniffer-3.5.3.tgz) = 16f786f6f34827b1e489cd6df4ad9a4ffa281a6e23930af343fe49473c96f5dc28f9b0b27d3b639962ea483426453dc9b9538ede77246e33ae74705102553c94 From 8dda7733835a3efa19903bcd46ea5296ea83af5a Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 30 Jan 2020 08:09:00 +0000 Subject: [PATCH 072/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 be022dd..07b3cbc 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.5.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -122,6 +122,9 @@ fi %changelog +* Thu Jan 30 2020 Fedora Release Engineering - 3.5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Dec 4 2019 Remi Collet - 3.5.3-1 - update to 3.5.3 From 3a852c4dbc8f1cf43adf551e5bbaa7286b1bed85 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 31 Jan 2020 13:24:12 +0100 Subject: [PATCH 073/119] 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 - 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 - 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 From de698e48782a06a75375afa5ccd5d3a74c3691d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Apr 2020 07:58:24 +0200 Subject: [PATCH 074/119] v3.5.5 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1fae088..39a07fe 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ clog /PHP_CodeSniffer-3.5.2.tgz /PHP_CodeSniffer-3.5.3.tgz /PHP_CodeSniffer-3.5.4.tgz +/PHP_CodeSniffer-3.5.5.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 6e378c3..a0fe648 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.4 +Version: 3.5.5 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -127,6 +127,9 @@ fi %changelog +* Mon Apr 20 2020 Remi Collet - 3.5.5-1 +- update to 3.5.5 + * Fri Jan 31 2020 Remi Collet - 3.5.4-1 - update to 3.5.4 - fix test suite from diff --git a/sources b/sources index d0f19e4..e80bf94 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.4.tgz) = 3e8024aac18111741637f014629eeaf5863b2f080a673e5b379a676fafb69859d1889ae13289b0149a9810641b0a140123a970ae1178fcd2cf6da1c414233bfd +SHA512 (PHP_CodeSniffer-3.5.5.tgz) = dad676069122d879b8afb665d661bcd1c810c762b44738765231f8c8cc90d20e7e581690b7e725cdc24438be26fa3185f3556a300798ed5a03cff51f5cbb5d4d From 8b9dc8648040f56bb3a0e68a9d0109dff36a56ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 21:43:58 +0000 Subject: [PATCH 075/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 a0fe648..43a4c6b 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -127,6 +127,9 @@ fi %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 3.5.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Apr 20 2020 Remi Collet - 3.5.5-1 - update to 3.5.5 From 7e57057b845c187582ae34a7af797362bdc2f651 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 11 Aug 2020 14:52:42 +0200 Subject: [PATCH 076/119] v3.5.6 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 39a07fe..f2a22ca 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ clog /PHP_CodeSniffer-3.5.3.tgz /PHP_CodeSniffer-3.5.4.tgz /PHP_CodeSniffer-3.5.5.tgz +/PHP_CodeSniffer-3.5.6.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 43a4c6b..76a7e36 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.5 -Release: 2%{?dist} +Version: 3.5.6 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -95,6 +95,7 @@ rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* # Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. ret=0 +# TODO php80 for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do if which $cmdarg; then set $cmdarg @@ -127,6 +128,9 @@ fi %changelog +* Tue Aug 11 2020 Remi Collet - 3.5.6-1 +- update to 3.5.6 + * Tue Jul 28 2020 Fedora Release Engineering - 3.5.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild diff --git a/sources b/sources index e80bf94..6f9f4e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.5.tgz) = dad676069122d879b8afb665d661bcd1c810c762b44738765231f8c8cc90d20e7e581690b7e725cdc24438be26fa3185f3556a300798ed5a03cff51f5cbb5d4d +SHA512 (PHP_CodeSniffer-3.5.6.tgz) = 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7 From f81c2c88eb349140b40ac4dac7b0b00587c75bf4 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 23 Oct 2020 14:42:49 +0200 Subject: [PATCH 077/119] v3.5.8 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++----- sources | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index f2a22ca..e3dc017 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ clog /PHP_CodeSniffer-3.5.4.tgz /PHP_CodeSniffer-3.5.5.tgz /PHP_CodeSniffer-3.5.6.tgz +/PHP_CodeSniffer-3.5.8.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 76a7e36..12500bd 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.6 +Version: 3.5.8 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -86,10 +86,6 @@ 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.* @@ -128,6 +124,9 @@ fi %changelog +* Fri Oct 23 2020 Remi Collet - 3.5.8-1 +- update to 3.5.8 + * Tue Aug 11 2020 Remi Collet - 3.5.6-1 - update to 3.5.6 diff --git a/sources b/sources index 6f9f4e3..7321209 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.6.tgz) = 392c162cc8cb8d8fe455990d7f358cc59f486d8083387dc3bf60af6ca7aa0e75b72ed337f624b08948d8060cc96bd2d03373b7508fb9179da6a4e6b83adf06a7 +SHA512 (PHP_CodeSniffer-3.5.8.tgz) = 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e From 7208db8938942c14d9365c19bf9f97f9f1868a18 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 07:21:34 +0000 Subject: [PATCH 078/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 12500bd..a504350 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.5.8 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -124,6 +124,9 @@ fi %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 3.5.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Fri Oct 23 2020 Remi Collet - 3.5.8-1 - update to 3.5.8 From 48662ea79fe8b04d55d848330c60746b14f78520 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 5 Feb 2021 10:41:19 +0100 Subject: [PATCH 079/119] fix test relying on current year, fix FTBFS #1923570 --- php-pear-PHP-CodeSniffer.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index a504350..0dedc6c 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-2020 Remi Collet +# Copyright (c) 2013-2021 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -89,6 +89,11 @@ cd %{pear_name}-%{version} # fails with js: Couldn't read source file rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* +# Fix current date +YEAR=$(date +%Y) +sed -e "/@copyright/s/2020/${YEAR}/" \ + -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed + # Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. ret=0 # TODO php80 @@ -124,6 +129,9 @@ fi %changelog +* Fri Feb 5 2021 Remi Collet - 3.5.8-2 +- fix test relying on current year, fix FTBFS #1923570 + * Wed Jan 27 2021 Fedora Release Engineering - 3.5.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 57592805ee68362e0bc9b3f2564802fb5a5360d0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 9 Apr 2021 10:11:25 +0200 Subject: [PATCH 080/119] v3.6.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 12 +++++++----- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index e3dc017..836ca3c 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ clog /PHP_CodeSniffer-3.5.5.tgz /PHP_CodeSniffer-3.5.6.tgz /PHP_CodeSniffer-3.5.8.tgz +/PHP_CodeSniffer-3.6.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 0dedc6c..25e8b55 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.5.8 -Release: 2%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -94,10 +94,9 @@ YEAR=$(date +%Y) sed -e "/@copyright/s/2020/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed -# Version 3.4.0: Tests: 364, Assertions: 419, Skipped: 3. +# Version 3.6.0: Tests: 1183, Assertions: 8128, Skipped: 8. ret=0 -# TODO php80 -for cmdarg in "php %{phpunit}" php71 php72 php73 php74; do +for cmdarg in "php %{phpunit}" php73 php74 php80; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ @@ -129,6 +128,9 @@ fi %changelog +* Fri Apr 9 2021 Remi Collet - 3.6.0-1 +- update to 3.6.0 + * Fri Feb 5 2021 Remi Collet - 3.5.8-2 - fix test relying on current year, fix FTBFS #1923570 diff --git a/sources b/sources index 7321209..31aa47b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.5.8.tgz) = 69ef3d86520f541f492c955bd8158664c78aac6ecd4550f2b996f59d882d91f1bec81da9bbd106edc35c4f1a4c260ef2d9a56ec257fc0b4044047b902403065e +SHA512 (PHP_CodeSniffer-3.6.0.tgz) = 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8 From 6478506dcd31e2166c1f6820ab70ec13c3221944 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 02:43:35 +0000 Subject: [PATCH 081/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 25e8b55..c6dba08 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.6.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -128,6 +128,9 @@ fi %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 3.6.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Apr 9 2021 Remi Collet - 3.6.0-1 - update to 3.6.0 From 0fffea05d0ed916e48aa076d3bd52ba9e48ad9ec Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Oct 2021 09:36:54 +0200 Subject: [PATCH 082/119] 3.6.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 836ca3c..39cc4f8 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ clog /PHP_CodeSniffer-3.5.6.tgz /PHP_CodeSniffer-3.5.8.tgz /PHP_CodeSniffer-3.6.0.tgz +/PHP_CodeSniffer-3.6.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c6dba08..2798ef1 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.6.0 -Release: 2%{?dist} +Version: 3.6.1 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -96,7 +96,7 @@ sed -e "/@copyright/s/2020/${YEAR}/" \ # Version 3.6.0: Tests: 1183, Assertions: 8128, Skipped: 8. ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ @@ -128,6 +128,9 @@ fi %changelog +* Mon Oct 11 2021 Remi Collet - 3.6.1-1 +- update to 3.6.1 + * Fri Jul 23 2021 Fedora Release Engineering - 3.6.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 31aa47b..90ad040 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.6.0.tgz) = 09c98ac460c6dc70637d2f4d81a1e46bdf742ee14d0b56032e8dbcaf7a0ff03f3fdb1abdf8144f664a33298cf397c732ba62027bcee41f1f4f740d12fa29f6a8 +SHA512 (PHP_CodeSniffer-3.6.1.tgz) = 4992a460494cf58e5731e10df216204842168465731c0d002b7913fbaa85370f01077f70c96b4390158fbcf52ee021650ab6f13609ea3133370b89f34c73343c From d671b79a0b24177fb8b84f75414c0c4a48d97973 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 14 Dec 2021 16:14:00 +0100 Subject: [PATCH 083/119] v3.6.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 39cc4f8..cb019ce 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ clog /PHP_CodeSniffer-3.5.8.tgz /PHP_CodeSniffer-3.6.0.tgz /PHP_CodeSniffer-3.6.1.tgz +/PHP_CodeSniffer-3.6.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 2798ef1..de66597 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.6.1 +Version: 3.6.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -94,9 +94,9 @@ YEAR=$(date +%Y) sed -e "/@copyright/s/2020/${YEAR}/" \ -i src/Standards/Squiz/Tests/Commenting/FileCommentUnitTest.1.*.fixed -# Version 3.6.0: Tests: 1183, Assertions: 8128, Skipped: 8. +# Version 3.6.2: Tests: 1327, Assertions: 8476, Skipped: 8. ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80 php81; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ @@ -128,6 +128,9 @@ fi %changelog +* Tue Dec 14 2021 Remi Collet - 3.6.2-1 +- update to 3.6.2 + * Mon Oct 11 2021 Remi Collet - 3.6.1-1 - update to 3.6.1 diff --git a/sources b/sources index 90ad040..03154df 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.6.1.tgz) = 4992a460494cf58e5731e10df216204842168465731c0d002b7913fbaa85370f01077f70c96b4390158fbcf52ee021650ab6f13609ea3133370b89f34c73343c +SHA512 (PHP_CodeSniffer-3.6.2.tgz) = 5e435a3ca8c64f01e58912eebbd866eb7285a5c6db94fede978413b20d1a7ccde529a7196ac6fa47097b96693d079fc305083583db7b73a7643d8cd01219af54 From 81d9cfdf613f0e08a0bd1670638966981f29fc32 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jan 2022 08:04:43 +0000 Subject: [PATCH 084/119] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 de66597..739b3b4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.6.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -128,6 +128,9 @@ fi %changelog +* Fri Jan 21 2022 Fedora Release Engineering - 3.6.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Dec 14 2021 Remi Collet - 3.6.2-1 - update to 3.6.2 From b943edd84fc22c1fd11b1378c48377091372f5ff Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 27 Jan 2022 14:04:42 +0100 Subject: [PATCH 085/119] fix new year in test suite, FBTFS #2046828 --- php-pear-PHP-CodeSniffer.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 739b3b4..c86f4b0 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-2021 Remi Collet +# Copyright (c) 2013-2022 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -91,7 +91,7 @@ rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* # Fix current date YEAR=$(date +%Y) -sed -e "/@copyright/s/2020/${YEAR}/" \ +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. @@ -128,6 +128,9 @@ fi %changelog +* Thu Jan 27 2022 Remi Collet - 3.6.2-2 +- fix new year in test suite, FBTFS #2046828 + * Fri Jan 21 2022 Fedora Release Engineering - 3.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From acdf10679d010821a4ed5904000fc3ceb8a4bca8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Jun 2022 11:14:06 +0200 Subject: [PATCH 086/119] v3.7.0 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb019ce..c704eab 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ clog /PHP_CodeSniffer-3.6.0.tgz /PHP_CodeSniffer-3.6.1.tgz /PHP_CodeSniffer-3.6.2.tgz +/PHP_CodeSniffer-3.7.0.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c86f4b0..23fa6da 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,8 +13,8 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.6.2 -Release: 2%{?dist} +Version: 3.7.0 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -128,6 +128,9 @@ fi %changelog +* Mon Jun 13 2022 Remi Collet - 3.7.0-1 +- update to 3.7.0 + * Thu Jan 27 2022 Remi Collet - 3.6.2-2 - fix new year in test suite, FBTFS #2046828 diff --git a/sources b/sources index 03154df..872d754 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.6.2.tgz) = 5e435a3ca8c64f01e58912eebbd866eb7285a5c6db94fede978413b20d1a7ccde529a7196ac6fa47097b96693d079fc305083583db7b73a7643d8cd01219af54 +SHA512 (PHP_CodeSniffer-3.7.0.tgz) = 0792c65267953509bfca60b36c3cf246bd7b18cbdfb0a825616ca61099512d106a3b1a20056b96eeecbd1a5172b7484d087147c6047efaae3ee186b857826b34 From 9abe832fd656be68fcc490944162eb01ddcd013c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 20 Jun 2022 10:40:21 +0200 Subject: [PATCH 087/119] v3.7.1 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c704eab..eb4f886 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ clog /PHP_CodeSniffer-3.6.1.tgz /PHP_CodeSniffer-3.6.2.tgz /PHP_CodeSniffer-3.7.0.tgz +/PHP_CodeSniffer-3.7.1.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 23fa6da..bfafd2e 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,7 +13,7 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.7.0 +Version: 3.7.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -128,6 +128,9 @@ fi %changelog +* Mon Jun 20 2022 Remi Collet - 3.7.1-1 +- update to 3.7.1 + * Mon Jun 13 2022 Remi Collet - 3.7.0-1 - update to 3.7.0 diff --git a/sources b/sources index 872d754..00f4a0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.7.0.tgz) = 0792c65267953509bfca60b36c3cf246bd7b18cbdfb0a825616ca61099512d106a3b1a20056b96eeecbd1a5172b7484d087147c6047efaae3ee186b857826b34 +SHA512 (PHP_CodeSniffer-3.7.1.tgz) = e0627a2c5deed3be3c6179b722daa3380f0c6f42d4570aaa0f98265be9b174eb3ac641769ba3b9fe7e10d3c386f0ed6f2ebe659b44095af332cc02fd90dd22d0 From 72ef492fd00d013b8bc400841a6fc69ca4f7fe43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 22 Jul 2022 13:58:50 +0000 Subject: [PATCH 088/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 bfafd2e..4f1ae5a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -128,6 +128,9 @@ fi %changelog +* Fri Jul 22 2022 Fedora Release Engineering - 3.7.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon Jun 20 2022 Remi Collet - 3.7.1-1 - update to 3.7.1 From 9c41fc23a3a2771bc6affebf7e47f86e573aad67 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 20 Jan 2023 09:00:07 +0000 Subject: [PATCH 089/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 4f1ae5a..14affa4 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.7.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP coding standards enforcement tool License: BSD @@ -128,6 +128,9 @@ fi %changelog +* Fri Jan 20 2023 Fedora Release Engineering - 3.7.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Fri Jul 22 2022 Fedora Release Engineering - 3.7.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From b3c46d8f0099953f5630e541cb043d4ef4b24525 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 Feb 2023 10:11:54 +0100 Subject: [PATCH 090/119] v3.7.2 --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 21 +++++++++++++++------ sources | 2 +- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index eb4f886..52ff25a 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ clog /PHP_CodeSniffer-3.6.2.tgz /PHP_CodeSniffer-3.7.0.tgz /PHP_CodeSniffer-3.7.1.tgz +/PHP_CodeSniffer-3.7.2.tgz diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 14affa4..ee21f2a 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-2022 Remi Collet +# Copyright (c) 2013-2023 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,11 +13,11 @@ %global pear_name PHP_CodeSniffer Name: php-pear-PHP-CodeSniffer -Version: 3.7.1 -Release: 3%{?dist} +Version: 3.7.2 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool -License: BSD +License: BSD 3-Clause URL: http://pear.php.net/package/PHP_CodeSniffer Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz @@ -96,11 +96,17 @@ sed -e "/@copyright/s/2021/${YEAR}/" \ # Version 3.6.2: Tests: 1327, Assertions: 8476, Skipped: 8. ret=0 -for cmdarg in "php %{phpunit}" php74 php80 php81; do +for cmdarg in "php %{phpunit}" php80 php81 php82; do if which $cmdarg; then set $cmdarg + if [ $($1 -r 'echo PHP_VERSION_ID;') -ge 80200 ]; then + # failing upstream + FILTER="--filter '^((?!(testNotReadonly)).)*$'" + else + FILTER="" + fi $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ - --verbose || ret=1 + $FILTER || ret=1 fi done exit $ret @@ -128,6 +134,9 @@ fi %changelog +* Thu Feb 23 2023 Remi Collet - 3.7.2-1 +- update to 3.7.2 + * Fri Jan 20 2023 Fedora Release Engineering - 3.7.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 00f4a0c..29db81d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.7.1.tgz) = e0627a2c5deed3be3c6179b722daa3380f0c6f42d4570aaa0f98265be9b174eb3ac641769ba3b9fe7e10d3c386f0ed6f2ebe659b44095af332cc02fd90dd22d0 +SHA512 (PHP_CodeSniffer-3.7.2.tgz) = 3d59e07998baea3f2da3a839e7d04486154c7249f7e8306ac5b900826878b58ccbe4fc31469645ca1c1c9b250522f151ec7b4d99d6d66e3f46f0a3c5eb786d6c From 979344cd83d63361ff63619ae2c9e574f1590bf5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 21 Jul 2023 04:39:33 +0000 Subject: [PATCH 091/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- 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 ee21f2a..10117bb 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -14,7 +14,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.7.2 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause @@ -134,6 +134,9 @@ fi %changelog +* Fri Jul 21 2023 Fedora Release Engineering - 3.7.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Feb 23 2023 Remi Collet - 3.7.2-1 - update to 3.7.2 From 8233b24af94777f38322e523b021f20f64756598 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 11 Dec 2023 10:25:44 +0100 Subject: [PATCH 092/119] update to 3.8.0 sources from github instead or pear channel --- .gitignore | 1 + makesrc.sh | 32 ++++++++ php-pear-PHP-CodeSniffer-rpm.patch | 32 ++++++++ php-pear-PHP-CodeSniffer.spec | 124 ++++++++++++++++------------- sources | 2 +- 5 files changed, 133 insertions(+), 58 deletions(-) create mode 100755 makesrc.sh create mode 100644 php-pear-PHP-CodeSniffer-rpm.patch diff --git a/.gitignore b/.gitignore index 52ff25a..34b4747 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ clog /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 diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..1ee3ac8 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) +SHORT=${COMMIT:0:7} + +if [ -f $NAME-$VERSION-$SHORT.tgz ]; then + echo Skip $NAME-$VERSION-$SHORT.tgz +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" + + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || echo exit 1 + cp composer.json ../composer.json + popd + + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude .git $PROJECT-$COMMIT + + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + + echo "Done." +fi diff --git a/php-pear-PHP-CodeSniffer-rpm.patch b/php-pear-PHP-CodeSniffer-rpm.patch new file mode 100644 index 0000000..66736db --- /dev/null +++ b/php-pear-PHP-CodeSniffer-rpm.patch @@ -0,0 +1,32 @@ +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 @@ + * @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'; +-} ++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 @@ + * @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'; +-} ++include_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 10117bb..7ab7b8a 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -9,46 +9,62 @@ # # Please, preserve the changelog entries # -%{!?__pear: %global __pear %{_bindir}/pear} -%global pear_name PHP_CodeSniffer + + +%bcond_without tests + +%global gh_commit 5805f7a4e4958dbb5e944ef1e6edae0a303765e7 +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_owner PHPCSStandards +%global gh_project PHP_CodeSniffer +# keep in old PEAR tree +%global pear_phpdir %{_datadir}/pear + Name: php-pear-PHP-CodeSniffer -Version: 3.7.2 -Release: 2%{?dist} +Version: 3.8.0 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause -URL: http://pear.php.net/package/PHP_CodeSniffer -Source0: http://pear.php.net/get/%{pear_name}-%{version}.tgz +URL: https://github.com/%{gh_owner}/%{gh_project} +# git snapshot to retrieve test suite +Source0: %{gh_commit}/%{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh + +# RPM installation path +Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 5.4 -BuildRequires: php-pear -# to run test suite -%global phpunit %{_bindir}/phpunit7 +BuildRequires: php-tokenizer +BuildRequires: php-xmlwriter +BuildRequires: php-simplexml +BuildRequires: php-dom +BuildRequires: php-iconv +BuildRequires: php-intl +%if %{with tests} +# to run test suite, from composer.json "require-dev" +# "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" +%global phpunit %{_bindir}/phpunit9 BuildRequires: %{phpunit} +%endif -Requires(post): %{__pear} -Requires(postun): %{__pear} -# From package.xml -Requires: php-pear(PEAR) +# from composer.json "require": { +# "php": ">=5.4.0", +# "ext-tokenizer": "*", +# "ext-xmlwriter": "*", +# "ext-simplexml": "*" Requires: php(language) >= 5.4 Requires: php-tokenizer Requires: php-xmlwriter Requires: php-simplexml -# From phpcompatinfo report for version 3.0.0 -Requires: php-reflection -Requires: php-ctype -Requires: php-date +# From phpcompatinfo report for version 3.8.0 Requires: php-dom -Requires: php-json Requires: php-iconv -Requires: php-pcntl -Requires: php-pcre -Requires: php-soap -Requires: php-spl +Requires: php-intl -Provides: php-pear(%{pear_name}) = %{version} +Provides: php-pear(%{gh_project}) = %{version} Provides: php-composer(squizlabs/php_codesniffer) = %{version} Provides: phpcs = %{version} Obsoletes: phpcs < %{version} @@ -60,10 +76,8 @@ certain standards, such as PEAR, or user-defined. %prep -%setup -q -c - -cd %{pear_name}-%{version} -mv ../package.xml %{pear_name}.xml +%setup -q -n %{gh_project}-%{gh_commit} +%patch -P0 -p1 -b .rpm %build @@ -71,21 +85,23 @@ mv ../package.xml %{pear_name}.xml %install -cd %{pear_name}-%{version} +: 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/ -%{__pear} install --nodeps --packagingroot %{buildroot} %{pear_name}.xml +: Cleanup +find %{buildroot}%{pear_phpdir}/PHP/CodeSniffer -depth -type d -name Tests -exec rm -r {} \; -print -# Clean up unnecessary files -rm -rf %{buildroot}%{pear_metadir}/.??* - -# Install XML package description -mkdir -p %{buildroot}%{pear_xmldir} -install -pm 644 %{pear_name}.xml %{buildroot}%{pear_xmldir} +: Install the commands +install -Dpm 755 bin/phpcs %{buildroot}%{_bindir}/phpcs +install -Dpm 755 bin/phpcbf %{buildroot}%{_bindir}/phpcbf +%if %{with tests} %check -cd %{pear_name}-%{version} - # fails with js: Couldn't read source file rm src/Standards/Generic/Tests/Debug/JSHintUnitTest.* @@ -96,44 +112,38 @@ sed -e "/@copyright/s/2021/${YEAR}/" \ # Version 3.6.2: Tests: 1327, Assertions: 8476, Skipped: 8. ret=0 -for cmdarg in "php %{phpunit}" php80 php81 php82; do +for cmdarg in "php %{phpunit}" php81 php82 php83; do if which $cmdarg; then set $cmdarg - if [ $($1 -r 'echo PHP_VERSION_ID;') -ge 80200 ]; then - # failing upstream - FILTER="--filter '^((?!(testNotReadonly)).)*$'" - else - FILTER="" - fi - $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit7} \ - $FILTER || ret=1 + $1 -d memory_limit=1G ${2:-%{_bindir}/phpunit9} \ + || ret=1 fi done exit $ret +%endif %post -%{__pear} install --nodeps --soft --force --register-only \ - %{pear_xmldir}/%{pear_name}.xml >/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - %{__pear} uninstall --nodeps --ignore-errors --register-only \ - %{pear_name} >/dev/null || : +# no more from pear channel +if [ -x %{_bindir}/pear ]; then + %{_bindir}/pear uninstall --nodeps --ignore-errors --register-only %{gh_project} >/dev/null || : fi %files -%doc %{pear_docdir}/%{pear_name} -%{pear_xmldir}/%{pear_name}.xml -%{pear_testdir}/%{pear_name} -%{pear_datadir}/%{pear_name} +%{!?_licensedir:%global license %%doc} +%license licence.txt +%doc *.md %{pear_phpdir}/PHP %{_bindir}/phpcbf %{_bindir}/phpcs %changelog +* Mon Dec 11 2023 Remi Collet - 3.8.0-1 +- update to 3.8.0 +- sources from github instead or pear channel + * Fri Jul 21 2023 Fedora Release Engineering - 3.7.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 29db81d..83f1b4b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (PHP_CodeSniffer-3.7.2.tgz) = 3d59e07998baea3f2da3a839e7d04486154c7249f7e8306ac5b900826878b58ccbe4fc31469645ca1c1c9b250522f151ec7b4d99d6d66e3f46f0a3c5eb786d6c +SHA512 (php-pear-PHP-CodeSniffer-3.8.0-5805f7a.tgz) = c3bec38c0f96654f6f01dd937851cc7d0bf6996d2129be483c909343359971f4285f2198840f48b385b0c42ee2f73b906e0409cfed86233f3b8da3385fcb71ee From ab3b7ab56e07954f8a3512f5eb14297b6f596e7d Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 12 Jan 2024 08:39:43 +0100 Subject: [PATCH 093/119] update to 3.8.1 add patch for test suite from https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/256 --- .gitignore | 1 + ...-skip-tests-requiring-git-repository.patch | 41 +++++++++++++++++++ php-pear-PHP-CodeSniffer.spec | 17 +++++--- sources | 2 +- 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 0001-skip-tests-requiring-git-repository.patch diff --git a/.gitignore b/.gitignore index 34b4747..07b117a 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ clog /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 diff --git a/0001-skip-tests-requiring-git-repository.patch b/0001-skip-tests-requiring-git-repository.patch new file mode 100644 index 0000000..d79dbd5 --- /dev/null +++ b/0001-skip-tests-requiring-git-repository.patch @@ -0,0 +1,41 @@ +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.spec b/php-pear-PHP-CodeSniffer.spec index 7ab7b8a..6e6d839 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-2023 Remi Collet +# Copyright (c) 2013-2024 Remi Collet # Copyright (c) 2009-2013 Christof Damian # Copyright (c) 2006-2009 Konstantin Ryabitsev # @@ -13,7 +13,7 @@ %bcond_without tests -%global gh_commit 5805f7a4e4958dbb5e944ef1e6edae0a303765e7 +%global gh_commit 14f5fff1e64118595db5408e946f3a22c75807f7 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer @@ -22,7 +22,7 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.8.0 +Version: 3.8.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -34,6 +34,7 @@ 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 @@ -45,9 +46,9 @@ BuildRequires: php-iconv BuildRequires: php-intl %if %{with tests} # to run test suite, from composer.json "require-dev" -# "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.0" +# "phpunit/phpunit": "^4.0 || ^5.0 || ^6.0 || ^7.0 || ^8.0 || ^9.3.4" %global phpunit %{_bindir}/phpunit9 -BuildRequires: %{phpunit} +BuildRequires: phpunit9 >= 9.3.4 %endif # from composer.json "require": { @@ -78,6 +79,7 @@ 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 @@ -140,6 +142,11 @@ fi %changelog +* Fri Jan 12 2024 Remi Collet - 3.8.1-1 +- update to 3.8.1 +- add patch for test suite from + https://github.com/PHPCSStandards/PHP_CodeSniffer/pull/256 + * Mon Dec 11 2023 Remi Collet - 3.8.0-1 - update to 3.8.0 - sources from github instead or pear channel diff --git a/sources b/sources index 83f1b4b..af78dc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.8.0-5805f7a.tgz) = c3bec38c0f96654f6f01dd937851cc7d0bf6996d2129be483c909343359971f4285f2198840f48b385b0c42ee2f73b906e0409cfed86233f3b8da3385fcb71ee +SHA512 (php-pear-PHP-CodeSniffer-3.8.1-14f5fff.tgz) = f3d219c9520c134061994ee36a44ac3aff8aaf311495eefd4f0fc7489d3e9473283b69a4cc4cd6df8e352a1ed3d8bdc177b4ecec5bab59f25cee13cbeb9fe162 From 6b015c71072eb3a1a345d00b841e622a73edc551 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 21:06:42 +0000 Subject: [PATCH 094/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_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 6e6d839..1149187 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.8.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause @@ -142,6 +142,9 @@ fi %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 3.8.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Fri Jan 12 2024 Remi Collet - 3.8.1-1 - update to 3.8.1 - add patch for test suite from From 1990a2b3aff5c3de8137d6888d547e24122b6831 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 22:53:40 +0000 Subject: [PATCH 095/119] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_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 1149187..62429ee 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -23,7 +23,7 @@ Name: php-pear-PHP-CodeSniffer Version: 3.8.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause @@ -142,6 +142,9 @@ fi %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 3.8.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 3.8.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 307edb1bb419e19c7a0179edd633fa587899a6cf Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Feb 2024 08:54:47 +0100 Subject: [PATCH 096/119] update to 3.9.0 drop patch merged upstream --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 07b117a..933ca86 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ 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 diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 62429ee..c42381f 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 d63cee4890a8afaf86a22e51ad4d97c91dd4579b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_date 2024-02-16 %global gh_owner PHPCSStandards %global gh_project PHP_CodeSniffer # keep in old PEAR tree @@ -22,8 +23,8 @@ Name: php-pear-PHP-CodeSniffer -Version: 3.8.1 -Release: 3%{?dist} +Version: 3.9.0 +Release: 1%{?dist} Summary: PHP coding standards enforcement tool License: BSD 3-Clause @@ -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,10 @@ fi %changelog +* Sat Feb 17 2024 Remi Collet - 3.9.0-1 +- update to 3.9.0 +- drop patch merged upstream + * Thu Jan 25 2024 Fedora Release Engineering - 3.8.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index af78dc6..d68770b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.8.1-14f5fff.tgz) = f3d219c9520c134061994ee36a44ac3aff8aaf311495eefd4f0fc7489d3e9473283b69a4cc4cd6df8e352a1ed3d8bdc177b4ecec5bab59f25cee13cbeb9fe162 +SHA512 (php-pear-PHP-CodeSniffer-3.9.0-d63cee4.tgz) = a496f09e2d80a38936eb6117738f0dc41e9b256d67e2a45f2978b7c889b90c35a4c902f3579fa412f96615f86b6b3cb44b9990f5f78d6df21edb78d50a0038d8 From 3666b4ec4cd8e37d72605eb79a03cdddced5c847 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 2 Apr 2024 08:04:56 +0200 Subject: [PATCH 097/119] 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 - 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 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 From e22c1eabc2eca7658e01f53e80a3fea2e2cbb179 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 24 Apr 2024 11:02:24 +0200 Subject: [PATCH 098/119] v3.9.2 (cherry picked from commit 52cd0000aa6fa1088798da6630d046976c718328) --- .gitignore | 1 + php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 99d439c..6a8907d 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ clog /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 diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 9901ca8..5d0be42 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 267a4405fff1d9c847134db3a3c92f1ab7f77909 +%global gh_commit aac1f6f347a5c5ac6bc98ad395007df00990f480 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-03-31 +%global gh_date 2024-04-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.9.1 +Version: 3.9.2 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index f9b4ee0..6d7f47b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.9.1-267a440.tgz) = 5501d0b3e30c6ac9670921e451f47366c92e98abce80eaaf4e459e8a9752b304f0c31beb1ce5054af964c93e66282bbb20d0c9be22515758817767616e0626ef +SHA512 (php-pear-PHP-CodeSniffer-3.9.2-aac1f6f.tgz) = 7c4299bb058e24864439235b78d03486aa87cc6a2b30082fe79896054a49816c1fb1e29dd1b673fc16ccadbd83db2d3e4d57ba9827f7c007ae5a586bbbb9991d From 86de742b5b1c034607a78a65e8ccf02808900b25 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 22 May 2024 10:39:18 +0200 Subject: [PATCH 099/119] v3.10.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 6a8907d..187cc79 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ clog /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 diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index 5d0be42..c02b023 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit aac1f6f347a5c5ac6bc98ad395007df00990f480 +%global gh_commit 57e09801c2fbae2d257b8b75bebb3deeb7e9deb2 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-04-23 +%global gh_date 2024-05-20 %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.2 +Version: 3.10.0 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index 6d7f47b..a11a815 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.9.2-aac1f6f.tgz) = 7c4299bb058e24864439235b78d03486aa87cc6a2b30082fe79896054a49816c1fb1e29dd1b673fc16ccadbd83db2d3e4d57ba9827f7c007ae5a586bbbb9991d +SHA512 (php-pear-PHP-CodeSniffer-3.10.0-57e0980.tgz) = 33fd93bcb6294655e08f71dbdb2911b0030a938cd2dbebfd8a8052d4688056da04c49569b5be029a8d524d2de33c03607e650586577d388683e2797643bb3dd9 From ed1eb2685ab10149a221820c964773a32fb92f5c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 23 May 2024 07:42:25 +0200 Subject: [PATCH 100/119] v3.10.1 --- .gitignore | 2 ++ php-pear-PHP-CodeSniffer.spec | 9 ++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 187cc79..9f712fc 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,5 @@ clog /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 diff --git a/php-pear-PHP-CodeSniffer.spec b/php-pear-PHP-CodeSniffer.spec index c02b023..68e0c4f 100644 --- a/php-pear-PHP-CodeSniffer.spec +++ b/php-pear-PHP-CodeSniffer.spec @@ -13,9 +13,9 @@ %bcond_without tests -%global gh_commit 57e09801c2fbae2d257b8b75bebb3deeb7e9deb2 +%global gh_commit 8f90f7a53ce271935282967f53d0894f8f1ff877 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_date 2024-05-20 +%global gh_date 2024-05-22 %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.0 +Version: 3.10.1 Release: 1%{?dist} Summary: PHP coding standards enforcement tool @@ -141,6 +141,9 @@ fi %changelog +* 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 diff --git a/sources b/sources index a11a815..5a2cc0c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-pear-PHP-CodeSniffer-3.10.0-57e0980.tgz) = 33fd93bcb6294655e08f71dbdb2911b0030a938cd2dbebfd8a8052d4688056da04c49569b5be029a8d524d2de33c03607e650586577d388683e2797643bb3dd9 +SHA512 (php-pear-PHP-CodeSniffer-3.10.1-8f90f7a.tgz) = 00e972de684d7655b894212962aa49bb5c89899d01dcbb6eb0fb929bd5dc0553c7dd9542e017b22262564137dc2fb545ea8e055d8a6b3c79261d7ce85096432c From fd446d2d0a96f575c2af26e37da936028c8dba8f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 07:07:41 +0000 Subject: [PATCH 101/119] 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 102/119] 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 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 103/119] 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 104/119] 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 4ed1e86361a73abf5d1b1e091c5f82a96c7f1201 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 12 Nov 2024 12:46:45 +0100 Subject: [PATCH 105/119] 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 bbfa53333887ff1e6e3622098850a3b9df480a5b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 18 Nov 2024 10:01:24 +0100 Subject: [PATCH 106/119] 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 7426c9065a2c8af45025982d80d349407d89a823 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 12 Dec 2024 08:21:13 +0100 Subject: [PATCH 107/119] 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 8dd336ce026c73fe8cd25253f7d688e37d2fc9b8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 09:19:54 +0000 Subject: [PATCH 108/119] 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 109/119] 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 110/119] 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 2a1edf8f00b0cc6d82ae44bbafd4c956377d743e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 18 Mar 2025 09:03:06 +0100 Subject: [PATCH 111/119] 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 711b33f980c0f67d0fe6aedbf3617def12b757c9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Apr 2025 11:19:44 +0200 Subject: [PATCH 112/119] 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 bd66e5bd2ec598862b66ac9d38262ba8cd0d3d23 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 15 Apr 2025 09:52:03 +0200 Subject: [PATCH 113/119] 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 c04214bbca2cc00ffb1046d45dabba48d3e27c7c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 15 May 2025 16:52:46 +0200 Subject: [PATCH 114/119] 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 115/119] 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 116/119] 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 117/119] 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 118/119] 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 119/119] 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