Deprecate ext/wddx

cmb69 · cmb69 · commit 6ac8b0a783b2 · 2019-02-11T19:31:46.000+01:00
Cf. <https://wiki.php.net/rfc/deprecate-and-remove-ext-wddx>.
diff --git a/NEWS b/NEWS
@@ -92,4 +92,7 @@ PHP                                                                        NEWS
 - Tidy:
   . Added TIDY_TAG_* constants for HTML5 elements. (cmb)
 
+- WDDX:
+  . Deprecated the WDDX extension. (cmb)
+
 <<< NOTE: Insert NEWS from last stable release here prior to actual release! >>>
diff --git a/UPGRADING b/UPGRADING
@@ -241,6 +241,9 @@ PHP 7.4 UPGRADE NOTES
     possible, but unserialization yielded unusable objects.
   . The @param notation can now also be used to denote SQL query parameters.
 
+- WDDX:
+  . The WDDX extension has been deprecated.
+
 - Zip:
   . The bundled libzip library has been removed. A system libzip >= 0.11 is now
     necessary to build the extension.
diff --git a/ext/wddx/tests/001-64bit.phpt b/ext/wddx/tests/001-64bit.phpt
@@ -10,7 +10,8 @@ precision=14
 	$path = dirname(__FILE__);
 	var_dump(wddx_deserialize(file_get_contents("{$path}/wddx.xml")));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(11) {
   ["aNull"]=>
   NULL
diff --git a/ext/wddx/tests/001.phpt b/ext/wddx/tests/001.phpt
@@ -10,7 +10,8 @@ precision=14
 	$path = dirname(__FILE__);
 	var_dump(wddx_deserialize(file_get_contents("{$path}/wddx.xml")));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(11) {
   ["aNull"]=>
   NULL
diff --git a/ext/wddx/tests/002.phpt b/ext/wddx/tests/002.phpt
@@ -17,5 +17,10 @@ precision=14
 	wddx_add_vars($pkt, 'var1', 'var2', array('var3', 'var4'));
 	echo wddx_packet_end($pkt);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_packet_start() is deprecated in %s on line %d
+
+Deprecated: Function wddx_add_vars() is deprecated in %s on line %d
+
+Deprecated: Function wddx_packet_end() is deprecated in %s on line %d
 <wddxPacket version='1.0'><header><comment>TEST comment</comment></header><data><struct><var name='var1'><null/></var><var name='var2'><string>some string</string></var><var name='var3'><number>756</number></var><var name='var4'><boolean value='true'/></var></struct></data></wddxPacket>
diff --git a/ext/wddx/tests/003.phpt b/ext/wddx/tests/003.phpt
@@ -13,7 +13,8 @@ precision=14
 	var_dump(wddx_deserialize($fp));
 	fclose($fp);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(4) {
   ["var1"]=>
   NULL
diff --git a/ext/wddx/tests/bug27287.phpt b/ext/wddx/tests/bug27287.phpt
@@ -16,5 +16,8 @@ Bug #27287 (segfault with deserializing object data)
 	echo "OK\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 OK
diff --git a/ext/wddx/tests/bug34306.phpt b/ext/wddx/tests/bug34306.phpt
@@ -10,5 +10,6 @@ $buf = wddx_serialize_value($var, 'name');
 echo "OK\n";
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
 OK
diff --git a/ext/wddx/tests/bug35410.phpt b/ext/wddx/tests/bug35410.phpt
@@ -50,7 +50,8 @@ WDX;
 
 var_dump(wddx_deserialize($wddx));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["content_queries"]=>
   array(1) {
diff --git a/ext/wddx/tests/bug35410_64bit.phpt b/ext/wddx/tests/bug35410_64bit.phpt
@@ -50,7 +50,8 @@ WDX;
 
 var_dump(wddx_deserialize($wddx));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["content_queries"]=>
   array(1) {
diff --git a/ext/wddx/tests/bug37569.phpt b/ext/wddx/tests/bug37569.phpt
@@ -2,6 +2,8 @@
 Bug #37569 (WDDX incorrectly encodes high-ascii characters)
 --SKIPIF--
 <?php if (!extension_loaded("wddx")) print "skip"; ?>
+--INI--
+error_reporting=E_ALL & ~E_DEPRECATED
 --FILE--
 <?php
 for ($i = 65; $i < 256; $i++) {
diff --git a/ext/wddx/tests/bug37587.phpt b/ext/wddx/tests/bug37587.phpt
@@ -23,7 +23,8 @@ EOF
 
 ?>
 ===DONE===
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   [0]=>
   array(1) {
diff --git a/ext/wddx/tests/bug41283.phpt b/ext/wddx/tests/bug41283.phpt
@@ -10,7 +10,10 @@ $data = array(
 
 var_dump(wddx_deserialize(wddx_serialize_vars('data')));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_vars() is deprecated in %s on line %d
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["data"]=>
   array(1) {
diff --git a/ext/wddx/tests/bug41527.phpt b/ext/wddx/tests/bug41527.phpt
@@ -8,7 +8,10 @@ $data = array('01' => 'Zero', '+1' => 'Plus sign', ' 1' => 'Space');
 
 var_dump(wddx_deserialize(wddx_serialize_vars('data')));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_vars() is deprecated in %s on line %d
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["data"]=>
   array(3) {
diff --git a/ext/wddx/tests/bug45901.phpt b/ext/wddx/tests/bug45901.phpt
@@ -14,6 +14,8 @@ echo wddx_serialize_value($xml, 'Variables') . "\n";
 echo "DONE";
 ?>
 --EXPECTF--
+Deprecated: Function wddx_serialize_value() is deprecated in %sbug45901.php on line %d
+
 Warning: wddx_serialize_value(): Class SimpleXMLElement can not be serialized in %sbug45901.php on line %d
 <wddxPacket version='1.0'><header><comment>Variables</comment></header><data></data></wddxPacket>
 DONE
diff --git a/ext/wddx/tests/bug48562.phpt b/ext/wddx/tests/bug48562.phpt
@@ -29,6 +29,10 @@ var_dump(wddx_serialize_vars($a));
 
 ?>
 --EXPECTF--
+Deprecated: Function wddx_serialize_vars() is deprecated in %s on line %d
+
 Warning: wddx_serialize_vars(): recursion detected in %s on line %d
 string(78) "<wddxPacket version='1.0'><header/><data><struct></struct></data></wddxPacket>"
+
+Deprecated: Function wddx_serialize_vars() is deprecated in %s on line %d
 string(120) "<wddxPacket version='1.0'><header/><data><struct><var name='foo'><string>bar</string></var></struct></data></wddxPacket>"
diff --git a/ext/wddx/tests/bug52468.phpt b/ext/wddx/tests/bug52468.phpt
@@ -15,11 +15,14 @@ print_r(wddx_deserialize($message));
 print_r(wddx_deserialize($message));
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 Array
 (
     [handle] => 0
 )
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 Array
 (
     [handle] => 0
diff --git a/ext/wddx/tests/bug70661.phpt b/ext/wddx/tests/bug70661.phpt
@@ -53,7 +53,8 @@ function ptr2str($ptr)
 }
 ?>
 DONE
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   [0]=>
   array(1) {
diff --git a/ext/wddx/tests/bug71335.phpt b/ext/wddx/tests/bug71335.phpt
@@ -26,6 +26,7 @@ var_dump($d);
 ?>
 DONE
 --EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 object(stdClass)#%d (1) {
   ["php_class_name"]=>
   string(8) "stdClass"
diff --git a/ext/wddx/tests/bug71587.phpt b/ext/wddx/tests/bug71587.phpt
@@ -29,7 +29,8 @@ foreach($wddx as $k=>$v)
 
 ?>
 DONE
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(2) {
   [0]=>
   string(8) "manhluat"
diff --git a/ext/wddx/tests/bug72142.phpt b/ext/wddx/tests/bug72142.phpt
@@ -10,6 +10,9 @@ var_dump($wddx);
 var_dump(wddx_deserialize($wddx));
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
 string(301) "<wddxPacket version='1.0'><header><comment>&lt;/comment&gt;&lt;/header&gt;&lt;data&gt;&lt;struct&gt;&lt;var name=&quot;php_class_name&quot;&gt;&lt;string&gt;stdClass&lt;/string&gt;&lt;/var&gt;&lt;/struct&gt;&lt;/data&gt;&lt;/wddxPacket&gt;</comment></header><data><string></string></data></wddxPacket>"
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 string(0) ""
diff --git a/ext/wddx/tests/bug72340.phpt b/ext/wddx/tests/bug72340.phpt
@@ -19,6 +19,7 @@ EOF;
 $array = wddx_deserialize($xml);
 var_dump($array);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(0) {
 }
diff --git a/ext/wddx/tests/bug72564.phpt b/ext/wddx/tests/bug72564.phpt
@@ -10,11 +10,22 @@ Bug #72564: wddx deserialization of boolean
 	}
 ?>
 Done
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 string(84) "<wddxPacket version='1.0'><header/><data><boolean value='true'/></data></wddxPacket>"
 bool(true)
+
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 string(85) "<wddxPacket version='1.0'><header/><data><boolean value='false'/></data></wddxPacket>"
 bool(false)
+
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 string(68) "<wddxPacket version='1.0'><header/><data><null/></data></wddxPacket>"
 NULL
 Done
diff --git a/ext/wddx/tests/bug72749.phpt b/ext/wddx/tests/bug72749.phpt
@@ -26,7 +26,8 @@ XML;
 $array = wddx_deserialize($xml);
 var_dump($array);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["aDateTime3"]=>
   string(24) "2
diff --git a/ext/wddx/tests/bug72750.phpt b/ext/wddx/tests/bug72750.phpt
@@ -27,7 +27,8 @@ XML;
 $array = wddx_deserialize($xml);
 var_dump($array);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["aBinary"]=>
   string(9) "������FF"
diff --git a/ext/wddx/tests/bug72790.phpt b/ext/wddx/tests/bug72790.phpt
@@ -31,5 +31,6 @@ XML;
 $array = wddx_deserialize($xml);
 var_dump($array);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 NULL
diff --git a/ext/wddx/tests/bug72799.phpt b/ext/wddx/tests/bug72799.phpt
@@ -24,5 +24,6 @@ XML;
 $array = wddx_deserialize($xml);
 var_dump($array);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 NULL
diff --git a/ext/wddx/tests/bug72860.phpt b/ext/wddx/tests/bug72860.phpt
@@ -22,6 +22,7 @@ XML;
 var_dump(wddx_deserialize($xml));
 ?>
 DONE
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 NULL
 DONE
diff --git a/ext/wddx/tests/bug73065.phpt b/ext/wddx/tests/bug73065.phpt
@@ -81,18 +81,27 @@ for($i=1;$i<=5;$i++) {
 }
 ?>
 DONE
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(0) {
 }
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   [0]=>
   array(0) {
   }
 }
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(0) {
 }
 DONE
diff --git a/ext/wddx/tests/bug73173.phpt b/ext/wddx/tests/bug73173.phpt
@@ -21,5 +21,6 @@ XML;
 var_dump(wddx_deserialize($xml));
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 NULL
diff --git a/ext/wddx/tests/bug73331.phpt b/ext/wddx/tests/bug73331.phpt
@@ -9,5 +9,7 @@ $wddx = "<wddxPacket version='1.0'><header/><data><struct><var name='php_class_n
 var_dump(wddx_deserialize($wddx));
 ?>
 --EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
+
 Warning: wddx_deserialize(): Class pdorow can not be unserialized in %s73331.php on line %d
 NULL
diff --git a/ext/wddx/tests/bug73631.phpt b/ext/wddx/tests/bug73631.phpt
@@ -16,5 +16,6 @@ EOF;
 $wddx = wddx_deserialize($xml);
 var_dump($wddx);
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 int(1234)
diff --git a/ext/wddx/tests/bug73793.phpt b/ext/wddx/tests/bug73793.phpt
@@ -13,6 +13,7 @@ setlocale(LC_NUMERIC , ['de_DE', 'de_DE.UTF-8', 'de-DE']);
 var_dump(wddx_serialize_value(['foo' => 5.1]));
 ?>
 ===DONE===
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_serialize_value() is deprecated in %s on line %d
 string(120) "<wddxPacket version='1.0'><header/><data><struct><var name='foo'><number>5.1</number></var></struct></data></wddxPacket>"
 ===DONE===
diff --git a/ext/wddx/tests/bug73831.phpt b/ext/wddx/tests/bug73831.phpt
@@ -19,5 +19,7 @@ try {
 } catch(Error $e) { echo $e->getMessage(); }
 ?>
 --EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
+
 Warning: wddx_deserialize(): Class throwable can not be instantiated in %sbug73831.php on line %d
 Cannot instantiate interface Throwable
diff --git a/ext/wddx/tests/bug74145.phpt b/ext/wddx/tests/bug74145.phpt
@@ -11,6 +11,7 @@ $wddx = wddx_deserialize($data);
 var_dump($wddx);
 ?>
 DONE
---EXPECT--
+--EXPECTF--
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 NULL
 DONE
diff --git a/ext/wddx/tests/bug75055.phpt b/ext/wddx/tests/bug75055.phpt
@@ -12,8 +12,10 @@ print strlen($wddx_str) . " bytes read.\n";
 
 var_dump(wddx_deserialize($wddx_str));
 ?>
---EXPECT--
+--EXPECTF--
 323 bytes read.
+
+Deprecated: Function wddx_deserialize() is deprecated in %s on line %d
 array(1) {
   ["aDateTime"]=>
   string(12) "frONt of 0 0"
diff --git a/ext/wddx/wddx.c b/ext/wddx/wddx.c
