summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--PHPINFO4
-rw-r--r--REFLECTION18
-rw-r--r--php-ast.spec39
4 files changed, 44 insertions, 19 deletions
diff --git a/Makefile b/Makefile
index 91b0fd5..13af741 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
SRCDIR := $(shell pwd)
NAME := $(shell basename $(SRCDIR))
-include ../../common/Makefile
+include ../../../common/Makefile
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 7f730a9..072ec0f 100644
--- a/php-ast.spec
+++ b/php-ast.spec
@@ -1,14 +1,16 @@
# remirepo spec file for php-ast
#
-# Copyright (c) 2015-2024 Remi Collet
-# License: CC-BY-SA-4.0
-# http://creativecommons.org/licenses/by-sa/4.0/
+# SPDX-FileCopyrightText: Copyright 2015-2025 Remi Collet
+# SPDX-License-Identifier: CECILL-2.1
+# http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
#
# Please, preserve the changelog entries
#
%{?scl:%scl_package php-ast}
%global pecl_name ast
+%global pie_vend nikic
+%global pie_proj php-ast
%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}}
# After 20-tokenizer.ini
%global ini_name 40-%{pecl_name}.ini
@@ -17,8 +19,8 @@
Summary: Abstract Syntax Tree
Name: %{?scl_prefix}php-ast
-Version: 1.1.2
-Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
+Version: 1.1.3
+Release: 2%{?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
@@ -38,6 +40,9 @@ Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{rele
Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release}
Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version}
Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version}
+# PIE
+Provides: %{?scl_prefix}php-pie(%{pie_vend}/%{pie_proj}) = %{version}
+Provides: %{?scl_prefix}php-%{pie_vend}-%{pie_proj} = %{version}
%description
@@ -80,19 +85,21 @@ EOF
cd %{sources}
%{__phpize}
+[ -f Makefile.global ] && GLOBAL=Makefile.global || GLOBAL=build/Makefile.global
+sed -e 's/INSTALL_ROOT/DESTDIR/' -i $GLOBAL
cd ../NTS
%configure \
--with-php-config=%{__phpconfig} \
--enable-ast
-make %{?_smp_mflags}
+%make_build
%if %{with_zts}
cd ../ZTS
%configure \
--with-php-config=%{__ztsphpconfig} \
--enable-ast
-make %{?_smp_mflags}
+%make_build
%endif
@@ -103,12 +110,12 @@ make %{?_smp_mflags}
install -D -m 644 package.xml %{buildroot}%{pecl_xmldir}/%{name}.xml
# Install the NTS stuff
-make -C NTS install INSTALL_ROOT=%{buildroot}
+%make_install -C NTS
install -D -m 644 %{ini_name} %{buildroot}%{php_inidir}/%{ini_name}
%if %{with_zts}
# Install the ZTS stuff
-make -C ZTS install INSTALL_ROOT=%{buildroot}
+%make_install -C ZTS
install -D -m 644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name}
%endif
@@ -163,6 +170,20 @@ TEST_PHP_ARGS="-n -d extension=tokenizer.so -d extension=%{buildroot}%{php_ztsex
%changelog
+* Thu Sep 25 2025 Remi Collet <remi@remirepo.net> - 1.1.3-2
+- rebuild for PHP 8.5.0RC1
+
+* 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
+
+* Fri Jul 4 2025 Remi Collet <remi@remirepo.net> - 1.1.2-2
+- fix for PHP 8.5 using patch from upstream and from
+ https://github.com/nikic/php-ast/pull/253
+
* Mon Aug 12 2024 Remi Collet <remi@remirepo.net> - 1.1.2-1
- update to 1.1.2