Update more tests (WIP)

Author: nikic

ext/date/tests/bug54283.phpt

@@ -10,5 +10,6 @@ try {
 }
 
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: DatePeriod::__construct(): Passing null to parameter of type string is deprecated in %s on line %d
 string(51) "DatePeriod::__construct(): Unknown or bad format ()"

ext/date/tests/bug73858.phpt

@@ -15,22 +15,22 @@ $e = new DateTime($es);
 $d= $e->diff($s);
 var_dump($d->days); // 0 ... but should be 30
 
-$s = (new DateTime(null))->setTimestamp(strtotime($ss)); // verbose setup method
-$e = (new DateTime(null))->setTimestamp(strtotime($es)); // verbose setup method
+$s = (new DateTime("now"))->setTimestamp(strtotime($ss)); // verbose setup method
+$e = (new DateTime("now"))->setTimestamp(strtotime($es)); // verbose setup method
 $d = $e->diff($s);
 var_dump($d->days); // 30 ... and should be 30
 
 /*
 Next we will try mix/match the code to see what happens, surprisingly it seems that the end date ($e)
 is the important one, if it uses the verbose method it returns the correct values.
 */
-$s = (new DateTime(null))->setTimestamp(strtotime($ss)); // verbose setup method
+$s = (new DateTime("now"))->setTimestamp(strtotime($ss)); // verbose setup method
 $e = new DateTime($es);
 $d= $e->diff($s);
 var_dump($d->days); // 0 ... but should be 30
 
 $s = new DateTime($ss);
-$e = (new DateTime(null))->setTimestamp(strtotime($es)); // verbose setup method
+$e = (new DateTime("now"))->setTimestamp(strtotime($es)); // verbose setup method
 $d= $e->diff($s);
 var_dump($d->days); // 30 ... and should be 30
 
@@ -39,7 +39,7 @@ This test just proves that the $e date is important BUT NOT because it's the one
 on, that's just coincidental that seems to imply that the "- 1 second" in the date string is the problem.
 */
 $s = new DateTime($ss);
-$e = (new DateTime(null))->setTimestamp(strtotime($es)); // verbose setup method
+$e = (new DateTime("now"))->setTimestamp(strtotime($es)); // verbose setup method
 $d= $s->diff($e);
 var_dump($d->days); // 30 ... and should be 30
 

ext/date/tests/date_interval_create_from_date_string_nullparam.phpt

@@ -8,5 +8,7 @@ $i = date_interval_create_from_date_string(null);
 var_dump($i);
 ?>
 --EXPECTF--
+Deprecated: date_interval_create_from_date_string(): Passing null to parameter of type string is deprecated in %s on line %d
+
 Warning: date_interval_create_from_date_string(): Unknown or bad format () at position 0 ( ): Empty string in %sdate_interval_create_from_date_string_nullparam.php on line 2
 bool(false)

ext/date/tests/date_timestamp_set_nullparam2.phpt

@@ -13,7 +13,8 @@ $dtms021 = date_create();
 
 var_dump(date_timestamp_set($dtms021, null));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: date_timestamp_set(): Passing null to parameter of type int is deprecated in %s on line %d
 object(DateTime)#1 (3) {
   ["date"]=>
   string(26) "1970-01-01 00:00:00.000000"

ext/date/tests/microtime_error.phpt

@@ -9,7 +9,7 @@ require_once __DIR__ .'/skipif.inc';
 ?>
 --FILE--
 <?php
-$filename = null;
+$filename = '';
 $doc = new DOMDocument('1.0');
 $root = $doc->createElement('html');
 $root = $doc->appendChild($root);

ext/dom/tests/DOMDocument_saveHTMLFile_invalid_filename.phpt

