From: Peter Kokot <peterkokot@gmail.com>
Date: Sat, 11 May 2019 15:16:50 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~307
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4e0e0b8152e9b982f2d029a5e1ff2d5ede9888e7;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Convert CRLF to LF in *.wsdl files
---

4e0e0b8152e9b982f2d029a5e1ff2d5ede9888e7
diff --cc ext/soap/tests/bugs/bug32941.wsdl
index 61fd13dcbc,3e91a75c6a..3e91a75c6a
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug32941.wsdl
+++ b/ext/soap/tests/bugs/bug32941.wsdl
diff --cc ext/soap/tests/bugs/bug34453.wsdl
index 205e1c95b5,6b5ca48fe8..6b5ca48fe8
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug34453.wsdl
+++ b/ext/soap/tests/bugs/bug34453.wsdl
diff --cc ext/soap/tests/bugs/bug34643.wsdl
index 24c3a50828,304681509f..304681509f
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug34643.wsdl
+++ b/ext/soap/tests/bugs/bug34643.wsdl
diff --cc ext/soap/tests/bugs/bug35142.wsdl
index 2c712ec108,bdb62bd8e4..bdb62bd8e4
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug35142.wsdl
+++ b/ext/soap/tests/bugs/bug35142.wsdl
diff --cc ext/soap/tests/bugs/bug36226-2.wsdl
index 18c2ce3c00,327022d192..327022d192
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug36226-2.wsdl
+++ b/ext/soap/tests/bugs/bug36226-2.wsdl
diff --cc ext/soap/tests/bugs/bug36575.wsdl
index 0f1899bcd5,1396eb1966..1396eb1966
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug36575.wsdl
+++ b/ext/soap/tests/bugs/bug36575.wsdl
diff --cc ext/soap/tests/bugs/bug36908.wsdl
index f3be3f6304,6889df3aaa..6889df3aaa
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug36908.wsdl
+++ b/ext/soap/tests/bugs/bug36908.wsdl
diff --cc ext/soap/tests/bugs/bug37013.wsdl
index dbd77fd8df,aae7604233..aae7604233
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug37013.wsdl
+++ b/ext/soap/tests/bugs/bug37013.wsdl
diff --cc ext/soap/tests/bugs/bug37083.wsdl
index 2a3b379802,f7df3bea78..f7df3bea78
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug37083.wsdl
+++ b/ext/soap/tests/bugs/bug37083.wsdl
diff --cc ext/soap/tests/bugs/bug38004.wsdl
index c288135966,34c03d819d..34c03d819d
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug38004.wsdl
+++ b/ext/soap/tests/bugs/bug38004.wsdl
diff --cc ext/soap/tests/bugs/bug38055.wsdl
index f8935477f1,c06b496782..c06b496782
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug38055.wsdl
+++ b/ext/soap/tests/bugs/bug38055.wsdl
diff --cc ext/soap/tests/bugs/bug38067.wsdl
index beb9fc2141,0257effa42..0257effa42
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug38067.wsdl
+++ b/ext/soap/tests/bugs/bug38067.wsdl
diff --cc ext/soap/tests/bugs/bug39832.wsdl
index a71f581dd5,87c639aa38..87c639aa38
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug39832.wsdl
+++ b/ext/soap/tests/bugs/bug39832.wsdl
diff --cc ext/soap/tests/bugs/bug40609.wsdl
index 0792e90b3f,0474ff8169..0474ff8169
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug40609.wsdl
+++ b/ext/soap/tests/bugs/bug40609.wsdl
diff --cc ext/soap/tests/bugs/bug41004.wsdl
index d683e5d4ac,6c2a5f4879..6c2a5f4879
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug41004.wsdl
+++ b/ext/soap/tests/bugs/bug41004.wsdl
diff --cc ext/soap/tests/bugs/bug42086.wsdl
index 5ec3d956ca,d55883268f..d55883268f
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug42086.wsdl
+++ b/ext/soap/tests/bugs/bug42086.wsdl
diff --cc ext/soap/tests/bugs/bug42326.wsdl
index a125ed8cd8,a8e845b537..a8e845b537
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug42326.wsdl
+++ b/ext/soap/tests/bugs/bug42326.wsdl
diff --cc ext/soap/tests/bugs/bug42359.wsdl
index bc73adaec6,e51db4bab0..e51db4bab0
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug42359.wsdl
+++ b/ext/soap/tests/bugs/bug42359.wsdl
diff --cc ext/soap/tests/bugs/bug42692.wsdl
index c8928e30d0,5a6d02383d..5a6d02383d
mode 100644,100755..100644
--- a/ext/soap/tests/bugs/bug42692.wsdl
+++ b/ext/soap/tests/bugs/bug42692.wsdl
diff --cc ext/soap/tests/classmap003.wsdl
index 494c41864e,5fd4660444..5fd4660444
mode 100644,100755..100644
--- a/ext/soap/tests/classmap003.wsdl
+++ b/ext/soap/tests/classmap003.wsdl