Update more tests (WIP)

Author: nikic

ext/filter/tests/055.phpt

@@ -5,18 +5,18 @@ filter_var() and FILTER_VALIDATE_MAC
 --FILE--
 <?php
 $values = Array(
-    array("01-23-45-67-89-ab", null),
+    array("01-23-45-67-89-ab", 0),
     array("01-23-45-67-89-ab", array("options" => array("separator" => "-"))),
     array("01-23-45-67-89-ab", array("options" => array("separator" => "."))),
     array("01-23-45-67-89-ab", array("options" => array("separator" => ":"))),
-    array("01-23-45-67-89-AB", null),
-    array("01-23-45-67-89-aB", null),
-    array("01:23:45:67:89:ab", null),
-    array("01:23:45:67:89:AB", null),
-    array("01:23:45:67:89:aB", null),
-    array("01:23:45-67:89:aB", null),
-    array("xx:23:45:67:89:aB", null),
-    array("0123.4567.89ab", null),
+    array("01-23-45-67-89-AB", 0),
+    array("01-23-45-67-89-aB", 0),
+    array("01:23:45:67:89:ab", 0),
+    array("01:23:45:67:89:AB", 0),
+    array("01:23:45:67:89:aB", 0),
+    array("01:23:45-67:89:aB", 0),
+    array("xx:23:45:67:89:aB", 0),
+    array("0123.4567.89ab", 0),
     array("01-23-45-67-89-ab", array("options" => array("separator" => "--"))),
     array("01-23-45-67-89-ab", array("options" => array("separator" => ""))),
 );

ext/filter/tests/057.phpt

@@ -19,9 +19,13 @@ foreach (array(null, true, false, 1, "", new stdClass) as $invalid) {
 }
 ?>
 --EXPECTF--
+Deprecated: filter_input_array(): Passing null to parameter of type int is deprecated in %s on line %d
+
 Warning: filter_input_array(): Unknown filter with ID 0 in %s on line %d
 bool(false)
 
+Deprecated: filter_var_array(): Passing null to parameter of type int is deprecated in %s on line %d
+
 Warning: filter_var_array(): Unknown filter with ID 0 in %s on line %d
 bool(false)
 

ext/gd/tests/imagetruecolortopalette_error3.phpt

@@ -14,7 +14,7 @@ require __DIR__  . '/func.inc';
 $image = imagecreatetruecolor(50, 50);
 
 trycatch_dump(
-    fn() => imagetruecolortopalette($image, true, null)
+    fn() => imagetruecolortopalette($image, true, 0)
 );
 
 ?>

ext/intl/tests/bug72241.phpt

@@ -6,8 +6,7 @@ Bug #72241: get_icu_value_internal out-of-bounds read
 <?php
 $var1=str_repeat("A", 1000);
 $out = locale_get_primary_language($var1);
-echo strlen($out) . PHP_EOL;
-echo unpack('H*', $out)[1] . PHP_EOL;
+var_dump($out);
 ?>
 --EXPECT--
-0
+NULL

ext/intl/tests/collator_compare_variant2.phpt

@@ -71,12 +71,11 @@ function ut_main()
         array( 'ab'  , 'b'  ),
         array( 'ab'  , 'a'  ),
         array( 123  , 'abc' ),
-        array( 'ac' , null  ),
+        array( 'ac' , ''    ),
         array( '.'  , '.'   ),
         // Try to compare long strings.
         array( 'abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcde',
                'abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdea'),
-        array( null , null  )
     );
 
     $res_str .= compare_pairs( 'en_US', $test_params );
@@ -91,7 +90,7 @@ function ut_main()
         array( 'а',   'b' ),
         array( 'а',   'bb' ),
         array( 'а',   'ab' ),
-        array( 'а',   null )
+        array( 'а',   '' )
     );
 
     $res_str .= compare_pairs( 'ru_RU', $test_params );
@@ -120,16 +119,15 @@ ut_run();
 'ab' < 'b'
 'ab' > 'a'
 123 < 'abc'
-'ac' > NULL
+'ac' > ''
 '.' = '.'
 'abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcde' < 'abcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdefabcdea'
-NULL = NULL
 'а' < 'б'
 'а' < 'аа'
 'аб' < 'ба'
 'а' > ','
 'а' < 'b'
 'а' < 'bb'
 'а' < 'ab'
-'а' > NULL
+'а' > ''
 'y' < 'k'

