Merge branch 'PHP-8.3' into PHP-8.4

petk · petk · commit 06f9706bc9bd · 2025-05-23T00:43:42.000+02:00
diff --git a/cmake/ext/intl/CMakeLists.txt b/cmake/ext/intl/CMakeLists.txt
@@ -63,11 +63,11 @@ endif()
 # TODO: Recheck this.
 get_target_property(type php_ext_intl TYPE)
 if(
-  type MATCHES "^(MODULE|SHARED)_LIBRARY$"
+  NOT type MATCHES "^(MODULE|SHARED)_LIBRARY$"
   AND CMAKE_SYSTEM_NAME STREQUAL "Windows"
 )
   message(
-    WARNING
+    AUTHOR_WARNING
     "TODO: Recheck if Windows still requires ext/intl to be always built as "
     "shared (zend_strtod.c/ICU type conflict)."
   )

Original file line number	Diff line number	Diff line change
`@@ -63,11 +63,11 @@ endif()`
`63`	`63`	`# TODO: Recheck this.`
`64`	`64`	`get_target_property(type php_ext_intl TYPE)`
`65`	`65`	`if(`
`66`		`- type MATCHES "^(MODULE\|SHARED)_LIBRARY$"`
	`66`	`+ NOT type MATCHES "^(MODULE\|SHARED)_LIBRARY$"`
`67`	`67`	`AND CMAKE_SYSTEM_NAME STREQUAL "Windows"`
`68`	`68`	`)`
`69`	`69`	`message(`
`70`		`- WARNING`
	`70`	`+ AUTHOR_WARNING`
`71`	`71`	`"TODO: Recheck if Windows still requires ext/intl to be always built as "`
`72`	`72`	`"shared (zend_strtod.c/ICU type conflict)."`
`73`	`73`	`)`