From 071b4a3e2546f2b29f4f0c70a7f29c74b131c04c Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Mon, 3 Dec 2018 07:41:57 +0100
Subject: update to 4.0.1 rename to php-sebastian-environment4 move to
 /usr/share/php/SebastianBergmann/Environment4 raise dependency on PHP 7.1 use
 phpunit7

---
 composer.json                   | 10 +++++++---
 php-sebastian-environment4.spec | 43 ++++++++++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/composer.json b/composer.json
index 3086774..8925c7a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,12 +10,16 @@
             "email": "sebastian@phpunit.de"
         }
     ],
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "prefer-stable": true,
     "require": {
-        "php": "^7.0"
+        "php": "^7.1"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.1"
+        "phpunit/phpunit": "^7.4"
     },
     "autoload": {
         "classmap": [
@@ -24,7 +28,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "3.1.x-dev"
+            "dev-master": "4.0-dev"
         }
     }
 }
diff --git a/php-sebastian-environment4.spec b/php-sebastian-environment4.spec
index 184ed8d..6b098f7 100644
--- a/php-sebastian-environment4.spec
+++ b/php-sebastian-environment4.spec
@@ -1,20 +1,22 @@
-# remirepo/fedora spec file for php-sebastian-environment3
+# remirepo/fedora spec file for php-sebastian-environment4
 #
-# Copyright (c) 2014-2017 Remi Collet
+# Copyright (c) 2014-2018 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    cd0871b3975fb7fc44d11314fd1ee20925fce4f5
+%global gh_commit    febd209a219cea7b56ad799b30ebbea34b71eb8f
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   environment
+# Packagist
 %global pk_vendor    sebastian
 %global pk_project   %{gh_project}
-%global major        3
+%global major        4
 %global php_home     %{_datadir}/php
+# Namespace
 %global ns_vendor    SebastianBergmann
 %global ns_project   Environment
 %if %{bootstrap}
@@ -24,7 +26,7 @@
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        3.1.0
+Version:        4.0.1
 Release:        1%{?dist}
 Summary:        Handle HHVM/PHP environments
 
@@ -34,21 +36,21 @@ URL:            https://github.com/%{gh_owner}/%{gh_project}
 Source0:        https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz
 
 BuildArch:      noarch
-BuildRequires:  php(language) >= 7.0
+BuildRequires:  php(language) >= 7.1
 BuildRequires:  php-pcre
 BuildRequires:  php-posix
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.1"
-BuildRequires:  phpunit6 >= 6.1
+#        "phpunit/phpunit": "^7.4"
+BuildRequires:  phpunit7 >= 7.4
 %endif
 
 # from composer.json, "require": {
-#        "php": "^7.0"
-Requires:       php(language) >= 7.0
-# From phpcompatinfo report for 3.0.2
+#        "php": "^7.1"
+Requires:       php(language) >= 7.1
+# From phpcompatinfo report for 4.0.1
 Requires:       php-pcre
 Requires:       php-posix
 # Autoloader
@@ -81,13 +83,15 @@ cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}
 
 %if %{with_tests}
 %check
-: Run tests - set include_path to ensure PHPUnit autoloader use it
+mkdir vendor
+touch vendor/autoload.php
+
+: Run tests
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php71 php72 php73; do
   if which $cmd; then
-   $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-     %{_bindir}/phpunit6 --bootstrap %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
-       --verbose || ret=1
+   $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
+     %{_bindir}/phpunit7 --verbose || ret=1
   fi
 done
 exit $ret
@@ -103,6 +107,13 @@ exit $ret
 
 
 %changelog
+* Mon Dec  3 2018 Remi Collet <remi@remirepo.net> - 4.0.1-1
+- update to 4.0.1
+- rename to php-sebastian-environment4
+- move to /usr/share/php/SebastianBergmann/Environment4
+- raise dependency on PHP 7.1
+- use phpunit7
+
 * Sun Jul  2 2017 Remi Collet <remi@remirepo.net> - 3.1.0-1
 - Update to 3.1.0
 
-- 
cgit