ext/intl/tests/collator_get_sort_key_variant7.phpt

@@ -33,7 +33,7 @@ function ut_main()
     $test_params = array(
         'abc', 'abd', 'aaa',
         'аа', 'а', 'z',
-        '', null , '3',
+        '', '3',
         'y'  , 'i'  , 'k'
     );
 
@@ -70,8 +70,6 @@ source: z
 key: 5c01050105
 source: 
 key: 0101
-source: 
-key: 0101
 source: 3
 key: 1901050105
 source: y

ext/intl/tests/formatter_fail.phpt

@@ -107,6 +107,18 @@ ArgumentCountError: NumberFormatter::create() expects at least 2 arguments, 0 gi
 Error: NumberFormatter object is already constructed in %s on line %d
 'U_ZERO_ERROR'
 
+Deprecated: NumberFormatter::__construct(): Passing null to parameter of type string is deprecated in %s on line %d
+
+Deprecated: NumberFormatter::__construct(): Passing null to parameter of type int is deprecated in %s on line %d
+
+Deprecated: NumberFormatter::create(): Passing null to parameter of type string is deprecated in %s on line %d
+
+Deprecated: NumberFormatter::create(): Passing null to parameter of type int is deprecated in %s on line %d
+
+Deprecated: numfmt_create(): Passing null to parameter of type string is deprecated in %s on line %d
+
+Deprecated: numfmt_create(): Passing null to parameter of type int is deprecated in %s on line %d
+
 IntlException: Constructor failed in %s on line %d
 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR'
 'numfmt_create: number formatter creation failed: U_UNSUPPORTED_ERROR'

ext/intl/tests/gregoriancalendar___construct_error.phpt

@@ -29,7 +29,7 @@ try {
     echo $e->getMessage(), "\n";
 }
 try {
-    var_dump(new IntlGregorianCalendar(1,2,3,4,NULL,array()));
+    var_dump(new IntlGregorianCalendar(1,2,3,4,5,array()));
 } catch (TypeError $e) {
     echo $e->getMessage(), "\n";
 }

ext/intl/tests/gregoriancalendar___construct_variant1.phpt

@@ -10,7 +10,7 @@ ini_set("intl.error_level", E_WARNING);
 
 date_default_timezone_set('Europe/Amsterdam');
 
-$intlcal = intlgregcal_create_instance(2012, 1, 29, 16, 0, NULL);
+$intlcal = intlgregcal_create_instance(2012, 1, 29, 16, 0, 0);
 var_dump($intlcal->getTimeZone()->getId());
 var_dump($intlcal->getTime(), (float)strtotime('2012-02-29 16:00:00') * 1000);
 

ext/intl/tests/msgfmt_fail2.phpt

@@ -126,9 +126,21 @@ ArgumentCountError: msgfmt_create() expects exactly 2 arguments, 1 given in %s o
 ArgumentCountError: MessageFormatter::create() expects exactly 2 arguments, 1 given in %s on line %d
 'U_ZERO_ERROR'
 
+Deprecated: MessageFormatter::__construct(): Passing null to parameter of type string is deprecated in %s on line %d
+
+Deprecated: MessageFormatter::__construct(): Passing null to parameter of type string is deprecated in %s on line %d
+
 IntlException: msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR in %s on line %d
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
+
+Deprecated: MessageFormatter::create(): Passing null to parameter of type string is deprecated in %s on line %d
+
+Deprecated: MessageFormatter::create(): Passing null to parameter of type string is deprecated in %s on line %d
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
+
+Deprecated: msgfmt_create(): Passing null to parameter of type string is deprecated in %s on line %d
+
+Deprecated: msgfmt_create(): Passing null to parameter of type string is deprecated in %s on line %d
 'msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR'
 
 IntlException: msgfmt_create: message formatter creation failed: U_ILLEGAL_ARGUMENT_ERROR in %s on line %d

ext/intl/tests/ut_common.inc

@@ -142,7 +142,7 @@ function ut_nfmt_create( $locale, $style, $pattern = null )
         return numfmt_create( $locale, $style, $pattern );
     }
 }
-function ut_nfmt_format( $fmt, $number, $type = null )
+function ut_nfmt_format( $fmt, $number, $type = NumberFormatter::TYPE_DEFAULT )
 {
     return $GLOBALS['oo-mode'] ? $fmt->format( $number, $type ) : numfmt_format( $fmt, $number, $type );
 }