summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2020-02-07 10:56:48 +0100
committerRemi Collet <remi@remirepo.net>2020-02-07 10:56:48 +0100
commitad57c466ad432961dbd64e9f0c7c0538c71acd67 (patch)
treebfe53d5a88393adaafcb1c11a8544009cb5693f2
parentad54d49e817e6dfb3300f81829beeafab0591df5 (diff)
update to 4.0.0
raise dependency on PHP 7.3 rename to php-phpunit-php-token-stream4 move to /usr/share/php/SebastianBergmann/PhpTokenStream4
-rw-r--r--composer.json9
-rw-r--r--php-phpunit-php-token-stream4.spec33
2 files changed, 26 insertions, 16 deletions
diff --git a/composer.json b/composer.json
index f50e937..dddf196 100644
--- a/composer.json
+++ b/composer.json
@@ -16,13 +16,16 @@
},
"prefer-stable": true,
"require": {
- "php": "^7.1",
+ "php": "^7.3",
"ext-tokenizer": "*"
},
"require-dev": {
- "phpunit/phpunit": "^7.0"
+ "phpunit/phpunit": "^9.0"
},
"config": {
+ "platform": {
+ "php": "7.3.0"
+ },
"optimize-autoloader": true,
"sort-packages": true
},
@@ -33,7 +36,7 @@
},
"extra": {
"branch-alias": {
- "dev-master": "3.1-dev"
+ "dev-master": "4.0-dev"
}
}
}
diff --git a/php-phpunit-php-token-stream4.spec b/php-phpunit-php-token-stream4.spec
index eca263f..0586edb 100644
--- a/php-phpunit-php-token-stream4.spec
+++ b/php-phpunit-php-token-stream4.spec
@@ -1,6 +1,6 @@
-# remirepo/fedora spec file for php-phpunit-php-token-stream3
+# remirepo/fedora spec file for php-phpunit-php-token-stream4
#
-# Copyright (c) 2010-2019 Christof Damian, Remi Collet
+# Copyright (c) 2010-2020 Christof Damian, Remi Collet
#
# License: MIT
# http://opensource.org/licenses/MIT
@@ -8,13 +8,13 @@
# Please, preserve the changelog entries
#
%global bootstrap 0
-%global gh_commit 995192df77f63a59e47f025390d2d1fdf8f425ff
+%global gh_commit b2560a0c33f7710e4d7f8780964193e8e8f8effe
%global gh_short %(c=%{gh_commit}; echo ${c:0:7})
%global gh_owner sebastianbergmann
%global gh_project php-token-stream
%global pk_vendor phpunit
%global pk_project %{gh_project}
-%global major 3
+%global major 4
%global php_home %{_datadir}/php
# Fake NS for directory layout
%global ns_vendor SebastianBergmann
@@ -26,7 +26,7 @@
%endif
Name: php-%{pk_vendor}-%{pk_project}%{major}
-Version: 3.1.1
+Version: 4.0.0
Release: 1%{?dist}
Summary: Wrapper around PHP tokenizer extension
@@ -37,21 +37,22 @@ Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit
BuildArch: noarch
BuildRequires: php-fedora-autoloader-devel
%if %{with_tests}
-BuildRequires: php(language) >= 7.1
+BuildRequires: php(language) >= 7.3
BuildRequires: php-tokenizer
-# from composer.json, "require-dev": {
-# "phpunit/phpunit": "^7.0"
-BuildRequires: phpunit7
BuildRequires: php-pcre
BuildRequires: php-spl
+# from composer.json, "require-dev": {
+# "phpunit/phpunit": "^9.0"
+# TODO test suite passes with v8, switch to v9 when available
+BuildRequires: phpunit8
%endif
# from composer.json
# "php": "^7.1",
# "ext-tokenizer": "*"
-Requires: php(language) >= 7.1
+Requires: php(language) >= 7.3
Requires: php-tokenizer
-# from phpcompatinfo report for version 2.0.1
+# from phpcompatinfo report for version 4.0.0
Requires: php-pcre
Requires: php-spl
# Autoloader
@@ -87,10 +88,10 @@ touch vendor/autoload.php
: Run upstream test suite
ret=0
-for cmd in php php71 php72 php73 php74; do
+for cmd in php php73 php74; do
if which $cmd; then
$cmd -d auto_prepend_file=%{buildroot}%{php_home}/%{ns_vendor}/%{ns_project}%{major}/autoload.php \
- %{_bindir}/phpunit7 --verbose || ret=1
+ %{_bindir}/phpunit8 --verbose || ret=1
fi
done
exit $ret
@@ -110,6 +111,12 @@ exit $ret
%changelog
+* Fri Feb 7 2020 Remi Collet <remi@remirepo.net> - 4.0.0-1
+- update to 4.0.0
+- raise dependency on PHP 7.3
+- rename to php-phpunit-php-token-stream4
+- move to /usr/share/php/SebastianBergmann/PhpTokenStream4
+
* Tue Sep 17 2019 Remi Collet <remi@remirepo.net> - 3.1.1-1
- update to 3.1.1