update to 1.1.3

drop patch merged upstream

4 files changed, 19 insertions, 65 deletions

diff --git a/PHPINFO b/PHPINFO
index dcc20d5..5802f7e 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -2,5 +2,5 @@
 ast
 
 ast support => enabled
-extension version => 1.1.2
-AST version => Current version is 110. All versions (including experimental): {50, 60, 70, 80, 85, 90, 100, 110}
+extension version => 1.1.3
+AST version => Current version is 120. All versions (including experimental): {50, 60, 70, 80, 85, 90, 100, 110, 120}
diff --git a/REFLECTION b/REFLECTION
index dbc52b8..a01fe43 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,6 +1,6 @@
-Extension [ <persistent> extension #65 ast version 1.1.2 ] {
+Extension [ <persistent> extension #69 ast version 1.1.3 ] {
 
-  - Constants [205] {
+  - Constants [209] {
     Constant [ int ast\AST_ARG_LIST ] { 128 }
     Constant [ int ast\AST_LIST ] { 255 }
     Constant [ int ast\AST_ARRAY ] { 129 }
@@ -65,7 +65,7 @@ Extension [ <persistent> extension #65 ast version 1.1.2 ] {
     Constant [ int ast\AST_CONTINUE ] { 287 }
     Constant [ int ast\AST_CLASS_NAME ] { 276 }
     Constant [ int ast\AST_PROPERTY_HOOK_SHORT_BODY ] { 510 }
-    Constant [ int ast\AST_CLASS_CONST_GROUP ] { 546 }
+    Constant [ int ast\AST_CLASS_CONST_GROUP ] { 777 }
     Constant [ int ast\AST_DIM ] { 512 }
     Constant [ int ast\AST_PROP ] { 513 }
     Constant [ int ast\AST_NULLSAFE_PROP ] { 514 }
@@ -97,10 +97,10 @@ Extension [ <persistent> extension #65 ast version 1.1.2 ] {
     Constant [ int ast\AST_USE_ELEM ] { 543 }
     Constant [ int ast\AST_TRAIT_ALIAS ] { 544 }
     Constant [ int ast\AST_GROUP_USE ] { 545 }
-    Constant [ int ast\AST_ATTRIBUTE ] { 547 }
-    Constant [ int ast\AST_MATCH ] { 548 }
-    Constant [ int ast\AST_MATCH_ARM ] { 549 }
-    Constant [ int ast\AST_NAMED_ARG ] { 550 }
+    Constant [ int ast\AST_ATTRIBUTE ] { 546 }
+    Constant [ int ast\AST_MATCH ] { 547 }
+    Constant [ int ast\AST_MATCH_ARM ] { 548 }
+    Constant [ int ast\AST_NAMED_ARG ] { 549 }
     Constant [ int ast\AST_METHOD_CALL ] { 768 }
     Constant [ int ast\AST_NULLSAFE_METHOD_CALL ] { 769 }
     Constant [ int ast\AST_STATIC_CALL ] { 770 }
@@ -121,6 +121,9 @@ Extension [ <persistent> extension #65 ast version 1.1.2 ] {
     Constant [ int ast\flags\MODIFIER_ABSTRACT ] { 64 }
     Constant [ int ast\flags\MODIFIER_FINAL ] { 32 }
     Constant [ int ast\flags\MODIFIER_READONLY ] { 128 }
+    Constant [ int ast\flags\MODIFIER_PUBLIC_SET ] { 2048 }
+    Constant [ int ast\flags\MODIFIER_PROTECTED_SET ] { 4096 }
+    Constant [ int ast\flags\MODIFIER_PRIVATE_SET ] { 8192 }
     Constant [ int ast\flags\PARAM_MODIFIER_PUBLIC ] { 1 }
     Constant [ int ast\flags\PARAM_MODIFIER_PROTECTED ] { 2 }
     Constant [ int ast\flags\PARAM_MODIFIER_PRIVATE ] { 4 }
@@ -183,6 +186,7 @@ Extension [ <persistent> extension #65 ast version 1.1.2 ] {
     Constant [ int ast\flags\BINARY_IS_GREATER_OR_EQUAL ] { 257 }
     Constant [ int ast\flags\BINARY_SPACESHIP ] { 170 }
     Constant [ int ast\flags\BINARY_COALESCE ] { 260 }
+    Constant [ int ast\flags\BINARY_PIPE ] { 261 }
     Constant [ int ast\flags\EXEC_EVAL ] { 1 }
     Constant [ int ast\flags\EXEC_INCLUDE ] { 2 }
     Constant [ int ast\flags\EXEC_INCLUDE_ONCE ] { 4 }
diff --git a/php-ast.spec b/php-ast.spec
index 373f47f..42b8fc8 100644
--- a/php-ast.spec
+++ b/php-ast.spec
@@ -19,14 +19,12 @@
 
 Summary:       Abstract Syntax Tree
 Name:          %{?scl_prefix}php-ast
-Version:       1.1.2
-Release:       3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version:       1.1.3
+Release:       1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 License:       BSD-3-Clause
 URL:           https://pecl.php.net/package/ast
 Source0:       http://pecl.php.net/get/%{sources}.tgz
 
-Patch0:        php85.patch
-
 BuildRequires: make
 BuildRequires: %{?dtsprefix}gcc
 BuildRequires: %{?scl_prefix}php-devel >= 7.2
@@ -61,8 +59,6 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd %{sources}
-%patch -P0 -p1
-
 # Sanity check, really often broken
 extver=$(sed -n '/#define PHP_AST_VERSION/{s/.* "//;s/".*$//;p}' php_ast.h)
 if test "x${extver}" != "x%{version}"; then
@@ -173,6 +169,10 @@ TEST_PHP_ARGS="-n -d extension=tokenizer.so -d extension=%{buildroot}%{php_ztsex
 
 
 %changelog
+* Mon Aug 11 2025 Remi Collet <remi@remirepo.net> - 1.1.3-1
+- update to 1.1.3
+- drop patch merged upstream
+
 * Wed Jul 30 2025 Remi Collet <remi@remirepo.net> - 1.1.2-3
 - rebuild for 8.5.0alpha3
 
diff --git a/php85.patch b/php85.patch
deleted file mode 100644
index ba00564..0000000
--- a/php85.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From d546378de770fbe5d40a7bf181d2b77ea408f59f Mon Sep 17 00:00:00 2001
-From: Nikita Popov <github@npopov.com>
-Date: Sun, 1 Jun 2025 17:33:35 +0200
-Subject: [PATCH] Add compatibility define for ZEND_AST_EXIT
-
----
- php_ast.h | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/php_ast.h b/php_ast.h
-index 29e4450..4ba3bbc 100644
---- a/php_ast.h
-+++ b/php_ast.h
-@@ -93,6 +93,11 @@ extern ast_str_globals str_globals;
- # define ZEND_AST_PARENT_PROPERTY_HOOK_CALL 0x2f8
- #endif
- 
-+/* ZEND_AST_EXIT has been replaced with plain function call. */
-+#if PHP_VERSION_ID >= 80500
-+# define ZEND_AST_EXIT 0x1fd
-+#endif
-+
- /* Pretend it still exists */
- # define ZEND_AST_LIST ((1 << (ZEND_AST_IS_LIST_SHIFT + 1)) - 1)
- 
-From 69c9ca89d4db6c5aabbeaaf7f22dfe979907d60a Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@remirepo.net>
-Date: Wed, 9 Jul 2025 12:38:30 +0200
-Subject: [PATCH] Add compatibility define for ZEND_AST_CLONE
-
----
- php_ast.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/php_ast.h b/php_ast.h
-index 4ba3bbc..0eeb28c 100644
---- a/php_ast.h
-+++ b/php_ast.h
-@@ -93,9 +93,10 @@ extern ast_str_globals str_globals;
- # define ZEND_AST_PARENT_PROPERTY_HOOK_CALL 0x2f8
- #endif
- 
--/* ZEND_AST_EXIT has been replaced with plain function call. */
-+/* ZEND_AST_EXIT and ZEND_AST_CLONE have been replaced with plain function call. */
- #if PHP_VERSION_ID >= 80500
- # define ZEND_AST_EXIT 0x1fd
-+# define ZEND_AST_CLONE 0x1fc
- #endif
- 
- /* Pretend it still exists */