From a8020b09b055f7a60e4ab5e575ae12ceb4b59a04 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Tue, 20 Apr 2021 17:03:09 +0200
Subject: update to 1.0.11

---
 PHPINFO      |   4 +-
 REFLECTION   | 141 ++++++++++++++++++++++++++++++-----------------------------
 php-ast.spec |  18 ++++----
 3 files changed, 82 insertions(+), 81 deletions(-)

diff --git a/PHPINFO b/PHPINFO
index 2b43af8..aa06434 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,5 +2,5 @@
 ast
 
 ast support => enabled
-extension version => 1.0.10
-AST version => Current version is 80. All versions (including experimental): {50, 60, 70, 80}
+extension version => 1.0.11
+AST version => Current version is 80. All versions (including experimental): {50, 60, 70, 80, 85}
diff --git a/REFLECTION b/REFLECTION
index 9d31195..dd8fa27 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,6 +1,6 @@
-Extension [ <persistent> extension #71 ast version 1.0.10 ] {
+Extension [ <persistent> extension #67 ast version 1.0.11 ] {
 
-  - Constants [193] {
+  - Constants [196] {
     Constant [ int ast\AST_ARG_LIST ] { 128 }
     Constant [ int ast\AST_LIST ] { 255 }
     Constant [ int ast\AST_ARRAY ] { 129 }
@@ -28,7 +28,7 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\AST_FUNC_DECL ] { 67 }
     Constant [ int ast\AST_CLOSURE ] { 68 }
     Constant [ int ast\AST_METHOD ] { 69 }
-    Constant [ int ast\AST_ARROW_FUNC ] { 1535 }
+    Constant [ int ast\AST_ARROW_FUNC ] { 71 }
     Constant [ int ast\AST_CLASS ] { 70 }
     Constant [ int ast\AST_MAGIC_CONST ] { 0 }
     Constant [ int ast\AST_TYPE ] { 1 }
@@ -49,18 +49,18 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\AST_POST_INC ] { 273 }
     Constant [ int ast\AST_POST_DEC ] { 274 }
     Constant [ int ast\AST_YIELD_FROM ] { 275 }
-    Constant [ int ast\AST_GLOBAL ] { 276 }
-    Constant [ int ast\AST_UNSET ] { 277 }
-    Constant [ int ast\AST_RETURN ] { 278 }
-    Constant [ int ast\AST_LABEL ] { 279 }
-    Constant [ int ast\AST_REF ] { 280 }
-    Constant [ int ast\AST_HALT_COMPILER ] { 281 }
-    Constant [ int ast\AST_ECHO ] { 282 }
-    Constant [ int ast\AST_THROW ] { 283 }
-    Constant [ int ast\AST_GOTO ] { 284 }
-    Constant [ int ast\AST_BREAK ] { 285 }
-    Constant [ int ast\AST_CONTINUE ] { 286 }
-    Constant [ int ast\AST_CLASS_NAME ] { 511 }
+    Constant [ int ast\AST_GLOBAL ] { 277 }
+    Constant [ int ast\AST_UNSET ] { 278 }
+    Constant [ int ast\AST_RETURN ] { 279 }
+    Constant [ int ast\AST_LABEL ] { 280 }
+    Constant [ int ast\AST_REF ] { 281 }
+    Constant [ int ast\AST_HALT_COMPILER ] { 282 }
+    Constant [ int ast\AST_ECHO ] { 283 }
+    Constant [ int ast\AST_THROW ] { 284 }
+    Constant [ int ast\AST_GOTO ] { 285 }
+    Constant [ int ast\AST_BREAK ] { 286 }
+    Constant [ int ast\AST_CONTINUE ] { 287 }
+    Constant [ int ast\AST_CLASS_NAME ] { 276 }
     Constant [ int ast\AST_CLASS_CONST_GROUP ] { 766 }
     Constant [ int ast\AST_DIM ] { 512 }
     Constant [ int ast\AST_PROP ] { 513 }
@@ -76,27 +76,28 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\AST_NEW ] { 526 }
     Constant [ int ast\AST_INSTANCEOF ] { 527 }
     Constant [ int ast\AST_YIELD ] { 528 }
-    Constant [ int ast\AST_STATIC ] { 530 }
-    Constant [ int ast\AST_WHILE ] { 531 }
-    Constant [ int ast\AST_DO_WHILE ] { 532 }
-    Constant [ int ast\AST_IF_ELEM ] { 533 }
-    Constant [ int ast\AST_SWITCH ] { 534 }
-    Constant [ int ast\AST_SWITCH_CASE ] { 535 }
-    Constant [ int ast\AST_DECLARE ] { 536 }
+    Constant [ int ast\AST_STATIC ] { 531 }
+    Constant [ int ast\AST_WHILE ] { 532 }
+    Constant [ int ast\AST_DO_WHILE ] { 533 }
+    Constant [ int ast\AST_IF_ELEM ] { 534 }
+    Constant [ int ast\AST_SWITCH ] { 535 }
+    Constant [ int ast\AST_SWITCH_CASE ] { 536 }
+    Constant [ int ast\AST_DECLARE ] { 537 }
     Constant [ int ast\AST_PROP_ELEM ] { 774 }
-    Constant [ int ast\AST_PROP_GROUP ] { 767 }
+    Constant [ int ast\AST_PROP_GROUP ] { 545 }
     Constant [ int ast\AST_CONST_ELEM ] { 775 }
-    Constant [ int ast\AST_USE_TRAIT ] { 537 }
-    Constant [ int ast\AST_TRAIT_PRECEDENCE ] { 538 }
-    Constant [ int ast\AST_METHOD_REFERENCE ] { 539 }
-    Constant [ int ast\AST_NAMESPACE ] { 540 }
-    Constant [ int ast\AST_USE_ELEM ] { 541 }
-    Constant [ int ast\AST_TRAIT_ALIAS ] { 542 }
-    Constant [ int ast\AST_GROUP_USE ] { 543 }
+    Constant [ int ast\AST_USE_TRAIT ] { 538 }
+    Constant [ int ast\AST_TRAIT_PRECEDENCE ] { 539 }
+    Constant [ int ast\AST_METHOD_REFERENCE ] { 540 }
+    Constant [ int ast\AST_NAMESPACE ] { 541 }
+    Constant [ int ast\AST_USE_ELEM ] { 542 }
+    Constant [ int ast\AST_TRAIT_ALIAS ] { 543 }
+    Constant [ int ast\AST_GROUP_USE ] { 544 }
     Constant [ int ast\AST_ATTRIBUTE ] { 765 }
     Constant [ int ast\AST_MATCH ] { 764 }
     Constant [ int ast\AST_MATCH_ARM ] { 763 }
     Constant [ int ast\AST_NAMED_ARG ] { 762 }
+    Constant [ int ast\AST_ENUM_CASE ] { 1022 }
     Constant [ int ast\AST_METHOD_CALL ] { 768 }
     Constant [ int ast\AST_NULLSAFE_METHOD_CALL ] { 1023 }
     Constant [ int ast\AST_STATIC_CALL ] { 769 }
@@ -109,25 +110,26 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\flags\NAME_FQ ] { 0 }
     Constant [ int ast\flags\NAME_NOT_FQ ] { 1 }
     Constant [ int ast\flags\NAME_RELATIVE ] { 2 }
