Compare commits

...
Sign in to create a new pull request.

6 commits

Author SHA1 Message Date
Remi Collet
084ab6f1a0 v8.5.33
(cherry picked from commit 1594f12219)
2023-02-28 15:24:00 +01:00
Remi Collet
263e0b51e9 v8.5.32
(cherry picked from commit a5c01da422)
(cherry picked from commit 90763ffd74)
2023-01-26 14:46:45 +01:00
Remi Collet
08bfb901cf v8.5.31
(cherry picked from commit 98ac28703a)
2022-10-28 08:35:56 +02:00
Remi Collet
a96cfa7fe3 update to 8.5.30
raise dependency on sebastian/comparator 3.0.2
raise dependency on sebastian/exporter 3.1.5

(cherry picked from commit dcf88a488e)
2022-09-26 09:08:10 +02:00
Remi Collet
c979111643 update to 8.5.29
keep dependency on phpspec/prophecy (optional)

(cherry picked from commit 109317cc3a)
2022-09-08 11:37:23 +02:00
Remi Collet
248224595b v8.5.28
(cherry picked from commit 11cef361c3)
2022-07-29 14:07:14 +02:00
4 changed files with 52 additions and 18 deletions

6
.gitignore vendored
View file

@ -21,3 +21,9 @@ clog
/phpunit8-8.5.25-9ff23f4.tgz
/phpunit8-8.5.26-ef117c5.tgz
/phpunit8-8.5.27-df70070.tgz
/phpunit8-8.5.28-8f2d1c9.tgz
/phpunit8-8.5.29-e8c563c.tgz
/phpunit8-8.5.30-4fd448d.tgz
/phpunit8-8.5.31-33c126b.tgz
/phpunit8-8.5.32-3756869.tgz
/phpunit8-8.5.33-7d1ff0e.tgz

View file

