From 4c6738ab56f8a47d346641a7aa477416b31537c3 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Fri, 7 Feb 2020 12:58:31 +0100
Subject: update to 4.0.0 raise dependency on PHP 7.3 rename to
 php-sebastian-diff4 move to /usr/share/php/SebastianBergmann/Diff4

---
 composer.json            | 16 ++++++++++++----
 php-sebastian-diff4.spec | 38 +++++++++++++++++++++++---------------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 59520e9..10a3f33 100644
--- a/composer.json
+++ b/composer.json
@@ -14,12 +14,20 @@
             "email": "mail@kore-nordmann.de"
         }
     ],
+    "prefer-stable": true,
+    "config": {
+        "platform": {
+            "php": "7.3.0"
+        },
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "require": {
-        "php": "^7.1"
+        "php": "^7.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^7.5 || ^8.0",
-        "symfony/process": "^2 || ^3.3 || ^4"
+        "phpunit/phpunit": "^9.0",
+        "symfony/process": "^4 || ^5"
     },
     "autoload": {
         "classmap": [
@@ -33,7 +41,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.0-dev"
+            "dev-master": "4.0-dev"
         }
     }
 }
diff --git a/php-sebastian-diff4.spec b/php-sebastian-diff4.spec
index 0069ea1..3fd8fa4 100644
--- a/php-sebastian-diff4.spec
+++ b/php-sebastian-diff4.spec
@@ -1,13 +1,13 @@
-# remirepo/fedora spec file for php-sebastian-diff3
+# remirepo/fedora spec file for php-sebastian-diff4
 #
-# Copyright (c) 2013-2019 Remi Collet
+# Copyright (c) 2013-2020 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
 # Please, preserve the changelog entries
 #
 %global bootstrap    0
-%global gh_commit    720fcc7e9b5cf384ea68d9d930d480907a0c1a29
+%global gh_commit    c0c26c9188b538bfa985ae10c9f05d278f12060d
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   diff
@@ -18,7 +18,7 @@
 %global ns_vendor    SebastianBergmann
 %global ns_project   Diff
 
-%global major        3
+%global major        4
 %global php_home     %{_datadir}/php
 %if %{bootstrap}
 %global with_tests   0%{?_with_tests:1}
@@ -27,7 +27,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.0.2
+Version:        4.0.0
 Release:        1%{?dist}
 Summary:        Diff implementation
 
@@ -38,20 +38,21 @@ Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
 BuildArch:      noarch
 BuildRequires:  php-fedora-autoloader-devel
 %if %{with_tests}
-BuildRequires:  php(language) >= 7.1
+BuildRequires:  php(language) >= 7.3
 BuildRequires:  php-pcre
 BuildRequires:  php-spl
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^7.5 || ^8.0",
-#        "symfony/process": "^2 || ^3.3 || ^4"
-BuildRequires:  phpunit7 >= 7.5
+#        "phpunit/phpunit": "^9.0",
+#        "symfony/process": "^4 || ^5"
+# TODO test suite passes with v8, switch to v9 when available
+BuildRequires:  phpunit8
 BuildRequires:  php-symfony4-process
 %endif
 
 # from composer.json
-#        "php": "^7.1"
-Requires:       php(language) >= 7.1
-# from phpcompatinfo report for version 3.0.0
+#        "php": "^7.3"
+Requires:       php(language) >= 7.3
+# from phpcompatinfo report for version 4.0.0
 Requires:       php-pcre
 Requires:       php-spl
 # Autoloader
@@ -88,18 +89,19 @@ cat << 'EOF' | tee -a vendor/autoload.php
 \Fedora\Autoloader\Autoload::addPsr4('Symfony\\Component\\Process', '%{php_home}/Symfony4/Component/Process');
 EOF
 
-# remirepo:4
+# remirepo:5
 %if 0%{?rhel} == 6 || 0%{?rhel} == 7
 : Ignore tests using git command: unknown option 'unsafe-paths' with old git
 rm -r tests/Output/Integration
+rm    tests/Utils/UnifiedDiffAssertTraitIntegrationTest.php
 %endif
 
 : Run upstream test suite
 ret=0
-for cmd in php php71 php72 php73; do
+for cmd in php php73 php74; do
   if which $cmd; then
     $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-      %{_bindir}/phpunit7  --verbose || ret=1
+      %{_bindir}/phpunit8  --verbose || ret=1
   fi
 done
 exit $ret
@@ -119,6 +121,12 @@ exit $ret
 
 
 %changelog
+* Fri Feb  7 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1
+- update to 4.0.0
+- raise dependency on PHP 7.3
+- rename to php-sebastian-diff4
+- move to /usr/share/php/SebastianBergmann/Diff4
+
 * Mon Feb  4 2019 Remi Collet <remi@remirepo.net> - 3.0.2-1
 - update to 3.0.2
 
-- 
cgit