-    Constant [ int ast\flags\MODIFIER_PUBLIC ] { 256 }
-    Constant [ int ast\flags\MODIFIER_PROTECTED ] { 512 }
-    Constant [ int ast\flags\MODIFIER_PRIVATE ] { 1024 }
-    Constant [ int ast\flags\MODIFIER_STATIC ] { 1 }
-    Constant [ int ast\flags\MODIFIER_ABSTRACT ] { 2 }
-    Constant [ int ast\flags\MODIFIER_FINAL ] { 4 }
+    Constant [ int ast\flags\MODIFIER_PUBLIC ] { 1 }
+    Constant [ int ast\flags\MODIFIER_PROTECTED ] { 2 }
+    Constant [ int ast\flags\MODIFIER_PRIVATE ] { 4 }
+    Constant [ int ast\flags\MODIFIER_STATIC ] { 16 }
+    Constant [ int ast\flags\MODIFIER_ABSTRACT ] { 64 }
+    Constant [ int ast\flags\MODIFIER_FINAL ] { 32 }
     Constant [ int ast\flags\PARAM_MODIFIER_PUBLIC ] { 4 }
     Constant [ int ast\flags\PARAM_MODIFIER_PROTECTED ] { 8 }
     Constant [ int ast\flags\PARAM_MODIFIER_PRIVATE ] { 16 }
-    Constant [ int ast\flags\RETURNS_REF ] { 67108864 }
-    Constant [ int ast\flags\FUNC_RETURNS_REF ] { 67108864 }
-    Constant [ int ast\flags\FUNC_GENERATOR ] { 8388608 }
+    Constant [ int ast\flags\RETURNS_REF ] { 4096 }
+    Constant [ int ast\flags\FUNC_RETURNS_REF ] { 4096 }
+    Constant [ int ast\flags\FUNC_GENERATOR ] { 16777216 }
     Constant [ int ast\flags\ARRAY_ELEM_REF ] { 1 }
     Constant [ int ast\flags\CLOSURE_USE_REF ] { 1 }
