boostrap build

rename to php-sebastian-global-state3
update to 3.0.0
raise dependency on PHP 7.2
add dependency on sebastian/object-reflector
add dependency on sebastian/recursion-context

2 files changed, 67 insertions, 23 deletions

diff --git a/composer.json b/composer.json
index 8f7edb3..166649d 100644
--- a/composer.json
+++ b/composer.json
@@ -10,11 +10,19 @@
             "email": "sebastian@phpunit.de"
         }
     ],
+    "prefer-stable": true,
+    "config": {
+        "optimize-autoloader": true,
+        "sort-packages": true
+    },
     "require": {
-        "php": "^7.0"
+        "php": "^7.2",
+        "sebastian/object-reflector": "^1.1.1",
+        "sebastian/recursion-context": "^3.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^6.0"
+        "ext-dom": "*",
+        "phpunit/phpunit": "^8.0"
     },
     "suggest": {
         "ext-uopz": "*"
@@ -34,7 +42,7 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "2.0-dev"
+            "dev-master": "3.0-dev"
         }
     }
 }
diff --git a/php-sebastian-global-state3.spec b/php-sebastian-global-state3.spec
index 2d3e406..db2a67f 100644
--- a/php-sebastian-global-state3.spec
+++ b/php-sebastian-global-state3.spec
@@ -1,31 +1,31 @@
-# spec file for php-sebastian-global-state2
+# spec file for php-sebastian-global-state3
 #
-# Copyright (c) 2014-2017 Remi Collet
+# Copyright (c) 2014-2019 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    e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4
+%global bootstrap    1
+%global gh_commit    edf8a461cf1d4005f19fb0b6b8b95a9f7fa0adc4
 %global gh_short     %(c=%{gh_commit}; echo ${c:0:7})
 %global gh_owner     sebastianbergmann
 %global gh_project   global-state
 %global pk_vendor    sebastian
 %global pk_project   %{gh_project}
-%global major        2
+%global major        3
 %global php_home     %{_datadir}/php
 %global ns_vendor    SebastianBergmann
 %global ns_project   GlobalState
 %if %{bootstrap}
-%global with_tests   %{?_with_tests:1}%{!?_with_tests:0}
+%global with_tests   0%{?_with_tests:1}
 %else
-%global with_tests   %{?_without_tests:0}%{!?_without_tests:1}
+%global with_tests   0%{!?_without_tests:1}
 %endif
 
 Name:           php-%{pk_vendor}-%{pk_project}%{major}
-Version:        2.0.0
-Release:        1%{?dist}
+Version:        3.0.0
+Release:        0%{?dist}
 Summary:        Snapshotting of global state
 
 License:        BSD
@@ -33,26 +33,48 @@ 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.2
 BuildRequires:  php-reflection
 BuildRequires:  php-spl
 # Autoloader
 BuildRequires:  php-fedora-autoloader-devel >= 1.0.0
 %if %{with_tests}
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+BuildRequires:  (php-composer(sebastian/object-reflector)  >= 1.1.1   with php-composer(sebastian/object-reflector)  < 2)
+BuildRequires:  (php-composer(sebastian/recursion-context) >= 3.0     with php-composer(sebastian/recursion-context) < 4)
+# remirepo:4
+%else
+BuildRequires:  php-sebastian-object-reflector         >= 1.1.1
+BuildRequires:  php-sebastian-recursion-context3
+%endif
 # from composer.json, "require-dev": {
-#        "phpunit/phpunit": "^6.0"
-BuildRequires:  phpunit6
+#        "ext-dom": "*",
+#        "phpunit/phpunit": "^8.0"
+BuildRequires:  phpunit8
+BuildRequires:  php-dom
 %endif
 
 # from composer.json, "require": {
-#        "php": "^7.0"
-Requires:       php(language) >= 7.0
+#        "php": "^7.2",
+#        "sebastian/object-reflector": "^1.1.1",
+#        "sebastian/recursion-context": "^3.0"
+Requires:       php(language) >= 7.2
+# remirepo:1
+%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
+Requires:       (php-composer(sebastian/object-reflector)  >= 1.1.1   with php-composer(sebastian/object-reflector)  < 2)
+Requires:       (php-composer(sebastian/recursion-context) >= 3.0     with php-composer(sebastian/recursion-context) < 4)
+# remirepo:4
+%else
+Requires:       php-sebastian-object-reflector         >= 1.1.1
+Requires:       php-sebastian-recursion-context3
+%endif
 # from phpcompatinfo report for version 2.0.0
 Requires:       php-reflection
 Requires:       php-spl
 # from composer.json, "suggest": {
 #        "ext-uopz": "*"
-%if 0%{?fedora} > 21
+%if 0%{?fedora} > 21 || 0%{?rhel} >= 8
 Suggests:       php-uopz
 %endif
 # Autoloader
@@ -72,10 +94,16 @@ factored out of PHPUnit into a stand-alone component.
 
 %build
 # Generate the Autoloader
-phpab --template fedora2 --output src/autoload.php src
+phpab --template fedora --output src/autoload.php src
+cat << 'EOF' | tee -a src/autoload.php
+\Fedora\Autoloader\Dependencies::required([
+    '%{php_home}/%{ns_vendor}/ObjectReflector/autoload.php',
+    '%{php_home}/%{ns_vendor}/RecursionContext3/autoload.php',
+]);
+EOF
 
 # For the test suite
-phpab --template fedora2 --output tests/autoload.php tests/_fixture/
+phpab --template fedora --output tests/autoload.php tests/_fixture/
 
 
 %install
@@ -95,10 +123,10 @@ EOF
 
 : Run upstream test suite
 ret=0
-for cmd in php php70 php71 php72; do
+for cmd in php php72 php73; do
   if which $cmd; then
-   $cmd -d include_path=.:%{buildroot}%{php_home}:%{php_home} \
-   %{_bindir}/phpunit6 --verbose || ret=1
+   $cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
+     %{_bindir}/phpunit8 --verbose || ret=1
   fi
 done
 exit $ret
@@ -118,6 +146,14 @@ exit $ret
 
 
 %changelog
+* Fri Feb  1 2019 Remi Collet <remi@remirepo.net> - 3.0.0-0
+- boostrap build
+- rename to php-sebastian-global-state3
+- update to 3.0.0
+- raise dependency on PHP 7.2
+- add dependency on sebastian/object-reflector
+- add dependency on sebastian/recursion-context
+
 * Fri Apr 28 2017 Remi Collet <remi@fedoraproject.org> - 2.0.0-1
 - rename to php-sebastian-global-state2
 - update to 2.0.0