diff options
| -rw-r--r-- | composer.json | 10 | ||||
| -rwxr-xr-x | makesrc.sh | 34 | ||||
| -rw-r--r-- | php-nikic-php-parser5-rpm.patch | 2 | ||||
| -rw-r--r-- | php-nikic-php-parser5.spec | 39 |
4 files changed, 53 insertions, 32 deletions
diff --git a/composer.json b/composer.json index 2fd064a..4adefc3 100644 --- a/composer.json +++ b/composer.json @@ -13,16 +13,18 @@ } ], "require": { - "php": ">=7.0", - "ext-tokenizer": "*" + "php": ">=7.1", + "ext-tokenizer": "*", + "ext-json": "*", + "ext-ctype": "*" }, "require-dev": { - "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0", + "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", "ircmaxell/php-yacc": "^0.0.7" }, "extra": { "branch-alias": { - "dev-master": "4.9-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -3,26 +3,32 @@ NAME=$(basename $PWD) OWNER=$(sed -n '/^%global gh_owner/{s/.* //;p}' $NAME.spec) PROJECT=$(sed -n '/^%global gh_project/{s/.* //;p}' $NAME.spec) -VERSION=$(sed -n '/^Version:/{s/.* //;p}' $NAME.spec) +VERSION=$(sed -n '/^%global upstream_version/{s/.* //;p}' $NAME.spec) +PREVER=$(sed -n '/^%global upstream_prever/{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, Commit=$COMMIT\n" +echo -e "\nCreate git snapshot\nName=$NAME, Owner=$OWNER, Project=$PROJECT, Version=$VERSION$PREVER, Commit=$COMMIT\n" -echo "Cloning..." -git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT +TAR=$NAME-$VERSION$PREVER-$SHORT.tgz -echo "Getting commit..." -pushd $PROJECT-$COMMIT -git checkout $COMMIT -cp composer.json ../composer.json -popd +if [ -f $TAR ]; then + echo "Skip $TAR" +else + echo "Cloning..." + git clone https://github.com/$OWNER/$PROJECT.git $PROJECT-$COMMIT -echo "Archiving..." -tar czf $NAME-$VERSION-$SHORT.tgz --exclude-vcs $PROJECT-$COMMIT + echo "Getting commit..." + pushd $PROJECT-$COMMIT + git checkout $COMMIT || exit 1 + cp composer.json ../composer.json + popd -echo "Cleaning..." -rm -rf $PROJECT-$COMMIT + echo "Archiving..." + tar czf $TAR --exclude-vcs $PROJECT-$COMMIT -echo "Done." + echo "Cleaning..." + rm -rf $PROJECT-$COMMIT + echo "Done." +fi diff --git a/php-nikic-php-parser5-rpm.patch b/php-nikic-php-parser5-rpm.patch index 66edc42..c51924b 100644 --- a/php-nikic-php-parser5-rpm.patch +++ b/php-nikic-php-parser5-rpm.patch @@ -11,7 +11,7 @@ diff -up ./bin/php-parse.rpm ./bin/php-parse - break; - } -} -+require '/usr/share/php/PhpParser4/autoload.php'; ++require '/usr/share/php/PhpParser5/autoload.php'; ini_set('xdebug.max_nesting_level', 3000); diff --git a/php-nikic-php-parser5.spec b/php-nikic-php-parser5.spec index 2fa2164..1308211 100644 --- a/php-nikic-php-parser5.spec +++ b/php-nikic-php-parser5.spec @@ -1,4 +1,4 @@ -# remirepo/fedora spec file for php-nikic-php-parser4 +# remirepo/fedora spec file for php-nikic-php-parser5 # # Copyright (c) 2016-2023 Remi Collet # License: CC-BY-SA-4.0 @@ -17,23 +17,26 @@ %bcond_with tests %endif -%global gh_commit 19526a33fb561ef417e822e85f08a00db4059c17 +%global gh_commit 571ca90b7e048fa8446712d11255c80b23b78753 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nikic %global gh_project PHP-Parser %global pk_project php-parser %global php_home %{_datadir}/php %global ns_project PhpParser -%global major 4 +%global major 5 + +%global upstream_version 5.0.0 +%global upstream_prever alpha3 Name: php-%{gh_owner}-%{pk_project}%{major} -Version: 4.16.0 +Version: %{upstream_version}%{?upstream_prever:~%{upstream_prever}} Release: 1%{?dist} Summary: A PHP parser written in PHP - version %{major} License: BSD-3-Clause URL: https://github.com/%{gh_owner}/%{gh_project} -Source0: %{name}-%{version}-%{gh_short}.tgz +Source0: %{name}-%{upstream_version}%{?upstream_prever}-%{gh_short}.tgz Source1: makesrc.sh # Autoloader @@ -51,7 +54,7 @@ BuildRequires: php-json BuildRequires: php-pcre BuildRequires: php-spl # From composer.json, "require-dev": { -# "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0", +# "phpunit/phpunit": "^7.0 || ^8.0 || ^9.0", # "ircmaxell/php-yacc": "0.0.7" %global phpunit %{_bindir}/phpunit9 BuildRequires: phpunit9 @@ -60,14 +63,16 @@ BuildRequires: phpunit9 BuildRequires: php-fedora-autoloader-devel # From composer.json, "require": { -# "php": ">=7.0", -# "ext-tokenizer": "*" -Requires: php(language) >= 7.0 +# "php": ">=7.1", +# "ext-tokenizer": "*", +# "ext-json": "*", +# "ext-ctype": "*" +Requires: php(language) >= 7.1 Requires: php-tokenizer -# From phpcompatinfo report for version 4.0.0 -Requires: php-reflection -Requires: php-ctype Requires: php-json +Requires: php-ctype +# From phpcompatinfo report for version 5.0.0 +Requires: php-reflection Requires: php-pcre Requires: php-spl Requires: php-cli @@ -97,6 +102,7 @@ Autoloader: %{php_home}/%{ns_project}%{major}/autoload.php %build : Generate an simple classmap autoloader phpab --template fedora \ + --tolerant \ --output lib/%{ns_project}/autoload.php \ lib/%{ns_project} @@ -125,7 +131,8 @@ cat << 'AUTOLOAD' | tee vendor/autoload.php AUTOLOAD : Upstream test suite -FILTER="--filter '^((?!(testLexNewFeatures)).)*$'" +# need investigations (autoloader ?) +FILTER="--filter '^((?!(testAliases)).)*$'" ret=0 for cmdarg in "php %{phpunit}" php80 php81 php82 php83; do @@ -153,6 +160,12 @@ exit $ret %changelog +* Tue Jun 27 2023 Remi Collet <remi@remirepo.net> - 5.0.0~alpha3-1 +- update to 5.0.0alpha3 +- rename to php-nikic-php-parser5 +- install in /usr/share/php/PhpParser5 +- raise dependency on PHP 7.1 + * Mon Jun 26 2023 Remi Collet <remi@remirepo.net> - 4.16.0-1 - update to 4.16.0 |