-    Constant [ int ast\flags\CLASS_ABSTRACT ] { 32 }
-    Constant [ int ast\flags\CLASS_FINAL ] { 4 }
-    Constant [ int ast\flags\CLASS_TRAIT ] { 128 }
-    Constant [ int ast\flags\CLASS_INTERFACE ] { 64 }
-    Constant [ int ast\flags\CLASS_ANONYMOUS ] { 256 }
+    Constant [ int ast\flags\CLASS_ABSTRACT ] { 64 }
+    Constant [ int ast\flags\CLASS_FINAL ] { 32 }
+    Constant [ int ast\flags\CLASS_TRAIT ] { 2 }
+    Constant [ int ast\flags\CLASS_INTERFACE ] { 1 }
+    Constant [ int ast\flags\CLASS_ANONYMOUS ] { 4 }
+    Constant [ int ast\flags\CLASS_ENUM ] { 4194304 }
     Constant [ int ast\flags\PARAM_REF ] { 1 }
     Constant [ int ast\flags\PARAM_VARIADIC ] { 2 }
     Constant [ int ast\flags\TYPE_NULL ] { 1 }
@@ -143,14 +145,15 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\flags\TYPE_ITERABLE ] { 18 }
     Constant [ int ast\flags\TYPE_STATIC ] { 20 }
     Constant [ int ast\flags\TYPE_MIXED ] { 21 }
-    Constant [ int ast\flags\UNARY_BOOL_NOT ] { 13 }
-    Constant [ int ast\flags\UNARY_BITWISE_NOT ] { 12 }
+    Constant [ int ast\flags\TYPE_NEVER ] { 22 }
+    Constant [ int ast\flags\UNARY_BOOL_NOT ] { 14 }
+    Constant [ int ast\flags\UNARY_BITWISE_NOT ] { 13 }
     Constant [ int ast\flags\UNARY_SILENCE ] { 260 }
     Constant [ int ast\flags\UNARY_PLUS ] { 261 }
     Constant [ int ast\flags\UNARY_MINUS ] { 262 }
     Constant [ int ast\flags\BINARY_BOOL_AND ] { 259 }
     Constant [ int ast\flags\BINARY_BOOL_OR ] { 258 }
-    Constant [ int ast\flags\BINARY_BOOL_XOR ] { 14 }
+    Constant [ int ast\flags\BINARY_BOOL_XOR ] { 15 }
     Constant [ int ast\flags\BINARY_BITWISE_OR ] { 9 }
     Constant [ int ast\flags\BINARY_BITWISE_AND ] { 10 }
     Constant [ int ast\flags\BINARY_BITWISE_XOR ] { 11 }
@@ -160,15 +163,15 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\flags\BINARY_MUL ] { 3 }
     Constant [ int ast\flags\BINARY_DIV ] { 4 }
     Constant [ int ast\flags\BINARY_MOD ] { 5 }
-    Constant [ int ast\flags\BINARY_POW ] { 166 }
+    Constant [ int ast\flags\BINARY_POW ] { 12 }
     Constant [ int ast\flags\BINARY_SHIFT_LEFT ] { 6 }
     Constant [ int ast\flags\BINARY_SHIFT_RIGHT ] { 7 }
-    Constant [ int ast\flags\BINARY_IS_IDENTICAL ] { 15 }
-    Constant [ int ast\flags\BINARY_IS_NOT_IDENTICAL ] { 16 }
-    Constant [ int ast\flags\BINARY_IS_EQUAL ] { 17 }
-    Constant [ int ast\flags\BINARY_IS_NOT_EQUAL ] { 18 }
-    Constant [ int ast\flags\BINARY_IS_SMALLER ] { 19 }
-    Constant [ int ast\flags\BINARY_IS_SMALLER_OR_EQUAL ] { 20 }
+    Constant [ int ast\flags\BINARY_IS_IDENTICAL ] { 16 }
+    Constant [ int ast\flags\BINARY_IS_NOT_IDENTICAL ] { 17 }
+    Constant [ int ast\flags\BINARY_IS_EQUAL ] { 18 }
+    Constant [ int ast\flags\BINARY_IS_NOT_EQUAL ] { 19 }
+    Constant [ int ast\flags\BINARY_IS_SMALLER ] { 20 }
+    Constant [ int ast\flags\BINARY_IS_SMALLER_OR_EQUAL ] { 21 }
     Constant [ int ast\flags\BINARY_IS_GREATER ] { 256 }
     Constant [ int ast\flags\BINARY_IS_GREATER_OR_EQUAL ] { 257 }
     Constant [ int ast\flags\BINARY_SPACESHIP ] { 170 }
@@ -181,14 +184,14 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
     Constant [ int ast\flags\USE_NORMAL ] { 1 }
     Constant [ int ast\flags\USE_FUNCTION ] { 2 }
     Constant [ int ast\flags\USE_CONST ] { 4 }
