diff --git a/.gitignore b/.gitignore index 18644fb..74d0363 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /php-microsoft-tolerant-php-parser-0.0.20-c5e2bf5.tgz /php-microsoft-tolerant-php-parser-0.0.22-3fdca6b.tgz /php-microsoft-tolerant-php-parser-0.0.23-1d76657.tgz +/php-microsoft-tolerant-php-parser-0.1.1-6a96561.tgz diff --git a/php-microsoft-tolerant-php-parser.spec b/php-microsoft-tolerant-php-parser.spec index da3794b..e94cf20 100644 --- a/php-microsoft-tolerant-php-parser.spec +++ b/php-microsoft-tolerant-php-parser.spec @@ -1,13 +1,13 @@ # remirepo/fedora spec file for php-microsoft-tolerant-php-parser # -# Copyright (c) 2018-2020 Remi Collet +# Copyright (c) 2018-2021 Remi Collet # License: CC-BY-SA # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit 1d76657e3271754515ace52501d3e427eca42ad0 +%global gh_commit 6a965617cf484355048ac6d2d3de7b6ec93abb16 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Microsoft %global gh_project tolerant-php-parser @@ -22,8 +22,8 @@ Name: php-%{pk_vendor}-%{pk_name} -Version: 0.0.23 -Release: 3%{?dist} +Version: 0.1.1 +Release: 1%{?dist} Summary: Tolerant PHP-to-AST parser License: MIT @@ -35,22 +35,22 @@ Source1: makesrc.sh BuildArch: noarch %if %{with_tests} # For tests -BuildRequires: php(language) >= 7.0 +BuildRequires: php(language) >= 7.2 BuildRequires: php-reflection BuildRequires: php-json BuildRequires: php-spl BuildRequires: php-tokenizer # From composer.json, "require-dev": { -# "phpunit/phpunit": "^6.4" -BuildRequires: phpunit6 >= 6.4 +# "phpunit/phpunit": "^8.5.15" +BuildRequires: phpunit8 %endif # Autoloader BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.0" +# "php": ">=7.2" # php-parser 1.4 for autoloader -Requires: php(language) >= 7.0 +Requires: php(language) >= 7.2 # From phpcompatifo report for 2.1.0 Requires: php-reflection Requires: php-json @@ -88,20 +88,24 @@ cp -pr src %{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project} sed -e 's:src/bootstrap.php:%{buildroot}%{_datadir}/php/%{ns_vendor}/%{ns_project}/autoload.php:' \ -i phpunit.xml +# test using BaseTestListener dropped in phpunit7 +rm tests/LexicalGrammarTest.php +rm tests/ParserGrammarTest.php + : Run the test suite ret=0 -for cmd in php php72 php73 php74; do +for cmd in php php73 php74 php80; do if which $cmd; then - $cmd %{_bindir}/phpunit6 \ + $cmd %{_bindir}/phpunit8 \ --testsuite invariants \ || ret=1 - $cmd %{_bindir}/phpunit6 \ + $cmd %{_bindir}/phpunit8 \ --testsuite grammar \ --filter '^((?!(testOutputTreeClassificationAndLength)).)*$' \ || ret=1 - $cmd %{_bindir}/phpunit6 \ + $cmd %{_bindir}/phpunit8 \ --testsuite api\ --filter '^((?!(testOutOfOrderTextEdits|testOverlappingTextEdits)).)*$' \ || ret=1 @@ -123,6 +127,11 @@ exit $ret %changelog +* Mon Jul 19 2021 Remi Collet - 0.1.1-1 +- update to 0.1.1 +- raise dependency on PHP 7.2 +- switch to phpunit8 + * Wed Jan 27 2021 Fedora Release Engineering - 0.0.23-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 9e7faf2..88f647b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (php-microsoft-tolerant-php-parser-0.0.23-1d76657.tgz) = 5fbe69a23df12c0b6df877ab338c33284fbcf749fec791ef11a77eadb49d5313b22e07ea5bb9ff969467d09e5f8a64a47281670d3af9e8c7b4a201df60b1f10c +SHA512 (php-microsoft-tolerant-php-parser-0.1.1-6a96561.tgz) = 4595664a6f7e7b129414651e22599cd4c78dfaec41a75fdef790fe444da00bf7e9cb644d9c0b7a0aec85ae37632f64c8b8307fd612a8d4f2cc84c859c548e81c