From 4c1a7789c583903b2b4eefad38d663f9779e2dde Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 31 Mar 2020 11:47:03 +0200 Subject: [PATCH 1/8] 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 (cherry picked from commit 21a4aa0ea7422ace3df1f53ec4e6a425e8cd1ecc) --- .gitignore | 1 + phpunit9.spec | 50 +++++++++++++++++++++++++++++++------------------- sources | 2 +- 3 files changed, 33 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 2583c85..33805a7 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /phpunit9-9.0.1-68d7e5b.tar.gz +/phpunit9-9.0.2-c0ecbfb.tar.gz diff --git a/phpunit9.spec b/phpunit9.spec index c922b58..6bccc65 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 c0ecbfb898ab8b24d8a59a23520f7b2a73e27b5b #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 9 %global ver_minor 0 -%global ver_patch 1 +%global ver_patch 2 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -46,14 +46,14 @@ BuildRequires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-c 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-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) >= 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/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(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) @@ -82,19 +82,20 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "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", +# "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": "^3.0", +# "sebastian/comparator": "^4.0", +# "sebastian/diff": "^4.0", +# "sebastian/environment": "^5.0.1", +# "sebastian/exporter": "^4.0", +# "sebastian/global-state": "^4.0", +# "sebastian/object-enumerator": "^4.0", +# "sebastian/resource-operations": "^3.0", +# "sebastian/type": "^2.0", +# "sebastian/version": "^3.0" Requires: php(language) >= 7.3 Requires: php-cli Requires: php-dom @@ -108,14 +109,14 @@ Requires: (php-composer(myclabs/deep-copy) >= 1.9.1 with php-c 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-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) >= 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/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(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) @@ -191,6 +192,10 @@ cat << 'EOF' | tee -a src/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 @@ -206,6 +211,7 @@ cat src/autoload.php %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 @@ -234,6 +240,12 @@ exit $ret %changelog +* 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..3ce5125 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.0.1-68d7e5b.tar.gz) = da752e2cb9e6bc27afee7ff1d0cb2c45f587e6e60a7905ea308a19691b422ab3419cb761f271e2b127943b2e456df9ac3c64bc9cb427be40fe301d4609e4295e +SHA512 (phpunit9-9.0.2-c0ecbfb.tar.gz) = d03885e0bfee9b2a6acd42af0f9869e9daa2c2faf11948fff2a5bf4148f46e003b73410fe7d0c1b31f1ec73266e5c3abdf1b759fdea10417ca79ab9302a126af From 9909cb9e0895d4016e400a8a49b729cf4e1301f5 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 24 Apr 2020 07:47:18 +0200 Subject: [PATCH 2/8] update to 9.1.3 raise dependency on phpunit/php-timer 3.1.4 add dependency on sebastian/code-unit (cherry picked from commit efaf444cbffcbbd1de3e8ea08edd83cd4f29c5ff) --- .gitignore | 1 + phpunit9.spec | 23 ++++++++++++++++------- sources | 2 +- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 33805a7..4e51a5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /phpunit9-9.0.1-68d7e5b.tar.gz /phpunit9-9.0.2-c0ecbfb.tar.gz +/phpunit9-9.1.3-a747804.tar.gz diff --git a/phpunit9.spec b/phpunit9.spec index 6bccc65..3d35109 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit c0ecbfb898ab8b24d8a59a23520f7b2a73e27b5b +%global gh_commit a74780472172957a65cb5999a597e8c0878cf39c #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,8 +23,8 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 0 -%global ver_patch 2 +%global ver_minor 1 +%global ver_patch 3 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -50,7 +50,8 @@ BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-c 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(phpunit/php-timer) >= 3.1.4 with php-composer(phpunit/php-timer) < 4) +BuildRequires: (php-composer(sebastian/code-unit) >= 1.0 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) @@ -86,7 +87,8 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-file-iterator": "^3.0", # "phpunit/php-invoker": "^3.0", # "phpunit/php-text-template": "^2.0", -# "phpunit/php-timer": "^3.0", +# "phpunit/php-timer": "^3.1.4", +# "sebastian/code-unit": "^1.0", # "sebastian/comparator": "^4.0", # "sebastian/diff": "^4.0", # "sebastian/environment": "^5.0.1", @@ -113,7 +115,8 @@ Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-c 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(phpunit/php-timer) >= 3.1.4 with php-composer(phpunit/php-timer) < 4) +Requires: (php-composer(sebastian/code-unit) >= 1.0 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) @@ -170,6 +173,7 @@ cat << 'EOF' | tee -a src/autoload.php '%{php_home}/SebastianBergmann/Template2/autoload.php', '%{php_home}/SebastianBergmann/Timer3/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', @@ -223,7 +227,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 @@ -240,6 +244,11 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 3ce5125..9b4808b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.0.2-c0ecbfb.tar.gz) = d03885e0bfee9b2a6acd42af0f9869e9daa2c2faf11948fff2a5bf4148f46e003b73410fe7d0c1b31f1ec73266e5c3abdf1b759fdea10417ca79ab9302a126af +SHA512 (phpunit9-9.1.3-a747804.tar.gz) = 5285ec86f8755b737f863fd833b9cb2b603e7f06499866c136f92407c4fe3c38567e275dcc6ce8c13a522b5eec6a0857ac8d4933f6b6a1f03551db75ff5d7f1d From 977519f810dfcae7419609969b41d60010ff36b8 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 30 Apr 2020 10:44:31 +0200 Subject: [PATCH 3/8] update to 9.1.4 raise dependency on sebastian/code-unit 1.0.2 (cherry picked from commit 06a1b75dc59170c8c4f7dc7701b8744d4a13fb2d) --- .gitignore | 1 + phpunit9.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4e51a5f..1580524 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /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 diff --git a/phpunit9.spec b/phpunit9.spec index 3d35109..5034ca3 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit a74780472172957a65cb5999a597e8c0878cf39c +%global gh_commit 2d7080c622cf7884992e7c3cf87853877bae8ff4 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,7 +24,7 @@ %global php_home %{_datadir}/php %global ver_major 9 %global ver_minor 1 -%global ver_patch 3 +%global ver_patch 4 %global specrel 1 Name: %{pk_project}%{ver_major} @@ -51,7 +51,7 @@ BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-c 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.1.4 with php-composer(phpunit/php-timer) < 4) -BuildRequires: (php-composer(sebastian/code-unit) >= 1.0 with php-composer(sebastian/code-unit) < 2) +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) @@ -88,7 +88,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-invoker": "^3.0", # "phpunit/php-text-template": "^2.0", # "phpunit/php-timer": "^3.1.4", -# "sebastian/code-unit": "^1.0", +# "sebastian/code-unit": "^1.0.2", # "sebastian/comparator": "^4.0", # "sebastian/diff": "^4.0", # "sebastian/environment": "^5.0.1", @@ -116,7 +116,7 @@ Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-c 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.1.4 with php-composer(phpunit/php-timer) < 4) -Requires: (php-composer(sebastian/code-unit) >= 1.0 with php-composer(sebastian/code-unit) < 2) +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) @@ -244,6 +244,10 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 9b4808b..537dcbc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.1.3-a747804.tar.gz) = 5285ec86f8755b737f863fd833b9cb2b603e7f06499866c136f92407c4fe3c38567e275dcc6ce8c13a522b5eec6a0857ac8d4933f6b6a1f03551db75ff5d7f1d +SHA512 (phpunit9-9.1.4-2d7080c.tar.gz) = 82466806e42639318db1b93b71eceb4185d5f9570df8bf984635abf618c558b77a02d18f75fca41b624e3a547e0d3abcf63c115dcccb1c2d000f7608f22531ba From 2edee26b494da8bf79ceeb80a61d9b704c925390 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 25 May 2020 09:45:12 +0200 Subject: [PATCH 4/8] update to 9.1.5 sources from git snapshot (cherry picked from commit 1e0211c6c74224c2407bce28f75225741bc9f221) --- .gitignore | 1 + makesrc.sh | 28 ++++++++++++++++++++++++++++ phpunit9.spec | 12 ++++++++---- sources | 2 +- 4 files changed, 38 insertions(+), 5 deletions(-) create mode 100755 makesrc.sh diff --git a/.gitignore b/.gitignore index 1580524..cedb029 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /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 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.spec b/phpunit9.spec index 5034ca3..911a4f5 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 2d7080c622cf7884992e7c3cf87853877bae8ff4 +%global gh_commit 1b570cd7edbe136055bf5f651857dc8af6b829d2 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -24,17 +24,17 @@ %global php_home %{_datadir}/php %global ver_major 9 %global ver_minor 1 -%global ver_patch 4 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: %{ver_major}.%{ver_minor}.%{ver_patch} +Version: 9.1.5 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 @@ -244,6 +244,10 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 537dcbc..4ce2cca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.1.4-2d7080c.tar.gz) = 82466806e42639318db1b93b71eceb4185d5f9570df8bf984635abf618c558b77a02d18f75fca41b624e3a547e0d3abcf63c115dcccb1c2d000f7608f22531ba +SHA512 (phpunit9-9.1.5-1b570cd.tgz) = e7c8977f4de232e59256d7d618b1141abb9d4bdc494394ecfdd0de2acb78b2fc1a05225db332a0bdbef1bd9f7227a1ab252e9a448ac712f318e87631b1158f19 From 6647c1221d0536636110d15b263d624558908739 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Mon, 29 Jun 2020 08:35:01 +0200 Subject: [PATCH 5/8] update to 9.2.5 raise dependency on phpunit/php-timer 5.0 raise dependency on sebastian/type 2.1 (cherry picked from commit 81bd4daf496be16e42dbedf02d1afbd9475f19f2) --- .gitignore | 1 + phpunit9.spec | 26 ++++++++++++++++---------- sources | 2 +- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index cedb029..a1ac9c8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /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 diff --git a/phpunit9.spec b/phpunit9.spec index 911a4f5..175e1c9 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1b570cd7edbe136055bf5f651857dc8af6b829d2 +%global gh_commit ad7cc5ec3ab2597b329880e30442d9054526023b #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,11 +23,11 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 1 +%global ver_minor 2 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 9.1.5 +Version: 9.2.5 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} @@ -50,7 +50,7 @@ BuildRequires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-c 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.1.4 with php-composer(phpunit/php-timer) < 4) +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) @@ -59,7 +59,7 @@ BuildRequires: (php-composer(sebastian/exporter) >= 4.0 with php-c 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/type) >= 2.1 with php-composer(sebastian/type) < 3) BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) BuildRequires: php-dom BuildRequires: php-json @@ -87,7 +87,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "phpunit/php-file-iterator": "^3.0", # "phpunit/php-invoker": "^3.0", # "phpunit/php-text-template": "^2.0", -# "phpunit/php-timer": "^3.1.4", +# "phpunit/php-timer": "^5.0", # "sebastian/code-unit": "^1.0.2", # "sebastian/comparator": "^4.0", # "sebastian/diff": "^4.0", @@ -96,7 +96,7 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "sebastian/global-state": "^4.0", # "sebastian/object-enumerator": "^4.0", # "sebastian/resource-operations": "^3.0", -# "sebastian/type": "^2.0", +# "sebastian/type": "^2.1", # "sebastian/version": "^3.0" Requires: php(language) >= 7.3 Requires: php-cli @@ -115,7 +115,7 @@ Requires: (php-composer(phpunit/php-code-coverage) >= 8.0.1 with php-c 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.1.4 with php-composer(phpunit/php-timer) < 4) +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) @@ -124,7 +124,7 @@ Requires: (php-composer(sebastian/exporter) >= 4.0 with php-c 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/type) >= 2.1 with php-composer(sebastian/type) < 3) Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4) # From composer.json, "suggest": { # "ext-soap": "*", @@ -171,7 +171,7 @@ 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', @@ -209,6 +209,7 @@ 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' \ tests @@ -244,6 +245,11 @@ exit $ret %changelog +* 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 diff --git a/sources b/sources index 4ce2cca..1302298 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.1.5-1b570cd.tgz) = e7c8977f4de232e59256d7d618b1141abb9d4bdc494394ecfdd0de2acb78b2fc1a05225db332a0bdbef1bd9f7227a1ab252e9a448ac712f318e87631b1158f19 +SHA512 (phpunit9-9.2.5-ad7cc5e.tgz) = 3e7281091f9a5de466099ccd9a317016511f41c7c9c12d383f6bdd9947f8933b40e79b2a037ed52559aae69faf0a9368955d93011f4adec212cd821d351b1000 From db6cce91291537b34bdbfe34026bea31000a5b85 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Wed, 15 Jul 2020 11:13:35 +0200 Subject: [PATCH 6/8] update to 9.2.6 raise dependency on latest minor version available for all libraries (cherry picked from commit 2a44177a06992854656dd216ae75513482cca162) --- .gitignore | 1 + phpunit9-rpm.patch | 16 +++--- phpunit9.spec | 122 ++++++++++++++++++++++----------------------- sources | 2 +- 4 files changed, 71 insertions(+), 70 deletions(-) diff --git a/.gitignore b/.gitignore index a1ac9c8..5c1622d 100644 --- a/.gitignore +++ b/.gitignore @@ -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 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 175e1c9..97779de 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -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 - 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 diff --git a/sources b/sources index 1302298..0d04592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.2.5-ad7cc5e.tgz) = 3e7281091f9a5de466099ccd9a317016511f41c7c9c12d383f6bdd9947f8933b40e79b2a037ed52559aae69faf0a9368955d93011f4adec212cd821d351b1000 +SHA512 (phpunit9-9.2.6-1c6a9e4.tgz) = cadc1ddfee700a7d4a72135221a969b9db0c4d602c66cc35e4321ae838f1052facc40c40571466ed58061713f7e70e6e28fb4831838cf601cf3e4240d04cf04d From ec703c1882d74633864588aaed3a12630db718f9 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Aug 2020 08:07:27 +0200 Subject: [PATCH 7/8] update to 9.3.8 add dependency on sebastian/cli-parser raise dependency on phpunit/php-code-coverage 9.1.5 raise dependency on myclabs/deep-copy 1.10.1 raise dependency on phar-io/manifest 2.0.1 raise dependency on phar-io/version 3.0.2 raise dependency on phpspec/prophecy 1.11.1 raise dependency on phpunit/php-file-iterator 3.0.4 raise dependency on phpunit/php-invoker 3.1 raise dependency on sebastian/diff 4.0.2 raise dependency on sebastian/global-state 5.0 raise dependency on sebastian/type 2.2.1 --- .gitignore | 1 + phpunit9-rpm.patch | 29 +++++++------- phpunit9.spec | 97 ++++++++++++++++++++++++++++------------------ sources | 2 +- 4 files changed, 75 insertions(+), 54 deletions(-) diff --git a/.gitignore b/.gitignore index 5c1622d..382913d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /phpunit9-9.1.5-1b570cd.tgz /phpunit9-9.2.5-ad7cc5e.tgz /phpunit9-9.2.6-1c6a9e4.tgz +/phpunit9-9.3.8-93d78d8.tgz diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index 5984d82..b6ccbc5 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-07-14 07:50:32.000000000 +0200 -+++ ./phpunit 2020-07-14 07:59:08.950883697 +0200 +--- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200 ++++ ./phpunit 2020-08-10 12:02:22.089870229 +0200 @@ -27,25 +27,12 @@ if (!ini_get('date.timezone')) { ini_set('date.timezone', 'UTC'); } @@ -43,21 +43,20 @@ diff -up ./phpunit.rpm ./phpunit +} else { + 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-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); -- $xsdFilename = __DIR__ . '/../../../phpunit.xsd'; -+ $xsdFilename = __DIR__ . '/../../phpunit.xsd'; +diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php +--- ./src/Util/Xml/SchemaFinder.php.rpm 2020-08-10 12:02:22.089870229 +0200 ++++ ./src/Util/Xml/SchemaFinder.php 2020-08-10 12:06:11.098559995 +0200 +@@ -48,6 +48,6 @@ final class SchemaFinder + return __PHPUNIT_PHAR_ROOT__ . '/'; + } - if (\defined('__PHPUNIT_PHAR_ROOT__')) { - $xsdFilename = __PHPUNIT_PHAR_ROOT__ . '/phpunit.xsd'; +- return __DIR__ . '/../../../'; ++ return __DIR__ . '/../../'; + } + } diff -up ./tests/bootstrap.php.rpm ./tests/bootstrap.php ---- ./tests/bootstrap.php.rpm 2020-07-14 07:50:32.000000000 +0200 -+++ ./tests/bootstrap.php 2020-07-14 07:59:08.950883697 +0200 +--- ./tests/bootstrap.php.rpm 2020-08-10 12:02:07.000000000 +0200 ++++ ./tests/bootstrap.php 2020-08-10 12:02:22.089870229 +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 97779de..990ea19 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 1c6a9e4312e209e659f1fce3ce88dd197c2448f6 +%global gh_commit 93d78d8e2a06393a0d0c1ead6fe9984f1af1f88c #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,11 +23,11 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 2 +%global ver_minor 3 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 9.2.6 +Version: 9.3.8 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} @@ -42,24 +42,25 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 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.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(myclabs/deep-copy) >= 1.10.1 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.11.1 with php-composer(phpspec/prophecy) < 2) +BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.1.5 with php-composer(phpunit/php-code-coverage) < 10) +BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) +BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 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/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) 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/diff) >= 4.0.2 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/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) 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/type) >= 2.2.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 @@ -71,7 +72,7 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": "^7.3", +# "php": "^7.3 || ^8.0", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", @@ -79,24 +80,25 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xml": "*", # "ext-xmlwriter": "*", # "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.10.3", -# "phpunit/php-code-coverage": "^8.0.2", -# "phpunit/php-file-iterator": "^3.0.3", -# "phpunit/php-invoker": "^3.0.2", +# "myclabs/deep-copy": "^1.10.1", +# "phar-io/manifest": "^2.0.1", +# "phar-io/version": "^3.0.2", +# "phpspec/prophecy": "^1.11.1", +# "phpunit/php-code-coverage": "^9.1.5", +# "phpunit/php-file-iterator": "^3.0.4", +# "phpunit/php-invoker": "^3.1", # "phpunit/php-text-template": "^2.0.2", # "phpunit/php-timer": "^5.0.1", +# "sebastian/cli-parser": "^1.0", # "sebastian/code-unit": "^1.0.5", # "sebastian/comparator": "^4.0.3", -# "sebastian/diff": "^4.0.1", +# "sebastian/diff": "^4.0.2", # "sebastian/environment": "^5.1.2", # "sebastian/exporter": "^4.0.2", -# "sebastian/global-state": "^4.0", +# "sebastian/global-state": "^5.0", # "sebastian/object-enumerator": "^4.0.2", # "sebastian/resource-operations": "^3.0.2", -# "sebastian/type": "^2.1.1", +# "sebastian/type": "^2.2.1", # "sebastian/version": "^3.0.1" Requires: php(language) >= 7.3 Requires: php-cli @@ -107,24 +109,25 @@ Requires: php-mbstring 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.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.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(myclabs/deep-copy) >= 1.10.1 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.11.1 with php-composer(phpspec/prophecy) < 2) +Requires: (php-composer(phpunit/php-code-coverage) >= 9.1.5 with php-composer(phpunit/php-code-coverage) < 10) +Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) +Requires: (php-composer(phpunit/php-invoker) >= 3.1 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/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) 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/diff) >= 4.0.2 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/global-state) >= 5.0 with php-composer(sebastian/global-state) < 6) 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/type) >= 2.2.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": "*", @@ -168,26 +171,27 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage8/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage9/autoload.php', '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', '%{php_home}/SebastianBergmann/Template2/autoload.php', '%{php_home}/SebastianBergmann/Timer5/autoload.php', '%{php_home}/Prophecy/autoload.php', + '%{php_home}/SebastianBergmann/CliParser/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', '%{php_home}/SebastianBergmann/Environment5/autoload.php', '%{php_home}/SebastianBergmann/Exporter4/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState4/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState5/autoload.php', '%{php_home}/SebastianBergmann/ObjectEnumerator4/autoload.php', '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', '%{php_home}/SebastianBergmann/Type2/autoload.php', '%{php_home}/SebastianBergmann/Version3/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', + '%{php_home}/PharIo/Manifest2/autoload.php', + '%{php_home}/PharIo/Version3/autoload.php', __DIR__ . '/Framework/Assert/Functions.php', ]); // Extensions @@ -205,12 +209,15 @@ cat src/autoload.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' \ + --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ + --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.php' \ tests %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} +cp -pr schema %{buildroot}%{php_home}/%{ns_vendor}/schema mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} @@ -240,6 +247,20 @@ exit $ret %changelog +* Thu Aug 27 2020 Remi Collet - 9.3.8-1 +- update to 9.3.8 +- add dependency on sebastian/cli-parser +- raise dependency on phpunit/php-code-coverage 9.1.5 +- raise dependency on myclabs/deep-copy 1.10.1 +- raise dependency on phar-io/manifest 2.0.1 +- raise dependency on phar-io/version 3.0.2 +- raise dependency on phpspec/prophecy 1.11.1 +- raise dependency on phpunit/php-file-iterator 3.0.4 +- raise dependency on phpunit/php-invoker 3.1 +- raise dependency on sebastian/diff 4.0.2 +- raise dependency on sebastian/global-state 5.0 +- raise dependency on sebastian/type 2.2.1 + * Tue Jul 14 2020 Remi Collet - 9.2.6-1 - update to 9.2.6 - raise dependency on latest minor version available diff --git a/sources b/sources index 0d04592..a8f522b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.2.6-1c6a9e4.tgz) = cadc1ddfee700a7d4a72135221a969b9db0c4d602c66cc35e4321ae838f1052facc40c40571466ed58061713f7e70e6e28fb4831838cf601cf3e4240d04cf04d +SHA512 (phpunit9-9.3.8-93d78d8.tgz) = 5f6c8e9110b87006863eb0c24825baedafee63dad1a0727676826d773eb6e1cd91f49150f97caf43b79c4ce924761397df8a4df3d27814381a57c94fde0349ce From 3f7538bd49ea285e0dc5864d43adf930f1b15d9c Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 28 Aug 2020 08:08:15 +0200 Subject: [PATCH 8/8] Revert "update to 9.3.8" This reverts commit ec703c1882d74633864588aaed3a12630db718f9. --- .gitignore | 1 - phpunit9-rpm.patch | 29 +++++++------- phpunit9.spec | 97 ++++++++++++++++++---------------------------- sources | 2 +- 4 files changed, 54 insertions(+), 75 deletions(-) diff --git a/.gitignore b/.gitignore index 382913d..5c1622d 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ /phpunit9-9.1.5-1b570cd.tgz /phpunit9-9.2.5-ad7cc5e.tgz /phpunit9-9.2.6-1c6a9e4.tgz -/phpunit9-9.3.8-93d78d8.tgz diff --git a/phpunit9-rpm.patch b/phpunit9-rpm.patch index b6ccbc5..5984d82 100644 --- a/phpunit9-rpm.patch +++ b/phpunit9-rpm.patch @@ -1,6 +1,6 @@ diff -up ./phpunit.rpm ./phpunit ---- ./phpunit.rpm 2020-08-10 12:02:07.000000000 +0200 -+++ ./phpunit 2020-08-10 12:02:22.089870229 +0200 +--- ./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'); } @@ -43,20 +43,21 @@ diff -up ./phpunit.rpm ./phpunit +} else { + PHPUnit\TextUI\Command::main(); // PHPUnit v6 or newer +} -diff -up ./src/Util/Xml/SchemaFinder.php.rpm ./src/Util/Xml/SchemaFinder.php ---- ./src/Util/Xml/SchemaFinder.php.rpm 2020-08-10 12:02:22.089870229 +0200 -+++ ./src/Util/Xml/SchemaFinder.php 2020-08-10 12:06:11.098559995 +0200 -@@ -48,6 +48,6 @@ final class SchemaFinder - return __PHPUNIT_PHAR_ROOT__ . '/'; - } +diff -up ./src/TextUI/Configuration/Loader.php.rpm ./src/TextUI/Configuration/Loader.php +--- ./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); +- $xsdFilename = __DIR__ . '/../../../phpunit.xsd'; ++ $xsdFilename = __DIR__ . '/../../phpunit.xsd'; -- return __DIR__ . '/../../../'; -+ return __DIR__ . '/../../'; - } - } + 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-08-10 12:02:07.000000000 +0200 -+++ ./tests/bootstrap.php 2020-08-10 12:02:22.089870229 +0200 +--- ./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 990ea19..97779de 100644 --- a/phpunit9.spec +++ b/phpunit9.spec @@ -11,7 +11,7 @@ # For compatibility with SCL %undefine __brp_mangle_shebangs -%global gh_commit 93d78d8e2a06393a0d0c1ead6fe9984f1af1f88c +%global gh_commit 1c6a9e4312e209e659f1fce3ce88dd197c2448f6 #global gh_date 20150927 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_vendor sebastianbergmann @@ -23,11 +23,11 @@ %global ns_vendor PHPUnit9 %global php_home %{_datadir}/php %global ver_major 9 -%global ver_minor 3 +%global ver_minor 2 %global specrel 1 Name: %{pk_project}%{ver_major} -Version: 9.3.8 +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} @@ -42,25 +42,24 @@ Patch0: %{name}-rpm.patch BuildArch: noarch BuildRequires: php(language) >= 7.3 BuildRequires: (php-composer(doctrine/instantiator) >= 1.3.1 with php-composer(doctrine/instantiator) < 2) -BuildRequires: (php-composer(myclabs/deep-copy) >= 1.10.1 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.11.1 with php-composer(phpspec/prophecy) < 2) -BuildRequires: (php-composer(phpunit/php-code-coverage) >= 9.1.5 with php-composer(phpunit/php-code-coverage) < 10) -BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) -BuildRequires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) +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.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/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) 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.2 with php-composer(sebastian/diff) < 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) >= 5.0 with php-composer(sebastian/global-state) < 6) +BuildRequires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) 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.2.1 with php-composer(sebastian/type) < 3) +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 @@ -72,7 +71,7 @@ BuildRequires: php-xmlwriter BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # From composer.json, "require": { -# "php": "^7.3 || ^8.0", +# "php": "^7.3", # "ext-dom": "*", # "ext-json": "*", # "ext-libxml": "*", @@ -80,25 +79,24 @@ BuildRequires: php-fedora-autoloader-devel >= 1.0.0 # "ext-xml": "*", # "ext-xmlwriter": "*", # "doctrine/instantiator": "^1.3.1", -# "myclabs/deep-copy": "^1.10.1", -# "phar-io/manifest": "^2.0.1", -# "phar-io/version": "^3.0.2", -# "phpspec/prophecy": "^1.11.1", -# "phpunit/php-code-coverage": "^9.1.5", -# "phpunit/php-file-iterator": "^3.0.4", -# "phpunit/php-invoker": "^3.1", +# "myclabs/deep-copy": "^1.9.5", +# "phar-io/manifest": "^1.0.3", +# "phar-io/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/cli-parser": "^1.0", # "sebastian/code-unit": "^1.0.5", # "sebastian/comparator": "^4.0.3", -# "sebastian/diff": "^4.0.2", +# "sebastian/diff": "^4.0.1", # "sebastian/environment": "^5.1.2", # "sebastian/exporter": "^4.0.2", -# "sebastian/global-state": "^5.0", +# "sebastian/global-state": "^4.0", # "sebastian/object-enumerator": "^4.0.2", # "sebastian/resource-operations": "^3.0.2", -# "sebastian/type": "^2.2.1", +# "sebastian/type": "^2.1.1", # "sebastian/version": "^3.0.1" Requires: php(language) >= 7.3 Requires: php-cli @@ -109,25 +107,24 @@ Requires: php-mbstring 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.1 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.11.1 with php-composer(phpspec/prophecy) < 2) -Requires: (php-composer(phpunit/php-code-coverage) >= 9.1.5 with php-composer(phpunit/php-code-coverage) < 10) -Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.4 with php-composer(phpunit/php-file-iterator) < 4) -Requires: (php-composer(phpunit/php-invoker) >= 3.1 with php-composer(phpunit/php-invoker) < 4) +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.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/cli-parser) >= 1.0 with php-composer(sebastian/cli-parser) < 2) 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.2 with php-composer(sebastian/diff) < 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) >= 5.0 with php-composer(sebastian/global-state) < 6) +Requires: (php-composer(sebastian/global-state) >= 4.0 with php-composer(sebastian/global-state) < 5) 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.2.1 with php-composer(sebastian/type) < 3) +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": "*", @@ -171,27 +168,26 @@ find . -name \*.rpm -delete -print cat << 'EOF' | tee -a src/autoload.php // Dependencies \Fedora\Autoloader\Dependencies::required([ - '%{php_home}/SebastianBergmann/CodeCoverage9/autoload.php', + '%{php_home}/SebastianBergmann/CodeCoverage8/autoload.php', '%{php_home}/SebastianBergmann/FileIterator3/autoload.php', '%{php_home}/SebastianBergmann/Template2/autoload.php', '%{php_home}/SebastianBergmann/Timer5/autoload.php', '%{php_home}/Prophecy/autoload.php', - '%{php_home}/SebastianBergmann/CliParser/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', '%{php_home}/SebastianBergmann/Environment5/autoload.php', '%{php_home}/SebastianBergmann/Exporter4/autoload.php', - '%{php_home}/SebastianBergmann/GlobalState5/autoload.php', + '%{php_home}/SebastianBergmann/GlobalState4/autoload.php', '%{php_home}/SebastianBergmann/ObjectEnumerator4/autoload.php', '%{php_home}/SebastianBergmann/ResourceOperations3/autoload.php', '%{php_home}/SebastianBergmann/Type2/autoload.php', '%{php_home}/SebastianBergmann/Version3/autoload.php', '%{php_home}/Doctrine/Instantiator/autoload.php', '%{php_home}/DeepCopy/autoload.php', - '%{php_home}/PharIo/Manifest2/autoload.php', - '%{php_home}/PharIo/Version3/autoload.php', + '%{php_home}/PharIo/Manifest/autoload.php', + '%{php_home}/PharIo/Version/autoload.php', __DIR__ . '/Framework/Assert/Functions.php', ]); // Extensions @@ -209,15 +205,12 @@ cat src/autoload.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' \ - --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/src/Greeter.php' \ - --exclude 'tests/end-to-end/migration/possibility-to-migrate-from-85-is-detected/tests/GreeterTest.php' \ tests %install mkdir -p %{buildroot}%{php_home} cp -pr src %{buildroot}%{php_home}/%{ns_vendor} -cp -pr schema %{buildroot}%{php_home}/%{ns_vendor}/schema mkdir %{buildroot}%{php_home}/%{ns_vendor}/Extensions install -D -p -m 755 phpunit %{buildroot}%{_bindir}/%{name} @@ -247,20 +240,6 @@ exit $ret %changelog -* Thu Aug 27 2020 Remi Collet - 9.3.8-1 -- update to 9.3.8 -- add dependency on sebastian/cli-parser -- raise dependency on phpunit/php-code-coverage 9.1.5 -- raise dependency on myclabs/deep-copy 1.10.1 -- raise dependency on phar-io/manifest 2.0.1 -- raise dependency on phar-io/version 3.0.2 -- raise dependency on phpspec/prophecy 1.11.1 -- raise dependency on phpunit/php-file-iterator 3.0.4 -- raise dependency on phpunit/php-invoker 3.1 -- raise dependency on sebastian/diff 4.0.2 -- raise dependency on sebastian/global-state 5.0 -- raise dependency on sebastian/type 2.2.1 - * Tue Jul 14 2020 Remi Collet - 9.2.6-1 - update to 9.2.6 - raise dependency on latest minor version available diff --git a/sources b/sources index a8f522b..0d04592 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (phpunit9-9.3.8-93d78d8.tgz) = 5f6c8e9110b87006863eb0c24825baedafee63dad1a0727676826d773eb6e1cd91f49150f97caf43b79c4ce924761397df8a4df3d27814381a57c94fde0349ce +SHA512 (phpunit9-9.2.6-1c6a9e4.tgz) = cadc1ddfee700a7d4a72135221a969b9db0c4d602c66cc35e4321ae838f1052facc40c40571466ed58061713f7e70e6e28fb4831838cf601cf3e4240d04cf04d