@@ -13,10 +13,7 @@ function_exists('mb_ereg') or die("skip mb_ereg() is not available in this build
  * pattern is supplied to mb_ereg. Similar error message to ereg().
  */
 
-$unset_var = 10;
-unset ($unset_var);
-$inputs = array(NULL, null, false, FALSE, "", '', @$undefined_var,
-@$unset_var);
+$inputs = array(false, FALSE, "", '');
 
 $iterator = 1;
 foreach($inputs as $input) {
@@ -70,31 +67,3 @@ mb_ereg(): Argument #1 ($pattern) must not be empty
 With $regs arg:
 mb_ereg(): Argument #1 ($pattern) must not be empty
 NULL
-
--- Iteration 5 --
-Without $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-With $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-NULL
-
--- Iteration 6 --
-Without $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-With $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-NULL
-
--- Iteration 7 --
-Without $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-With $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-NULL
-
--- Iteration 8 --
-Without $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-With $regs arg:
-mb_ereg(): Argument #1 ($pattern) must not be empty
-NULL

ext/mbstring/tests/bug43994.phpt

@@ -9,7 +9,7 @@ if (!function_exists('mb_ereg')) die('skip mbregex support not available');
 <?php
 $var0 = "e";
 $var2 = "";
-$var3 = NULL;
+$var3 = "";
 try {
     $var8 = mb_ereg_replace($var2,$var3,$var3,$var0);
     var_dump($var8);

ext/mbstring/tests/bug72164.phpt

@@ -9,5 +9,6 @@ if (!function_exists('mb_ereg')) die('skip mbregex support not available');
 <?php
 var_dump(mb_ereg_search_init(NULL));
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: mb_ereg_search_init(): Passing null to parameter of type string is deprecated in %s on line %d
 bool(true)

ext/mbstring/tests/bug73646.phpt

@@ -16,10 +16,6 @@ $replacement = 'string_val';
 $string = 'string_val';
 $option = '';
 
-//get an unset variable
-$unset_var = 10;
-unset ($unset_var);
-
 // get a class
 class classA
 {
@@ -49,10 +45,6 @@ $inputs = array(
        12.3456789000E-10,
        .5,
 
-       // null data
-/*10*/ NULL,
-       null,
-
        // boolean data
 /*12*/ true,
        false,
@@ -71,12 +63,6 @@ $inputs = array(
        // object data
 /*21*/ new classA(),
 
-       // undefined data
-/*22*/ @$undefined_var,
-
-       // unset data
-/*23*/ @$unset_var,
-
 );
 
 // loop through each element of the array for pattern
@@ -121,7 +107,7 @@ string(10) "string_val"
 string(10) "string_val"
 
 -- Iteration 10 --
-string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
+string(10) "string_val"
 
 -- Iteration 11 --
 string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
@@ -133,32 +119,20 @@ string(10) "string_val"
 string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
 
 -- Iteration 14 --
-string(10) "string_val"
+string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
 
 -- Iteration 15 --
 string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
 
 -- Iteration 16 --
-string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
+string(10) "string_val"
 
 -- Iteration 17 --
-string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
+string(10) "string_val"
 
 -- Iteration 18 --
 string(10) "string_val"
 
 -- Iteration 19 --
 string(10) "string_val"
-
--- Iteration 20 --
-string(10) "string_val"
-
--- Iteration 21 --
-string(10) "string_val"
-
--- Iteration 22 --
-string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
-
--- Iteration 23 --
-string(120) "string_valsstring_valtstring_valrstring_valistring_valnstring_valgstring_val_string_valvstring_valastring_vallstring_val"
 Done

ext/mbstring/tests/mb_ereg_replace_variation1.phpt

@@ -1,5 +1,5 @@
 --TEST--
-Optional long parameter might be null
+Optional long parameter might be null (deprecated)
 --SKIPIF--
 <?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
 --FILE--
@@ -16,15 +16,32 @@ echo mb_substr('foobarbaz', 6, null, 'UTF-8') . "\n";
 echo mb_strcut('foobarbaz', 6, null, 'UTF-8') . "\n";
 echo mb_strimwidth('foobar', 0, 3, null, 'UTF-8') . "\n";
 ?>
---EXPECT--
+--EXPECTF--
+Deprecated: mb_strpos(): Passing null to parameter of type int is deprecated in %s on line %d
 1
+
+Deprecated: mb_strrpos(): Passing null to parameter of type int is deprecated in %s on line %d
 2
+
+Deprecated: mb_stripos(): Passing null to parameter of type int is deprecated in %s on line %d
 1
+
+Deprecated: mb_strripos(): Passing null to parameter of type int is deprecated in %s on line %d
 2
+
+Deprecated: mb_strstr(): Passing null to parameter of type bool is deprecated in %s on line %d
 barbaz
+
+Deprecated: mb_strrchr(): Passing null to parameter of type bool is deprecated in %s on line %d
 baz
+
+Deprecated: mb_stristr(): Passing null to parameter of type bool is deprecated in %s on line %d
 barbaz
+
+Deprecated: mb_strrichr(): Passing null to parameter of type bool is deprecated in %s on line %d
 baz
 baz
 baz
+
+Deprecated: mb_strimwidth(): Passing null to parameter of type string is deprecated in %s on line %d
 foo

ext/mbstring/tests/mb_str_functions_opt-parameter.phpt

@@ -10,7 +10,7 @@ phar.readonly=0
 --FILE--
 <?php
 $phar = __DIR__ . '/files/stuboflength1041.phar';
-foreach (new RecursiveIteratorIterator(new Phar($phar, null, 'stuboflength1041.phar')) as $item) {
+foreach (new RecursiveIteratorIterator(new Phar($phar, alias: 'stuboflength1041.phar')) as $item) {
     var_dump($item->getFileName());
 }
 ?>

ext/phar/tests/bug60164.phpt

@@ -13,9 +13,9 @@ var_dump(decoct(umask()));
 $sFile = tempnam(__DIR__, 'test77022');
 var_dump(decoct(stat($sFile)['mode']));
 
-foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
+foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $format => $ext) {
     clearstatcache();
-    $phar = new PharData(__DIR__ . '/test77022.' . $ext, null, null, $mode);
+    $phar = new PharData(__DIR__ . '/test77022.' . $ext, format: $format);
     $phar->addFile($sFile, 'test-file-phar');
     $phar->addFromString("test-from-string", 'test-file-phar');
     $phar->extractTo(__DIR__);
@@ -33,4 +33,4 @@ string(6) "100600"
 string(6) "100600"
 string(6) "100644"
 string(6) "100600"
-string(6) "100644"
+string(6) "100644"

ext/phar/tests/bug77022.phpt

@@ -12,19 +12,19 @@ var_dump(decoct(umask()));
 chmod(__DIR__ . '/test79082/test79082-testfile', 0644);
 chmod(__DIR__ . '/test79082/test79082-testfile2', 0400);
 
-foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
+foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $format => $ext) {
     clearstatcache();
-    $phar = new PharData(__DIR__ . '/test79082.' . $ext, null, null, $mode);
+    $phar = new PharData(__DIR__ . '/test79082.' . $ext, format: $format);
     $phar->buildFromIterator(new \RecursiveDirectoryIterator(__DIR__ . '/test79082', \FilesystemIterator::SKIP_DOTS), __DIR__ . '/test79082');
     $phar->extractTo(__DIR__);
     var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));
     var_dump(decoct(stat(__DIR__ . '/test79082-testfile2')['mode']));
     unlink(__DIR__ . '/test79082-testfile');
     unlink(__DIR__ . '/test79082-testfile2');
 }
-foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
+foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $format => $ext) {
     clearstatcache();
-    $phar = new PharData(__DIR__ . '/test79082-d.' . $ext, null, null, $mode);
+    $phar = new PharData(__DIR__ . '/test79082-d.' . $ext, format: $format);
     $phar->buildFromDirectory(__DIR__ . '/test79082');
     $phar->extractTo(__DIR__);
     var_dump(decoct(stat(__DIR__ . '/test79082-testfile')['mode']));

ext/phar/tests/bug79082.phpt

@@ -35,7 +35,7 @@ foreach($files as $name => $cont)
     if (empty($ulen)) $ulen = strlen($cont);
     if (empty($clen)) $clen = strlen($comp);
     if (empty($crc32))$crc32= crc32((binary)$cont);
-    if (isset($meta)) $meta = serialize($meta);
+    $meta = isset($meta) ? serialize($meta) : "";
 
     // write manifest entry
     $manifest .= pack('V', strlen($name)) . (binary)$name;