Skip to content

Commit ef5a57e

Browse files
committed
Merge branch 'PHP-8.3' into PHP-8.4
2 parents cd55876 + c4fb30a commit ef5a57e

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

patches/8.3/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ index ae434fef976..87545d9162e 100644
153153
+CMakeLists.txt.user
154154
+CMakeScripts/
155155
diff --git a/run-tests.php b/run-tests.php
156-
index 8fb638ed3e8..5193b8e5af1 100755
156+
index a06f0958d1b..1a566d392e5 100755
157157
--- a/run-tests.php
158158
+++ b/run-tests.php
159159
@@ -891,10 +891,12 @@ function write_information(): void

patches/8.4/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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 c80dd71688f..3d724fa6871 100755
156+
index e437487f4d1..6cb36a92153 100755
157157
--- a/run-tests.php
158158
+++ b/run-tests.php
159159
@@ -871,10 +871,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
@@ -154,7 +154,7 @@ index e691bd3964b..191fcd70eb5 100644
154154
+CMakeLists.txt.user
155155
+CMakeScripts/
156156
diff --git a/run-tests.php b/run-tests.php
157-
index ac5fc91118e..dc56eba1d15 100755
157+
index d0befa3738d..02330624bc9 100755
158158
--- a/run-tests.php
159159
+++ b/run-tests.php
160160
@@ -857,10 +857,12 @@ function write_information(array $user_tests, $phpdbg): void

patches/8.6/cmake.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ index e691bd3964b..191fcd70eb5 100644
154154
+CMakeLists.txt.user
155155
+CMakeScripts/
156156
diff --git a/run-tests.php b/run-tests.php
157-
index ac5fc91118e..dc56eba1d15 100755
157+
index d0befa3738d..02330624bc9 100755
158158
--- a/run-tests.php
159159
+++ b/run-tests.php
160160
@@ -857,10 +857,12 @@ function write_information(array $user_tests, $phpdbg): void

0 commit comments

Comments
 (0)