summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2018-12-03 07:51:01 +0100
committerRemi Collet <remi@remirepo.net>2018-12-03 07:51:01 +0100
commit2527e049ca7c5e85deec84a7a70c90143ad9369c (patch)
tree57a4deece7741eb662fab28e4570872866ce38d7
parentf73512b8a65701481618686f4798c26b74f57ecc (diff)
update to 7.4.5
raise dependency on sebastian/environment 4.0
-rw-r--r--composer.json2
-rw-r--r--phpunit7.spec29
2 files changed, 13 insertions, 18 deletions
diff --git a/composer.json b/composer.json
index a295cc6..6a09da5 100644
--- a/composer.json
+++ b/composer.json
@@ -38,7 +38,7 @@
"phpunit/php-timer": "^2.0",
"sebastian/comparator": "^3.0",
"sebastian/diff": "^3.0",
- "sebastian/environment": "^3.1 || ^4.0",
+ "sebastian/environment": "^4.0",
"sebastian/exporter": "^3.1",
"sebastian/global-state": "^2.0",
"sebastian/object-enumerator": "^3.0.3",
diff --git a/phpunit7.spec b/phpunit7.spec
index 2efb004..5aa81cc 100644
--- a/phpunit7.spec
+++ b/phpunit7.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit b1be2c8530c4c29c3519a052c9fb6cee55053bbd
+%global gh_commit 61d34e8dd6eb3555900f0f2a2fa9e7e570730102
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -24,7 +24,7 @@
%global php_home %{_datadir}/php
%global ver_major 7
%global ver_minor 4
-%global ver_patch 4
+%global ver_patch 5
%global specrel 1
Name: %{pk_project}%{ver_major}
@@ -54,7 +54,7 @@ BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-co
BuildRequires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3)
BuildRequires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 4)
BuildRequires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4)
-BuildRequires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 5)
+BuildRequires: (php-composer(sebastian/environment) >= 4.0 with php-composer(sebastian/environment) < 5)
BuildRequires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
BuildRequires: (php-composer(sebastian/global-state) >= 2.0 with php-composer(sebastian/global-state) < 3)
BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
@@ -74,7 +74,7 @@ BuildRequires: php-phpunit-Text-Template >= 1.2.1
BuildRequires: php-phpunit-php-timer2
BuildRequires: php-sebastian-comparator3
BuildRequires: php-sebastian-diff3
-BuildRequires: php-sebastian-environment3 >= 3.1
+BuildRequires: php-sebastian-environment4
BuildRequires: php-sebastian-exporter3 >= 3.1
BuildRequires: php-sebastian-global-state2
BuildRequires: php-sebastian-object-enumerator3 >= 3.0.3
@@ -109,7 +109,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "phpunit/php-timer": "^2.0",
# "sebastian/comparator": "^3.0",
# "sebastian/diff": "^3.0",
-# "sebastian/environment": "^3.1 || ^4.0",
+# "sebastian/environment": "^4.0",
# "sebastian/exporter": "^3.1",
# "sebastian/global-state": "^2.0",
# "sebastian/object-enumerator": "^3.0.3",
@@ -135,7 +135,7 @@ Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-co
Requires: (php-composer(phpunit/php-timer) >= 2.0 with php-composer(phpunit/php-timer) < 3)
Requires: (php-composer(sebastian/comparator) >= 3.0 with php-composer(sebastian/comparator) < 4)
Requires: (php-composer(sebastian/diff) >= 3.0 with php-composer(sebastian/diff) < 4)
-Requires: (php-composer(sebastian/environment) >= 3.1 with php-composer(sebastian/environment) < 5)
+Requires: (php-composer(sebastian/environment) >= 4.0 with php-composer(sebastian/environment) < 5)
Requires: (php-composer(sebastian/exporter) >= 3.1 with php-composer(sebastian/exporter) < 4)
Requires: (php-composer(sebastian/global-state) >= 2.0 with php-composer(sebastian/global-state) < 3)
Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
@@ -158,7 +158,7 @@ Requires: php-phpunit-Text-Template >= 1.2.1
Requires: php-phpunit-php-timer2
Requires: php-sebastian-comparator3
Requires: php-sebastian-diff3
-Requires: php-sebastian-environment3 >= 3.1
+Requires: php-sebastian-environment4
Requires: php-sebastian-exporter3 >= 3.1
Requires: php-sebastian-global-state2
Requires: php-sebastian-object-enumerator3 >= 3.0.3
@@ -175,12 +175,6 @@ Requires: php-pcntl
Requires: php-pcre
Requires: php-phar
Requires: php-spl
-# remirepo:1
-%if 0%{?fedora} > 21 || 0%{?rhel} >= 8
-Recommends: php-phpunit-dbunit4
-#Suggests: php-phpunit-selenium
-# remirepo:1
-%endif
# projects have been merged
Obsoletes: php-phpunit-mock-objects6 < 6.1.3
@@ -211,10 +205,7 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/Prophecy/autoload.php',
'%{php_home}/SebastianBergmann/Diff3/autoload.php', // Before comparator which may load v2
'%{php_home}/SebastianBergmann/Comparator3/autoload.php',
- [
- '%{php_home}/SebastianBergmann/Environment4/autoload.php',
- '%{php_home}/SebastianBergmann/Environment3/autoload.php',
- ],
+ '%{php_home}/SebastianBergmann/Environment4/autoload.php',
'%{php_home}/SebastianBergmann/Exporter3/autoload.php',
'%{php_home}/SebastianBergmann/GlobalState2/autoload.php',
'%{php_home}/SebastianBergmann/ObjectEnumerator3/autoload.php',
@@ -276,6 +267,10 @@ exit $ret
%changelog
+* Mon Dec 3 2018 Remi Collet <remi@remirepo.net> - 7.4.5-1
+- update to 7.4.5
+- raise dependency on sebastian/environment 4.0
+
* Thu Nov 15 2018 Remi Collet <remi@remirepo.net> - 7.4.4-1
- update to 7.4.4