summaryrefslogtreecommitdiff
path: root/ext/phar/tests
diff options
context:
space:
mode:
Diffstat (limited to 'ext/phar/tests')
-rw-r--r--ext/phar/tests/002.phpt2
-rw-r--r--ext/phar/tests/020.phpt2
-rw-r--r--ext/phar/tests/021.phpt2
-rw-r--r--ext/phar/tests/032.phpt3
-rw-r--r--ext/phar/tests/addfuncs.phpt2
-rw-r--r--ext/phar/tests/bug13786.phpt2
-rw-r--r--ext/phar/tests/bug46178.phpt2
-rw-r--r--ext/phar/tests/bug47085.phpt2
-rw-r--r--ext/phar/tests/bug48377.phpt2
-rw-r--r--ext/phar/tests/bug53872.phpt1
-rw-r--r--ext/phar/tests/bug60164.phpt2
-rw-r--r--ext/phar/tests/bug65028.phpt1
-rw-r--r--ext/phar/tests/bug69324.phpt2
-rw-r--r--ext/phar/tests/bug69720.phpt1
-rw-r--r--ext/phar/tests/bug71354.phpt2
-rw-r--r--ext/phar/tests/bug71391.phpt2
-rw-r--r--ext/phar/tests/bug71488.phpt2
-rw-r--r--ext/phar/tests/bug72928.phpt2
-rw-r--r--ext/phar/tests/bug73035.phpt2
-rw-r--r--ext/phar/tests/bug73764.phpt2
-rw-r--r--ext/phar/tests/bug74383.phpt1
-rw-r--r--ext/phar/tests/cache_list/copyonwrite1.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite10.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite11.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite12.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite13.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite14.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite15.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite16.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite17.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite18.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite19.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite2.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite20.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite21.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite22.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite23.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite24.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite25.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite3.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite4.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite4a.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite5.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite7.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite8.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/copyonwrite9.phar.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller11.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller12.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller13.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller15.phpt1
-rw-r--r--ext/phar/tests/cache_list/frontcontroller16.phpt1
-rw-r--r--ext/phar/tests/cache_list/frontcontroller17.phpt1
-rw-r--r--ext/phar/tests/cache_list/frontcontroller22.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller23.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller24.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller25.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller26.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller27.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller29.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller30.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller31.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller33.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller6.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller8.phpt2
-rw-r--r--ext/phar/tests/cache_list/frontcontroller9.phpt2
-rw-r--r--ext/phar/tests/create_new_phar_b.phpt1
-rw-r--r--ext/phar/tests/create_path_error.phpt1
-rw-r--r--ext/phar/tests/delete.phpt2
-rw-r--r--ext/phar/tests/delete_in_phar.phpt2
-rw-r--r--ext/phar/tests/dir.phpt2
-rw-r--r--ext/phar/tests/file_get_contents.phpt2
-rw-r--r--ext/phar/tests/fopen.phpt2
-rw-r--r--ext/phar/tests/fopen5.2.phpt2
-rw-r--r--ext/phar/tests/fopen_edgecases.phpt2
-rw-r--r--ext/phar/tests/frontcontroller11.phpt2
-rw-r--r--ext/phar/tests/frontcontroller12.phpt2
-rw-r--r--ext/phar/tests/frontcontroller13.phpt2
-rw-r--r--ext/phar/tests/frontcontroller15.phpt1
-rw-r--r--ext/phar/tests/frontcontroller16.phpt1
-rw-r--r--ext/phar/tests/frontcontroller17.phpt1
-rw-r--r--ext/phar/tests/frontcontroller22.phpt2
-rw-r--r--ext/phar/tests/frontcontroller23.phpt2
-rw-r--r--ext/phar/tests/frontcontroller24.phpt2
-rw-r--r--ext/phar/tests/frontcontroller25.phpt2
-rw-r--r--ext/phar/tests/frontcontroller26.phpt2
-rw-r--r--ext/phar/tests/frontcontroller27.phpt2
-rw-r--r--ext/phar/tests/frontcontroller29.phpt2
-rw-r--r--ext/phar/tests/frontcontroller30.phpt2
-rw-r--r--ext/phar/tests/frontcontroller31.phpt2
-rw-r--r--ext/phar/tests/frontcontroller33.phpt2
-rw-r--r--ext/phar/tests/frontcontroller6.phpt2
-rw-r--r--ext/phar/tests/frontcontroller8.phpt2
-rw-r--r--ext/phar/tests/frontcontroller9.phpt2
-rw-r--r--ext/phar/tests/include_path.phpt2
-rw-r--r--ext/phar/tests/include_path_advanced.phpt2
-rw-r--r--ext/phar/tests/invalid_alias.phpt2
-rw-r--r--ext/phar/tests/invalid_setstubalias.phpt2
-rw-r--r--ext/phar/tests/mkdir.phpt2
-rw-r--r--ext/phar/tests/open_for_write_existing_b.phpt1
-rw-r--r--ext/phar/tests/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/open_for_write_newfile_b.phpt1
-rw-r--r--ext/phar/tests/open_for_write_newfile_c.phpt1
-rw-r--r--ext/phar/tests/opendir.phpt2
-rw-r--r--ext/phar/tests/phar_bz2.phpt2
-rw-r--r--ext/phar/tests/phar_commitwrite.phpt2
-rw-r--r--ext/phar/tests/phar_copy.phpt2
-rw-r--r--ext/phar/tests/phar_create_in_cwd.phpt2
-rw-r--r--ext/phar/tests/phar_ctx_001.phpt2
-rw-r--r--ext/phar/tests/phar_get_supportedcomp1.phpt2
-rw-r--r--ext/phar/tests/phar_get_supportedcomp2.phpt2
-rw-r--r--ext/phar/tests/phar_get_supportedcomp3.phpt2
-rw-r--r--ext/phar/tests/phar_gobyebye.phpt2
-rw-r--r--ext/phar/tests/phar_isvalidpharfilename.phpt1
-rw-r--r--ext/phar/tests/phar_mount.phpt2
-rw-r--r--ext/phar/tests/phar_oo_getcontents.phpt2
-rw-r--r--ext/phar/tests/phar_oo_getcontentsgz.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_chmod.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_compression.phpt2
-rw-r--r--ext/phar/tests/pharfileinfo_destruct.phpt2
-rw-r--r--ext/phar/tests/readfile.phpt2
-rw-r--r--ext/phar/tests/rename.phpt2
-rw-r--r--ext/phar/tests/security.phpt2
-rw-r--r--ext/phar/tests/stat.phpt2
-rw-r--r--ext/phar/tests/stat2.phpt2
-rw-r--r--ext/phar/tests/tar/create_new_phar_b.phpt1
-rw-r--r--ext/phar/tests/tar/delete.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller10.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller11.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller12.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller13.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller15.phar.phpt1
-rw-r--r--ext/phar/tests/tar/frontcontroller16.phar.phpt1
-rw-r--r--ext/phar/tests/tar/frontcontroller17.phar.phpt1
-rw-r--r--ext/phar/tests/tar/frontcontroller6.phar.phpt2
-rw-r--r--ext/phar/tests/tar/frontcontroller8.phar.phpt2
-rw-r--r--ext/phar/tests/tar/links6.phpt2
-rw-r--r--ext/phar/tests/tar/open_for_write_existing_b.phpt1
-rw-r--r--ext/phar/tests/tar/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/tar/open_for_write_newfile_b.phpt1
-rw-r--r--ext/phar/tests/tar/open_for_write_newfile_c.phpt1
-rw-r--r--ext/phar/tests/tar/phar_copy.phpt2
-rw-r--r--ext/phar/tests/tar/tar_makegz.phpt2
-rw-r--r--ext/phar/tests/test_alias_unset.phpt2
-rw-r--r--ext/phar/tests/test_unset.phpt2
-rw-r--r--ext/phar/tests/webphar_compilefail.phpt2
-rw-r--r--ext/phar/tests/zip/create_new_phar_b.phpt1
-rw-r--r--ext/phar/tests/zip/delete.phpt2
-rw-r--r--ext/phar/tests/zip/delete_in_phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller10.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller11.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller12.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller13.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller15.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller16.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller17.phar.phpt1
-rw-r--r--ext/phar/tests/zip/frontcontroller6.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller8.phar.phpt2
-rw-r--r--ext/phar/tests/zip/frontcontroller9.phar.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_b.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_c.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_b.phpt1
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_c.phpt1
-rw-r--r--ext/phar/tests/zip/phar_copy.phpt2
-rw-r--r--ext/phar/tests/zip/rename.phpt2
-rw-r--r--ext/phar/tests/zip/rename_dir.phpt2
165 files changed, 132 insertions, 166 deletions
diff --git a/ext/phar/tests/002.phpt b/ext/phar/tests/002.phpt
index a7cf0cb2d2..41cb9be716 100644
--- a/ext/phar/tests/002.phpt
+++ b/ext/phar/tests/002.phpt
@@ -14,4 +14,4 @@ Phar::mapPhar();
__HALT_COMPILER(); ?>
--EXPECTF--
Warning: Phar::mapPhar() expects at most 2 parameters, 3 given in %s002.php on line %d
-internal corruption of phar "%s002.php" (truncated manifest at manifest length) \ No newline at end of file
+internal corruption of phar "%s002.php" (truncated manifest at manifest length)
diff --git a/ext/phar/tests/020.phpt b/ext/phar/tests/020.phpt
index 289fc39c95..1c2b4b1abe 100644
--- a/ext/phar/tests/020.phpt
+++ b/ext/phar/tests/020.phpt
@@ -133,4 +133,4 @@ array(26) {
int(-1)
[%sblocks"]=>
int(-1)
-} \ No newline at end of file
+}
diff --git a/ext/phar/tests/021.phpt b/ext/phar/tests/021.phpt
index 3e3278b9f8..010136f779 100644
--- a/ext/phar/tests/021.phpt
+++ b/ext/phar/tests/021.phpt
@@ -82,4 +82,4 @@ array(26) {
int(-1)
[%sblocks"]=>
int(-1)
-} \ No newline at end of file
+}
diff --git a/ext/phar/tests/032.phpt b/ext/phar/tests/032.phpt
index 5e5d759c62..0878482d0a 100644
--- a/ext/phar/tests/032.phpt
+++ b/ext/phar/tests/032.phpt
@@ -25,5 +25,4 @@ unlink(dirname(__FILE__) . '/files/032.phar.php');
__halt_compiler();
?>
--EXPECTF--
-
-phar "%s032.phar.php" does not have a signature===DONE=== \ No newline at end of file
+phar "%s032.phar.php" does not have a signature===DONE===
diff --git a/ext/phar/tests/addfuncs.phpt b/ext/phar/tests/addfuncs.phpt
index 4312bff1a0..ab10736a8a 100644
--- a/ext/phar/tests/addfuncs.phpt
+++ b/ext/phar/tests/addfuncs.phpt
@@ -50,4 +50,4 @@ Entry a does not exist and cannot be created: phar error: file "a" in phar "%sad
phar error: unable to open file "%s/does/not/exist" to add to phar archive
Cannot create any files in magic ".phar" directory
Cannot create any files in magic ".phar" directory
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug13786.phpt b/ext/phar/tests/bug13786.phpt
index 572d1eb9aa..8ed0697bff 100644
--- a/ext/phar/tests/bug13786.phpt
+++ b/ext/phar/tests/bug13786.phpt
@@ -29,4 +29,4 @@ echo $e->getMessage() . "\n";
--EXPECTF--
string(26) "file 0 in DataArchive.phar"
unable to seek to start of file "0" while creating new phar "%sDataArchive.phar"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug46178.phpt b/ext/phar/tests/bug46178.phpt
index 9dab621485..1496ae1c33 100644
--- a/ext/phar/tests/bug46178.phpt
+++ b/ext/phar/tests/bug46178.phpt
@@ -17,4 +17,4 @@ $phar->addEmptyDir('long/path');
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');?>
--EXPECT--
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug47085.phpt b/ext/phar/tests/bug47085.phpt
index 9aaaed0670..5c2504f675 100644
--- a/ext/phar/tests/bug47085.phpt
+++ b/ext/phar/tests/bug47085.phpt
@@ -21,4 +21,4 @@ var_dump(rename("phar://a.phar/x", "phar://a.phar/y"));
--EXPECTF--
Warning: rename(): phar error: cannot rename "phar://a.phar/x" to "phar://a.phar/y" from extracted phar archive, source does not exist in %sbug47085.php on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug48377.phpt b/ext/phar/tests/bug48377.phpt
index 6282a1565e..f466ea4532 100644
--- a/ext/phar/tests/bug48377.phpt
+++ b/ext/phar/tests/bug48377.phpt
@@ -26,4 +26,4 @@ try {
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.zip');?>
--EXPECTF--
phar "%sbug48377.zip" exists and must be unlinked prior to conversion
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug53872.phpt b/ext/phar/tests/bug53872.phpt
index a3745a20cb..ada60055f9 100644
--- a/ext/phar/tests/bug53872.phpt
+++ b/ext/phar/tests/bug53872.phpt
@@ -25,4 +25,3 @@ unlink("bug53872-phar.phar");
--EXPECT--
content of first.txt
content of third.txt
-
diff --git a/ext/phar/tests/bug60164.phpt b/ext/phar/tests/bug60164.phpt
index 8fd5de5146..83883b6ee5 100644
--- a/ext/phar/tests/bug60164.phpt
+++ b/ext/phar/tests/bug60164.phpt
@@ -18,4 +18,4 @@ foreach (new RecursiveIteratorIterator(new Phar($phar, null, 'stuboflength1041.p
--EXPECT--
string(5) "a.php"
string(5) "b.php"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/bug65028.phpt b/ext/phar/tests/bug65028.phpt
index d62f3c2b72..7d24ead69d 100644
--- a/ext/phar/tests/bug65028.phpt
+++ b/ext/phar/tests/bug65028.phpt
@@ -153,4 +153,3 @@ catch(UnexpectedValueException $ex)
?>
--EXPECT--
No exception thrown.
-
diff --git a/ext/phar/tests/bug69324.phpt b/ext/phar/tests/bug69324.phpt
index 70e3f972e7..7768ffbd66 100644
--- a/ext/phar/tests/bug69324.phpt
+++ b/ext/phar/tests/bug69324.phpt
@@ -14,4 +14,4 @@ var_dump($meta);
echo $e->getMessage();
}
--EXPECTF--
-internal corruption of phar "%s" (truncated manifest entry) \ No newline at end of file
+internal corruption of phar "%s" (truncated manifest entry)
diff --git a/ext/phar/tests/bug69720.phpt b/ext/phar/tests/bug69720.phpt
index 286d3cbdbe..c0f76c7a0e 100644
--- a/ext/phar/tests/bug69720.phpt
+++ b/ext/phar/tests/bug69720.phpt
@@ -22,7 +22,6 @@ try {
}
?>
--EXPECTF--
-
MY_METADATA_NULL
Warning: file_get_contents(phar://%s): failed to open stream: phar error: "test.php" is not a file in phar "%s.phar" in %s.php on line %d
diff --git a/ext/phar/tests/bug71354.phpt b/ext/phar/tests/bug71354.phpt
index 43230f1520..91cc9b0111 100644
--- a/ext/phar/tests/bug71354.phpt
+++ b/ext/phar/tests/bug71354.phpt
@@ -10,4 +10,4 @@ var_dump($p['aaaa']->getContent());
DONE
--EXPECT--
string(0) ""
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug71391.phpt b/ext/phar/tests/bug71391.phpt
index 6965aaaa30..f442116191 100644
--- a/ext/phar/tests/bug71391.phpt
+++ b/ext/phar/tests/bug71391.phpt
@@ -15,4 +15,4 @@ DONE
unlink(__DIR__."/bug71391.test.tar");
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug71488.phpt b/ext/phar/tests/bug71488.phpt
index 22d2bf098f..53f1304343 100644
--- a/ext/phar/tests/bug71488.phpt
+++ b/ext/phar/tests/bug71488.phpt
@@ -14,4 +14,4 @@ DONE
@unlink(__DIR__."/bug71488.test");
?>
--EXPECT--
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug72928.phpt b/ext/phar/tests/bug72928.phpt
index 8e6a95418c..1277e88711 100644
--- a/ext/phar/tests/bug72928.phpt
+++ b/ext/phar/tests/bug72928.phpt
@@ -15,4 +15,4 @@ var_dump($phar);
DONE
--EXPECTF--
phar error: signature cannot be read in zip-based phar "%sbug72928.zip"
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug73035.phpt b/ext/phar/tests/bug73035.phpt
index 5928428abc..ffdd36c52e 100644
--- a/ext/phar/tests/bug73035.phpt
+++ b/ext/phar/tests/bug73035.phpt
@@ -15,4 +15,4 @@ var_dump($phar);
DONE
--EXPECTF--
phar error: tar-based phar "%sbug73035.tar" signature cannot be read
-DONE \ No newline at end of file
+DONE
diff --git a/ext/phar/tests/bug73764.phpt b/ext/phar/tests/bug73764.phpt
index cab314a731..baff083265 100644
--- a/ext/phar/tests/bug73764.phpt
+++ b/ext/phar/tests/bug73764.phpt
@@ -13,4 +13,4 @@ echo "OK\n";
}
?>
--EXPECTF--
-internal corruption of phar "%sbug73764.phar" (truncated manifest entry) \ No newline at end of file
+internal corruption of phar "%sbug73764.phar" (truncated manifest entry)
diff --git a/ext/phar/tests/bug74383.phpt b/ext/phar/tests/bug74383.phpt
index 4257629ff5..3932d0b258 100644
--- a/ext/phar/tests/bug74383.phpt
+++ b/ext/phar/tests/bug74383.phpt
@@ -13,7 +13,6 @@ echo PHP_EOL;
echo (int) $rm->getParameters()[0]->isOptional();
?>
-
--EXPECT--
1
0
diff --git a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
index 90b0a8fe46..dd6b45f9a2 100644
--- a/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite1.phar.phpt
@@ -11,4 +11,4 @@ files/write.phar
--EXPECT--
hi
changed
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
index 3d5b7fe784..dc4425dee1 100644
--- a/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite10.phar.phpt
@@ -21,4 +21,4 @@ __HALT_COMPILER(); ?>
"
<?php __HALT_COMPILER(); ?>
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
index c3851e6494..c1d3a42dd0 100644
--- a/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite11.phar.phpt
@@ -19,4 +19,4 @@ echo "ok\n";
__HALT_COMPILER(); ?>
"
6643
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
index 40b544191d..b197f6501b 100644
--- a/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite12.phar.phpt
@@ -21,4 +21,4 @@ array(2) {
["hash_type"]=>
string(3) "MD5"
}
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
index fc47174d2b..0e6b68bd0d 100644
--- a/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite13.phar.phpt
@@ -12,4 +12,4 @@ files/write13.phar
--EXPECTF--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
index 11201ac989..c776058d08 100644
--- a/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite14.phar.phpt
@@ -12,4 +12,4 @@ files/write14.phar
--EXPECTF--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
index 6e46289227..9a0f159162 100644
--- a/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite15.phar.phpt
@@ -11,4 +11,4 @@ files/write15.phar
--EXPECTF--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
index f17784c355..f2e531e530 100644
--- a/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite16.phar.phpt
@@ -11,4 +11,4 @@ files/write16.phar
--EXPECTF--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
index 158c049b14..5ca937a145 100644
--- a/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite17.phar.phpt
@@ -11,4 +11,4 @@ files/write17.phar
--EXPECTF--
NULL
%string|unicode%(2) "hi"
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
index 3e65f5a124..574a976fbc 100644
--- a/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite18.phar.phpt
@@ -11,4 +11,4 @@ files/write18.phar
--EXPECTF--
100666
100444
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
index 6e03554d96..38f9a74dc0 100644
--- a/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite19.phar.phpt
@@ -11,4 +11,4 @@ files/write19.phar
--EXPECTF--
string(2) "hi"
%string|unicode%(3) "hi2"
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
index 8d21c813a4..f28871f158 100644
--- a/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite2.phar.phpt
@@ -14,4 +14,4 @@ bool(true)
string(2) "hi"
bool(true)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
index acce57415c..da4931b3c6 100644
--- a/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite20.phar.phpt
@@ -11,4 +11,4 @@ files/write20.phar
--EXPECTF--
string(2) "hi"
NULL
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
index 8960ea7171..4621679d1f 100644
--- a/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite21.phar.phpt
@@ -12,4 +12,4 @@ files/write21.phar
--EXPECTF--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
index 7cba216395..0c41f7be5e 100644
--- a/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite22.phar.phpt
@@ -12,4 +12,4 @@ files/write22.phar
--EXPECTF--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
index 292e5af668..2709399760 100644
--- a/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite23.phar.phpt
@@ -14,4 +14,4 @@ bool(true)
bool(false)
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
index 69197f2b4b..b0063957f3 100644
--- a/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite24.phar.phpt
@@ -12,4 +12,4 @@ files/write24.phar
--EXPECTF--
bool(false)
bool(true)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
index b661cb61c1..17143a6f65 100644
--- a/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite25.phar.phpt
@@ -13,4 +13,4 @@ files/write25.phar
bool(false)
bool(true)
<?php __HALT_COMPILER();
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
index 7e2c94c5b2..887ef82231 100644
--- a/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite3.phar.phpt
@@ -13,4 +13,4 @@ bool(true)
bool(true)
bool(false)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
index 20ff78e282..dd14582055 100644
--- a/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite4.phar.phpt
@@ -12,4 +12,4 @@ files/write4.phar
bool(false)
bool(true)
string(2) "hi"
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite4a.phpt b/ext/phar/tests/cache_list/copyonwrite4a.phpt
index 1945e31f16..039113288b 100644
--- a/ext/phar/tests/cache_list/copyonwrite4a.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite4a.phpt
@@ -17,4 +17,4 @@ var_dump(file_exists('phar://' . dirname(__FILE__) . '/files/write4.phar/testit.
bool(false)
bool(true)
string(2) "hi"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
index 89990a7af1..3ca835ae5f 100644
--- a/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite5.phar.phpt
@@ -24,4 +24,4 @@ array(2) {
phar://%scopyonwrite5.phar.php%cfile1 file1
phar://%scopyonwrite5.phar.php%cfile2 file2
phar://%scopyonwrite5.phar.php%chi hi
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
index d6faded9cc..520368d3b6 100644
--- a/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite7.phar.phpt
@@ -11,4 +11,4 @@ files/write7.phar
--EXPECT--
bool(true)
bool(false)
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
index 7217d336e2..99f12ca8ca 100644
--- a/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite8.phar.phpt
@@ -11,4 +11,4 @@ files/write8.phar
--EXPECTF--
string(%s) "%scopyonwrite8.phar.php"
hi
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
index ffda9565bd..7d5cd7a8a7 100644
--- a/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
+++ b/ext/phar/tests/cache_list/copyonwrite9.phar.phpt
@@ -20,4 +20,4 @@ __HALT_COMPILER(); ?>
"
<?php __HALT_COMPILER(); ?>
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/cache_list/frontcontroller11.phpt b/ext/phar/tests/cache_list/frontcontroller11.phpt
index f5e4e2269f..ba830dcd49 100644
--- a/ext/phar/tests/cache_list/frontcontroller11.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller11.phpt
@@ -19,4 +19,4 @@ Fatal error: Uncaught PharException: Key of MIME type overrides array must be a
Stack trace:
#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller11.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller11.php on line 2
diff --git a/ext/phar/tests/cache_list/frontcontroller12.phpt b/ext/phar/tests/cache_list/frontcontroller12.phpt
index 6d798f9f8a..8b78e62c9c 100644
--- a/ext/phar/tests/cache_list/frontcontroller12.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller12.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.php on line 2
diff --git a/ext/phar/tests/cache_list/frontcontroller13.phpt b/ext/phar/tests/cache_list/frontcontroller13.phpt
index c81d0cfbd9..9d2f9105da 100644
--- a/ext/phar/tests/cache_list/frontcontroller13.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller13.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.php on line 2
diff --git a/ext/phar/tests/cache_list/frontcontroller15.phpt b/ext/phar/tests/cache_list/frontcontroller15.phpt
index d142a5d742..fc639c316f 100644
--- a/ext/phar/tests/cache_list/frontcontroller15.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller15.phpt
@@ -18,4 +18,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/cache_list/frontcontroller16.phpt b/ext/phar/tests/cache_list/frontcontroller16.phpt
index 10bebdccef..0664c039d5 100644
--- a/ext/phar/tests/cache_list/frontcontroller16.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller16.phpt
@@ -15,4 +15,3 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/cache_list/frontcontroller17.phpt b/ext/phar/tests/cache_list/frontcontroller17.phpt
index 35d3ae4e9c..05ad328167 100644
--- a/ext/phar/tests/cache_list/frontcontroller17.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller17.phpt
@@ -15,4 +15,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/cache_list/frontcontroller22.phpt b/ext/phar/tests/cache_list/frontcontroller22.phpt
index 2769b01f2f..c73b7c05bb 100644
--- a/ext/phar/tests/cache_list/frontcontroller22.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller22.phpt
@@ -19,4 +19,4 @@ Content-type: text/html; charset=UTF-8
Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
-Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d \ No newline at end of file
+Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
diff --git a/ext/phar/tests/cache_list/frontcontroller23.phpt b/ext/phar/tests/cache_list/frontcontroller23.phpt
index 3da9631dfb..4de4d7dd1c 100644
--- a/ext/phar/tests/cache_list/frontcontroller23.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller23.phpt
@@ -15,4 +15,4 @@ files/frontcontroller14.phar
Content-type: text/html; charset=UTF-8
--EXPECTF--
string(9) "/hi/there"
-string(%d) "phar://%sfrontcontroller23.php/html/index.php" \ No newline at end of file
+string(%d) "phar://%sfrontcontroller23.php/html/index.php"
diff --git a/ext/phar/tests/cache_list/frontcontroller24.phpt b/ext/phar/tests/cache_list/frontcontroller24.phpt
index 561826bd78..1304e9ccee 100644
--- a/ext/phar/tests/cache_list/frontcontroller24.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller24.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-My 404 is rawesome \ No newline at end of file
+My 404 is rawesome
diff --git a/ext/phar/tests/cache_list/frontcontroller25.phpt b/ext/phar/tests/cache_list/frontcontroller25.phpt
index a8779392b6..ea42865f5c 100644
--- a/ext/phar/tests/cache_list/frontcontroller25.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller25.phpt
@@ -15,4 +15,4 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECTF--
string(42) "/frontcontroller25.php/a1.phps/extra/stuff"
-string(12) "/extra/stuff" \ No newline at end of file
+string(12) "/extra/stuff"
diff --git a/ext/phar/tests/cache_list/frontcontroller26.phpt b/ext/phar/tests/cache_list/frontcontroller26.phpt
index 86a1c1444c..5418c055e1 100644
--- a/ext/phar/tests/cache_list/frontcontroller26.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller26.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: application/octet-stream
--EXPECTF--
-<?php var_dump("hi"); \ No newline at end of file
+<?php var_dump("hi");
diff --git a/ext/phar/tests/cache_list/frontcontroller27.phpt b/ext/phar/tests/cache_list/frontcontroller27.phpt
index 4a76e02eae..51e1e4c29f 100644
--- a/ext/phar/tests/cache_list/frontcontroller27.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller27.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/plain;charset=UTF-8
--EXPECTF--
-hi \ No newline at end of file
+hi
diff --git a/ext/phar/tests/cache_list/frontcontroller29.phpt b/ext/phar/tests/cache_list/frontcontroller29.phpt
index c86cdfe4ac..caaf34538e 100644
--- a/ext/phar/tests/cache_list/frontcontroller29.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller29.phpt
@@ -19,4 +19,4 @@ Stack trace:
#0 [internal function]: unknown()
#1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
#2 {main}
- thrown in phar://%sfatalerror.phps on line 1 \ No newline at end of file
+ thrown in phar://%sfatalerror.phps on line 1
diff --git a/ext/phar/tests/cache_list/frontcontroller30.phpt b/ext/phar/tests/cache_list/frontcontroller30.phpt
index 5a63da874c..e30f170e07 100644
--- a/ext/phar/tests/cache_list/frontcontroller30.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller30.phpt
@@ -11,4 +11,4 @@ REQUEST_URI=/huh?
files/frontcontroller8.phar
--EXPECTF--
oops did not run
-%a \ No newline at end of file
+%a
diff --git a/ext/phar/tests/cache_list/frontcontroller31.phpt b/ext/phar/tests/cache_list/frontcontroller31.phpt
index 9ef1221a28..54128759f0 100644
--- a/ext/phar/tests/cache_list/frontcontroller31.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller31.phpt
@@ -13,4 +13,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller16.phar
--EXPECT--
-phar error: invalid rewrite callback \ No newline at end of file
+phar error: invalid rewrite callback
diff --git a/ext/phar/tests/cache_list/frontcontroller33.phpt b/ext/phar/tests/cache_list/frontcontroller33.phpt
index 9573854823..6ceae8abe6 100644
--- a/ext/phar/tests/cache_list/frontcontroller33.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller33.phpt
@@ -13,4 +13,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller18.phar
--EXPECTF--
-phar error: rewrite callback must return a string or false \ No newline at end of file
+phar error: rewrite callback must return a string or false
diff --git a/ext/phar/tests/cache_list/frontcontroller6.phpt b/ext/phar/tests/cache_list/frontcontroller6.phpt
index a79c958517..4781c66310 100644
--- a/ext/phar/tests/cache_list/frontcontroller6.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller6.phpt
@@ -20,4 +20,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/cache_list/frontcontroller8.phpt b/ext/phar/tests/cache_list/frontcontroller8.phpt
index e04f9e5a3a..fc85ef8fa5 100644
--- a/ext/phar/tests/cache_list/frontcontroller8.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller8.phpt
@@ -20,4 +20,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/cache_list/frontcontroller9.phpt b/ext/phar/tests/cache_list/frontcontroller9.phpt
index 1a8b9168cc..631bb30ef0 100644
--- a/ext/phar/tests/cache_list/frontcontroller9.phpt
+++ b/ext/phar/tests/cache_list/frontcontroller9.phpt
@@ -17,4 +17,4 @@ Content-type: text/html; charset=UTF-8
<code><span style="color: #000000">
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
-</code> \ No newline at end of file
+</code>
diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt
index 39fc31e27b..91e22270c6 100644
--- a/ext/phar/tests/create_new_phar_b.phpt
+++ b/ext/phar/tests/create_new_phar_b.phpt
@@ -17,7 +17,6 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt
index e3f7be856c..7829ffc533 100644
--- a/ext/phar/tests/create_path_error.phpt
+++ b/ext/phar/tests/create_path_error.phpt
@@ -81,4 +81,3 @@ string(5) "query"
12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character
13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character
Error: Phar::offsetSet() expects parameter 1 to be a valid path, string given===DONE===
-
diff --git a/ext/phar/tests/delete.phpt b/ext/phar/tests/delete.phpt
index 1d98509064..46a4e23817 100644
--- a/ext/phar/tests/delete.phpt
+++ b/ext/phar/tests/delete.phpt
@@ -28,4 +28,4 @@ echo file_get_contents($pname . '/a') . "\n";
--EXPECTF--
a
-Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16 \ No newline at end of file
+Warning: file_get_contents(phar://%sdelete.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.php" in %sdelete.php on line 16
diff --git a/ext/phar/tests/delete_in_phar.phpt b/ext/phar/tests/delete_in_phar.phpt
index d28f136f77..c7f8e82403 100644
--- a/ext/phar/tests/delete_in_phar.phpt
+++ b/ext/phar/tests/delete_in_phar.phpt
@@ -54,4 +54,4 @@ Warning: include(%sdelete_in_phar.phar.php/b/c.php): failed to open stream: phar
Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.php/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d
===DONE===
- \ No newline at end of file
+
diff --git a/ext/phar/tests/dir.phpt b/ext/phar/tests/dir.phpt
index a8f9d3f889..5740d60f87 100644
--- a/ext/phar/tests/dir.phpt
+++ b/ext/phar/tests/dir.phpt
@@ -89,4 +89,4 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php
Warning: rmdir(): phar error: cannot remove directory "" in phar "%sdir.phar.php", directory does not exist in %sdir.php on line %d
Warning: mkdir(): phar error: cannot create directory "" in phar "%sdir.phar.php", phar error: invalid path "" must not be empty in %sdir.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/file_get_contents.phpt b/ext/phar/tests/file_get_contents.phpt
index fcc9d64655..24d6e48723 100644
--- a/ext/phar/tests/file_get_contents.phpt
+++ b/ext/phar/tests/file_get_contents.phpt
@@ -27,4 +27,4 @@ include $fname;
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECT--
-hihi===DONE=== \ No newline at end of file
+hihi===DONE===
diff --git a/ext/phar/tests/fopen.phpt b/ext/phar/tests/fopen.phpt
index 5b694d6e2d..ddde929d35 100644
--- a/ext/phar/tests/fopen.phpt
+++ b/ext/phar/tests/fopen.phpt
@@ -40,4 +40,4 @@ include $fname;
Warning: fopen() expects at least 2 parameters, 0 given in %sfopen.php on line %d
hihi
Warning: fopen(notfound.txt): failed to open stream: No such file or directory in phar://%sfopen.phar.php/index.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/fopen5.2.phpt b/ext/phar/tests/fopen5.2.phpt
index aa064f1662..e0975b62ba 100644
--- a/ext/phar/tests/fopen5.2.phpt
+++ b/ext/phar/tests/fopen5.2.phpt
@@ -40,4 +40,4 @@ include $fname;
Warning: fopen() expects at least 2 parameters, 0 given in %sfopen5.2.php on line %d
hihi
Warning: fopen(phar://%sfopen5.2.phar.php/notfound.txt): failed to open stream: phar error: "notfound.txt" is not a file in phar "%sfopen5.2.phar.php" in phar://%sfopen5.2.phar.php/index.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/fopen_edgecases.phpt b/ext/phar/tests/fopen_edgecases.phpt
index 4c28ff31a1..7af8451f8f 100644
--- a/ext/phar/tests/fopen_edgecases.phpt
+++ b/ext/phar/tests/fopen_edgecases.phpt
@@ -121,4 +121,4 @@ Warning: rename(): phar error: cannot rename "phar://%sfopen_edgecases.phar.php/
Warning: fopen(./notfound.php): failed to open stream: No such file or directory in phar://%sfopen_edgecases.phar.php/test.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/frontcontroller11.phpt b/ext/phar/tests/frontcontroller11.phpt
index aa20e19e97..80f7ba847e 100644
--- a/ext/phar/tests/frontcontroller11.phpt
+++ b/ext/phar/tests/frontcontroller11.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Key of MIME type overrides array must be a
Stack trace:
#0 %sfrontcontroller11.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller11.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller11.php on line 2
diff --git a/ext/phar/tests/frontcontroller12.phpt b/ext/phar/tests/frontcontroller12.phpt
index bad71d0ac5..a7b1a892d6 100644
--- a/ext/phar/tests/frontcontroller12.phpt
+++ b/ext/phar/tests/frontcontroller12.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.php on line 2
diff --git a/ext/phar/tests/frontcontroller13.phpt b/ext/phar/tests/frontcontroller13.phpt
index 7d018a141a..99b769d406 100644
--- a/ext/phar/tests/frontcontroller13.phpt
+++ b/ext/phar/tests/frontcontroller13.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.php on line 2
diff --git a/ext/phar/tests/frontcontroller15.phpt b/ext/phar/tests/frontcontroller15.phpt
index 370098014d..16b64c0e9e 100644
--- a/ext/phar/tests/frontcontroller15.phpt
+++ b/ext/phar/tests/frontcontroller15.phpt
@@ -17,4 +17,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/frontcontroller16.phpt b/ext/phar/tests/frontcontroller16.phpt
index 712af40bf3..1355d0042a 100644
--- a/ext/phar/tests/frontcontroller16.phpt
+++ b/ext/phar/tests/frontcontroller16.phpt
@@ -14,4 +14,3 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/frontcontroller17.phpt b/ext/phar/tests/frontcontroller17.phpt
index 233e2e2a49..a735eb42cf 100644
--- a/ext/phar/tests/frontcontroller17.phpt
+++ b/ext/phar/tests/frontcontroller17.phpt
@@ -13,4 +13,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
index 827c5688c7..b482164396 100644
--- a/ext/phar/tests/frontcontroller22.phpt
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -18,4 +18,4 @@ string(12) "oof/test.php"
Warning: include(./hi.php): failed to open stream: No such file or directory in phar://%s/oof/test.php on line %d
-Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d \ No newline at end of file
+Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
diff --git a/ext/phar/tests/frontcontroller23.phpt b/ext/phar/tests/frontcontroller23.phpt
index 24464c9beb..441eb701c2 100644
--- a/ext/phar/tests/frontcontroller23.phpt
+++ b/ext/phar/tests/frontcontroller23.phpt
@@ -14,4 +14,4 @@ files/frontcontroller14.phar
Content-type: text/html; charset=UTF-8
--EXPECTF--
string(9) "/hi/there"
-string(%d) "phar://%sfrontcontroller23.php/html/index.php" \ No newline at end of file
+string(%d) "phar://%sfrontcontroller23.php/html/index.php"
diff --git a/ext/phar/tests/frontcontroller24.phpt b/ext/phar/tests/frontcontroller24.phpt
index 767971ee91..5d94738ae7 100644
--- a/ext/phar/tests/frontcontroller24.phpt
+++ b/ext/phar/tests/frontcontroller24.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
-My 404 is rawesome \ No newline at end of file
+My 404 is rawesome
diff --git a/ext/phar/tests/frontcontroller25.phpt b/ext/phar/tests/frontcontroller25.phpt
index 9b383de413..80a0844f2e 100644
--- a/ext/phar/tests/frontcontroller25.phpt
+++ b/ext/phar/tests/frontcontroller25.phpt
@@ -14,4 +14,4 @@ files/frontcontroller8.phar
Content-type: text/html; charset=UTF-8
--EXPECTF--
string(42) "/frontcontroller25.php/a1.phps/extra/stuff"
-string(12) "/extra/stuff" \ No newline at end of file
+string(12) "/extra/stuff"
diff --git a/ext/phar/tests/frontcontroller26.phpt b/ext/phar/tests/frontcontroller26.phpt
index a8097b0886..7d787ddf49 100644
--- a/ext/phar/tests/frontcontroller26.phpt
+++ b/ext/phar/tests/frontcontroller26.phpt
@@ -11,4 +11,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: application/octet-stream
--EXPECTF--
-<?php var_dump("hi"); \ No newline at end of file
+<?php var_dump("hi");
diff --git a/ext/phar/tests/frontcontroller27.phpt b/ext/phar/tests/frontcontroller27.phpt
index 16203f6feb..21dd28d31d 100644
--- a/ext/phar/tests/frontcontroller27.phpt
+++ b/ext/phar/tests/frontcontroller27.phpt
@@ -13,4 +13,4 @@ files/frontcontroller8.phar
--EXPECTHEADERS--
Content-type: text/plain;charset=UTF-8
--EXPECTF--
-hi \ No newline at end of file
+hi
diff --git a/ext/phar/tests/frontcontroller29.phpt b/ext/phar/tests/frontcontroller29.phpt
index 710a58f91b..5e18357b6b 100644
--- a/ext/phar/tests/frontcontroller29.phpt
+++ b/ext/phar/tests/frontcontroller29.phpt
@@ -18,4 +18,4 @@ Stack trace:
#0 [internal function]: unknown()
#1 %s(%d): Phar::webPhar('whatever', 'index.php', '404.php', Array)
#2 {main}
- thrown in phar://%sfatalerror.phps on line 1 \ No newline at end of file
+ thrown in phar://%sfatalerror.phps on line 1
diff --git a/ext/phar/tests/frontcontroller30.phpt b/ext/phar/tests/frontcontroller30.phpt
index de6960c244..fd6088d05a 100644
--- a/ext/phar/tests/frontcontroller30.phpt
+++ b/ext/phar/tests/frontcontroller30.phpt
@@ -9,4 +9,4 @@ REQUEST_URI=/huh?
files/frontcontroller8.phar
--EXPECTF--
oops did not run
-%a \ No newline at end of file
+%a
diff --git a/ext/phar/tests/frontcontroller31.phpt b/ext/phar/tests/frontcontroller31.phpt
index 13c305d2f3..a02c937b58 100644
--- a/ext/phar/tests/frontcontroller31.phpt
+++ b/ext/phar/tests/frontcontroller31.phpt
@@ -12,4 +12,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller16.phar
--EXPECT--
-phar error: invalid rewrite callback \ No newline at end of file
+phar error: invalid rewrite callback
diff --git a/ext/phar/tests/frontcontroller33.phpt b/ext/phar/tests/frontcontroller33.phpt
index 8593e31766..91581f43af 100644
--- a/ext/phar/tests/frontcontroller33.phpt
+++ b/ext/phar/tests/frontcontroller33.phpt
@@ -12,4 +12,4 @@ Content-type: text/html; charset=UTF-8
--FILE_EXTERNAL--
files/frontcontroller18.phar
--EXPECTF--
-phar error: rewrite callback must return a string or false \ No newline at end of file
+phar error: rewrite callback must return a string or false
diff --git a/ext/phar/tests/frontcontroller6.phpt b/ext/phar/tests/frontcontroller6.phpt
index c5dd382b10..de298c7b0e 100644
--- a/ext/phar/tests/frontcontroller6.phpt
+++ b/ext/phar/tests/frontcontroller6.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/frontcontroller8.phpt b/ext/phar/tests/frontcontroller8.phpt
index 77d33dac38..b22f14a03a 100644
--- a/ext/phar/tests/frontcontroller8.phpt
+++ b/ext/phar/tests/frontcontroller8.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/frontcontroller9.phpt b/ext/phar/tests/frontcontroller9.phpt
index d47a2898e6..c591879172 100644
--- a/ext/phar/tests/frontcontroller9.phpt
+++ b/ext/phar/tests/frontcontroller9.phpt
@@ -16,4 +16,4 @@ Content-type: text/html; charset=UTF-8
<code><span style="color: #000000">
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
-</code> \ No newline at end of file
+</code>
diff --git a/ext/phar/tests/include_path.phpt b/ext/phar/tests/include_path.phpt
index 5f9462c260..4041ae2c20 100644
--- a/ext/phar/tests/include_path.phpt
+++ b/ext/phar/tests/include_path.phpt
@@ -31,4 +31,4 @@ test/file1.php
Warning: include(file2.php): failed to open stream: No such file or directory in %sinclude_path.php on line %d
Warning: include(): Failed opening 'file2.php' for inclusion (include_path='%sphar://%stempmanifest1.phar.php/test') in %sinclude_path.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/include_path_advanced.phpt b/ext/phar/tests/include_path_advanced.phpt
index 6feee422b4..c4603ba28b 100644
--- a/ext/phar/tests/include_path_advanced.phpt
+++ b/ext/phar/tests/include_path_advanced.phpt
@@ -9,4 +9,4 @@ files/include_path.phar
--EXPECT--
file1.php
test/file1.php
-ok \ No newline at end of file
+ok
diff --git a/ext/phar/tests/invalid_alias.phpt b/ext/phar/tests/invalid_alias.phpt
index dc0c71ed11..97ebe0fe1a 100644
--- a/ext/phar/tests/invalid_alias.phpt
+++ b/ext/phar/tests/invalid_alias.phpt
@@ -42,4 +42,4 @@ Invalid alias "hi/" specified for phar "%sinvalid_alias.phar"
Invalid alias "hi\l" specified for phar "%sinvalid_alias.phar"
Invalid alias "hil;" specified for phar "%sinvalid_alias.phar"
Invalid alias ":hil" specified for phar "%sinvalid_alias.phar"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/invalid_setstubalias.phpt b/ext/phar/tests/invalid_setstubalias.phpt
index 04cb779ddb..86fa6e7f78 100644
--- a/ext/phar/tests/invalid_setstubalias.phpt
+++ b/ext/phar/tests/invalid_setstubalias.phpt
@@ -44,4 +44,4 @@ Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.t
Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.tar", use setAlias
Cannot set stub ".phar/stub.php" directly in phar "%sinvalid_setstubalias.phar.zip", use setStub
Cannot set alias ".phar/alias.txt" directly in phar "%sinvalid_setstubalias.phar.zip", use setAlias
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/mkdir.phpt b/ext/phar/tests/mkdir.phpt
index 527d77547c..ca8de30860 100644
--- a/ext/phar/tests/mkdir.phpt
+++ b/ext/phar/tests/mkdir.phpt
@@ -44,4 +44,4 @@ Warning: rmdir(): phar error: cannot remove directory "" in phar "foo.phar", dir
Warning: rmdir(): phar error: cannot remove directory "a" in phar "%smkdir.phar.php", phar error: path "a" exists and is a not a directory in %smkdir.php on line %d
Cannot create a directory in magic ".phar" directory
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index df8bf4dca3..3c4ffbe3dd 100644
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -34,7 +34,6 @@ include $pname . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index 3d4c508559..c217fc7d2c 100644
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -28,7 +28,6 @@ include $pname . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 915d1a52a5..c1c08df7ef 100644
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -36,7 +36,6 @@ include $pname . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index a9a7d98a74..d8ae654dc9 100644
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -30,7 +30,6 @@ include $pname . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/opendir.phpt b/ext/phar/tests/opendir.phpt
index ca6e391b06..0bde7dbff7 100644
--- a/ext/phar/tests/opendir.phpt
+++ b/ext/phar/tests/opendir.phpt
@@ -41,4 +41,4 @@ phar url "phar://" is unknown in %sopendir.php on line %d
Warning: opendir(phar://hi.phar): failed to open dir: phar error: invalid url or non-existent phar "phar://hi.phar"
phar url "phar://hi.phar" is unknown in %sopendir.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_bz2.phpt b/ext/phar/tests/phar_bz2.phpt
index 556123a853..19ad7112cb 100644
--- a/ext/phar/tests/phar_bz2.phpt
+++ b/ext/phar/tests/phar_bz2.phpt
@@ -62,4 +62,4 @@ bool(true)
Warning: Phar::isFileFormat() expects parameter 1 to be integer, array given in %sphar_bz2.php on line %d
Unknown file format specified
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index 86578754d9..8d7068f19a 100644
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -39,4 +39,4 @@ Phar::mapPhar('brandnewphar.phar');
include 'phar://brandnewphar.phar/startup.php';
__HALT_COMPILER(); ?>
"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_copy.phpt b/ext/phar/tests/phar_copy.phpt
index 382b7f0754..5b28278ceb 100644
--- a/ext/phar/tests/phar_copy.phpt
+++ b/ext/phar/tests/phar_copy.phpt
@@ -81,4 +81,4 @@ file "a" cannot be copied to file "b", file must not already exist in phar %spha
hi
file "d" cannot be copied to file ".phar/stub.php", cannot copy to Phar meta-file in %sphar_copy2.phar.php
file ".phar/stub.php" cannot be copied to file "d", cannot copy Phar meta-file in %sphar_copy2.phar.php
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index 78dd1b39e7..0e0903d1dd 100644
--- a/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@ -42,4 +42,4 @@ Phar::mapPhar('brandnewphar.phar');
include 'phar://brandnewphar.phar/startup.php';
__HALT_COMPILER(); ?>
"
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_ctx_001.phpt b/ext/phar/tests/phar_ctx_001.phpt
index 197c7628d8..f8f349a380 100644
--- a/ext/phar/tests/phar_ctx_001.phpt
+++ b/ext/phar/tests/phar_ctx_001.phpt
@@ -97,4 +97,4 @@ array(1) {
[0]=>
int(4)
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_get_supportedcomp1.phpt b/ext/phar/tests/phar_get_supportedcomp1.phpt
index d32e12c0ab..aa278a768f 100644
--- a/ext/phar/tests/phar_get_supportedcomp1.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp1.phpt
@@ -19,4 +19,4 @@ array(2) {
[1]=>
string(5) "BZIP2"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_get_supportedcomp2.phpt b/ext/phar/tests/phar_get_supportedcomp2.phpt
index c607724918..a535eba41c 100644
--- a/ext/phar/tests/phar_get_supportedcomp2.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp2.phpt
@@ -17,4 +17,4 @@ array(1) {
[0]=>
string(5) "BZIP2"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_get_supportedcomp3.phpt b/ext/phar/tests/phar_get_supportedcomp3.phpt
index c300407f3f..ab1d7cb6e2 100644
--- a/ext/phar/tests/phar_get_supportedcomp3.phpt
+++ b/ext/phar/tests/phar_get_supportedcomp3.phpt
@@ -17,4 +17,4 @@ array(1) {
[0]=>
string(2) "GZ"
}
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_gobyebye.phpt b/ext/phar/tests/phar_gobyebye.phpt
index 608e950768..93e153bdf2 100644
--- a/ext/phar/tests/phar_gobyebye.phpt
+++ b/ext/phar/tests/phar_gobyebye.phpt
@@ -44,4 +44,4 @@ bool(false)
bool(false)
Warning: opendir(foo/hi): failed to open dir: No such file or directory in phar://%sphar_gobyebye.phar.php/foo/hi on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_isvalidpharfilename.phpt b/ext/phar/tests/phar_isvalidpharfilename.phpt
index da07bec287..a59f498b95 100644
--- a/ext/phar/tests/phar_isvalidpharfilename.phpt
+++ b/ext/phar/tests/phar_isvalidpharfilename.phpt
@@ -137,4 +137,3 @@ bool(true)
bool(true)
bool(false)
===DONE===
-
diff --git a/ext/phar/tests/phar_mount.phpt b/ext/phar/tests/phar_mount.phpt
index 80f8cda389..73bd489a2d 100644
--- a/ext/phar/tests/phar_mount.phpt
+++ b/ext/phar/tests/phar_mount.phpt
@@ -60,4 +60,4 @@ Mounting of testit to %sphar_mount.php within phar %sphar_mount.phar.tar failed
Mounting of /oops to /home/oops/../../etc/passwd: within phar %sphar_mount.phar.php failed
<?php
$fname = dirname(__FILE__) . '/' . basename(
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt
index c3bb3a53c6..72828b198e 100644
--- a/ext/phar/tests/phar_oo_getcontents.phpt
+++ b/ext/phar/tests/phar_oo_getcontents.phpt
@@ -36,4 +36,4 @@ file contents
this works
Phar error: Cannot retrieve contents, "a" in phar "%sphar_oo_getcontents.phar.php" is a directory
Phar error: Cannot retrieve contents, "hi" in phar "%sphar_oo_getcontents.phar.php" is a directory
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt
index 2f6ceb8cd4..9e9653bd9c 100644
--- a/ext/phar/tests/phar_oo_getcontentsgz.phpt
+++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt
@@ -31,4 +31,4 @@ __halt_compiler();
bool(true)
file contents
this works
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/pharfileinfo_chmod.phpt b/ext/phar/tests/pharfileinfo_chmod.phpt
index ddc4d37393..9101862130 100644
--- a/ext/phar/tests/pharfileinfo_chmod.phpt
+++ b/ext/phar/tests/pharfileinfo_chmod.phpt
@@ -30,4 +30,4 @@ $b->chmod(0666);
Phar entry "a" is a temporary directory (not an actual entry in the archive), cannot chmod
Warning: PharFileInfo::chmod() expects parameter 1 to be integer, array given in %spharfileinfo_chmod.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/pharfileinfo_compression.phpt b/ext/phar/tests/pharfileinfo_compression.phpt
index 2c3bac8863..d10450e044 100644
--- a/ext/phar/tests/pharfileinfo_compression.phpt
+++ b/ext/phar/tests/pharfileinfo_compression.phpt
@@ -91,4 +91,4 @@ Phar is readonly, cannot decompress
Phar entry is a directory, cannot set compression
bool(true)
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/pharfileinfo_destruct.phpt b/ext/phar/tests/pharfileinfo_destruct.phpt
index 48a58c0d09..6625d1e0c5 100644
--- a/ext/phar/tests/pharfileinfo_destruct.phpt
+++ b/ext/phar/tests/pharfileinfo_destruct.phpt
@@ -22,4 +22,4 @@ unset($b);
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar'); ?>
--EXPECTF--
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/readfile.phpt b/ext/phar/tests/readfile.phpt
index 60fdad1792..63e80eb0e3 100644
--- a/ext/phar/tests/readfile.phpt
+++ b/ext/phar/tests/readfile.phpt
@@ -27,4 +27,4 @@ include $fname;
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
--EXPECT--
-hihi===DONE=== \ No newline at end of file
+hihi===DONE===
diff --git a/ext/phar/tests/rename.phpt b/ext/phar/tests/rename.phpt
index c73c98ec81..cfcedc7000 100644
--- a/ext/phar/tests/rename.phpt
+++ b/ext/phar/tests/rename.phpt
@@ -29,4 +29,4 @@ echo file_get_contents($pname . '/a') . "\n";
a
a
-Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%srename.phar.php/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.php" in %srename.php on line %d
diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt
index f2944da413..6d26da0b25 100644
--- a/ext/phar/tests/security.phpt
+++ b/ext/phar/tests/security.phpt
@@ -33,4 +33,4 @@ include $fname2;
--EXPECT--
bool(false)
Write operations disabled by the php.ini setting phar.readonly
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/stat.phpt b/ext/phar/tests/stat.phpt
index 184aa6d2ec..c397b3e4a0 100644
--- a/ext/phar/tests/stat.phpt
+++ b/ext/phar/tests/stat.phpt
@@ -222,4 +222,4 @@ not found 2
Warning: fileperms(): stat failed for not/found in phar://%sstat.phar.php/my/index.php on line %d
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/stat2.phpt b/ext/phar/tests/stat2.phpt
index defda719f3..cbd60b0509 100644
--- a/ext/phar/tests/stat2.phpt
+++ b/ext/phar/tests/stat2.phpt
@@ -58,4 +58,4 @@ bool(false)
dir
bool(true)
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt
index 371e47d93b..48738a4313 100644
--- a/ext/phar/tests/tar/create_new_phar_b.phpt
+++ b/ext/phar/tests/tar/create_new_phar_b.phpt
@@ -17,7 +17,6 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
diff --git a/ext/phar/tests/tar/delete.phpt b/ext/phar/tests/tar/delete.phpt
index 32b2b1e28b..3395fa54d1 100644
--- a/ext/phar/tests/tar/delete.phpt
+++ b/ext/phar/tests/tar/delete.phpt
@@ -29,4 +29,4 @@ echo file_get_contents($alias . '/a') . "\n";
--EXPECTF--
a
-Warning: file_get_contents(phar://%sdelete.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%sdelete.phar.tar/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.tar" in %sdelete.php on line %d
diff --git a/ext/phar/tests/tar/frontcontroller10.phar.phpt b/ext/phar/tests/tar/frontcontroller10.phar.phpt
index 23ce6f37e2..211b02c51c 100644
--- a/ext/phar/tests/tar/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller10.phar.phpt
@@ -21,4 +21,4 @@ Status: 403 Access Denied
<body>
<h1>403 - File Access Denied</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/tar/frontcontroller11.phar.phpt b/ext/phar/tests/tar/frontcontroller11.phar.phpt
index 4b8c29dd1b..7343bc6660 100644
--- a/ext/phar/tests/tar/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller11.phar.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Key of MIME type overrides array must be a
Stack trace:
#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller11.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller11.phar.php on line 2
diff --git a/ext/phar/tests/tar/frontcontroller12.phar.phpt b/ext/phar/tests/tar/frontcontroller12.phar.phpt
index 53804e476a..cbb928ff77 100644
--- a/ext/phar/tests/tar/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller12.phar.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.phar.php on line 2
diff --git a/ext/phar/tests/tar/frontcontroller13.phar.phpt b/ext/phar/tests/tar/frontcontroller13.phar.phpt
index 7fc0676aea..107961a70f 100644
--- a/ext/phar/tests/tar/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller13.phar.phpt
@@ -17,4 +17,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.phar.php on line 2
diff --git a/ext/phar/tests/tar/frontcontroller15.phar.phpt b/ext/phar/tests/tar/frontcontroller15.phar.phpt
index 2147121dbe..eaaa62c56a 100644
--- a/ext/phar/tests/tar/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller15.phar.phpt
@@ -17,4 +17,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/tar/frontcontroller16.phar.phpt b/ext/phar/tests/tar/frontcontroller16.phar.phpt
index caa0c3119d..a74d99f248 100644
--- a/ext/phar/tests/tar/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller16.phar.phpt
@@ -14,4 +14,3 @@ files/frontcontroller8.phar.tar
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/tar/frontcontroller17.phar.phpt b/ext/phar/tests/tar/frontcontroller17.phar.phpt
index 17d04baf30..0fc0adfddd 100644
--- a/ext/phar/tests/tar/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller17.phar.phpt
@@ -13,4 +13,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/tar/frontcontroller6.phar.phpt b/ext/phar/tests/tar/frontcontroller6.phar.phpt
index b811f00f75..0b35b975b6 100644
--- a/ext/phar/tests/tar/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller6.phar.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/tar/frontcontroller8.phar.phpt b/ext/phar/tests/tar/frontcontroller8.phar.phpt
index a180e2010a..bfa713afde 100644
--- a/ext/phar/tests/tar/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/tar/frontcontroller8.phar.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/tar/links6.phpt b/ext/phar/tests/tar/links6.phpt
index 95fd8fb701..e26b8379f7 100644
--- a/ext/phar/tests/tar/links6.phpt
+++ b/ext/phar/tests/tar/links6.phpt
@@ -26,4 +26,4 @@ hi there
there
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index 752192835d..04a11870f9 100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
@@ -47,7 +47,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index 4c1c59dadb..2117015165 100644
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
@@ -41,7 +41,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index 59afb1e301..92d0aa079f 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
@@ -48,7 +48,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index b0adfe502a..2bb8d00c99 100644
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
@@ -41,7 +41,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/tar/phar_copy.phpt b/ext/phar/tests/tar/phar_copy.phpt
index ed5cdac8bc..a257e64fc0 100644
--- a/ext/phar/tests/tar/phar_copy.phpt
+++ b/ext/phar/tests/tar/phar_copy.phpt
@@ -53,4 +53,4 @@ hihibool(true)
file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s
bool(true)
-a: hib: hic: hi===DONE=== \ No newline at end of file
+a: hib: hic: hi===DONE===
diff --git a/ext/phar/tests/tar/tar_makegz.phpt b/ext/phar/tests/tar/tar_makegz.phpt
index 46fe177611..a68db482d2 100644
--- a/ext/phar/tests/tar/tar_makegz.phpt
+++ b/ext/phar/tests/tar/tar_makegz.phpt
@@ -38,4 +38,4 @@ var_dump($phar2->isCompressed() == Phar::GZ);
bool(true)
bool(true)
bool(true)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/test_alias_unset.phpt b/ext/phar/tests/test_alias_unset.phpt
index 0127d8bba2..de13acc315 100644
--- a/ext/phar/tests/test_alias_unset.phpt
+++ b/ext/phar/tests/test_alias_unset.phpt
@@ -42,4 +42,4 @@ Cannot open archive "%stest_alias_unset.2.phar.php", alias is already in use by
string(5) "first"
Warning: file_get_contents(phar://%sfile1.txt): failed to open stream: Cannot open archive "%stest_alias_unset.phar.php", alias is already in use by existing archive in %stest_alias_unset.php on line %d
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/test_unset.phpt b/ext/phar/tests/test_unset.phpt
index 3da537c13c..ae84823bc5 100644
--- a/ext/phar/tests/test_unset.phpt
+++ b/ext/phar/tests/test_unset.phpt
@@ -39,4 +39,4 @@ var_dump(file_exists($fname));
NULL
string(%d) "%stest_unset.phar.php"
bool(false)
-===DONE=== \ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/webphar_compilefail.phpt b/ext/phar/tests/webphar_compilefail.phpt
index ab5532d6be..7d89509f77 100644
--- a/ext/phar/tests/webphar_compilefail.phpt
+++ b/ext/phar/tests/webphar_compilefail.phpt
@@ -14,4 +14,4 @@ echo $e->getMessage() . "\n";
__HALT_COMPILER();
?>
--EXPECTF--
-internal corruption of phar "%swebphar_compilefail.php" (truncated manifest at manifest length) \ No newline at end of file
+internal corruption of phar "%swebphar_compilefail.php" (truncated manifest at manifest length)
diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt
index 5fda5b4fdf..c0cb256925 100644
--- a/ext/phar/tests/zip/create_new_phar_b.phpt
+++ b/ext/phar/tests/zip/create_new_phar_b.phpt
@@ -17,7 +17,6 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %screate_new_phar_b.php on line %d
Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
diff --git a/ext/phar/tests/zip/delete.phpt b/ext/phar/tests/zip/delete.phpt
index 06078b3a39..bd2ce5fffa 100644
--- a/ext/phar/tests/zip/delete.phpt
+++ b/ext/phar/tests/zip/delete.phpt
@@ -28,4 +28,4 @@ echo file_get_contents($alias . '/a') . "\n";
--EXPECTF--
a
-Warning: file_get_contents(phar://%sdelete.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%sdelete.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%sdelete.phar.zip" in %sdelete.php on line %d
diff --git a/ext/phar/tests/zip/delete_in_phar.phpt b/ext/phar/tests/zip/delete_in_phar.phpt
index f01280013f..b6f2dbb515 100644
--- a/ext/phar/tests/zip/delete_in_phar.phpt
+++ b/ext/phar/tests/zip/delete_in_phar.phpt
@@ -54,4 +54,4 @@ Warning: include(%sdelete_in_phar.phar.zip/b/c.php): failed to open stream: phar
Warning: include(): Failed opening 'phar://%sdelete_in_phar.phar.zip/b/c.php' for inclusion (include_path='%s') in %sdelete_in_phar.php on line %d
===DONE===
- \ No newline at end of file
+
diff --git a/ext/phar/tests/zip/frontcontroller10.phar.phpt b/ext/phar/tests/zip/frontcontroller10.phar.phpt
index 5bbe9e1aff..ca4f55bcff 100644
--- a/ext/phar/tests/zip/frontcontroller10.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller10.phar.phpt
@@ -21,4 +21,4 @@ Status: 403 Access Denied
<body>
<h1>403 - File Access Denied</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/zip/frontcontroller11.phar.phpt b/ext/phar/tests/zip/frontcontroller11.phar.phpt
index c0c555a1a4..0807dd8fcf 100644
--- a/ext/phar/tests/zip/frontcontroller11.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller11.phar.phpt
@@ -19,4 +19,4 @@ Fatal error: Uncaught PharException: Key of MIME type overrides array must be a
Stack trace:
#0 %sfrontcontroller11.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller11.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller11.phar.php on line 2
diff --git a/ext/phar/tests/zip/frontcontroller12.phar.phpt b/ext/phar/tests/zip/frontcontroller12.phar.phpt
index a74a0d5d32..b0caca91ac 100644
--- a/ext/phar/tests/zip/frontcontroller12.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller12.phar.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used, only Phar
Stack trace:
#0 %sfrontcontroller12.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller12.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller12.phar.php on line 2
diff --git a/ext/phar/tests/zip/frontcontroller13.phar.phpt b/ext/phar/tests/zip/frontcontroller13.phar.phpt
index 4ed1dc8670..18a1c1fd2f 100644
--- a/ext/phar/tests/zip/frontcontroller13.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller13.phar.phpt
@@ -18,4 +18,4 @@ Fatal error: Uncaught PharException: Unknown mime type specifier used (not a str
Stack trace:
#0 %sfrontcontroller13.phar.php(2): Phar::webPhar('whatever', 'index.php', '', Array)
#1 {main}
- thrown in %sfrontcontroller13.phar.php on line 2 \ No newline at end of file
+ thrown in %sfrontcontroller13.phar.php on line 2
diff --git a/ext/phar/tests/zip/frontcontroller15.phar.phpt b/ext/phar/tests/zip/frontcontroller15.phar.phpt
index f6cd29a3c5..f6468ee521 100644
--- a/ext/phar/tests/zip/frontcontroller15.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller15.phar.phpt
@@ -18,4 +18,3 @@ Content-type: text/html; charset=UTF-8
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
</code>
-
diff --git a/ext/phar/tests/zip/frontcontroller16.phar.phpt b/ext/phar/tests/zip/frontcontroller16.phar.phpt
index d3f457bea6..890eb5d0e2 100644
--- a/ext/phar/tests/zip/frontcontroller16.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller16.phar.phpt
@@ -15,4 +15,3 @@ files/frontcontroller8.phar.zip
Content-type: text/html; charset=UTF-8
--EXPECT--
hio1
-
diff --git a/ext/phar/tests/zip/frontcontroller17.phar.phpt b/ext/phar/tests/zip/frontcontroller17.phar.phpt
index 5d52653687..d6ccdc6dfc 100644
--- a/ext/phar/tests/zip/frontcontroller17.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller17.phar.phpt
@@ -14,4 +14,3 @@ Content-type: application/octet-stream
Content-length: 4
--EXPECT--
hio3
-
diff --git a/ext/phar/tests/zip/frontcontroller6.phar.phpt b/ext/phar/tests/zip/frontcontroller6.phar.phpt
index 63f7c62e88..8188caf7c9 100644
--- a/ext/phar/tests/zip/frontcontroller6.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller6.phar.phpt
@@ -19,4 +19,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/zip/frontcontroller8.phar.phpt b/ext/phar/tests/zip/frontcontroller8.phar.phpt
index d4c3a3f9ea..15a898a53c 100644
--- a/ext/phar/tests/zip/frontcontroller8.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller8.phar.phpt
@@ -18,4 +18,4 @@ Status: 404 Not Found
<body>
<h1>404 - File Not Found</h1>
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/ext/phar/tests/zip/frontcontroller9.phar.phpt b/ext/phar/tests/zip/frontcontroller9.phar.phpt
index 4f12c9cd43..bdbf066194 100644
--- a/ext/phar/tests/zip/frontcontroller9.phar.phpt
+++ b/ext/phar/tests/zip/frontcontroller9.phar.phpt
@@ -16,4 +16,4 @@ Content-type: text/html; charset=UTF-8
<code><span style="color: #000000">
<span style="color: #0000BB">&lt;?php&nbsp;</span><span style="color: #007700">function&nbsp;</span><span style="color: #0000BB">hio</span><span style="color: #007700">(){}</span>
</span>
-</code> \ No newline at end of file
+</code>
diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index d8efa51050..0d5d90452f 100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -44,7 +44,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_b.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 43d862a2f1..90eb154814 100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -38,7 +38,6 @@ include $alias . '/b/c.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_existing_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index 6457a029d9..7176da0140 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -47,7 +47,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_b.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index b4a254c358..126a71d1fd 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -41,7 +41,6 @@ include $alias . '/b/new.php';
--CLEAN--
<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
--EXPECTF--
-
Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by the php.ini setting phar.readonly in %sopen_for_write_newfile_c.php on line %d
Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
diff --git a/ext/phar/tests/zip/phar_copy.phpt b/ext/phar/tests/zip/phar_copy.phpt
index 14034c92c0..98450a4ffc 100644
--- a/ext/phar/tests/zip/phar_copy.phpt
+++ b/ext/phar/tests/zip/phar_copy.phpt
@@ -52,4 +52,4 @@ hihibool(true)
file "/error/.." contains invalid characters upper directory reference, cannot be copied from "a" in phar %s
bool(true)
-a: hib: hic: hi===DONE=== \ No newline at end of file
+a: hib: hic: hi===DONE===
diff --git a/ext/phar/tests/zip/rename.phpt b/ext/phar/tests/zip/rename.phpt
index 9b1f5c98cd..10d73fd3d8 100644
--- a/ext/phar/tests/zip/rename.phpt
+++ b/ext/phar/tests/zip/rename.phpt
@@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a') . "\n";
a
a
-Warning: file_get_contents(phar://%srename.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%srename.phar.zip/a): failed to open stream: phar error: "a" is not a file in phar "%srename.phar.zip" in %srename.php on line %d
diff --git a/ext/phar/tests/zip/rename_dir.phpt b/ext/phar/tests/zip/rename_dir.phpt
index bb03c7fd66..1885a7ce75 100644
--- a/ext/phar/tests/zip/rename_dir.phpt
+++ b/ext/phar/tests/zip/rename_dir.phpt
@@ -31,4 +31,4 @@ echo file_get_contents($alias . '/a/x') . "\n";
a
a
-Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d \ No newline at end of file
+Warning: file_get_contents(phar://%srename_dir.phar.zip/a/x): failed to open stream: phar error: "a/x" is not a file in phar "%srename_dir.phar.zip" in %srename_dir.php on line %d