Fix tests

Author: Girgias

ext/phar/tests/phar_oo_008.phpt

@@ -33,7 +33,7 @@ class MyCSVFile extends SplFileObject
 {
     function current(): array|false
     {
-        return parent::fgetcsv(',', '"');
+        return parent::fgetcsv(',', '"', escape: '');
     }
 }
 
@@ -44,14 +44,14 @@ $v = $phar['a.csv'];
 echo "===3===\n";
 while(!$v->eof())
 {
-    echo $v->key() . "=>" . join('|', $v->fgetcsv()) . "\n";
+    echo $v->key() . "=>" . join('|', $v->fgetcsv(escape: '')) . "\n";
 }
 
 echo "===4===\n";
 $v->rewind();
 while(!$v->eof())
 {
-    $l = $v->fgetcsv();
+    $l = $v->fgetcsv(escape: '');
     echo $v->key() . "=>" . join('|', $l) . "\n";
 }
 
@@ -66,7 +66,7 @@ class MyCSVFile2 extends SplFileObject
     function getCurrentLine(): string
     {
         echo __METHOD__ . "\n";
-        return implode('|', parent::fgetcsv(',', '"'));
+        return implode('|', parent::fgetcsv(',', '"', escape: ''));
     }
 }
 

ext/standard/tests/file/bug72330.phpt

@@ -11,14 +11,13 @@ if (setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "d
 setlocale(LC_ALL, "en_US.utf8", "en_AU.utf8", "ko_KR.utf8", "zh_CN.utf8", "de_DE.utf8", "es_EC.utf8", "fr_FR.utf8", "ja_JP.utf8", "el_GR.utf8", "nl_NL.utf8");
 
 $utf_1 = chr(0xD1) . chr(0x81); // U+0440;
-$utf_2   = chr(0xD8) . chr(0x80); // U+0600
+$utf_2 = chr(0xD8) . chr(0x80); // U+0600
 
 $string = '"first #' . $utf_1 . $utf_2 . '";"second"';
 $fields = str_getcsv($string, ';', '"', "#");
 var_dump($fields);
 ?>
 --EXPECTF--
-Deprecated: str_getcsv(): Passing a non-empty string to the $escape parameter is deprecated since 8.4 in %s on line %d
 array(2) {
   [0]=>
   string(11) "first #с؀"

ext/standard/tests/general_functions/004.data renamed to ext/standard/tests/file/fgetcsv_tab_delimiter.data

@@ -2,9 +2,10 @@
 fgetcsv() with tab delimited fields (BUG #8258)
 --FILE--
 <?php
-chdir(__DIR__);
-$fp=fopen("004.data","r");
-while($a=fgetcsv($fp,100,"\t")) {
+
+$file = __DIR__ . '/fgetcsv_tab_delimiter.data';
+$fp = fopen($file,"r");
+while ($a = fgetcsv($fp, 100, "\t", escape: '')) {
     echo join(",",$a)."\n";
 }
 fclose($fp);

ext/standard/tests/general_functions/004.phpt renamed to ext/standard/tests/file/fgetcsv_tab_delimiter.phpt

@@ -6,6 +6,7 @@ var_dump(str_getcsv(
     "aaaaaaaaaaaa\0  ",
     "\0",
     "\0",
+    escape: '',
 ));
 ?>
 --EXPECT--