Skip to content

Commit 9612ec0

Browse files
committed
Merge branch 'PHP-8.4'
2 parents 20347ae + 5894fc8 commit 9612ec0

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

patches/8.5/cmake.patch

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ Subject: Add CMake changes for PHP-8.5 branch
88
and ext/ext_skel.php script
99
---
1010
.editorconfig | 2 +-
11-
.gitignore | 49 ++++++++++++++++++++++++++++++++++++++
11+
.gitignore | 50 ++++++++++++++++++++++++++++++++++++++
1212
ext/ext_skel.php | 2 ++
1313
ext/skeleton/.gitignore.in | 23 ++++++++++++++++++
14-
run-tests.php | 24 ++++++++++++++-----
15-
5 files changed, 93 insertions(+), 7 deletions(-)
14+
run-tests.php | 24 +++++++++++++-----
15+
5 files changed, 94 insertions(+), 7 deletions(-)
1616

1717
diff --git a/.editorconfig b/.editorconfig
1818
index 19be96087d..58a83dfb68 100644
@@ -28,10 +28,18 @@ index 19be96087d..58a83dfb68 100644
2828
indent_style = space
2929

3030
diff --git a/.gitignore b/.gitignore
31-
index 52dde98ed4..5783dd2285 100644
31+
index 52dde98ed4..d698b5a19c 100644
3232
--- a/.gitignore
3333
+++ b/.gitignore
34-
@@ -290,9 +290,58 @@ tmp-php.ini
34+
@@ -152,6 +152,7 @@ php
35+
# ------------------------------------------------------------------------------
36+
/ext/json/json_parser.tab.h
37+
/ext/json/json_parser.tab.c
38+
+/ext/json/json_parser.output
39+
/sapi/phpdbg/phpdbg_parser.c
40+
/sapi/phpdbg/phpdbg_parser.h
41+
/sapi/phpdbg/phpdbg_parser.output
42+
@@ -290,9 +291,58 @@ tmp-php.ini
3543
/junit.out.xml
3644
/.ccache/
3745

0 commit comments

Comments
 (0)