summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-08-10 14:52:02 +0200
committerRemi Collet <remi@remirepo.net>2020-08-10 14:52:02 +0200
commitce3bca428b27e1c55ed85dfc0e3475e735260348 (patch)
treeb19aa030569ae50322e2e4b2e60b316e12c6eb4a
parent12774e53b732cc6ea8000d0a3234d36477d76cd8 (diff)
update to 9.1.2
-rw-r--r--composer.json23
-rw-r--r--php-phpunit-php-code-coverage9.spec146
2 files changed, 103 insertions, 66 deletions
diff --git a/composer.json b/composer.json
index 1c8abd0..95721a9 100644
--- a/composer.json
+++ b/composer.json
@@ -28,19 +28,22 @@
},
"prefer-stable": true,
"require": {
- "php": "^7.3",
+ "php": "^7.3 || ^8.0",
"ext-dom": "*",
+ "ext-libxml": "*",
"ext-xmlwriter": "*",
- "phpunit/php-file-iterator": "^3.0",
- "phpunit/php-token-stream": "^4.0",
- "phpunit/php-text-template": "^2.0",
- "sebastian/code-unit-reverse-lookup": "^2.0",
- "sebastian/environment": "^5.0",
- "sebastian/version": "^3.0",
- "theseer/tokenizer": "^1.1.3"
+ "nikic/php-parser": "^4.7",
+ "phpunit/php-file-iterator": "^3.0.3",
+ "phpunit/php-text-template": "^2.0.2",
+ "sebastian/code-unit-reverse-lookup": "^2.0.2",
+ "sebastian/complexity": "^2.0",
+ "sebastian/environment": "^5.1.2",
+ "sebastian/lines-of-code": "^1.0",
+ "sebastian/version": "^3.0.1",
+ "theseer/tokenizer": "^1.2.0"
},
"require-dev": {
- "phpunit/phpunit": "^9.0"
+ "phpunit/phpunit": "^9.3"
},
"suggest": {
"ext-pcov": "*",
@@ -59,7 +62,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "8.0-dev"
+ "dev-master": "9.1-dev"
}
}
}
diff --git a/php-phpunit-php-code-coverage9.spec b/php-phpunit-php-code-coverage9.spec
index 2b2b960..3596ee9 100644
--- a/php-phpunit-php-code-coverage9.spec
+++ b/php-phpunit-php-code-coverage9.spec
@@ -1,4 +1,4 @@
-# remirepo/fedora spec file for php-phpunit-php-code-coverage8
+# remirepo/fedora spec file for php-phpunit-php-code-coverage9
#
# Copyright (c) 2013-2020 Remi Collet
# License: CC-BY-SA
@@ -7,9 +7,14 @@
# Please, preserve the changelog entries
#
-%global bootstrap 0
+%bcond_with bootstrap
+%if %{with bootstrap}
+%bcond_with tests
+%else
+%bcond_without tests
+%endif
# Github
-%global gh_commit ca6647ffddd2add025ab3f21644a441d7c146cdc
+%global gh_commit 5210f9269e44e6d34419cb92242ef11aee9351ac
#global gh_date 20150924
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_vendor sebastianbergmann
@@ -21,15 +26,10 @@
%global ns_vendor SebastianBergmann
%global ns_project CodeCoverage
%global php_home %{_datadir}/php
-%global ver_major 8
-%if %{bootstrap}
-%global with_tests 0%{?_with_tests:1}
-%else
-%global with_tests 0%{!?_without_tests:1}
-%endif
+%global ver_major 9
Name: php-%{pk_vendor}-%{pk_project}%{ver_major}
-Version: 8.0.2
+Version: 9.1.2
Release: 1%{?dist}
Summary: PHP code coverage information
@@ -44,75 +44,89 @@ Source1: makesrc.sh
BuildArch: noarch
BuildRequires: php-fedora-autoloader-devel >= 1.0.0
-%if %{with_tests}
+%if %{with tests}
BuildRequires: php(language) >= 7.3
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
-BuildRequires: (php-composer(phpunit/php-token-stream) >= 4.0 with php-composer(phpunit/php-token-stream) < 5)
-BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3)
-BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0 with php-composer(sebastian/code-unit-reverse-lookup) < 3)
-BuildRequires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6)
-BuildRequires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
-BuildRequires: (php-composer(theseer/tokenizer) >= 1.1.3 with php-composer(theseer/tokenizer) < 2)
-# remirepo:9
+BuildRequires: (php-composer(nikic/php-parser) >= 4.7 with php-composer(nikic/php-parser) < 5)
+BuildRequires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4)
+BuildRequires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
+BuildRequires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.2 with php-composer(sebastian/code-unit-reverse-lookup) < 3)
+BuildRequires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3)
+BuildRequires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
+BuildRequires: (php-composer(sebastian/lines-of-code) >= 1.0 with php-composer(sebastian/lines-of-code) < 2)
+BuildRequires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
+BuildRequires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2)
+# remirepo:11
%else
-BuildRequires: php-phpunit-php-file-iterator3
-BuildRequires: php-phpunit-php-token-stream4
-BuildRequires: php-phpunit-php-text-template2
-BuildRequires: php-sebastian-code-unit-reverse-lookup2
-BuildRequires: php-sebastian-environment5
-BuildRequires: php-sebastian-version3
-BuildRequires: php-theseer-tokenizer >= 1.1.3
+BuildRequires: php-nikic-php-parser4 >= 4.7
+BuildRequires: php-phpunit-php-file-iterator3 >= 3.0.3
+BuildRequires: php-phpunit-php-text-template2 >= 2.0.2
+BuildRequires: php-sebastian-code-unit-reverse-lookup2 >= 2.0.2
+BuildRequires: php-sebastian-complexity >= 2.0.0
+BuildRequires: php-sebastian-environment5 >= 5.1.2
+BuildRequires: php-sebastian-lines-of-code >= 1.0
+BuildRequires: php-sebastian-version3 >= 3.0.1
+BuildRequires: php-theseer-tokenizer >= 1.2.0
%endif
# From composer.json, "require-dev": {
-# "phpunit/phpunit": "^9.0"
-# TODO test suite passes with v8, switch to v9 when available
-BuildRequires: phpunit8
+# "phpunit/phpunit": "^9.3"
+# TODO test suite passes with v9.2, switch to v9.3 when available
+BuildRequires: phpunit9
BuildRequires: php-pecl-xdebug
%endif
# From composer.json, require
# "php": "^7.3",
+# "php": "^7.3 || ^8.0",
# "ext-dom": "*",
+# "ext-libxml": "*",
# "ext-xmlwriter": "*",
-# "phpunit/php-file-iterator": "^3.0",
-# "phpunit/php-token-stream": "^4.0",
-# "phpunit/php-text-template": "^2.0",
-# "sebastian/code-unit-reverse-lookup": "^2.0",
-# "sebastian/environment": "^5.0",
-# "sebastian/version": "^3.0",
-# "theseer/tokenizer": "^1.1.3"
+# "nikic/php-parser": "^4.7",
+# "phpunit/php-file-iterator": "^3.0.3",
+# "phpunit/php-text-template": "^2.0.2",
+# "sebastian/code-unit-reverse-lookup": "^2.0.2",
+# "sebastian/complexity": "^2.0",
+# "sebastian/environment": "^5.1.2",
+# "sebastian/lines-of-code": "^1.0",
+# "sebastian/version": "^3.0.1",
+# "theseer/tokenizer": "^1.2.0"
Requires: php(language) >= 7.3
Requires: php-dom
+Requires: php-libxml
Requires: php-xmlwriter
# remirepo:1
%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Requires: (php-composer(phpunit/php-file-iterator) >= 3.0 with php-composer(phpunit/php-file-iterator) < 4)
-Requires: (php-composer(phpunit/php-token-stream) >= 4.0 with php-composer(phpunit/php-token-stream) < 5)
-Requires: (php-composer(phpunit/php-text-template) >= 2.0 with php-composer(phpunit/php-text-template) < 3)
-Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0 with php-composer(sebastian/code-unit-reverse-lookup) < 3)
-Requires: (php-composer(sebastian/environment) >= 5.0 with php-composer(sebastian/environment) < 6)
-Requires: (php-composer(sebastian/version) >= 3.0 with php-composer(sebastian/version) < 4)
-Requires: (php-composer(theseer/tokenizer) >= 1.1.3 with php-composer(theseer/tokenizer) < 2)
+Requires: (php-composer(nikic/php-parser) >= 4.7 with php-composer(nikic/php-parser) < 5)
+Requires: (php-composer(phpunit/php-file-iterator) >= 3.0.3 with php-composer(phpunit/php-file-iterator) < 4)
+Requires: (php-composer(phpunit/php-text-template) >= 2.0.2 with php-composer(phpunit/php-text-template) < 3)
+Requires: (php-composer(sebastian/code-unit-reverse-lookup) >= 2.0.2 with php-composer(sebastian/code-unit-reverse-lookup) < 3)
+Requires: (php-composer(sebastian/complexity) >= 2.0 with php-composer(sebastian/complexity) < 3)
+Requires: (php-composer(sebastian/environment) >= 5.1.2 with php-composer(sebastian/environment) < 6)
+Requires: (php-composer(sebastian/lines-of-code) >= 1.0 with php-composer(sebastian/lines-of-code) < 2)
+Requires: (php-composer(sebastian/version) >= 3.0.1 with php-composer(sebastian/version) < 4)
+Requires: (php-composer(theseer/tokenizer) >= 1.2.0 with php-composer(theseer/tokenizer) < 2)
# From composer.json, suggest
# "ext-pcov": "*",
# "ext-xdebug": "*"
Suggests: php-xdebug
Recommends: php-pcov
-# remirepo:9
+# remirepo:11
%else
-Requires: php-phpunit-php-file-iterator3
-Requires: php-phpunit-php-token-stream4
-Requires: php-phpunit-php-text-template2
-Requires: php-sebastian-code-unit-reverse-lookup2
-Requires: php-sebastian-environment5
-Requires: php-sebastian-version3
-Requires: php-theseer-tokenizer >= 1.1.3
+Requires: php-nikic-php-parser4 >= 4.7
+Requires: php-phpunit-php-file-iterator3 >= 3.0.3
+Requires: php-phpunit-php-text-template2 >= 2.0.2
+Requires: php-sebastian-code-unit-reverse-lookup2 >= 2.0.2
+Requires: php-sebastian-complexity >= 2.0.0
+Requires: php-sebastian-environment5 >= 5.1.2
+Requires: php-sebastian-lines-of-code >= 1.0
+Requires: php-sebastian-version3 >= 3.0.1
+Requires: php-theseer-tokenizer >= 1.2.0
%endif
-# From phpcompatinfo report for version 8.0.0
+# From phpcompatinfo report for version 9.0.0
Requires: php-reflection
Requires: php-date
+Requires: php-hash
Requires: php-json
Requires: php-spl
Requires: php-tokenizer
@@ -148,11 +162,13 @@ Autoloader: %{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php
cat << 'EOF' | tee -a src/autoload.php
\Fedora\Autoloader\Dependencies::required([
+ '%{php_home}/PhpParser4/autoload.php',
'%{php_home}/%{ns_vendor}/FileIterator3/autoload.php',
- '%{php_home}/%{ns_vendor}/PhpTokenStream4/autoload.php',
'%{php_home}/%{ns_vendor}/Template2/autoload.php',
'%{php_home}/%{ns_vendor}/CodeUnitReverseLookup2/autoload.php',
+ '%{php_home}/%{ns_vendor}/Complexity/autoload.php',
'%{php_home}/%{ns_vendor}/Environment5/autoload.php',
+ '%{php_home}/%{ns_vendor}/LinesOfCode/autoload.php',
'%{php_home}/%{ns_vendor}/Version3/autoload.php',
'%{php_home}/TheSeer/Tokenizer/autoload.php',
]);
@@ -165,7 +181,7 @@ mkdir -p %{buildroot}%{php_home}/%{ns_vendor}
cp -pr src %{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}
-%if %{with_tests}
+%if %{with tests}
%check
if ! php -v | grep Xdebug
then EXT="-d zend_extension=xdebug.so"
@@ -179,11 +195,11 @@ define('TEST_FILES_PATH', __DIR__ . '/_files/');
EOF
ret=0
-for cmd in php php73 php74 php80; do
+for cmd in php php73 php74; do
if which $cmd; then
$cmd $EXT \
-d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{ver_major}/autoload.php \
- %{_bindir}/phpunit8 \
+ %{_bindir}/phpunit9 \
--verbose || ret=1
fi
done
@@ -202,6 +218,24 @@ exit $ret
%changelog
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 9.1.2-1
+- update to 9.1.2
+
+* Mon Aug 10 2020 Remi Collet <remi@remirepo.net> - 9.1.1-1
+- update to 9.1.1
+- rename to php-phpunit-php-code-coverage9
+- move to /usr/share/php/SebastianBergmann/CodeCoverage9
+- add dependency on nikic/php-parser 4.7
+- add dependency on sebastian/complexity 2.0
+- add dependency on sebastian/lines-of-code 1.0
+- drop dependency on phpunit/php-token-stream
+- raise dependency on phpunit/php-file-iterator 3.0.3
+- raise dependency on phpunit/php-text-template 2.0.2
+- raise dependency on sebastian/code-unit-reverse-lookup 2.0.2
+- raise dependency on sebastian/environment 5.1.2
+- raise dependency on sebastian/version 3.0.1
+- raise dependency on theseer/tokenizer 1.2.0
+
* Sun May 24 2020 Remi Collet <remi@remirepo.net> - 8.0.2-1
- update to 8.0.2
- sources from git snapshot