From 90e626942cafb3c9e07413cc194a7a3c18b31e6f Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 4 Feb 2021 06:49:50 +0100 Subject: [PATCH 1/8] v8.5.14 (cherry picked from commit 7f3d2baddd3fe42e09b6011fdc88a05fe4f369f5) --- .gitignore | 1 + phpunit8-rpm.patch | 18 +++++++++--------- phpunit8.spec | 9 ++++++--- sources | 2 +- 4 files changed, 17 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index 23a4c56..95b3fa2 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ clog /phpunit8-8.5.11-3123601.tgz /phpunit8-8.5.12-f40cf5b.tgz /phpunit8-8.5.13-8e86be3.tgz +/phpunit8-8.5.14-c25f798.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index b66a4d2..f4e4c9f 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-11-10 16:52:55.000000000 +0100 -+++ ./phpunit 2020-11-10 16:58:06.470107562 +0100 +--- ./phpunit.rpm 2021-02-03 14:04:11.000000000 +0100 ++++ ./phpunit 2021-02-03 14:04:57.662439204 +0100 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -44,20 +44,20 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2020-11-10 16:58:06.470107562 +0100 -+++ ./src/Util/Configuration.php 2020-11-10 16:59:17.462913118 +0100 -@@ -903,7 +903,7 @@ final class Configuration +--- ./src/Util/Configuration.php.rpm 2021-02-03 14:04:57.662439204 +0100 ++++ ./src/Util/Configuration.php 2021-02-03 14:06:08.876097281 +0100 +@@ -929,7 +929,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { - $original = \libxml_use_internal_errors(true); + $original = libxml_use_internal_errors(true); - $xsdFilename = __DIR__ . '/../../phpunit.xsd'; + $xsdFilename = __DIR__ . '/../phpunit.xsd'; - if (\defined('__PHPUNIT_PHAR_ROOT__')) { + if (defined('__PHPUNIT_PHAR_ROOT__')) { $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-11-10 16:52:55.000000000 +0100 -+++ ./tests/bootstrap.php 2020-11-10 16:58:06.470107562 +0100 +--- ./tests/bootstrap.php.rpm 2021-02-03 14:04:11.000000000 +0100 ++++ ./tests/bootstrap.php 2021-02-03 14:04:57.662439204 +0100 @@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) { \ini_set('precision', '14'); \ini_set('serialize_precision', '14'); diff --git a/phpunit8.spec b/phpunit8.spec index a0089dc..150031b 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -1,6 +1,6 @@ # remirepo/fedora spec file for phpunit8 # -# Copyright (c) 2010-2020 Remi Collet +# Copyright (c) 2010-2021 Remi Collet # # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 8e86be391a58104ef86037ba8a846524528d784e +%global gh_commit c25f79895d27b6ecd5abfa63de1606b786a461a3 #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: 8.5.13 +Version: 8.5.14 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} @@ -231,6 +231,9 @@ exit $ret %changelog +* Wed Feb 3 2021 Remi Collet - 8.5.14-1 +- update to 8.5.14 + * Tue Dec 1 2020 Remi Collet - 8.5.13-1 - update to 8.5.13 diff --git a/sources b/sources index 6a55d8a..ef34862 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.13-8e86be3.tgz) = bc2e9a4ecd8ef26c55faa9a439cdb5be95b0825f73785a20e03bea40457ce68c44a82da297327f46ffbe309f230e345e2d3546f9590cdcc932f8cdd1aa8cfefb +SHA512 (phpunit8-8.5.14-c25f798.tgz) = 406a84b619741308396e400da75c7b29f04bfe05c02017819749305044781afb6bf615bd6d8e4f458a4f0108557d39f9694d59ed4fd24f626d69af8300256018 From e4dc5b4c29ad1a168c10bff9c239aed3a9de508e Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 17 Mar 2021 10:21:13 +0100 Subject: [PATCH 2/8] v8.5.15 (cherry picked from commit b54a71ac0ad05eed8c21a1b9c5e6708508dc7247) --- .gitignore | 1 + makesrc.sh | 36 ++++++++++++++++++++---------------- phpunit8.spec | 19 ++++++++++++------- sources | 2 +- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.gitignore b/.gitignore index 95b3fa2..cff5d82 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ clog /phpunit8-8.5.12-f40cf5b.tgz /phpunit8-8.5.13-8e86be3.tgz /phpunit8-8.5.14-c25f798.tgz +/phpunit8-8.5.15-038d419.tgz diff --git a/makesrc.sh b/makesrc.sh index 8152336..3580b58 100755 --- a/makesrc.sh +++ b/makesrc.sh @@ -1,28 +1,32 @@ #!/bin/bash NAME=$(basename $PWD) -OWNER=$(sed -n '/^%global gh_vendor/{s/.* //;p}' $NAME.spec) +OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) COMMIT=$(sed -n '/^%global gh_commit/{s/.* //;p}' $NAME.spec) SHORT=${COMMIT:0:7} -echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" +if [ -f $NAME-$VERSION-$SHORT.tgz ]; then + echo "$NAME-$VERSION-$SHORT.tgz already there" +else + echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION\n" -echo "Cloning..." -rm -rf $PROJECT-$COMMIT -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT + echo "Cloning..." + rm -rf $PROJECT-$COMMIT + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit1 + cp composer.json ../composer.json + popd -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + echo "Archiving..." + tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT -echo "Done." + echo "Done." +fi diff --git a/phpunit8.spec b/phpunit8.spec index 150031b..56a56d4 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,10 +11,10 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c25f79895d27b6ecd5abfa63de1606b786a461a3 +%global gh_commit 038d4196d8e8cb405cd5e82cedfe413ad6eef9ef #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) -%global gh_vendor sebastianbergmann +%global gh_owner sebastianbergmann %global gh_project phpunit # Packagist %global pk_vendor phpunit @@ -24,16 +24,18 @@ %global php_home %{_datadir}/php %global ver_major 8 %global ver_minor 5 -%global specrel 1 + +%global upstream_version 8.5.15 +#global upstream_prever dev Name: %{pk_project}%{ver_major} -Version: 8.5.14 -Release: %{?gh_date:1%{specrel}.%{?prever}%{!?prever:%{gh_date}git%{gh_short}}}%{!?gh_date:%{specrel}}%{?dist} +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} +Release: 1%{?dist} Summary: The PHP Unit Testing framework version %{ver_major} License: BSD -URL: https://github.com/%{gh_vendor}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz +URL: https://github.com/%{gh_owner}/%{gh_project} +Source0: %{name}-%{upstream_version}-%{gh_short}.tgz Source1: makesrc.sh # Fix command for autoload @@ -231,6 +233,9 @@ exit $ret %changelog +* Wed Mar 17 2021 Remi Collet - 8.5.15-1 +- update to 8.5.15 + * Wed Feb 3 2021 Remi Collet - 8.5.14-1 - update to 8.5.14 diff --git a/sources b/sources index ef34862..657224a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.14-c25f798.tgz) = 406a84b619741308396e400da75c7b29f04bfe05c02017819749305044781afb6bf615bd6d8e4f458a4f0108557d39f9694d59ed4fd24f626d69af8300256018 +SHA512 (phpunit8-8.5.15-038d419.tgz) = 365b77b4784aa24d9b30caedd92e3811df2333749ef84fd848f3be49a03bd90cdfd5a00f29f5d126712c35337c374b0d625ff46f5fe65854039c394ffa416a04 From e80b8b78250343c881635863e8e54894fd33f387 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 7 Jun 2021 07:46:36 +0200 Subject: [PATCH 3/8] v8.5.16 (cherry picked from commit f3d6cd2ea39930a479c2af9429d6652813d9448f) --- .gitignore | 1 + phpunit8-rpm.patch | 29 ++++++++++++++++++----------- phpunit8.spec | 7 +++++-- sources | 2 +- 4 files changed, 25 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index cff5d82..1eb8383 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ clog /phpunit8-8.5.13-8e86be3.tgz /phpunit8-8.5.14-c25f798.tgz /phpunit8-8.5.15-038d419.tgz +/phpunit8-8.5.16-cc66f2f.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index f4e4c9f..530819f 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-02-03 14:04:11.000000000 +0100 -+++ ./phpunit 2021-02-03 14:04:57.662439204 +0100 +--- ./phpunit.rpm 2021-06-07 07:13:03.000000000 +0200 ++++ ./phpunit 2021-06-07 07:13:10.372992677 +0200 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2021-02-03 14:04:57.662439204 +0100 -+++ ./src/Util/Configuration.php 2021-02-03 14:06:08.876097281 +0100 +--- ./src/Util/Configuration.php.rpm 2021-06-07 07:13:03.000000000 +0200 ++++ ./src/Util/Configuration.php 2021-06-07 07:13:10.372992677 +0200 @@ -929,7 +929,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { @@ -56,14 +56,21 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php if (defined('__PHPUNIT_PHAR_ROOT__')) { $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-02-03 14:04:11.000000000 +0100 -+++ ./tests/bootstrap.php 2021-02-03 14:04:57.662439204 +0100 -@@ -14,4 +14,9 @@ if (!\defined('TEST_FILES_PATH')) { - \ini_set('precision', '14'); - \ini_set('serialize_precision', '14'); +--- ./tests/bootstrap.php.rpm 2021-06-07 07:13:10.372992677 +0200 ++++ ./tests/bootstrap.php 2021-06-07 07:15:29.571502817 +0200 +@@ -8,7 +8,7 @@ + * file that was distributed with this source code. + */ + if (!defined('PHPUNIT_COMPOSER_INSTALL')) { +- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); ++ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); + } --require_once __DIR__ . '/../vendor/autoload.php'; -+require_once '@PATH@/autoload.php'; + if (!defined('TEST_FILES_PATH')) { +@@ -19,3 +19,8 @@ ini_set('precision', '14'); + ini_set('serialize_precision', '14'); + + require_once PHPUNIT_COMPOSER_INSTALL; +require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; +require_once __DIR__ . '/_files/CoveredFunction.php'; +require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; diff --git a/phpunit8.spec b/phpunit8.spec index 56a56d4..79d65a4 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 038d4196d8e8cb405cd5e82cedfe413ad6eef9ef +%global gh_commit cc66f2fc61296be66c99931a862200e7456b9a01 #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.15 +%global upstream_version 8.5.16 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Mon Jun 7 2021 Remi Collet - 8.5.16-1 +- update to 8.5.16 + * Wed Mar 17 2021 Remi Collet - 8.5.15-1 - update to 8.5.15 diff --git a/sources b/sources index 657224a..23acff3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.15-038d419.tgz) = 365b77b4784aa24d9b30caedd92e3811df2333749ef84fd848f3be49a03bd90cdfd5a00f29f5d126712c35337c374b0d625ff46f5fe65854039c394ffa416a04 +SHA512 (phpunit8-8.5.16-cc66f2f.tgz) = 05e3972106da1670977497751424831a3e6c817e94b470ac1aab2de5e683c53dc19f3757bdd31fb7085ea883f578001d54364d06dce4ac593c2f94dcc8185c75 From 212f7511fd95b80e3753c8a7efeef162778a8451 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 23 Jun 2021 09:21:59 +0200 Subject: [PATCH 4/8] v8.5.17 (cherry picked from commit 4205266d379810af4999fee6d2ac75d10c951b44) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1eb8383..b09aa10 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ clog /phpunit8-8.5.14-c25f798.tgz /phpunit8-8.5.15-038d419.tgz /phpunit8-8.5.16-cc66f2f.tgz +/phpunit8-8.5.17-7906785.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 79d65a4..17c2dc7 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit cc66f2fc61296be66c99931a862200e7456b9a01 +%global gh_commit 79067856d85421c56d413bd238d4e2cd6b0e54da #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.16 +%global upstream_version 8.5.17 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Wed Jun 23 2021 Remi Collet - 8.5.17-1 +- update to 8.5.17 + * Mon Jun 7 2021 Remi Collet - 8.5.16-1 - update to 8.5.16 diff --git a/sources b/sources index 23acff3..bc5ced2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.16-cc66f2f.tgz) = 05e3972106da1670977497751424831a3e6c817e94b470ac1aab2de5e683c53dc19f3757bdd31fb7085ea883f578001d54364d06dce4ac593c2f94dcc8185c75 +SHA512 (phpunit8-8.5.17-7906785.tgz) = 19a40afa2b97d0d593747185ed9d38864820e0371bb5318ecc996119c2a5a7114e0ad7e67bcc54f10176a4c689b2b8d89eb19da179f027a3f2be47f8951de15f From a84202d66fcc7369dbdbc00ab9a5f59bcc7cecdb Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 19 Jul 2021 14:10:08 +0200 Subject: [PATCH 5/8] v8.5.18 (cherry picked from commit 6db24b184565c3456acd1702a4dc1eebb6eb5a59) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b09aa10..24b8a2b 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ clog /phpunit8-8.5.15-038d419.tgz /phpunit8-8.5.16-cc66f2f.tgz /phpunit8-8.5.17-7906785.tgz +/phpunit8-8.5.18-bd5fc77.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 17c2dc7..7f54cbb 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 79067856d85421c56d413bd238d4e2cd6b0e54da +%global gh_commit bd5fc77c869e8dd65040dacbad170f074c13796c #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.17 +%global upstream_version 8.5.18 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Mon Jul 19 2021 Remi Collet - 8.5.18-1 +- update to 8.5.18 + * Wed Jun 23 2021 Remi Collet - 8.5.17-1 - update to 8.5.17 diff --git a/sources b/sources index bc5ced2..816424a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.17-7906785.tgz) = 19a40afa2b97d0d593747185ed9d38864820e0371bb5318ecc996119c2a5a7114e0ad7e67bcc54f10176a4c689b2b8d89eb19da179f027a3f2be47f8951de15f +SHA512 (phpunit8-8.5.18-bd5fc77.tgz) = 284a3b0c5ae2041585230c26ef068323ba5540a1cf817fa50584159c67218b2500c90b664d8254acfd8e00c3e4cd3aefe9e879a6e80693e8b5816ab9bb402423 From 41b785bb6aa8ed663f00a6eb276999ef86885cd0 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 2 Aug 2021 09:35:21 +0200 Subject: [PATCH 6/8] update to 8.5.19 raise dependency on phar-io/manifest 2.0.3 raise dependency on phpunit/php-file-iterator 2.0.4 (cherry picked from commit 3fb51192c08418ca6ed689e6ec7b93002ce8333c) (cherry picked from commit b626eb3b6f591ceb34a8e5fa4d6c790c83a296b5) --- .gitignore | 1 + phpunit8-rpm.patch | 57 +++++++++++++++++++++++++++------------------- phpunit8.spec | 21 ++++++++++------- sources | 2 +- 4 files changed, 49 insertions(+), 32 deletions(-) diff --git a/.gitignore b/.gitignore index 24b8a2b..e650502 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ clog /phpunit8-8.5.16-cc66f2f.tgz /phpunit8-8.5.17-7906785.tgz /phpunit8-8.5.18-bd5fc77.tgz +/phpunit8-8.5.19-496281b.tgz diff --git a/phpunit8-rpm.patch b/phpunit8-rpm.patch index 530819f..12bef82 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,7 +1,7 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2021-06-07 07:13:03.000000000 +0200 -+++ ./phpunit 2021-06-07 07:13:10.372992677 +0200 -@@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { +--- ./phpunit.rpm 2021-08-02 08:27:58.000000000 +0200 ++++ ./phpunit 2021-08-02 08:34:41.313976887 +0200 +@@ -58,25 +58,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -33,7 +33,7 @@ diff -up ./phpunit.rpm ./phpunit } $options = getopt('', array('prepend:')); -@@ -58,4 +45,8 @@ unset($options); +@@ -89,4 +76,8 @@ unset($options); require PHPUNIT_COMPOSER_INSTALL; @@ -44,8 +44,8 @@ diff -up ./phpunit.rpm ./phpunit + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php ---- ./src/Util/Configuration.php.rpm 2021-06-07 07:13:03.000000000 +0200 -+++ ./src/Util/Configuration.php 2021-06-07 07:13:10.372992677 +0200 +--- ./src/Util/Configuration.php.rpm 2021-08-02 08:27:58.000000000 +0200 ++++ ./src/Util/Configuration.php 2021-08-02 08:34:40.070979790 +0200 @@ -929,7 +929,7 @@ final class Configuration private function validateConfigurationAgainstSchema(): void { @@ -56,23 +56,34 @@ diff -up ./src/Util/Configuration.php.rpm ./src/Util/Configuration.php if (defined('__PHPUNIT_PHAR_ROOT__')) { $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2021-06-07 07:13:10.372992677 +0200 -+++ ./tests/bootstrap.php 2021-06-07 07:15:29.571502817 +0200 -@@ -8,7 +8,7 @@ - * file that was distributed with this source code. +--- ./tests/bootstrap.php.rpm 2021-08-02 08:27:58.000000000 +0200 ++++ ./tests/bootstrap.php 2021-08-02 08:44:30.257601265 +0200 +@@ -9,8 +9,8 @@ */ - if (!defined('PHPUNIT_COMPOSER_INSTALL')) { -- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); -+ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); + const TEST_FILES_PATH = __DIR__ . DIRECTORY_SEPARATOR . '_files' . DIRECTORY_SEPARATOR; + +-$composer = file_exists(__DIR__ . '/../vendor/autoload.php'); +-$phar = file_exists(__DIR__ . '/autoload.php'); ++$composer = true; ++$phar = false; + + if ($composer && $phar) { + print 'More than one test fixture autoloader is available, exiting.' . PHP_EOL; +@@ -26,10 +26,15 @@ if (!$composer && !$phar) { + + if ($composer) { + if (!defined('PHPUNIT_COMPOSER_INSTALL')) { +- define('PHPUNIT_COMPOSER_INSTALL', dirname(__DIR__) . '/vendor/autoload.php'); ++ define('PHPUNIT_COMPOSER_INSTALL', '@PATH@/autoload.php'); + } + +- require_once __DIR__ . '/../vendor/autoload.php'; ++ require_once PHPUNIT_COMPOSER_INSTALL; ++ require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; ++ require_once __DIR__ . '/_files/CoveredFunction.php'; ++ require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; ++ require_once '@PATH@//Framework/Assert/Functions.php'; ++ require_once __DIR__ . '/autoload.php'; } - if (!defined('TEST_FILES_PATH')) { -@@ -19,3 +19,8 @@ ini_set('precision', '14'); - ini_set('serialize_precision', '14'); - - require_once PHPUNIT_COMPOSER_INSTALL; -+require_once __DIR__ . '/_files/CoverageNamespacedFunctionTest.php'; -+require_once __DIR__ . '/_files/CoveredFunction.php'; -+require_once __DIR__ . '/_files/NamespaceCoveredFunction.php'; -+require_once '@PATH@/Framework/Assert/Functions.php'; -+require_once __DIR__ . '/autoload.php'; + if ($phar) { diff --git a/phpunit8.spec b/phpunit8.spec index 7f54cbb..cd4caa0 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit bd5fc77c869e8dd65040dacbad170f074c13796c +%global gh_commit 496281b64ec781856ed0a583483b5923b4033722 #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.18 +%global upstream_version 8.5.19 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -45,11 +45,11 @@ BuildArch: noarch BuildRequires: php(language) >= 7.2 BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) -BuildRequires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) +BuildRequires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) BuildRequires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) BuildRequires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) BuildRequires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) +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) @@ -81,11 +81,11 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.3.1", # "myclabs/deep-copy": "^1.10.0", -# "phar-io/manifest": "^2.0.1", +# "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.2", +# "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", @@ -107,11 +107,11 @@ Requires: php-xml Requires: php-xmlwriter Requires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) Requires: (php-composer(myclabs/deep-copy) >= 1.10.0 with php-composer(myclabs/deep-copy) < 2) -Requires: (php-composer(phar-io/manifest) >= 2.0.1 with php-composer(phar-io/manifest) < 3) +Requires: (php-composer(phar-io/manifest) >= 2.0.3 with php-composer(phar-io/manifest) < 3) Requires: (php-composer(phar-io/version) >= 3.0.2 with php-composer(phar-io/version) < 4) Requires: (php-composer(phpspec/prophecy) >= 1.10.3 with php-composer(phpspec/prophecy) < 2) Requires: (php-composer(phpunit/php-code-coverage) >= 7.0.12 with php-composer(phpunit/php-code-coverage) < 8) -Requires: (php-composer(phpunit/php-file-iterator) >= 2.0.2 with php-composer(phpunit/php-file-iterator) < 3) +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) @@ -233,6 +233,11 @@ exit $ret %changelog +* Mon Aug 2 2021 Remi Collet - 8.5.19-1 +- update to 8.5.19 +- raise dependency on phar-io/manifest 2.0.3 +- raise dependency on phpunit/php-file-iterator 2.0.4 + * Mon Jul 19 2021 Remi Collet - 8.5.18-1 - update to 8.5.18 diff --git a/sources b/sources index 816424a..071cb90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.18-bd5fc77.tgz) = 284a3b0c5ae2041585230c26ef068323ba5540a1cf817fa50584159c67218b2500c90b664d8254acfd8e00c3e4cd3aefe9e879a6e80693e8b5816ab9bb402423 +SHA512 (phpunit8-8.5.19-496281b.tgz) = 5c0e03be73ce40d347266379dd70d615926ef5a0350bfea013c2952e0deb46aec876cbd24408180a45c0150716495d1394450149b40c7dfe8dc7faa8ba104233 From 042ac5d157967671622e72c64447f07376a3decd Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 1 Sep 2021 15:01:16 +0200 Subject: [PATCH 7/8] v8.5.20 (cherry picked from commit 87c5760237c4995664e025172e44766918ceaed6) --- .gitignore | 1 + phpunit8.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e650502..c4eed13 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ clog /phpunit8-8.5.17-7906785.tgz /phpunit8-8.5.18-bd5fc77.tgz /phpunit8-8.5.19-496281b.tgz +/phpunit8-8.5.20-9deefba.tgz diff --git a/phpunit8.spec b/phpunit8.spec index cd4caa0..89093ce 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 496281b64ec781856ed0a583483b5923b4033722 +%global gh_commit 9deefba183198398a09b927a6ac6bc1feb0b7b70 #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.19 +%global upstream_version 8.5.20 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -216,7 +216,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 php72 php73 php74 php80; do +for cmd in php php72 php73 php74 php80 php81; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -233,6 +233,9 @@ exit $ret %changelog +* Wed Sep 1 2021 Remi Collet - 8.5.20-1 +- update to 8.5.20 + * Mon Aug 2 2021 Remi Collet - 8.5.19-1 - update to 8.5.19 - raise dependency on phar-io/manifest 2.0.3 diff --git a/sources b/sources index 071cb90..7254dae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.19-496281b.tgz) = 5c0e03be73ce40d347266379dd70d615926ef5a0350bfea013c2952e0deb46aec876cbd24408180a45c0150716495d1394450149b40c7dfe8dc7faa8ba104233 +SHA512 (phpunit8-8.5.20-9deefba.tgz) = 9af814f55440efb2592a509641755cbef83ee03aa783ccad7ff6370c8b3b0d21b9b8da3d01976210c804375ac00d7939863a8426491a28541bd419c41b0b93fc From ee75966681c65544c01b003d13ce736fd8cd7164 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 27 Sep 2021 07:02:12 +0200 Subject: [PATCH 8/8] v8.5.21 (cherry picked from commit c425089c0ea0d0b8f494d7c37ac75523756d6ddc) --- .gitignore | 1 + phpunit8.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c4eed13..deadda5 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ clog /phpunit8-8.5.18-bd5fc77.tgz /phpunit8-8.5.19-496281b.tgz /phpunit8-8.5.20-9deefba.tgz +/phpunit8-8.5.21-50a58a6.tgz diff --git a/phpunit8.spec b/phpunit8.spec index 89093ce..4db7e71 100644 --- a/phpunit8.spec +++ b/phpunit8.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 9deefba183198398a09b927a6ac6bc1feb0b7b70 +%global gh_commit 50a58a60b85947b0bee4c8ecfe0f4bbdcf20e984 #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.20 +%global upstream_version 8.5.21 #global upstream_prever dev Name: %{pk_project}%{ver_major} @@ -233,6 +233,9 @@ exit $ret %changelog +* Mon Sep 27 2021 Remi Collet - 8.5.21-1 +- update to 8.5.21 + * Wed Sep 1 2021 Remi Collet - 8.5.20-1 - update to 8.5.20 diff --git a/sources b/sources index 7254dae..226fae1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.20-9deefba.tgz) = 9af814f55440efb2592a509641755cbef83ee03aa783ccad7ff6370c8b3b0d21b9b8da3d01976210c804375ac00d7939863a8426491a28541bd419c41b0b93fc +SHA512 (phpunit8-8.5.21-50a58a6.tgz) = 300514111a18da6af56d9e322ad88c1b13992da631078ed468743ba06a7fd2fa60fd85d77b3845e5c521881c1c29579e8f5688835c90719b9ca8bccac73b16ab