summaryrefslogtreecommitdiff
path: root/ext/phar/tests/zip
diff options
context:
space:
mode:
authorPedro Magalhães <mail@pmmaga.net>2016-11-06 22:28:42 +0100
committerNikita Popov <nikic@php.net>2016-11-20 21:11:53 +0100
commit9c5af4e4cb2f1cadc659542dad8967e9fd05f1d4 (patch)
tree8223a6d88419c2d2a3008e35c4059b075422dd42 /ext/phar/tests/zip
parentb98357823a816a55097fc7f6f833db88722efeea (diff)
downloadphp-git-9c5af4e4cb2f1cadc659542dad8967e9fd05f1d4.tar.gz
Remove the b prefix from literals on unrelated tests
Diffstat (limited to 'ext/phar/tests/zip')
-rw-r--r--ext/phar/tests/zip/files/frontcontroller12.phar.inc14
-rw-r--r--ext/phar/tests/zip/files/frontcontroller12.phar.zipbin793 -> 964 bytes
-rw-r--r--ext/phar/tests/zip/files/frontcontroller3.phar.inc2
-rw-r--r--ext/phar/tests/zip/files/frontcontroller3.phar.zipbin818 -> 994 bytes
-rw-r--r--ext/phar/tests/zip/files/frontcontroller4.phar.inc2
-rw-r--r--ext/phar/tests/zip/files/frontcontroller4.phar.zipbin813 -> 990 bytes
-rw-r--r--ext/phar/tests/zip/open_for_write_existing.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_b.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_existing_c.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_b.phpt2
-rw-r--r--ext/phar/tests/zip/open_for_write_newfile_c.phpt2
-rw-r--r--ext/phar/tests/zip/phar_stub.phpt6
-rw-r--r--ext/phar/tests/zip/refcount1.phpt2
14 files changed, 19 insertions, 19 deletions
diff --git a/ext/phar/tests/zip/files/frontcontroller12.phar.inc b/ext/phar/tests/zip/files/frontcontroller12.phar.inc
index c5f38ffd19..77c4a1dd0e 100644
--- a/ext/phar/tests/zip/files/frontcontroller12.phar.inc
+++ b/ext/phar/tests/zip/files/frontcontroller12.phar.inc
@@ -3,13 +3,13 @@
$a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.zip');
$a['index.php'] = '<?php
var_dump($_SERVER["PHP_SELF"]);
-var_dump($_SERVER[b"SCRIPT_NAME"]);
-var_dump($_SERVER[b"SCRIPT_FILENAME"]);
-var_dump($_SERVER[b"REQUEST_URI"]);
-var_dump($_SERVER[b"PHAR_PHP_SELF"]);
-var_dump($_SERVER[b"PHAR_SCRIPT_NAME"]);
-var_dump($_SERVER[b"PHAR_SCRIPT_FILENAME"]);
-var_dump($_SERVER[b"PHAR_REQUEST_URI"]);
+var_dump($_SERVER["SCRIPT_NAME"]);
+var_dump($_SERVER["SCRIPT_FILENAME"]);
+var_dump($_SERVER["REQUEST_URI"]);
+var_dump($_SERVER["PHAR_PHP_SELF"]);
+var_dump($_SERVER["PHAR_SCRIPT_NAME"]);
+var_dump($_SERVER["PHAR_SCRIPT_FILENAME"]);
+var_dump($_SERVER["PHAR_REQUEST_URI"]);
';
$a->setStub('<?php
Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
diff --git a/ext/phar/tests/zip/files/frontcontroller12.phar.zip b/ext/phar/tests/zip/files/frontcontroller12.phar.zip
index ed9be3d00b..41ae5873d6 100644
--- a/ext/phar/tests/zip/files/frontcontroller12.phar.zip
+++ b/ext/phar/tests/zip/files/frontcontroller12.phar.zip
Binary files differ
diff --git a/ext/phar/tests/zip/files/frontcontroller3.phar.inc b/ext/phar/tests/zip/files/frontcontroller3.phar.inc
index ccd55b73f9..ab28f7b3d0 100644
--- a/ext/phar/tests/zip/files/frontcontroller3.phar.inc
+++ b/ext/phar/tests/zip/files/frontcontroller3.phar.inc
@@ -7,7 +7,7 @@ $a['a.phps'] = '<?php function hio(){}';
$a->setStub('<?php
function s($a)
{
- static $b = array(b"/hi" => b"a.phps");
+ static $b = array("/hi" => "a.phps");
if (isset($b[$a])) return $b[$a];
return $a;
}
diff --git a/ext/phar/tests/zip/files/frontcontroller3.phar.zip b/ext/phar/tests/zip/files/frontcontroller3.phar.zip
index 6f35a8042c..c830fd060e 100644
--- a/ext/phar/tests/zip/files/frontcontroller3.phar.zip
+++ b/ext/phar/tests/zip/files/frontcontroller3.phar.zip
Binary files differ
diff --git a/ext/phar/tests/zip/files/frontcontroller4.phar.inc b/ext/phar/tests/zip/files/frontcontroller4.phar.inc
index 9f664cf2c6..d78399142e 100644
--- a/ext/phar/tests/zip/files/frontcontroller4.phar.inc
+++ b/ext/phar/tests/zip/files/frontcontroller4.phar.inc
@@ -7,7 +7,7 @@ $a['a.phps'] = '<?php function hio(){}';
$a->setStub('<?php
function s($a)
{
- static $b = array(b"/hi" => false);
+ static $b = array("/hi" => false);
if (isset($b[$a])) return $b[$a];
return $a;
}
diff --git a/ext/phar/tests/zip/files/frontcontroller4.phar.zip b/ext/phar/tests/zip/files/frontcontroller4.phar.zip
index fb27ccb0b1..d87fbd8406 100644
--- a/ext/phar/tests/zip/files/frontcontroller4.phar.zip
+++ b/ext/phar/tests/zip/files/frontcontroller4.phar.zip
Binary files differ
diff --git a/ext/phar/tests/zip/open_for_write_existing.phpt b/ext/phar/tests/zip/open_for_write_existing.phpt
index bbf036ce7e..94f85b4e3f 100644
--- a/ext/phar/tests/zip/open_for_write_existing.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing.phpt
@@ -26,7 +26,7 @@ foreach ($files as $n => $file) {
$phar->stopBuffering();
$fp = fopen($alias . '/b/c.php', 'wb');
-fwrite($fp, b'extra');
+fwrite($fp, 'extra');
fclose($fp);
include $alias . '/b/c.php';
?>
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 24368ad34b..d8efa51050 100644
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -36,7 +36,7 @@ function err_handler($errno, $errstr, $errfile, $errline) {
set_error_handler("err_handler", E_RECOVERABLE_ERROR);
$fp = fopen($alias . '/b/c.php', 'wb');
-fwrite($fp, b'extra');
+fwrite($fp, 'extra');
fclose($fp);
include $alias . '/b/c.php';
?>
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 3e769cf427..43d862a2f1 100644
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -30,7 +30,7 @@ $phar->stopBuffering();
ini_set('phar.readonly', 1);
$fp = fopen($alias . '/b/c.php', 'wb');
-fwrite($fp, b'extra');
+fwrite($fp, 'extra');
fclose($fp);
include $alias . '/b/c.php';
?>
diff --git a/ext/phar/tests/zip/open_for_write_newfile.phpt b/ext/phar/tests/zip/open_for_write_newfile.phpt
index ffcae0f833..c3782d4fd3 100644
--- a/ext/phar/tests/zip/open_for_write_newfile.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile.phpt
@@ -26,7 +26,7 @@ foreach ($files as $n => $file) {
$phar->stopBuffering();
$fp = fopen($alias . '/b/new.php', 'wb');
-fwrite($fp, b'extra');
+fwrite($fp, 'extra');
fclose($fp);
include $alias . '/b/c.php';
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 9303a457e0..6457a029d9 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -36,7 +36,7 @@ function err_handler($errno, $errstr, $errfile, $errline) {
set_error_handler("err_handler", E_RECOVERABLE_ERROR);
$fp = fopen($alias . '/b/new.php', 'wb');
-fwrite($fp, b'extra');
+fwrite($fp, 'extra');
fclose($fp);
include $alias . '/b/c.php';
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 f50a152243..b4a254c358 100644
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -30,7 +30,7 @@ $phar->stopBuffering();
ini_set('phar.readonly', 1);
$fp = fopen($alias . '/b/new.php', 'wb');
-fwrite($fp, b'extra');
+fwrite($fp, 'extra');
fclose($fp);
include $alias . '/b/c.php';
diff --git a/ext/phar/tests/zip/phar_stub.phpt b/ext/phar/tests/zip/phar_stub.phpt
index 72c1f17d78..a2a6aa6f2a 100644
--- a/ext/phar/tests/zip/phar_stub.phpt
+++ b/ext/phar/tests/zip/phar_stub.phpt
@@ -22,14 +22,14 @@ copy($fname2, $fname);
$phar = new Phar($fname);
echo $phar->getStub();
-$file = b'<?php echo "second stub\n"; __HALT_COMPILER(); ?>';
+$file = '<?php echo "second stub\n"; __HALT_COMPILER(); ?>';
//// 2
$phar->setStub($file);
echo $phar->getStub();
$fname3 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phartmp.php';
-$file = b'<?php echo "third stub\n"; __HALT_COMPILER(); ?>';
+$file = '<?php echo "third stub\n"; __HALT_COMPILER(); ?>';
$fp = fopen($fname3, 'wb');
fwrite($fp, $file);
fclose($fp);
@@ -42,7 +42,7 @@ fclose($fp);
echo $phar->getStub();
$fp = fopen($fname3, 'ab');
-fwrite($fp, b'booya');
+fwrite($fp, 'booya');
fclose($fp);
echo file_get_contents($fname3) . "\n";
diff --git a/ext/phar/tests/zip/refcount1.phpt b/ext/phar/tests/zip/refcount1.phpt
index 9917871148..5b8085bdbc 100644
--- a/ext/phar/tests/zip/refcount1.phpt
+++ b/ext/phar/tests/zip/refcount1.phpt
@@ -28,7 +28,7 @@ foreach ($files as $n => $file) {
$phar->stopBuffering();
$fp = fopen($alias . '/b/c.php', 'wb');
-fwrite($fp, b"extra");
+fwrite($fp, "extra");
fclose($fp);
echo "===CLOSE===\n";
$b = fopen($alias . '/b/c.php', 'rb');