4 files changed, 9 insertions, 9 deletions
diff --git a/ext/phar/tests/bug60164.phpt b/ext/phar/tests/bug60164.phpt
index 8cc2eceaa0..0a7b9227e7 100644
--- a/ext/phar/tests/bug60164.phpt
+++ b/ext/phar/tests/bug60164.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());
 }
 ?>
diff --git a/ext/phar/tests/bug77022.phpt b/ext/phar/tests/bug77022.phpt
index 40d908f1ee..4f5795842d 100644
--- a/ext/phar/tests/bug77022.phpt
+++ b/ext/phar/tests/bug77022.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"
-\ No newline at end of file
+string(6) "100644"
diff --git a/ext/phar/tests/bug79082.phpt b/ext/phar/tests/bug79082.phpt
index 512c4fb95c..1c36db2b1a 100644
--- a/ext/phar/tests/bug79082.phpt
+++ b/ext/phar/tests/bug79082.phpt
@@ -12,9 +12,9 @@ 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']));
@@ -22,9 +22,9 @@ foreach([Phar::TAR => 'tar', Phar::ZIP => 'zip'] as $mode => $ext) {
     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']));
diff --git a/ext/phar/tests/files/phar_test.inc b/ext/phar/tests/files/phar_test.inc
index f5279a93d2..277271ef4c 100644
--- a/ext/phar/tests/files/phar_test.inc
+++ b/ext/phar/tests/files/phar_test.inc
@@ -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;