diff --git a/.gitignore b/.gitignore index f000b96..cff5d82 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,9 @@ clog /phpunit8-8.5.5-63dda3b.tgz /phpunit8-8.5.6-3f9c407.tgz /phpunit8-8.5.8-34c18ba.tgz +/phpunit8-8.5.9-f5c8a5d.tgz +/phpunit8-8.5.11-3123601.tgz +/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-rpm.patch b/phpunit8-rpm.patch index 8b70cbd..f4e4c9f 100644 --- a/phpunit8-rpm.patch +++ b/phpunit8-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2019-02-01 06:41:59.000000000 +0100 -+++ ./phpunit 2019-02-01 08:43:27.079804951 +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 2019-02-01 06:41:59.000000000 +0100 -+++ ./src/Util/Configuration.php 2019-02-01 08:43:27.079804951 +0100 -@@ -899,7 +899,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__')) { - $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; + if (defined('__PHPUNIT_PHAR_ROOT__')) { + $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2019-02-01 08:43:27.080804957 +0100 -+++ ./tests/bootstrap.php 2019-02-01 08:44:59.691284599 +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 5f2b9be..ebf627c 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,10 +11,10 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 34c18baa6a44f1d1fbf0338907139e9dce95b997 +%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.8 -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 @@ -41,19 +43,19 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.2 -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(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) >= 7.0.7 with php-composer(phpunit/php-code-coverage) < 8) +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/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-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/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) -BuildRequires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) -BuildRequires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 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/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) @@ -70,26 +72,26 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": "^7.2", +# "php": ">=7.2", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", # "ext-mbstring": "*", # "ext-xml": "*", # "ext-xmlwriter": "*", -# "doctrine/instantiator": "^1.2.0", -# "myclabs/deep-copy": "^1.9.1", -# "phar-io/manifest": "^1.0.3", -# "phar-io/version": "^2.0.1", -# "phpspec/prophecy": "^1.8.1", -# "phpunit/php-code-coverage": "^7.0.7", +# "doctrine/instantiator": "^1.3.1", +# "myclabs/deep-copy": "^1.10.0", +# "phar-io/manifest": "^2.0.1", +# "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-text-template": "^1.2.1", # "phpunit/php-timer": "^2.1.2", # "sebastian/comparator": "^3.0.2", # "sebastian/diff": "^3.0.2", -# "sebastian/environment": "^4.2.2", -# "sebastian/exporter": "^3.1.1", +# "sebastian/environment": "^4.2.3", +# "sebastian/exporter": "^3.1.2", # "sebastian/global-state": "^3.0.0", # "sebastian/object-enumerator": "^3.0.3", # "sebastian/resource-operations": "^2.0.1", @@ -103,19 +105,19 @@ 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(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) >= 7.0.7 with php-composer(phpunit/php-code-coverage) < 8) +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/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-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/diff) >= 3.0.2 with php-composer(sebastian/diff) < 4) -Requires: (php-composer(sebastian/environment) >= 4.2.2 with php-composer(sebastian/environment) < 5) -Requires: (php-composer(sebastian/exporter) >= 3.1.1 with php-composer(sebastian/exporter) < 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/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) @@ -177,17 +179,11 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/ResourceOperations2/autoload.php', '%{php_home}/SebastianBergmann/Type/autoload.php', '%{php_home}/SebastianBergmann/Version/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}/SebastianBergmann/Invoker/autoload.php', - '%{php_home}/PharIo/Manifest/autoload.php', - '%{php_home}/PharIo/Version/autoload.php', + '%{php_home}/PharIo/Manifest2/autoload.php', + '%{php_home}/PharIo/Version3/autoload.php', ]); // Extensions \Fedora\Autoloader\Dependencies::optional( @@ -237,6 +233,33 @@ 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 + +* Tue Dec 1 2020 Remi Collet - 8.5.13-1 +- update to 8.5.13 + +* Mon Nov 30 2020 Remi Collet - 8.5.12-1 +- update to 8.5.12 +- raise dependency on phar-io/manifest 2.0.1 +- raise dependency on phar-io/version 3.0.2 + +* Fri Nov 27 2020 Remi Collet - 8.5.11-1 +- update to 8.5.11 +- raise dependency on phpunit/php-code-coverage 7.0.12 + +* Tue Nov 10 2020 Remi Collet - 8.5.9-1 +- update to 8.5.9 +- raise dependency on doctrine/instantiator 1.3.1 +- raise dependency on myclabs/deep-copy 1.10.0 +- raise dependency on phpspec/prophecy 1.10.3 +- raise dependency on phpunit/php-code-coverage 7.0.10 +- raise dependency on sebastian/environment 4.2.2 +- raise dependency on sebastian/exporter 3.1.2 + * Mon Jun 22 2020 Remi Collet - 8.5.8-1 - update to 8.5.8 diff --git a/sources b/sources index 0714d80..657224a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit8-8.5.8-34c18ba.tgz) = 27d70638c60e8951d090bab61f7cb4017e7479930dc7dd83b708bffe23ba4c49b647d3ce2f73b01bf92d81a1cb0c56025ece999dae31076a71117ddda3dc7506 +SHA512 (phpunit8-8.5.15-038d419.tgz) = 365b77b4784aa24d9b30caedd92e3811df2333749ef84fd848f3be49a03bd90cdfd5a00f29f5d126712c35337c374b0d625ff46f5fe65854039c394ffa416a04