diff --git a/.gitignore b/.gitignore index 2583c85..5c1622d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,7 @@ /phpunit9-9.0.1-68d7e5b.tar.gz +/phpunit9-9.0.2-c0ecbfb.tar.gz +/phpunit9-9.1.3-a747804.tar.gz +/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 diff --git a/makesrc.sh b/makesrc.sh new file mode 100755 index 0000000..8152336 --- /dev/null +++ b/makesrc.sh @@ -0,0 +1,28 @@ +#!/bin/bash + +NAME=$(basename $PWD) +OWNER=$(sed -n '/^%global gh_vendor/{s/.* //;p}' $NAME.spec) +PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^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" + +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 "Archiving..." +tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs --exclude tools $PROJECT-$COMMIT + +echo "Cleaning..." +rm -rf $PROJECT-$COMMIT + +echo "Done." diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 62091a4..5984d82 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -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'); diff --git a/phpunit9.spec b/phpunit9.spec index c922b58..97779de 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 68d7e5b17a6b9461e17c00446caa409863154f76 +%global gh_commit 1c6a9e4312e209e659f1fce3ce88dd197c2448f6 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,43 +23,44 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 0 -%global ver_patch 1 +%global ver_minor 2 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: %{ver_major}.%{ver_minor}.%{ver_patch} +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} License: BSD URL: https://github.com/%{gh_vendor}/%{gh_project} -Source0: https://github.com/%{gh_vendor}/%{gh_project}/archive/%{gh_commit}/%{name}-%{version}-%{gh_short}.tar.gz +Source0: %{name}-%{version}-%{gh_short}.tgz +Source1: makesrc.sh # Fix command for autoload 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 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) >= 3.0 with php-composer(phpunit/php-timer) < 4) -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 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.0 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 @@ -77,24 +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": "^7.0.7", -# "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/global-state": "^3.0.0", -# "sebastian/object-enumerator": "^3.0.3", -# "sebastian/resource-operations": "^2.0.1", -# "sebastian/type": "^1.1.3", -# "sebastian/version": "^2.0.1", +# "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.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 @@ -103,25 +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 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) >= 3.0 with php-composer(phpunit/php-timer) < 4) -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 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.0 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": "*" @@ -167,8 +171,9 @@ 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/Timer5/autoload.php', '%{php_home}/Prophecy/autoload.php', + '%{php_home}/SebastianBergmann/CodeUnit/autoload.php', '%{php_home}/SebastianBergmann/Invoker3/autoload.php', '%{php_home}/SebastianBergmann/Diff4/autoload.php', '%{php_home}/SebastianBergmann/Comparator4/autoload.php', @@ -179,18 +184,16 @@ 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', ]); +// Extensions +\Fedora\Autoloader\Dependencies::optional( + glob("%{php_home}/%{ns_vendor}/Extensions/*/autoload.php") +); EOF cat src/autoload.php @@ -200,12 +203,15 @@ 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' \ + --exclude 'tests/end-to-end/regression/GitHub/2448/Test.php' \ tests %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} +mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} install -p -m 644 phpunit.xsd %{buildroot}%{php_home}/%{ns_vendor}/phpunit.xsd @@ -217,7 +223,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 php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then $cmd ./phpunit $OPT --verbose || ret=1 fi @@ -234,6 +240,35 @@ exit $ret %changelog +* Tue Jul 14 2020 Remi Collet - 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 - 9.2.5-1 +- update to 9.2.5 +- raise dependency on phpunit/php-timer 5.0 +- raise dependency on sebastian/type 2.1 + +* Sat May 23 2020 Remi Collet - 9.1.5-1 +- update to 9.1.5 +- sources from git snapshot + +* Thu Apr 30 2020 Remi Collet - 9.1.4-1 +- update to 9.1.4 +- raise dependency on sebastian/code-unit 1.0.2 + +* Thu Apr 23 2020 Remi Collet - 9.1.3-1 +- update to 9.1.3 +- raise dependency on phpunit/php-timer 3.1.4 +- add dependency on sebastian/code-unit + +* Tue Mar 31 2020 Remi Collet - 9.0.2-1 +- update to 9.0.2 +- own /usr/share/php/PHPUnit9/Extensions +- raise dependency on phpunit/php-code-coverage 8.0.1 +- raise dependency on sebastian/environment 5.0.1 + * Fri Feb 14 2020 Remi Collet - 9.0.1-1 - update to 9.0.1 diff --git a/sources b/sources index dd847f2..0d04592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.0.1-68d7e5b.tar.gz) = da752e2cb9e6bc27afee7ff1d0cb2c45f587e6e60a7905ea308a19691b422ab3419cb761f271e2b127943b2e456df9ac3c64bc9cb427be40fe301d4609e4295e +SHA512 (phpunit9-9.2.6-1c6a9e4.tgz) = cadc1ddfee700a7d4a72135221a969b9db0c4d602c66cc35e4321ae838f1052facc40c40571466ed58061713f7e70e6e28fb4831838cf601cf3e4240d04cf04d