From 2312555b5d0a12e01bc8e228d0c582c9610e9218 Mon Sep 17 00:00:00 2001
From: Ken Guest <kguest@php.net>
Date: Thu, 12 Oct 2017 20:59:43 +0100
Subject: [PATCH 1/4] SoapParam should emit a warning if the parameter name is
 an empty string.

---
 ext/soap/tests/param001.phpt | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 ext/soap/tests/param001.phpt

diff --git a/ext/soap/tests/param001.phpt b/ext/soap/tests/param001.phpt
new file mode 100644
index 0000000000..498838abd2
--- /dev/null
+++ b/ext/soap/tests/param001.phpt
@@ -0,0 +1,21 @@
+--TEST--
+SoapParam should emit a warning if the parameter name is an empty string
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$a = 1;
+$fault = new SoapParam($a, "");
+$fault = new SoapParam($a, "Name");
+var_dump ($fault);
+?>
+--CREDITS--
+PHP TestFest 2017 - PHPDublin - Ken Guest <kguest@php.net>
+--EXPECTF--
+Warning: SoapParam::SoapParam(): Invalid parameter name in %s on line %d
+object(SoapParam)#%d (%d) {
+  ["param_name"]=>
+  string(4) "Name"
+  ["param_data"]=>
+  int(1)
+}

From a673cddb285a97e689de82f6653f892aab16a263 Mon Sep 17 00:00:00 2001
From: Ken Guest <kguest@php.net>
Date: Sat, 21 Oct 2017 20:57:42 +0100
Subject: [PATCH 2/4] PHP TestFest 2017 - phpdublin - soapheader tests.

---
 ext/soap/tests/header001.phpt | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 ext/soap/tests/header001.phpt

diff --git a/ext/soap/tests/header001.phpt b/ext/soap/tests/header001.phpt
new file mode 100644
index 0000000000..9ba9961e11
--- /dev/null
+++ b/ext/soap/tests/header001.phpt
@@ -0,0 +1,33 @@
+--TEST--
+SoapHeader emits specific warnings depending on invalid parameters passed to constructor.
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$namespace = 'urn:Foo-BAR';
+/* FROM soap.c
+   proto object SoapHeader::SoapHeader ( string namespace, string name [, mixed data [, bool mustUnderstand [, mixed actor]]])
+   SoapHeader constructor */
+$soapVarHeader = "value";
+$soapVar = new SoapHeader("", "urn", $soapVarHeader); // Invalid - namespace can't be an empty string
+$soapVar = new SoapHeader($namespace, "", $soapVarHeader); // Invalid - header name can't be an empty string
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, SOAP_ACTOR_NEXT);
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, SOAP_ACTOR_NONE);
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, SOAP_ACTOR_UNLIMATERECEIVER);
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, 4); // Invalid - actor value, if an integer must be one of the three SOAP_* constants above
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, NULL); // Invalid - actor value can't be null
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, "http://svc.example.com/soapService"); // Valid
+$soapVar = new SoapHeader($namespace, "name", $soapVarHeader, false, ""); // Invalid - if it's a string, then it can't be empty
+?>
+--CREDITS--
+PHP TestFest 2017 - PHPDublin - Ken Guest <kguest@php.net>
+--EXPECTF--
+Warning: SoapHeader::SoapHeader(): Invalid namespace in %s on line %d
+
+Warning: SoapHeader::SoapHeader(): Invalid header name in %s on line %d
+
+Warning: SoapHeader::SoapHeader(): Invalid actor in %s on line %d
+
+Warning: SoapHeader::SoapHeader(): Invalid actor in %s on line %d
+
+Warning: SoapHeader::SoapHeader(): Invalid actor in %s on line %d

From fd3b133c7704c97d6823b529e388a3ab9410ac21 Mon Sep 17 00:00:00 2001
From: Ken Guest <kguest@php.net>
Date: Sat, 21 Oct 2017 21:11:34 +0100
Subject: [PATCH 3/4] PHP TestFest 2017 - phpdublin - SoapVar should emit a
 warning if the type id is invalid (e.g. 'Invalid')

---
 ext/soap/tests/var001.phpt | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 ext/soap/tests/var001.phpt

diff --git a/ext/soap/tests/var001.phpt b/ext/soap/tests/var001.phpt
new file mode 100644
index 0000000000..149fd81d21
--- /dev/null
+++ b/ext/soap/tests/var001.phpt
@@ -0,0 +1,13 @@
+--TEST--
+SoapVar should emit a warning if the type id is invalid (e.g. "Invalid")
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+$a = 1;
+$soapVar = new SoapVar($a, "Invalid");
+?>
+--CREDITS--
+PHP TestFest 2017 - PHPDublin - Ken Guest <kguest@php.net>
+--EXPECTF--
+Warning: SoapVar::SoapVar(): Invalid type ID in %s on line %d

From e23790f14a8292f0d7390174562204758376630a Mon Sep 17 00:00:00 2001
From: Ken Guest <kguest@php.net>
Date: Tue, 24 Oct 2017 00:38:53 +0100
Subject: [PATCH 4/4] Bug #75421Invalid values accepted for the SoapHeader
 actor parameter.

---
 ext/soap/tests/bugs/bug75421.phpt | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 ext/soap/tests/bugs/bug75421.phpt

diff --git a/ext/soap/tests/bugs/bug75421.phpt b/ext/soap/tests/bugs/bug75421.phpt
new file mode 100644
index 0000000000..34b8552f40
--- /dev/null
+++ b/ext/soap/tests/bugs/bug75421.phpt
@@ -0,0 +1,25 @@
+--TEST--
+SoapHeader allows an invalid URL as the actor string, 'invalid actor' warning should be raised.
+--SKIPIF--
+<?php require_once('skipif.inc'); ?>
+--FILE--
+<?php
+/*
+ * As per the spec,the SoapHeader actor attribute/parameter should be an URI/URL.
+ *
+ * https://www.w3.org/TR/2000/NOTE-SOAP-20000508/#_Toc478383499
+ *
+ * There is no validation to ensure this is the case.
+ */
+$namespace = 'urn:Foo-BAR';
+$soapVarHeader = "value";
+$invalidURL = "http://127_0_0_1/next";
+var_dump(filter_var($invalidURL, FILTER_VALIDATE_URL));
+$soapHeader = new SoapHeader($namespace, "name", $soapVarHeader, false, $invalidURL);
+var_dump ($soapHeader); // shouldn't get this far.
+?>
+--CREDITS--
+PHP TestFest 2017 - PHPDublin - Ken Guest <kguest@php.net>
+--EXPECTF--
+bool(false)
+Warning: SoapHeader::SoapHeader(): Invalid actor in %s on line %d