From 90b8ef40b070532535334148fcd4b1396afba61f Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Thu, 7 Nov 2019 11:02:54 +0100
Subject: [PATCH 1/2] update to 1.4.0 switch to phpunit8

(cherry picked from commit 489610711ba165a58fe85f93bef0a57626309f53)
---
 .gitignore                       |  1 +
 php-composer-xdebug-handler.spec | 20 ++++++++++++--------
 sources                          |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 41d5dda..23a609b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /php-composer-xdebug-handler-1.3.1-dc52313.tgz
 /php-composer-xdebug-handler-1.3.2-d177081.tgz
 /php-composer-xdebug-handler-1.3.3-46867cb.tgz
+/php-composer-xdebug-handler-1.4.0-cbe2338.tgz
diff --git a/php-composer-xdebug-handler.spec b/php-composer-xdebug-handler.spec
index d098689..840ef5e 100644
--- a/php-composer-xdebug-handler.spec
+++ b/php-composer-xdebug-handler.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    46867cbf8ca9fb8d60c506895449eb799db1184f
+%global gh_commit    cbe23383749496fe0f373345208b79568e4bc248
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     composer
@@ -19,9 +19,9 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.3.3
+Version:        1.4.0
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
-Summary:        Restarts a process without xdebug
+Summary:        Restarts a process without Xdebug
 
 License:        MIT
 URL:            https://github.com/%{gh_owner}/%{gh_project}
@@ -39,10 +39,10 @@ BuildRequires:  php-pcre
 BuildRequires:  php-posix
 BuildRequires:  php-spl
 # From composer.json,     "require-dev": {
-#        "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
+#        "phpunit/phpunit": "^4.8.35 || ^5.7 || 6.5 - 8"
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(psr/log) >= 1.0   with php-composer(psr/log) < 2)
-BuildRequires:  phpunit6 >= 6.5
+BuildRequires:  phpunit8
 %global phpunit %{_bindir}/phpunit6
 %else
 BuildRequires:  php-PsrLog
@@ -54,7 +54,7 @@ BuildRequires:  php-composer(fedora/autoloader)
 %endif
 
 # From composer.json, "require": {
-#        "php": "^5.3.2 || ^7.0",
+#        "php": "^5.3.2 || ^7.0 || ^8.0",
 #        "psr/log": "^1.0"
 Requires:       php(language) >= 5.3.2
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
@@ -116,10 +116,10 @@ EOF
 
 %if %{with_tests}
 ret=0
-for cmdarg in "php %{phpunit}" php70 php71 php72 php73 php74; do
+for cmdarg in "php %{phpunit}" "php70 %{_bindir}/phpunit6" "php71 %{_bindir}/phpunit7" php72 php73 php74; do
   if which $cmdarg; then
     set $cmdarg
-    $1 ${2:-%{_bindir}/phpunit6} --verbose|| ret=1
+    $1 ${2:-%{_bindir}/phpunit8} --verbose|| ret=1
   fi
 done
 exit $ret
@@ -138,6 +138,10 @@ exit $ret
 
 
 %changelog
+* Thu Nov  7 2019 Remi Collet <remi@remirepo.net> - 1.4.0-1
+- update to 1.4.0
+- switch to phpunit8
+
 * Tue May 28 2019 Remi Collet <remi@remirepo.net> - 1.3.3-1
 - update to 1.3.3
 
diff --git a/sources b/sources
index 0252e26..cc0928f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-composer-xdebug-handler-1.3.3-46867cb.tgz) = acd5aeaccba8a29ae960bdec16cc0e57eb288b5f8e52f969534f33b21f682c62ff92e01bb9d81ee4d4c1f9b63cca04309ceff58f5115019861fd94f17aab5440
+SHA512 (php-composer-xdebug-handler-1.4.0-cbe2338.tgz) = e69d8658e0db081c873a0e2c48bd297d79269a0994bd746ae1ca15b21b3412469ade13fdce80b0ea515f4ac38fef8744b9649f4792f3fe457a5a36860f170649

From 83c4cf7c11c5d4f7d73f451a54f50328da166951 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@fedoraproject.org>
Date: Mon, 2 Mar 2020 11:30:55 +0100
Subject: [PATCH 2/2] v1.4.1

(cherry picked from commit bb9abd67aab57afd7ca462848daafea03f0d1e29)
(cherry picked from commit eb4e83328f9e5e76ff4a92e4a680701d1e886ab9)
---
 .gitignore                       | 1 +
 php-composer-xdebug-handler.spec | 7 +++++--
 sources                          | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 23a609b..a268f45 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /php-composer-xdebug-handler-1.3.2-d177081.tgz
 /php-composer-xdebug-handler-1.3.3-46867cb.tgz
 /php-composer-xdebug-handler-1.4.0-cbe2338.tgz
+/php-composer-xdebug-handler-1.4.1-1ab9842.tgz
diff --git a/php-composer-xdebug-handler.spec b/php-composer-xdebug-handler.spec
index 840ef5e..62e345a 100644
--- a/php-composer-xdebug-handler.spec
+++ b/php-composer-xdebug-handler.spec
@@ -6,7 +6,7 @@
 #
 # Please, preserve the changelog entries
 #
-%global gh_commit    cbe23383749496fe0f373345208b79568e4bc248
+%global gh_commit    1ab9842d69e64fb3a01be6b656501032d1b78cb7
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 #global gh_date      20150717
 %global gh_owner     composer
@@ -19,7 +19,7 @@
 %global with_tests   0%{!?_without_tests:1}
 
 Name:           php-%{gh_owner}-%{gh_project}
-Version:        1.4.0
+Version:        1.4.1
 Release:        1%{?gh_date:.%{gh_date}git%{gh_short}}%{?dist}
 Summary:        Restarts a process without Xdebug
 
@@ -138,6 +138,9 @@ exit $ret
 
 
 %changelog
+* Mon Mar  2 2020 Remi Collet <remi@remirepo.net> - 1.4.1-1
+- update to 1.4.1
+
 * Thu Nov  7 2019 Remi Collet <remi@remirepo.net> - 1.4.0-1
 - update to 1.4.0
 - switch to phpunit8
diff --git a/sources b/sources
index cc0928f..dda0874 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (php-composer-xdebug-handler-1.4.0-cbe2338.tgz) = e69d8658e0db081c873a0e2c48bd297d79269a0994bd746ae1ca15b21b3412469ade13fdce80b0ea515f4ac38fef8744b9649f4792f3fe457a5a36860f170649
+SHA512 (php-composer-xdebug-handler-1.4.1-1ab9842.tgz) = 5f0fa60d986c59be4616825bdceda4aef2372e13280a43890f24dd0deeac2c4bb03355e72744e0b587931784f996f3502dfcba9f546c2db67a3654965e0f6676