From 0a471daaf34c1c91e6d2ad621e3f35a0c4a05b9a Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 10 Jun 2016 18:25:37 +0200 Subject: php-ast: 1.2.0-dev for PHP 7.1 --- REFLECTION-DEV | 54 ++++++++++++++++++++++++++++-------------------------- php-ast-dev.spec | 24 +++++++++++++----------- 2 files changed, 41 insertions(+), 37 deletions(-) diff --git a/REFLECTION-DEV b/REFLECTION-DEV index 9174895..418e41f 100644 --- a/REFLECTION-DEV +++ b/REFLECTION-DEV @@ -1,27 +1,27 @@ -Extension [ extension #56 ast version 0.1.1 ] { +Extension [ extension #46 ast version 0.1.2-dev ] { - - Constants [180] { + - Constants [182] { Constant [ integer ast\AST_FUNC_DECL ] { 66 } Constant [ integer ast\AST_CLOSURE ] { 67 } Constant [ integer ast\AST_METHOD ] { 68 } Constant [ integer ast\AST_CLASS ] { 69 } Constant [ integer ast\AST_ARG_LIST ] { 128 } - Constant [ integer ast\AST_LIST ] { 129 } - Constant [ integer ast\AST_ARRAY ] { 130 } - Constant [ integer ast\AST_ENCAPS_LIST ] { 131 } - Constant [ integer ast\AST_EXPR_LIST ] { 132 } - Constant [ integer ast\AST_STMT_LIST ] { 133 } - Constant [ integer ast\AST_IF ] { 134 } - Constant [ integer ast\AST_SWITCH_LIST ] { 135 } - Constant [ integer ast\AST_CATCH_LIST ] { 136 } - Constant [ integer ast\AST_PARAM_LIST ] { 137 } - Constant [ integer ast\AST_CLOSURE_USES ] { 138 } - Constant [ integer ast\AST_PROP_DECL ] { 139 } - Constant [ integer ast\AST_CONST_DECL ] { 140 } - Constant [ integer ast\AST_CLASS_CONST_DECL ] { 141 } - Constant [ integer ast\AST_NAME_LIST ] { 142 } - Constant [ integer ast\AST_TRAIT_ADAPTATIONS ] { 143 } - Constant [ integer ast\AST_USE ] { 144 } + Constant [ integer ast\AST_LIST ] { 255 } + Constant [ integer ast\AST_ARRAY ] { 129 } + Constant [ integer ast\AST_ENCAPS_LIST ] { 130 } + Constant [ integer ast\AST_EXPR_LIST ] { 131 } + Constant [ integer ast\AST_STMT_LIST ] { 132 } + Constant [ integer ast\AST_IF ] { 133 } + Constant [ integer ast\AST_SWITCH_LIST ] { 134 } + Constant [ integer ast\AST_CATCH_LIST ] { 135 } + Constant [ integer ast\AST_PARAM_LIST ] { 136 } + Constant [ integer ast\AST_CLOSURE_USES ] { 137 } + Constant [ integer ast\AST_PROP_DECL ] { 138 } + Constant [ integer ast\AST_CONST_DECL ] { 139 } + Constant [ integer ast\AST_CLASS_CONST_DECL ] { 140 } + Constant [ integer ast\AST_NAME_LIST ] { 141 } + Constant [ integer ast\AST_TRAIT_ADAPTATIONS ] { 142 } + Constant [ integer ast\AST_USE ] { 143 } Constant [ integer ast\AST_MAGIC_CONST ] { 0 } Constant [ integer ast\AST_TYPE ] { 1 } Constant [ integer ast\AST_VAR ] { 256 } @@ -80,14 +80,14 @@ Extension [ extension #56 ast version 0.1.1 ] { Constant [ integer ast\AST_SWITCH ] { 534 } Constant [ integer ast\AST_SWITCH_CASE ] { 535 } Constant [ integer ast\AST_DECLARE ] { 536 } - Constant [ integer ast\AST_CONST_ELEM ] { 537 } - Constant [ integer ast\AST_USE_TRAIT ] { 538 } - Constant [ integer ast\AST_TRAIT_PRECEDENCE ] { 539 } - Constant [ integer ast\AST_METHOD_REFERENCE ] { 540 } - Constant [ integer ast\AST_NAMESPACE ] { 541 } - Constant [ integer ast\AST_USE_ELEM ] { 542 } - Constant [ integer ast\AST_TRAIT_ALIAS ] { 543 } - Constant [ integer ast\AST_GROUP_USE ] { 544 } + Constant [ integer ast\AST_CONST_ELEM ] { 775 } + Constant [ integer ast\AST_USE_TRAIT ] { 537 } + Constant [ integer ast\AST_TRAIT_PRECEDENCE ] { 538 } + Constant [ integer ast\AST_METHOD_REFERENCE ] { 539 } + Constant [ integer ast\AST_NAMESPACE ] { 540 } + Constant [ integer ast\AST_USE_ELEM ] { 541 } + Constant [ integer ast\AST_TRAIT_ALIAS ] { 542 } + Constant [ integer ast\AST_GROUP_USE ] { 543 } Constant [ integer ast\AST_METHOD_CALL ] { 768 } Constant [ integer ast\AST_STATIC_CALL ] { 769 } Constant [ integer ast\AST_CONDITIONAL ] { 770 } @@ -124,6 +124,7 @@ Extension [ extension #56 ast version 0.1.1 ] { Constant [ integer ast\flags\TYPE_ARRAY ] { 7 } Constant [ integer ast\flags\TYPE_OBJECT ] { 8 } Constant [ integer ast\flags\TYPE_CALLABLE ] { 14 } + Constant [ integer ast\flags\TYPE_VOID ] { 18 } Constant [ integer ast\flags\UNARY_BOOL_NOT ] { 13 } Constant [ integer ast\flags\UNARY_BITWISE_NOT ] { 12 } Constant [ integer ast\flags\UNARY_SILENCE ] { 260 } @@ -153,6 +154,7 @@ Extension [ extension #56 ast version 0.1.1 ] { Constant [ integer ast\flags\BINARY_IS_GREATER ] { 256 } Constant [ integer ast\flags\BINARY_IS_GREATER_OR_EQUAL ] { 257 } Constant [ integer ast\flags\BINARY_SPACESHIP ] { 170 } + Constant [ integer ast\flags\BINARY_COALESCE ] { 260 } Constant [ integer ast\flags\ASSIGN_BITWISE_OR ] { 31 } Constant [ integer ast\flags\ASSIGN_BITWISE_AND ] { 32 } Constant [ integer ast\flags\ASSIGN_BITWISE_XOR ] { 33 } diff --git a/php-ast-dev.spec b/php-ast-dev.spec index e8ad683..2521709 100644 --- a/php-ast-dev.spec +++ b/php-ast-dev.spec @@ -7,14 +7,12 @@ # Please, preserve the changelog entries # %{?scl: %scl_package php-ast} -%{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} -%{!?__php: %global __php %{_bindir}/php} -%global gh_commit 3b9abc7b6012d760de99e10edc99c9742dafd11a +%global gh_commit b8f5805b17c43c664dda62d1f401a7d3379be9f3 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner nikic %global gh_project php-ast -#global gh_date 20151021 +%global gh_date 20160608 %global pecl_name ast %global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} # After 20-tokenizer.ini @@ -22,9 +20,9 @@ Summary: Abstract Syntax Tree Name: %{?scl_prefix}php-ast -Version: 0.1.1 +Version: 0.1.2 %if 0%{?gh_date:1} -Release: 0.2.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 0.1.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %else Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} %endif @@ -45,6 +43,10 @@ Requires: %{?scl_prefix}php-tokenizer%{?_isa} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} Obsoletes: php70u-%{pecl_name} <= %{version} Obsoletes: php70w-%{pecl_name} <= %{version} +%if "%{php_version}" > "7.1" +Obsoletes: php71u-%{pecl_name} <= %{version} +Obsoletes: php71w-%{pecl_name} <= %{version} +%endif %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -71,9 +73,6 @@ cd NTS # When this file is removed, fix description [ -f EXPERIMENTAL ] || exit 1 -# Fix -sed -e '/PHP_AST_VERSION/s/0.1.0/0.1.0-dev/' -i php_ast.h - # Sanity check, really often broken extver=$(sed -n '/#define PHP_AST_VERSION/{s/.* "//;s/".*$//;p}' php_ast.h) if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then @@ -166,7 +165,7 @@ rm -rf %{buildroot} %license NTS/LICENSE %doc NTS/EXPERIMENTAL %doc NTS/README.md -%doc NTS/generate_ast_data.php +%doc NTS/scripts %doc NTS/util.php %config(noreplace) %{php_inidir}/%{ini_name} @@ -179,6 +178,9 @@ rm -rf %{buildroot} %changelog +* Fri Jun 10 2016 Remi Collet - 0.1.2-0.1.20160608gitb8f5805 +- update to 0.1.2-dev for PHP 7.1 + * Thu Jan 7 2016 Remi Collet - 0.1.1-1 - update to 0.1.1 @@ -186,4 +188,4 @@ rm -rf %{buildroot} - add dependency on php-tokenizer, fix test suite * Wed Oct 28 2015 Remi Collet - 0.1.0-0.1.20151021gitac969d7 -- new package, version 0.1.0dev \ No newline at end of file +- new package, version 0.1.0dev -- cgit