@ -33,15 +33,20 @@ diff -up ./phpunit.rpm ./phpunit
}
$options = getopt('', array('prepend:'));
@@ -95,4 +79,8 @@ unset($options);
@@ -95,4 +79,13 @@ unset($options);
require PHPUNIT_COMPOSER_INSTALL;
-PHPUnit\TextUI\Command::main();
+if (class_exists('PHPUnit_TextUI_Command')) {
+ PHPUnit_TextUI_Command::main(); // PHPUnit v5 or older
+if (class_exists('PHPUnit\\TextUI\\Application')) {
+ // PHPUnit v10 or newer
+ exit((new PHPUnit\TextUI\Application)->run($_SERVER['argv']));
+} else if (class_exists('PHPUnit_TextUI_Command')) {
+ // PHPUnit v5 or older
+ PHPUnit_TextUI_Command::main();
+} else {
+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+ // PHPUnit v6 to v9
+ PHPUnit\TextUI\Command::main();
+}
diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php
--- ./src/Util/Configuration.php.rpm 2021-12-30 08:58:05.000000000 +0100

View file

@ -1,8 +1,8 @@
# remirepo/fedora spec file for phpunit8
#
# Copyright (c) 2010-2022 Remi Collet
# Copyright (c) 2010-2023 Remi Collet
#
# License: CC-BY-SA
# License: CC-BY-SA-4.0
# http://creativecommons.org/licenses/by-sa/4.0/
#
# Please, preserve the changelog entries
@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
%global gh_commit df70070f2711b8fe8dcca0797c1239ede8c94be6
%global gh_commit 7d1ff0e8c6b35db78ff13e3e05517d7cbf7aa32e
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
@ -25,7 +25,7 @@
%global ver_major 8
%global ver_minor 5
%global upstream_version 8.5.27
%global upstream_version 8.5.33
#global upstream_prever dev
Name: %{pk_project}%{ver_major}
@ -33,7 +33,7 @@ Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}}
Release: 1%{?dist}
Summary: The PHP Unit Testing framework version %{ver_major}
License: BSD
License: BSD-3-Clause
URL: https://github.com/%{gh_owner}/%{gh_project}
Source0: %{name}-%{upstream_version}-%{gh_short}.tgz
Source1: makesrc.sh
@ -52,10 +52,10 @@ BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-c
BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3)
BuildRequires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
BuildRequires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3)
BuildRequires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4)
BuildRequires: (php-composer(sebastian/comparator) >= 3.0.5 with php-composer(sebastian/comparator) < 4)
BuildRequires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4)
BuildRequires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5)
BuildRequires: (php-composer(sebastian/exporter) >= 3.1.2 with php-composer(sebastian/exporter) < 4)
BuildRequires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4)
BuildRequires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4)
BuildRequires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
BuildRequires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
@ -83,15 +83,14 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "myclabs/deep-copy": "^1.10.0",
# "phar-io/manifest": "^2.0.3",
# "phar-io/version": "^3.0.2",
# "phpspec/prophecy": "^1.10.3",
# "phpunit/php-code-coverage": "^7.0.10",
# "phpunit/php-file-iterator": "^2.0.4",
# "phpunit/php-text-template": "^1.2.1",
# "phpunit/php-timer": "^2.1.2",
# "sebastian/comparator": "^3.0.2",
# "sebastian/comparator": "^3.0.5",
# "sebastian/diff": "^3.0.2",
# "sebastian/environment": "^4.2.3",
# "sebastian/exporter": "^3.1.2",
# "sebastian/exporter": "^3.1.5",
# "sebastian/global-state": "^3.0.0",
# "sebastian/object-enumerator": "^3.0.3",
# "sebastian/resource-operations": "^2.0.1",
@ -114,10 +113,10 @@ Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-c
Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.4 with php-composer(phpunit/php-file-iterator) < 3)
Requires: (php-composer(phpunit/php-text-template) >= 1.2.1 with php-composer(phpunit/php-text-template) < 2)
Requires: (php-composer(phpunit/php-timer) >= 2.1.2 with php-composer(phpunit/php-timer) < 3)
Requires: (php-composer(sebastian/comparator) >= 3.0.2 with php-composer(sebastian/comparator) < 4)
Requires: (php-composer(sebastian/comparator) >= 3.0.5 with php-composer(sebastian/comparator) < 4)
Requires: (php-composer(sebastian/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4)
Requires: (php-composer(sebastian/environment) >= 4.2.3 with php-composer(sebastian/environment) < 5)
Requires: (php-composer(sebastian/exporter) >= 3.1.2 with php-composer(sebastian/exporter) < 4)
Requires: (php-composer(sebastian/exporter) >= 3.1.5 with php-composer(sebastian/exporter) < 4)
Requires: (php-composer(sebastian/global-state) >= 3.0.0 with php-composer(sebastian/global-state) < 4)
Requires: (php-composer(sebastian/object-enumerator) >= 3.0.3 with php-composer(sebastian/object-enumerator) < 4)
Requires: (php-composer(sebastian/resource-operations) >= 2.0.1 with php-composer(sebastian/resource-operations) < 3)
@ -130,6 +129,9 @@ Requires: (php-composer(sebastian/version) >= 2.0.1 with php-c
Requires: (php-composer(phpunit/php-invoker) >= 2.0.0 with php-composer(phpunit/php-invoker) < 3)
Suggests: php-soap
Suggests: php-xdebug
# recommends latest versions
Recommends: phpunit9
Recommends: phpunit10
# Autoloader
Requires: php-composer(fedora/autoloader)
# From phpcompatinfo report for version 8.0.0
@ -216,7 +218,7 @@ sed -e 's:@PATH@:%{buildroot}%{php_home}/%{ns_vendor}:' -i tests/bootstrap.php
sed -e 's:%{php_home}/%{ns_vendor}:%{buildroot}%{php_home}/%{ns_vendor}:' -i phpunit
ret=0
for cmd in php php74 php80 php81; do
for cmd in php php74 php80 php81 php82; do
if which $cmd; then
$cmd ./phpunit $OPT --verbose || ret=1
fi
@ -233,6 +235,27 @@ exit $ret
%changelog
* Tue Feb 28 2023 Remi Collet <remi@remirepo.net> - 8.5.33-1
- update to 8.5.33
* Thu Jan 26 2023 Remi Collet <remi@remirepo.net> - 8.5.32-1
- update to 8.5.32
* Fri Oct 28 2022 Remi Collet <remi@remirepo.net> - 8.5.31-1
- update to 8.5.31
* Sun Sep 25 2022 Remi Collet <remi@remirepo.net> - 8.5.30-1
- update to 8.5.30
- raise dependency on sebastian/comparator 3.0.2
- raise dependency on sebastian/exporter 3.1.5
* Tue Aug 30 2022 Remi Collet <remi@remirepo.net> - 8.5.29-1
- update to 8.5.29
- keep dependency on phpspec/prophecy (optional)
* Fri Jul 29 2022 Remi Collet <remi@remirepo.net> - 8.5.28-1
- update to 8.5.28
* Mon Jun 20 2022 Remi Collet <remi@remirepo.net> - 8.5.27-1
- update to 8.5.27

View file

@ -1 +1 @@
SHA512 (phpunit8-8.5.27-df70070.tgz) = d1279f6316aee7b91224e1236edbbf9f665db2d2f3ae7371c2a8dc9af4e6596dbcd23a19f1881f28e0aa17856ac0070c2ea18a472285d397ff055ed8ef984584
SHA512 (phpunit8-8.5.33-7d1ff0e.tgz) = 24d801a3846cd4a49b7ad8ed76c832ca4c9c44ba084a643ac0b0a222a4dee10b44aef23aacb989804c7a8d2331fb8d43dfd0d7bdf264717b849e53c275af00c8