Skip to content

Commit 6f8f03f

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 5e76593 + ac63cdd commit 6f8f03f

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

patches/8.3/php-config.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ index 142ddf08fd9..e476c42f895 100644
5959

6060
dnl
6161
diff --git a/configure.ac b/configure.ac
62-
index d721458a73e..b7b5208897a 100644
62+
index 278dbd110d2..83b2e354112 100644
6363
--- a/configure.ac
6464
+++ b/configure.ac
6565
@@ -1480,6 +1480,9 @@ exec_prefix=$old_exec_prefix

patches/8.4/php-config.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ index d8a5cbf0842..b5a5b26eba5 100644
5858
])
5959

6060
diff --git a/configure.ac b/configure.ac
61-
index 0e12d55b009..eef8683e1ee 100644
61+
index 6dc1e45b34f..12d8cd679f5 100644
6262
--- a/configure.ac
6363
+++ b/configure.ac
6464
@@ -1363,6 +1363,9 @@ exec_prefix=$old_exec_prefix

patches/8.5/cmake.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ index 19be96087d9..58a83dfb688 100644
2828
indent_style = space
2929

3030
diff --git a/.gitignore b/.gitignore
31-
index 91120a5fa6b..1af59c1eaac 100644
31+
index 55c441323cf..090fae1e46b 100644
3232
--- a/.gitignore
3333
+++ b/.gitignore
3434
@@ -155,6 +155,7 @@ php
@@ -39,7 +39,7 @@ index 91120a5fa6b..1af59c1eaac 100644
3939
/sapi/phpdbg/phpdbg_parser.c
4040
/sapi/phpdbg/phpdbg_parser.h
4141
/sapi/phpdbg/phpdbg_parser.output
42-
@@ -298,9 +299,58 @@ tmp-php.ini
42+
@@ -299,9 +300,58 @@ tmp-php.ini
4343
# ------------------------------------------------------------------------------
4444
/ext/standard/tests/helpers/bad_cmd.exe
4545

@@ -153,7 +153,7 @@ index e691bd3964b..191fcd70eb5 100644
153153
+CMakeLists.txt.user
154154
+CMakeScripts/
155155
diff --git a/run-tests.php b/run-tests.php
156-
index 0db6937c7a8..47118f6a3ff 100755
156+
index a90681c7ff7..fb8e59d7d34 100755
157157
--- a/run-tests.php
158158
+++ b/run-tests.php
159159
@@ -848,10 +848,12 @@ function write_information(array $user_tests, $phpdbg): void

0 commit comments

Comments
 (0)