summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--composer.json6
-rw-r--r--phpunit9.spec34
2 files changed, 23 insertions, 17 deletions
diff --git a/composer.json b/composer.json
index 8295ae3..e3c7901 100644
--- a/composer.json
+++ b/composer.json
@@ -37,7 +37,7 @@
"phpunit/php-file-iterator": "^3.0",
"phpunit/php-invoker": "^3.0",
"phpunit/php-text-template": "^2.0",
- "phpunit/php-timer": "^3.1.4",
+ "phpunit/php-timer": "^4.0",
"sebastian/code-unit": "^1.0.2",
"sebastian/comparator": "^4.0",
"sebastian/diff": "^4.0",
@@ -46,7 +46,7 @@
"sebastian/global-state": "^4.0",
"sebastian/object-enumerator": "^4.0",
"sebastian/resource-operations": "^3.0",
- "sebastian/type": "^2.0",
+ "sebastian/type": "^2.1",
"sebastian/version": "^3.0"
},
"require-dev": {
@@ -87,7 +87,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "9.1-dev"
+ "dev-master": "9.2-dev"
}
}
}
diff --git a/phpunit9.spec b/phpunit9.spec
index ad50882..ab2a59e 100644
--- a/phpunit9.spec
+++ b/phpunit9.spec
@@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
-%global gh_commit 1b570cd7edbe136055bf5f651857dc8af6b829d2
+%global gh_commit 156770a4069dba439b26fc16be82e2287d22240e
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -23,11 +23,11 @@
%global ns_vendor PHPUnit9
%global php_home %{_datadir}/php
%global ver_major 9
-%global ver_minor 1
+%global ver_minor 2
%global specrel 1
Name: %{pk_project}%{ver_major}
-Version: 9.1.5
+Version: 9.2.0
Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
@@ -52,7 +52,7 @@ BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-c
BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4)
BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3)
-BuildRequires: (php-composer(phpunit/php-timer) >= 3.1.4 with php-composer(phpunit/php-timer) < 4)
+BuildRequires: (php-composer(phpunit/php-timer) >= 4.0 with php-composer(phpunit/php-timer) < 5)
BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.2 with php-composer(sebastian/code-unit) < 2)
BuildRequires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5)
BuildRequires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5)
@@ -61,7 +61,7 @@ BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-c
BuildRequires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5)
BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5)
BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4)
-BuildRequires: (php-composer(sebastian/type) >= 2.0 with php-composer(sebastian/type) < 3)
+BuildRequires: (php-composer(sebastian/type) >= 2.1 with php-composer(sebastian/type) < 3)
BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
# remirepo:22
%else
@@ -74,7 +74,7 @@ BuildRequires: php-phpunit-php-code-coverage8 >= 8.0.1
BuildRequires: php-phpunit-php-file-iterator3
BuildRequires: php-phpunit-php-invoker3
BuildRequires: php-phpunit-php-text-template2
-BuildRequires: php-phpunit-php-timer3 >= 3.1.4
+BuildRequires: php-phpunit-php-timer4
BuildRequires: php-sebastian-code-unit >= 1.0.2
BuildRequires: php-sebastian-comparator4
BuildRequires: php-sebastian-diff4
@@ -83,7 +83,7 @@ BuildRequires: php-sebastian-exporter4
BuildRequires: php-sebastian-global-state4
BuildRequires: php-sebastian-object-enumerator4
BuildRequires: php-sebastian-resource-operations3
-BuildRequires: php-sebastian-type2
+BuildRequires: php-sebastian-type2 >= 2.1
BuildRequires: php-sebastian-version3
%endif
BuildRequires: php-dom
@@ -112,7 +112,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "phpunit/php-file-iterator": "^3.0",
# "phpunit/php-invoker": "^3.0",
# "phpunit/php-text-template": "^2.0",
-# "phpunit/php-timer": "^3.1.4",
+# "phpunit/php-timer": "^4.0",
# "sebastian/code-unit": "^1.0.2",
# "sebastian/comparator": "^4.0",
# "sebastian/diff": "^4.0",
@@ -121,7 +121,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "sebastian/global-state": "^4.0",
# "sebastian/object-enumerator": "^4.0",
# "sebastian/resource-operations": "^3.0",
-# "sebastian/type": "^2.0",
+# "sebastian/type": "^2.1",
# "sebastian/version": "^3.0"
Requires: php(language) >= 7.3
Requires: php-cli
@@ -142,7 +142,7 @@ Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-c
Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
Requires: (php-composer(phpunit/php-invoker) >= 3.0 with php-composer(phpunit/php-invoker) < 4)
Requires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3)
-Requires: (php-composer(phpunit/php-timer) >= 3.1.4 with php-composer(phpunit/php-timer) < 4)
+Requires: (php-composer(phpunit/php-timer) >= 4.0 with php-composer(phpunit/php-timer) < 5)
Requires: (php-composer(sebastian/code-unit) >= 1.0.2 with php-composer(sebastian/code-unit) < 2)
Requires: (php-composer(sebastian/comparator) >= 4.0 with php-composer(sebastian/comparator) < 5)
Requires: (php-composer(sebastian/diff) >= 4.0 with php-composer(sebastian/diff) < 5)
@@ -151,7 +151,7 @@ Requires: (php-composer(sebastian/exporter) >= 4.0 with php-c
Requires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5)
Requires: (php-composer(sebastian/object-enumerator) >= 4.0 with php-composer(sebastian/object-enumerator) < 5)
Requires: (php-composer(sebastian/resource-operations) >= 3.0 with php-composer(sebastian/resource-operations) < 4)
-Requires: (php-composer(sebastian/type) >= 2.0 with php-composer(sebastian/type) < 3)
+Requires: (php-composer(sebastian/type) >= 2.1 with php-composer(sebastian/type) < 3)
Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
# From composer.json, "suggest": {
# "ext-soap": "*",
@@ -169,7 +169,7 @@ Requires: php-phpunit-php-code-coverage8 >= 8.0.1
Requires: php-phpunit-php-file-iterator3
Requires: php-phpunit-php-invoker3
Requires: php-phpunit-php-text-template2
-Requires: php-phpunit-php-timer3 >= 3.1.4
+Requires: php-phpunit-php-timer4
Requires: php-sebastian-code-unit >= 1.0.2
Requires: php-sebastian-comparator4
Requires: php-sebastian-diff4
@@ -178,7 +178,7 @@ Requires: php-sebastian-exporter4
Requires: php-sebastian-global-state4
Requires: php-sebastian-object-enumerator4
Requires: php-sebastian-resource-operations3
-Requires: php-sebastian-type2
+Requires: php-sebastian-type2 >= 2.1.0
Requires: php-sebastian-version3
%endif
# Autoloader
@@ -221,7 +221,7 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/SebastianBergmann/CodeCoverage8/autoload.php',
'%{php_home}/SebastianBergmann/FileIterator3/autoload.php',
'%{php_home}/SebastianBergmann/Template2/autoload.php',
- '%{php_home}/SebastianBergmann/Timer3/autoload.php',
+ '%{php_home}/SebastianBergmann/Timer4/autoload.php',
'%{php_home}/Prophecy/autoload.php',
'%{php_home}/SebastianBergmann/CodeUnit/autoload.php',
'%{php_home}/SebastianBergmann/Invoker3/autoload.php',
@@ -259,6 +259,7 @@ cat src/autoload.php
--exclude '*/regression/Trac/783/OneTest.php' \
--exclude 'tests/end-to-end/regression/GitHub/3889/Issue3889Test.test.php' \
--exclude 'tests/end-to-end/regression/GitHub/3904/Issue3904Test.php' \
+ --exclude 'tests/end-to-end/force-covers-annotation/tests/Test.php' \
tests
@@ -296,6 +297,11 @@ exit $ret
%changelog
+* Fri Jun 5 2020 Remi Collet <remi@remirepo.net> - 9.2.0-1
+- update to 9.2.0
+- raise dependency on phpunit/php-timer 4.0
+- raise dependency on sebastian/type 2.1
+
* Sat May 23 2020 Remi Collet <remi@remirepo.net> - 9.1.5-1
- update to 9.1.5
- sources from git snapshot