Skip to content

Commit af6481e

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents 58f5d67 + bef86ff commit af6481e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

patches/8.3/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: Add CMake changes for PHP-8.3 branch
77
1 file changed, 18 insertions(+), 6 deletions(-)
88

99
diff --git a/run-tests.php b/run-tests.php
10-
index 2716f2a520..39f66088e2 100755
10+
index d51ab99a20..9211cbb3e2 100755
1111
--- a/run-tests.php
1212
+++ b/run-tests.php
1313
@@ -885,10 +885,12 @@ function write_information(): void

patches/8.4/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Subject: Add CMake changes for PHP-8.4 branch
77
1 file changed, 18 insertions(+), 6 deletions(-)
88

99
diff --git a/run-tests.php b/run-tests.php
10-
index 8d4c8340e0..5d51c85fd9 100755
10+
index 4654ead998..a36dbf0f24 100755
1111
--- a/run-tests.php
1212
+++ b/run-tests.php
1313
@@ -865,10 +865,12 @@ function write_information(array $user_tests, $phpdbg): void

patches/8.5/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ index e691bd3964..191fcd70eb 100644
135135
+CMakeLists.txt.user
136136
+CMakeScripts/
137137
diff --git a/run-tests.php b/run-tests.php
138-
index 2c6db0d7e2..e264d9d08e 100755
138+
index 9dffecca8d..902409f53b 100755
139139
--- a/run-tests.php
140140
+++ b/run-tests.php
141141
@@ -847,10 +847,12 @@ function write_information(array $user_tests, $phpdbg): void

0 commit comments

Comments
 (0)