11 files changed, 16 insertions, 16 deletions
diff --git a/ext/phar/tests/tar/files/frontcontroller12.phar.inc b/ext/phar/tests/tar/files/frontcontroller12.phar.inc
index 0a9422a299..693ef0aa01 100644
--- a/ext/phar/tests/tar/files/frontcontroller12.phar.inc
+++ b/ext/phar/tests/tar/files/frontcontroller12.phar.inc
@@ -3,13 +3,13 @@
 $a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.tar');
 $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/tar/files/frontcontroller12.phar.tar b/ext/phar/tests/tar/files/frontcontroller12.phar.tar
index e945e49bd4..2d31581373 100644
--- a/ext/phar/tests/tar/files/frontcontroller12.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller12.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller3.phar.inc b/ext/phar/tests/tar/files/frontcontroller3.phar.inc
index 800f65e819..9729d0065b 100644
--- a/ext/phar/tests/tar/files/frontcontroller3.phar.inc
+++ b/ext/phar/tests/tar/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/tar/files/frontcontroller3.phar.tar b/ext/phar/tests/tar/files/frontcontroller3.phar.tar
index 16853bd10f..81a89b23c3 100644
--- a/ext/phar/tests/tar/files/frontcontroller3.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller3.phar.tar
diff --git a/ext/phar/tests/tar/files/frontcontroller4.phar.inc b/ext/phar/tests/tar/files/frontcontroller4.phar.inc
index bfb9b4104c..eb1d56f0d4 100644
--- a/ext/phar/tests/tar/files/frontcontroller4.phar.inc
+++ b/ext/phar/tests/tar/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/tar/files/frontcontroller4.phar.tar b/ext/phar/tests/tar/files/frontcontroller4.phar.tar
index 5a1d4ee10c..04787536e8 100644
--- a/ext/phar/tests/tar/files/frontcontroller4.phar.tar
+++ b/ext/phar/tests/tar/files/frontcontroller4.phar.tar
diff --git a/ext/phar/tests/tar/open_for_write_existing.phpt b/ext/phar/tests/tar/open_for_write_existing.phpt
index a034b8fc3c..641e5ce21d 100644
--- a/ext/phar/tests/tar/open_for_write_existing.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing.phpt
@@ -27,7 +27,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/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index 8d80847733..752192835d 100644
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/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/tar/open_for_write_newfile.phpt b/ext/phar/tests/tar/open_for_write_newfile.phpt
index e2efb3486a..31e9d4a7e9 100644
--- a/ext/phar/tests/tar/open_for_write_newfile.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile.phpt
@@ -27,7 +27,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/tar/phar_stub.phpt b/ext/phar/tests/tar/phar_stub.phpt
index 5a61eae4a2..e0d728f6f8 100644
--- a/ext/phar/tests/tar/phar_stub.phpt
+++ b/ext/phar/tests/tar/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/tar/refcount1.phpt b/ext/phar/tests/tar/refcount1.phpt
index 4d2c34e51e..9d1cb5e415 100644
--- a/ext/phar/tests/tar/refcount1.phpt
+++ b/ext/phar/tests/tar/refcount1.phpt
@@ -30,7 +30,7 @@ foreach ($files as $n => $file) {
 $tar->close();
 
 $fp = fopen($alias . '/b/c.php', 'wb');
-fwrite($fp, b"extra");
+fwrite($fp, "extra");
 fclose($fp);
 echo "===CLOSE===\n";
 $phar = new Phar($fname);