From 7e69e13140a1e703ec03b4feefeaff23c087b7ba Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Aug 2021 07:25:49 +0200 Subject: [PATCH 1/4] v2.0.2 (cherry picked from commit 4d24b6bf8577273a6f47046bb443952c39c92b34) --- .gitignore | 1 + php-composer-xdebug-handler2.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index f5398e1..3991b76 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /php-composer-xdebug-handler2-2.0.0-31d5769.tgz /php-composer-xdebug-handler2-2.0.1-964adcd.tgz +/php-composer-xdebug-handler2-2.0.2-84674dd.tgz diff --git a/php-composer-xdebug-handler2.spec b/php-composer-xdebug-handler2.spec index 7c1c774..8ca3098 100644 --- a/php-composer-xdebug-handler2.spec +++ b/php-composer-xdebug-handler2.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 964adcdd3a28bf9ed5d9ac6450064e0d71ed7496 +%global gh_commit 84674dd3a7575ba617f5a76d7e9e29a7d3891339 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -23,7 +23,7 @@ %global php_home %{_datadir}/php Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 2.0.1 +Version: 2.0.2 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Restarts a process without Xdebug, version %{major} @@ -60,7 +60,7 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": "^5.3.2 || ^7.0 || ^8.0", -# "psr/log": "^1.0" +# "psr/log": "^1 || ^2 || ^3" Requires: php(language) >= 5.3.2 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) @@ -143,6 +143,9 @@ exit $ret %changelog +* Mon Aug 2 2021 Remi Collet - 2.0.2-1 +- update to 2.0.2 + * Thu May 6 2021 Remi Collet - 2.0.1-1 - update to 2.0.1 diff --git a/sources b/sources index 2421a7e..5522c0e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-xdebug-handler2-2.0.1-964adcd.tgz) = fa5da59344edb08418567ef17427f5a8d18e5169cc207bcfea21f359cbf3ed739e0c86258e662b5a8d3be60452efa9f63bf08f96cb370180e707efffda57cc06 +SHA512 (php-composer-xdebug-handler2-2.0.2-84674dd.tgz) = e457759e087d14cb0113a8662296407d5f6a3561c64834b5999a5b525ef6375e51ed1dabcd3e45368ccc13dfef270d7e9ccc4c387715f4bac3395e37d5dfe810 From 73208ba29e0f42efeb3d12c9192fb000d63b7f18 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 13 Dec 2021 08:49:21 +0100 Subject: [PATCH 2/4] update to 2.0.3 add dependency on composer/pcre allow composer/log v2 and v3 (cherry picked from commit 7c40d97da2d4956a7d53820031e6d8fddb1bfe28) --- .gitignore | 1 + php-composer-xdebug-handler2.spec | 52 ++++++++++++++++++------------- sources | 2 +- 3 files changed, 33 insertions(+), 22 deletions(-) diff --git a/.gitignore b/.gitignore index 3991b76..f2e7870 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /php-composer-xdebug-handler2-2.0.0-31d5769.tgz /php-composer-xdebug-handler2-2.0.1-964adcd.tgz /php-composer-xdebug-handler2-2.0.2-84674dd.tgz +/php-composer-xdebug-handler2-2.0.3-6555461.tgz diff --git a/php-composer-xdebug-handler2.spec b/php-composer-xdebug-handler2.spec index 8ca3098..aea3d37 100644 --- a/php-composer-xdebug-handler2.spec +++ b/php-composer-xdebug-handler2.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 84674dd3a7575ba617f5a76d7e9e29a7d3891339 +%global gh_commit 6555461e76962fd0379c444c46fd558a0fcfb65e %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -23,7 +23,7 @@ %global php_home %{_datadir}/php Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 2.0.2 +Version: 2.0.3 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Restarts a process without Xdebug, version %{major} @@ -37,23 +37,23 @@ BuildArch: noarch %if %{with tests} # For tests BuildRequires: php(language) >= 5.3.2 -BuildRequires: php-reflection -BuildRequires: php-ctype +BuildRequires: php-pcntl BuildRequires: php-pcre -BuildRequires: php-posix +BuildRequires: php-reflection BuildRequires: php-spl # From composer.json, "require-dev": { -# "symfony/phpunit-bridge": "^4.2 || ^5", -# "phpstan/phpstan": "^0.12.55" +# "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0", +# "phpstan/phpstan": "^1.0", +# "phpstan/phpstan-strict-rules": "^1.1" %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) -BuildRequires: phpunit8 -%global phpunit %{_bindir}/phpunit8 +BuildRequires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) +BuildRequires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) %else BuildRequires: php-PsrLog -BuildRequires: php-phpunit-PHPUnit >= 4.8.35 -%global phpunit %{_bindir}/phpunit +BuildRequires: php-composer-pcre %endif +BuildRequires: phpunit9 +%global phpunit %{_bindir}/phpunit9 %endif # Autoloader BuildRequires: php-composer(fedora/autoloader) @@ -61,17 +61,18 @@ BuildRequires: php-composer(fedora/autoloader) # From composer.json, "require": { # "php": "^5.3.2 || ^7.0 || ^8.0", # "psr/log": "^1 || ^2 || ^3" +# "composer/pcre": "^1" Requires: php(language) >= 5.3.2 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8 -Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 2) +Requires: (php-composer(psr/log) >= 1.0 with php-composer(psr/log) < 4) +Requires: (php-composer(composer/pcre) >= 1.0 with php-composer(composer/pcre) < 2) %else Requires: php-PsrLog +Requires: php-composer-pcre %endif -# From phpcompatinfo report for version 1.0.0 -Requires: php-reflection -Requires: php-ctype +# From phpcompatinfo report for version 2.0.3 +Requires: php-pcntl Requires: php-pcre -Requires: php-posix Requires: php-spl # Autoloader Requires: php-composer(fedora/autoloader) @@ -100,7 +101,12 @@ require_once '%{_datadir}/php/Fedora/Autoloader/autoload.php'; \Fedora\Autoloader\Autoload::addPsr4('%{ns_vendor}\\%{ns_project}\\', __DIR__); \Fedora\Autoloader\Dependencies::required(array( - '%{_datadir}/php/Psr/Log/autoload.php', + array( + '%{_datadir}/php/Psr/Log3/autoload.php', + '%{_datadir}/php/Psr/Log2/autoload.php', + '%{_datadir}/php/Psr/Log/autoload.php', + ), + '%{_datadir}/php/Composer/Pcre/autoload.php', )); EOF @@ -116,7 +122,7 @@ mkdir vendor cat << 'EOF' | tee vendor/autoload.php - 2.0.3-1 +- update to 2.0.3 +- add dependency on composer/pcre +- allow composer/log v2 and v3 + * Mon Aug 2 2021 Remi Collet - 2.0.2-1 - update to 2.0.2 diff --git a/sources b/sources index 5522c0e..9f56e88 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-xdebug-handler2-2.0.2-84674dd.tgz) = e457759e087d14cb0113a8662296407d5f6a3561c64834b5999a5b525ef6375e51ed1dabcd3e45368ccc13dfef270d7e9ccc4c387715f4bac3395e37d5dfe810 +SHA512 (php-composer-xdebug-handler2-2.0.3-6555461.tgz) = 1145a8f183387b9693c9da9f87dfcc5ba09b9faa09d287dc1fcad70292c1b1000d7a936bf5fd7072a385f481eb672e75033b398ef747a88d9be29e12975da516 From 524d65db8ee10c5440c78298ac7078dfeaa6a423 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 5 Jan 2022 13:49:46 +0100 Subject: [PATCH 3/4] v2.0.4 (cherry picked from commit befc5ea586140bc723b565885e66407d005179ff) --- .gitignore | 1 + php-composer-xdebug-handler2.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f2e7870..62eeb20 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /php-composer-xdebug-handler2-2.0.1-964adcd.tgz /php-composer-xdebug-handler2-2.0.2-84674dd.tgz /php-composer-xdebug-handler2-2.0.3-6555461.tgz +/php-composer-xdebug-handler2-2.0.4-0c1a392.tgz diff --git a/php-composer-xdebug-handler2.spec b/php-composer-xdebug-handler2.spec index aea3d37..f7eed53 100644 --- a/php-composer-xdebug-handler2.spec +++ b/php-composer-xdebug-handler2.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for php-composer-xdebug-handler2 # -# Copyright (c) 2018-2021 Remi Collet +# Copyright (c) 2018-2022 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 6555461e76962fd0379c444c46fd558a0fcfb65e +%global gh_commit 0c1a3925ec58a4ec98e992b9c7d171e9e184be0a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -23,7 +23,7 @@ %global php_home %{_datadir}/php Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 2.0.3 +Version: 2.0.4 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Restarts a process without Xdebug, version %{major} @@ -127,7 +127,7 @@ EOF %if %{with tests} ret=0 -for cmdarg in "php %{phpunit}" php73 php74 php80; do +for cmdarg in "php %{phpunit}" php74 php80 php81; do if which $cmdarg; then set $cmdarg $1 ${2:-%{_bindir}/phpunit9} --verbose|| ret=1 @@ -148,6 +148,9 @@ exit $ret %changelog +* Wed Jan 5 2022 Remi Collet - 2.0.4-1 +- update to 2.0.4 + * Wed Dec 8 2021 Remi Collet - 2.0.3-1 - update to 2.0.3 - add dependency on composer/pcre diff --git a/sources b/sources index 9f56e88..dc7138b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-xdebug-handler2-2.0.3-6555461.tgz) = 1145a8f183387b9693c9da9f87dfcc5ba09b9faa09d287dc1fcad70292c1b1000d7a936bf5fd7072a385f481eb672e75033b398ef747a88d9be29e12975da516 +SHA512 (php-composer-xdebug-handler2-2.0.4-0c1a392.tgz) = 1007d64af408a4747357d2cb0d53133767b4dcf02efbba4adc9dc0ac94137578508a6a7caa6354e5119dbaa1cc46ff2947a374fe7417daf7161b4b0e8a09b981 From 9c7b48634071e712a082a0aac3da59456d6fc9df Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 25 Feb 2022 08:01:27 +0100 Subject: [PATCH 4/4] v2.0.5 (cherry picked from commit 4d5ddada4addf153673993d6e14a8331d0ce0aac) (cherry picked from commit 71bd62fe321c475ecdb251b342e20d4f7c572c72) --- .gitignore | 1 + php-composer-xdebug-handler2.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 62eeb20..19240bd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /php-composer-xdebug-handler2-2.0.2-84674dd.tgz /php-composer-xdebug-handler2-2.0.3-6555461.tgz /php-composer-xdebug-handler2-2.0.4-0c1a392.tgz +/php-composer-xdebug-handler2-2.0.5-9e36aee.tgz diff --git a/php-composer-xdebug-handler2.spec b/php-composer-xdebug-handler2.spec index f7eed53..ddeaddf 100644 --- a/php-composer-xdebug-handler2.spec +++ b/php-composer-xdebug-handler2.spec @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit 0c1a3925ec58a4ec98e992b9c7d171e9e184be0a +%global gh_commit 9e36aeed4616366d2b690bdce11f71e9178c579a %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) #global gh_date 20150717 %global gh_owner composer @@ -23,7 +23,7 @@ %global php_home %{_datadir}/php Name: php-%{gh_owner}-%{gh_project}%{major} -Version: 2.0.4 +Version: 2.0.5 Release: 1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist} Summary: Restarts a process without Xdebug, version %{major} @@ -148,6 +148,9 @@ exit $ret %changelog +* Fri Feb 25 2022 Remi Collet - 2.0.5-1 +- update to 2.0.5 + * Wed Jan 5 2022 Remi Collet - 2.0.4-1 - update to 2.0.4 diff --git a/sources b/sources index dc7138b..f46d087 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-composer-xdebug-handler2-2.0.4-0c1a392.tgz) = 1007d64af408a4747357d2cb0d53133767b4dcf02efbba4adc9dc0ac94137578508a6a7caa6354e5119dbaa1cc46ff2947a374fe7417daf7161b4b0e8a09b981 +SHA512 (php-composer-xdebug-handler2-2.0.5-9e36aee.tgz) = 51b1678422ab8d09a51660846f567f8d7b426487f84e667c5ce5913fbaefd8ea315834490883a808870449e3aadbd5dcf1eea054d1d2138b1030dc1ef558e216