Merge branch 'PHP-8.1' into PHP-8.2

* PHP-8.1: Fix failing soap tests on Windows
php · Sep 27, 2024 · 9f63657 · 9f63657
2 parents 706bcdb + 5f3e6e3
commit 9f63657
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/ext/soap/tests/bugs/bug27722.phpt b/ext/soap/tests/bugs/bug27722.phpt
@@ -2,8 +2,6 @@
 Bug #27722 (Segfault on schema without targetNamespace)
 --EXTENSIONS--
 soap
---GET--
-wsdl
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--

diff --git a/ext/soap/tests/bugs/bug27742.phpt b/ext/soap/tests/bugs/bug27742.phpt
@@ -2,8 +2,6 @@
 Bug #27742 (WDSL SOAP Parsing Schema bug)
 --EXTENSIONS--
 soap
---GET--
-wsdl
 --INI--
 soap.wsdl_cache_enabled=0
 --FILE--

diff --git a/ext/soap/tests/server011.phpt b/ext/soap/tests/server011.phpt
@@ -1,5 +1,11 @@
 --TEST--
 SOAP Server 11: bind
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === "Windows") {
+    die("skip currently unsupported on Windows");
+}
+?>
 --EXTENSIONS--
 soap
 --GET--

diff --git a/ext/soap/tests/server012.phpt b/ext/soap/tests/server012.phpt
@@ -1,5 +1,11 @@
 --TEST--
 SOAP Server 12: WSDL generation
+--SKIPIF--
+<?php
+if (PHP_OS_FAMILY === "Windows") {
+    die("skip currently unsupported on Windows");
+}
+?>
 --EXTENSIONS--
 soap
 --GET--
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,8 +2,6 @@ @@
     Bug #27722 (Segfault on schema without targetNamespace)
     --EXTENSIONS--
     soap
-    --GET--
-    wsdl
     --INI--
     soap.wsdl_cache_enabled=0
     --FILE--
@@ Expand Down @@