update to 9.2.6

raise dependency on latest minor version available
  for all libraries

(cherry picked from commit 2a44177a06)
This commit is contained in:
Remi Collet 2020-07-15 11:13:35 +02:00
commit db6cce9129
4 changed files with 71 additions and 70 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@
/phpunit9-9.1.4-2d7080c.tar.gz
/phpunit9-9.1.5-1b570cd.tgz
/phpunit9-9.2.5-ad7cc5e.tgz
/phpunit9-9.2.6-1c6a9e4.tgz

View file

@ -1,6 +1,6 @@
diff -up ./phpunit.rpm ./phpunit
--- ./phpunit.rpm 2020-02-07 07:56:17.000000000 +0100
+++ ./phpunit 2020-02-07 16:20:53.817753399 +0100
--- ./phpunit.rpm 2020-07-14 07:50:32.000000000 +0200
+++ ./phpunit 2020-07-14 07:59:08.950883697 +0200
@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) {
ini_set('date.timezone', 'UTC');
}
@ -44,9 +44,9 @@ diff -up ./phpunit.rpm ./phpunit
+ PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer
+}
diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Loader.php
--- ./src/TextUI/Configuration/Loader.php.rpm 2020-02-07 07:56:17.000000000 +0100
+++ ./src/TextUI/Configuration/Loader.php 2020-02-07 16:20:53.818753394 +0100
@@ -194,7 +194,7 @@ final class Loader
--- ./src/TextUI/Configuration/Loader.php.rpm 2020-07-14 07:59:08.950883697 +0200
+++ ./src/TextUI/Configuration/Loader.php 2020-07-14 08:00:39.167509659 +0200
@@ -195,7 +195,7 @@ final class Loader
private function validate(\DOMDocument $document): array
{
$original = \libxml_use_internal_errors(true);
@ -54,10 +54,10 @@ diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Lo
+ $xsdFilename = __DIR__ . '/../../phpunit.xsd';
if (\defined('__PHPUNIT_PHAR_ROOT__')) {
$xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
$xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd';
diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php
--- ./tests/bootstrap.php.rpm 2020-02-07 16:21:18.097630840 +0100
+++ ./tests/bootstrap.php 2020-02-07 16:22:12.237357522 +0100
--- ./tests/bootstrap.php.rpm 2020-07-14 07:50:32.000000000 +0200
+++ ./tests/bootstrap.php 2020-07-14 07:59:08.950883697 +0200
@@ -14,4 +14,8 @@ if (!\defined('TEST_FILES_PATH')) {
\ini_set('precision', '14');
\ini_set('serialize_precision', '14');

View file

@ -11,7 +11,7 @@
# For compatibility with SCL
%undefine __brp_mangle_shebangs
%global gh_commit ad7cc5ec3ab2597b329880e30442d9054526023b
%global gh_commit 1c6a9e4312e209e659f1fce3ce88dd197c2448f6
#global gh_date 20150927
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@ -27,7 +27,7 @@
%global specrel 1
Name: %{pk_project}%{ver_major}
Version: 9.2.5
Version: 9.2.6
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}
@ -41,26 +41,26 @@ Patch0: %{name}-rpm.patch
BuildArch: noarch
BuildRequires: php(language) >= 7.3
BuildRequires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2)
BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2)
BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.5 with php-composer(myclabs/deep-copy) < 2)
BuildRequires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2)
BuildRequires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3)
BuildRequires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2)
BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-composer(phpunit/php-code-coverage) < 9)
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) >= 5.0 with php-composer(phpunit/php-timer) < 6)
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)
BuildRequires: (php-composer(sebastian/environment) >= 5.0.1 with php-composer(sebastian/environment) < 6)
BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5)
BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.2 with php-composer(phpunit/php-code-coverage) < 9)
BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4)
BuildRequires: (php-composer(phpunit/php-invoker) >= 3.0.2 with php-composer(phpunit/php-invoker) < 4)
BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
BuildRequires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6)
BuildRequires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2)
BuildRequires: (php-composer(sebastian/comparator) >= 4.0.3 with php-composer(sebastian/comparator) < 5)
BuildRequires: (php-composer(sebastian/diff) >= 4.0.1 with php-composer(sebastian/diff) < 5)
BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
BuildRequires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5)
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.1 with php-composer(sebastian/type) < 3)
BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
BuildRequires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5)
BuildRequires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
BuildRequires: (php-composer(sebastian/type) >= 2.1.1 with php-composer(sebastian/type) < 3)
BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
BuildRequires: php-dom
BuildRequires: php-json
BuildRequires: php-mbstring
@ -78,26 +78,26 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0
# "ext-mbstring": "*",
# "ext-xml": "*",
# "ext-xmlwriter": "*",
# "doctrine/instantiator": "^1.2.0",
# "myclabs/deep-copy": "^1.9.1",
# "doctrine/instantiator": "^1.3.1",
# "myclabs/deep-copy": "^1.9.5",
# "phar-io/manifest": "^1.0.3",
# "phar-io/version": "^2.0.1",
# "phpspec/prophecy": "^1.8.1",
# "phpunit/php-code-coverage": "^8.0.1",
# "phpunit/php-file-iterator": "^3.0",
# "phpunit/php-invoker": "^3.0",
# "phpunit/php-text-template": "^2.0",
# "phpunit/php-timer": "^5.0",
# "sebastian/code-unit": "^1.0.2",
# "sebastian/comparator": "^4.0",
# "sebastian/diff": "^4.0",
# "sebastian/environment": "^5.0.1",
# "sebastian/exporter": "^4.0",
# "phpspec/prophecy": "^1.10.3",
# "phpunit/php-code-coverage": "^8.0.2",
# "phpunit/php-file-iterator": "^3.0.3",
# "phpunit/php-invoker": "^3.0.2",
# "phpunit/php-text-template": "^2.0.2",
# "phpunit/php-timer": "^5.0.1",
# "sebastian/code-unit": "^1.0.5",
# "sebastian/comparator": "^4.0.3",
# "sebastian/diff": "^4.0.1",
# "sebastian/environment": "^5.1.2",
# "sebastian/exporter": "^4.0.2",
# "sebastian/global-state": "^4.0",
# "sebastian/object-enumerator": "^4.0",
# "sebastian/resource-operations": "^3.0",
# "sebastian/type": "^2.1",
# "sebastian/version": "^3.0"
# "sebastian/object-enumerator": "^4.0.2",
# "sebastian/resource-operations": "^3.0.2",
# "sebastian/type": "^2.1.1",
# "sebastian/version": "^3.0.1"
Requires: php(language) >= 7.3
Requires: php-cli
Requires: php-dom
@ -106,26 +106,26 @@ Requires: php-libxml
Requires: php-mbstring
Requires: php-xml
Requires: php-xmlwriter
Requires: (php-composer(doctrine/instantiator) >= 1.2.0 with php-composer(doctrine/instantiator) < 2)
Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-composer(myclabs/deep-copy) < 2)
Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2)
Requires: (php-composer(myclabs/deep-copy) >= 1.9.6 with php-composer(myclabs/deep-copy) < 2)
Requires: (php-composer(phar-io/manifest) >= 1.0.3 with php-composer(phar-io/manifest) < 2)
Requires: (php-composer(phar-io/version) >= 2.0.1 with php-composer(phar-io/version) < 3)
Requires: (php-composer(phpspec/prophecy) >= 1.8.1 with php-composer(phpspec/prophecy) < 2)
Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-composer(phpunit/php-code-coverage) < 9)
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) >= 5.0 with php-composer(phpunit/php-timer) < 6)
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)
Requires: (php-composer(sebastian/environment) >= 5.0.1 with php-composer(sebastian/environment) < 6)
Requires: (php-composer(sebastian/exporter) >= 4.0 with php-composer(sebastian/exporter) < 5)
Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2)
Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.2 with php-composer(phpunit/php-code-coverage) < 9)
Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4)
Requires: (php-composer(phpunit/php-invoker) >= 3.0.2 with php-composer(phpunit/php-invoker) < 4)
Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
Requires: (php-composer(phpunit/php-timer) >= 5.0.1 with php-composer(phpunit/php-timer) < 6)
Requires: (php-composer(sebastian/code-unit) >= 1.0.5 with php-composer(sebastian/code-unit) < 2)
Requires: (php-composer(sebastian/comparator) >= 4.0.3 with php-composer(sebastian/comparator) < 5)
Requires: (php-composer(sebastian/diff) >= 4.0.1 with php-composer(sebastian/diff) < 5)
Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
Requires: (php-composer(sebastian/exporter) >= 4.0.2 with php-composer(sebastian/exporter) < 5)
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.1 with php-composer(sebastian/type) < 3)
Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
Requires: (php-composer(sebastian/object-enumerator) >= 4.0.2 with php-composer(sebastian/object-enumerator) < 5)
Requires: (php-composer(sebastian/resource-operations) >= 3.0.2 with php-composer(sebastian/resource-operations) < 4)
Requires: (php-composer(sebastian/type) >= 2.1.1 with php-composer(sebastian/type) < 3)
Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
# From composer.json, "suggest": {
# "ext-soap": "*",
# "ext-xdebug": "*"
@ -184,14 +184,8 @@ cat << 'EOF' | tee -a src/autoload.php
'%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php',
'%{php_home}/SebastianBergmann/Type2/autoload.php',
'%{php_home}/SebastianBergmann/Version3/autoload.php',
[
'%{php_home}/Doctrine/Instantiator11/autoload.php',
'%{php_home}/Doctrine/Instantiator/autoload.php',
],
[
'%{php_home}/DeepCopy19/autoload.php',
'%{php_home}/DeepCopy/autoload.php',
],
'%{php_home}/Doctrine/Instantiator/autoload.php',
'%{php_home}/DeepCopy/autoload.php',
'%{php_home}/PharIo/Manifest/autoload.php',
'%{php_home}/PharIo/Version/autoload.php',
__DIR__ . '/Framework/Assert/Functions.php',
@ -210,6 +204,7 @@ cat src/autoload.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' \
--exclude 'tests/end-to-end/regression/GitHub/2448/Test.php' \
tests
@ -245,6 +240,11 @@ exit $ret
%changelog
* Tue Jul 14 2020 Remi Collet <remi@remirepo.net> - 9.2.6-1
- update to 9.2.6
- raise dependency on latest minor version available
for all libraries
* Mon Jun 22 2020 Remi Collet <remi@remirepo.net> - 9.2.5-1
- update to 9.2.5
- raise dependency on phpunit/php-timer 5.0

View file

@ -1 +1 @@
SHA512 (phpunit9-9.2.5-ad7cc5e.tgz) = 3e7281091f9a5de466099ccd9a317016511f41c7c9c12d383f6bdd9947f8933b40e79b2a037ed52559aae69faf0a9368955d93011f4adec212cd821d351b1000
SHA512 (phpunit9-9.2.6-1c6a9e4.tgz) = cadc1ddfee700a7d4a72135221a969b9db0c4d602c66cc35e4321ae838f1052facc40c40571466ed58061713f7e70e6e28fb4831838cf601cf3e4240d04cf04d