-    Constant [ int ast\flags\MAGIC_LINE ] { 370 }
-    Constant [ int ast\flags\MAGIC_FILE ] { 371 }
-    Constant [ int ast\flags\MAGIC_DIR ] { 372 }
-    Constant [ int ast\flags\MAGIC_NAMESPACE ] { 389 }
-    Constant [ int ast\flags\MAGIC_FUNCTION ] { 376 }
-    Constant [ int ast\flags\MAGIC_METHOD ] { 375 }
-    Constant [ int ast\flags\MAGIC_CLASS ] { 373 }
-    Constant [ int ast\flags\MAGIC_TRAIT ] { 374 }
+    Constant [ int ast\flags\MAGIC_LINE ] { 373 }
+    Constant [ int ast\flags\MAGIC_FILE ] { 374 }
+    Constant [ int ast\flags\MAGIC_DIR ] { 375 }
+    Constant [ int ast\flags\MAGIC_NAMESPACE ] { 392 }
+    Constant [ int ast\flags\MAGIC_FUNCTION ] { 379 }
+    Constant [ int ast\flags\MAGIC_METHOD ] { 378 }
+    Constant [ int ast\flags\MAGIC_CLASS ] { 376 }
+    Constant [ int ast\flags\MAGIC_TRAIT ] { 377 }
     Constant [ int ast\flags\ARRAY_SYNTAX_LIST ] { 1 }
     Constant [ int ast\flags\ARRAY_SYNTAX_LONG ] { 2 }
     Constant [ int ast\flags\ARRAY_SYNTAX_SHORT ] { 3 }
@@ -197,20 +200,20 @@ Extension [ <persistent> extension #71 ast version 1.0.10 ] {
   }
 
   - Functions {
-    Function [ <internal:ast> function ast\parse_file ] {
+    Function [ <internal:ast> function ast\parse_code ] {
 
-      - Parameters [2] {
-        Parameter #0 [ <required> string $filename ]
+      - Parameters [3] {
+        Parameter #0 [ <required> string $code ]
         Parameter #1 [ <required> int $version ]
+        Parameter #2 [ <optional> string $filename ]
       }
       - Return [ ast\Node ]
     }
-    Function [ <internal:ast> function ast\parse_code ] {
+    Function [ <internal:ast> function ast\parse_file ] {
 
-      - Parameters [3] {
-        Parameter #0 [ <required> string $code ]
+      - Parameters [2] {
+        Parameter #0 [ <required> string $filename ]
         Parameter #1 [ <required> int $version ]
-        Parameter #2 [ <optional> string $filename ]
       }
       - Return [ ast\Node ]
     }
diff --git a/php-ast.spec b/php-ast.spec
index 3289fc4..512bcfb 100644
--- a/php-ast.spec
+++ b/php-ast.spec
@@ -1,6 +1,6 @@
 # remirepo spec file for php-ast
 #
-# Copyright (c) 2015-2020 Remi Collet
+# Copyright (c) 2015-2021 Remi Collet
 # License: CC-BY-SA
 # http://creativecommons.org/licenses/by-sa/4.0/
 #
@@ -20,11 +20,11 @@
 
 Summary:       Abstract Syntax Tree
 Name:          %{?scl_prefix}php-ast
-Version:       1.0.10
+Version:       1.0.11
 %if 0%{?gh_date:1}
 Release:       0.7.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %else
-Release:       3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 %endif
 License:       BSD
 URL:           https://github.com/%{gh_owner}/%{gh_project}
@@ -34,8 +34,9 @@ Source0:       https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}
 Source0:       http://pecl.php.net/get/%{pecl_name}-%{version}%{?prever}.tgz
 %endif
 
+BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
-BuildRequires: %{?scl_prefix}php-devel > 7
+BuildRequires: %{?scl_prefix}php-devel >= 7.0
 BuildRequires: %{?scl_prefix}php-pear
 BuildRequires: %{?scl_prefix}php-tokenizer
 
@@ -69,12 +70,6 @@ Obsoletes:     php80-pecl-%{pecl_name}  <= %{version}
 %endif
 %endif
 
-%if 0%{?fedora} < 20 && 0%{?rhel} < 7
-# Filter shared private
-%{?filter_provides_in: %filter_provides_in %{_libdir}/.*\.so$}
-%{?filter_setup}
-%endif
-
 
 %description
 This extension exposes the abstract syntax tree generated by PHP 7.
@@ -229,6 +224,9 @@ fi
 
 
 %changelog
+* Tue Apr 20 2021 Remi Collet <remi@remirepo.net> - 1.0.11-1
+- update to 1.0.11
+
 * Wed Sep 30 2020 Remi Collet <remi@remirepo.net> - 1.0.10-3
 - rebuild for PHP 8.0.0RC1
 
-- 
cgit