diff options
| -rw-r--r-- | composer.json | 4 | ||||
| -rw-r--r-- | php-microsoft-tolerant-php-parser.spec | 67 |
2 files changed, 56 insertions, 15 deletions
diff --git a/composer.json b/composer.json index 9579f11..91df816 100644 --- a/composer.json +++ b/composer.json @@ -3,10 +3,10 @@ "description": "Tolerant PHP-to-AST parser designed for IDE usage scenarios", "type": "library", "require": { - "php": ">=7.0" + "php": ">=7.2" }, "require-dev": { - "phpunit/phpunit": "^6.4" + "phpunit/phpunit": "^8.5.15" }, "license": "MIT", "authors": [ diff --git a/php-microsoft-tolerant-php-parser.spec b/php-microsoft-tolerant-php-parser.spec index 1c282b4..d908889 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-2019 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2018-2023 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries # # Github -%global gh_commit e255aa978b45729094da2a1a6f9954044a244ff2 +%global gh_commit 3eccfd273323aaf69513e2f1c888393f5947804b %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner Microsoft %global gh_project tolerant-php-parser @@ -22,7 +22,7 @@ Name: php-%{pk_vendor}-%{pk_name} -Version: 0.0.18 +Version: 0.1.2 Release: 1%{?dist} Summary: Tolerant PHP-to-AST parser @@ -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 @@ -89,13 +89,27 @@ 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 php70 php71 php72 php73; do +for cmd in php php80 php81 php82; do if which $cmd; then - $cmd %{_bindir}/phpunit6 --testsuite invariants || ret=1 - $cmd %{_bindir}/phpunit6 --testsuite grammar || ret=1 - $cmd %{_bindir}/phpunit6 --testsuite api || : ignore + $cmd %{_bindir}/phpunit8 \ + --testsuite invariants \ + || ret=1 + + $cmd %{_bindir}/phpunit8 \ + --testsuite grammar \ + --filter '^((?!(testOutputTreeClassificationAndLength)).)*$' \ + || ret=1 + + $cmd %{_bindir}/phpunit8 \ + --testsuite api\ + --filter '^((?!(testOutOfOrderTextEdits|testOverlappingTextEdits)).)*$' \ + || ret=1 fi done exit $ret @@ -114,6 +128,33 @@ exit $ret %changelog +* Mon Mar 6 2023 Remi Collet <remi@remirepo.net> - 0.1.2-1 +- update to 0.1.2 + +* Mon Jul 19 2021 Remi Collet <remi@remirepo.net> - 0.1.1-1 +- update to 0.1.1 + +* Mon Jun 28 2021 Remi Collet <remi@remirepo.net> - 0.1.0-1 +- update to 0.1.0 +- raise dependency on PHP 7.2 +- switch to phpunit8 + +* Tue Mar 23 2021 Remi Collet <remi@remirepo.net> - 0.0.23-4 +- switch to phpunit7 + +* Mon Sep 14 2020 Remi Collet <remi@remirepo.net> - 0.0.23-1 +- update to 0.0.23 + +* Wed Aug 26 2020 Remi Collet <remi@remirepo.net> - 0.0.22-1 +- update to 0.0.22 + +* Tue Feb 25 2020 Remi Collet <remi@remirepo.net> - 0.0.20-1 +- update to 0.0.20 +- re-enable the test suite, only ignore 3 known failed tests + +* Mon Feb 17 2020 Remi Collet <remi@remirepo.net> - 0.0.18-3 +- ignore grammar and api results, FTBFS #1799871 + * Tue Jul 2 2019 Remi Collet <remi@remirepo.net> - 0.0.18-1 - update to 0.0.18 |