Fix tests

Author: kocsismate

ext/soap/php_http.c

@@ -436,7 +436,7 @@ int make_http_soap_request(zval        *this_ptr,
 	}
 
 	tmp = zend_read_property(Z_OBJCE_P(this_ptr), Z_OBJ_P(this_ptr), "_stream_context", sizeof("_stream_context")-1, 1, &rv);
-	if (tmp != NULL) {
+	if (tmp != NULL && Z_TYPE_P(tmp) != IS_NULL) {
 		context = php_stream_context_from_zval(tmp, 0);
 	}
 

ext/soap/soap.c

@@ -2218,7 +2218,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
 				ZVAL_OBJ(&exception_object, EG(exception));
 				msg = zval_get_string(zend_read_property(zend_ce_error, Z_OBJ(exception_object), "message", sizeof("message")-1, 0, &rv));
 				/* change class */
-				EG(exception)->ce = soap_fault_class_entry;
+				EG(exception)->ce = soap_fault_class_entry; // TODO Why does it sigterm when all SoapFault properties are declared?
 				set_soap_fault(&exception_object, NULL, "Client", ZSTR_VAL(msg), NULL, NULL, NULL);
 				zend_string_release_ex(msg, 0);
 			} else if (
@@ -3777,12 +3777,14 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 					char *hdr_ns   = h->hdr?h->hdr->ns:NULL;
 					char *hdr_name = Z_TYPE(h->function_name) == IS_STRING
 						? Z_STRVAL(h->function_name) : NULL;
+					bool is_header = 0;
 
 					if (Z_TYPE(h->retval) == IS_OBJECT &&
 					    instanceof_function(Z_OBJCE(h->retval), soap_header_class_entry)) {
 						zval *tmp;
 						sdlSoapBindingFunctionHeaderPtr hdr;
 						smart_str key = {0};
+						is_header = 1;
 
 						tmp = zend_read_property(soap_header_class_entry, Z_OBJ(h->retval), "namespace", sizeof("namespace")-1, 1, &rv);
 						if (tmp != NULL && Z_TYPE_P(tmp) == IS_STRING) {
@@ -3820,7 +3822,9 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 						if (serialize_response_call2(head, h->function, Z_STRVAL(h->function_name), uri, hdr_ret, version, 0, &xmlHdr) == SOAP_ENCODED) {
 							use = SOAP_ENCODED;
 						}
-						set_soap_header_attributes(xmlHdr, &h->retval, version);
+						if (is_header) {
+							set_soap_header_attributes(xmlHdr, &h->retval, version);
+						}
 					} else {
 						xmlNodePtr xmlHdr = master_to_xml(hdr_enc, hdr_ret, hdr_use, head);
 						if (hdr_name) {
@@ -3830,7 +3834,9 @@ static xmlDocPtr serialize_response_call(sdlFunctionPtr function, char *function
 							xmlNsPtr nsptr = encode_add_ns(xmlHdr,hdr_ns);
 							xmlSetNs(xmlHdr, nsptr);
 						}
-						set_soap_header_attributes(xmlHdr, &h->retval, version);
+						if (is_header) {
+							set_soap_header_attributes(xmlHdr, &h->retval, version);
+						}
 					}
 				}
 				h = h->next;

ext/soap/soap.stub.php

@@ -38,23 +38,23 @@ public function __construct(string $namespace, string $name, mixed $data = UNKNO
 class SoapFault extends Exception
 {
     /** @var string */
-    public $faultstring;
+    public $faultstring = "";
 
     /** @var string|null */
     public $faultcode;
 
     /** @var string|null */
-    public $faultcodens;
+    //public $faultcodens;
 
     /** @var string|null */
-    public $faultactor;
+    //public $faultactor;
 
-    public mixed $detail = null;
+    //public mixed $detail = null;
 
     /** @var string|null */
-    public $_name;
+    //public $_name;
 
-    public mixed $headerfault = null;
+    //public mixed $headerfault = null;
 
     public function __construct(array|string|null $code, string $string, ?string $actor = null, mixed $details = null, ?string $name = null, mixed $headerFault = null) {}
 

ext/soap/soap_arginfo.h

@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: a88843aad714f9120a38f4cfda0e58e5dd4af7b7 */
+ * Stub hash: 409379e1ef2ad85cc968034427ded4575504f5e8 */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_use_soap_error_handler, 0, 0, _IS_BOOL, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, enable, _IS_BOOL, 0, "true")
@@ -301,7 +301,7 @@ static zend_class_entry *register_class_SoapFault(zend_class_entry *class_entry_
 	class_entry = zend_register_internal_class_ex(&ce, class_entry_Exception);
 
 	zval property_faultstring_default_value;
-	ZVAL_NULL(&property_faultstring_default_value);
+	ZVAL_EMPTY_STRING(&property_faultstring_default_value);
 	zend_string *property_faultstring_name = zend_string_init("faultstring", sizeof("faultstring") - 1, 1);
 	zend_declare_property_ex(class_entry, property_faultstring_name, &property_faultstring_default_value, ZEND_ACC_PUBLIC, NULL);
 	zend_string_release(property_faultstring_name);
@@ -312,36 +312,6 @@ static zend_class_entry *register_class_SoapFault(zend_class_entry *class_entry_
 	zend_declare_property_ex(class_entry, property_faultcode_name, &property_faultcode_default_value, ZEND_ACC_PUBLIC, NULL);
 	zend_string_release(property_faultcode_name);
 
-	zval property_faultcodens_default_value;
-	ZVAL_NULL(&property_faultcodens_default_value);
-	zend_string *property_faultcodens_name = zend_string_init("faultcodens", sizeof("faultcodens") - 1, 1);
-	zend_declare_property_ex(class_entry, property_faultcodens_name, &property_faultcodens_default_value, ZEND_ACC_PUBLIC, NULL);
-	zend_string_release(property_faultcodens_name);
-
-	zval property_faultactor_default_value;
-	ZVAL_NULL(&property_faultactor_default_value);
-	zend_string *property_faultactor_name = zend_string_init("faultactor", sizeof("faultactor") - 1, 1);
-	zend_declare_property_ex(class_entry, property_faultactor_name, &property_faultactor_default_value, ZEND_ACC_PUBLIC, NULL);
-	zend_string_release(property_faultactor_name);
-
-	zval property_detail_default_value;
-	ZVAL_NULL(&property_detail_default_value);
-	zend_string *property_detail_name = zend_string_init("detail", sizeof("detail") - 1, 1);
-	zend_declare_typed_property(class_entry, property_detail_name, &property_detail_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ANY));
-	zend_string_release(property_detail_name);
-
-	zval property__name_default_value;
-	ZVAL_NULL(&property__name_default_value);
-	zend_string *property__name_name = zend_string_init("_name", sizeof("_name") - 1, 1);
-	zend_declare_property_ex(class_entry, property__name_name, &property__name_default_value, ZEND_ACC_PUBLIC, NULL);
-	zend_string_release(property__name_name);
-
-	zval property_headerfault_default_value;
-	ZVAL_NULL(&property_headerfault_default_value);
-	zend_string *property_headerfault_name = zend_string_init("headerfault", sizeof("headerfault") - 1, 1);
-	zend_declare_typed_property(class_entry, property_headerfault_name, &property_headerfault_default_value, ZEND_ACC_PUBLIC, NULL, (zend_type) ZEND_TYPE_INIT_MASK(MAY_BE_ANY));
-	zend_string_release(property_headerfault_name);
-
 	return class_entry;
 }