From 606cbebbee5f77015c65e6b236ca8c0e2c315cb4 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 16 Dec 2019 16:03:19 +0100
Subject: v6.0.11 from Fedora

---
 php-di.spec | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'php-di.spec')

diff --git a/php-di.spec b/php-di.spec
index df94a3d..72c19fb 100644
--- a/php-di.spec
+++ b/php-di.spec
@@ -12,8 +12,8 @@
 
 %global github_owner     PHP-DI
 %global github_name      PHP-DI
-%global github_version   6.0.8
-%global github_commit    a634876c69b643b779a89e4b7bec1ed1df803afc
+%global github_version   6.0.11
+%global github_commit    9bdcc2f41f5fb700ddd01bc4fa8d5bd7b3f94620
 
 %global composer_vendor  php-di
 %global composer_project php-di
@@ -68,7 +68,7 @@ BuildArch:     noarch
 %if %{with_tests}
 ## composer.json
 BuildRequires: php(language) >= %{php_min_ver}
-BuildRequires: php-composer(phpunit/phpunit)
+BuildRequires: phpunit6
 %if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
 BuildRequires: (php-composer(doctrine/annotations) >= %{doctrine_annotations_min_ver} with php-composer(doctrine/annotations) < %{doctrine_annotations_max_ver})
 BuildRequires: (php-composer(jeremeamia/superclosure) >= %{jeremeamia_superclosure_min_ver} with php-composer(jeremeamia/superclosure) < %{jeremeamia_superclosure_max_ver})
@@ -209,14 +209,11 @@ BOOTSTRAP
 
 : Upstream tests
 RETURN_CODE=0
-for PHP_EXEC in php php70 php71 php72 php73 php74; do
-    if [ "php" == "$PHP_EXEC" ] || which $PHP_EXEC; then
-        for PHPUNIT in phpunit6; do
-            PHPUNIT=$(which $PHPUNIT) || :
-            if [ -n "$PHPUNIT" ]; then
-                $PHP_EXEC $PHPUNIT --bootstrap bootstrap.php --verbose || RETURN_CODE=1
-            fi
-        done
+PHPUNIT=$(which phpunit6)
+for PHP_EXEC in "" php71 php72 php73 php74; do
+    if [ -z "$PHP_EXEC" ] || which $PHP_EXEC; then
+        $PHP_EXEC $PHPUNIT --verbose --bootstrap bootstrap.php \
+            || RETURN_CODE=1
     fi
 done
 exit $RETURN_CODE
@@ -235,6 +232,10 @@ exit $RETURN_CODE
 
 
 %changelog
+* Sat Dec 14 2019 Shawn Iwinski <shawn@iwin.ski> - 6.0.11-1
+- Update to 6.0.11 (RHBZ #1763756)
+- Use PHPUnit 6
+
 * Sun May 26 2019 Shawn Iwinski <shawn@iwin.ski> - 6.0.8-1
 - Update to 6.0.8 (RHBZ #1442587)
 
-- 
cgit