From: Steph Fox <sfox@php.net>
Date: Thu, 21 Feb 2008 15:20:46 +0000 (+0000)
Subject: Update tests to accommodate those two extra bytes
X-Git-Tag: RELEASE_2_0_0a1~394
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9a1e7ee88b9ca1157409645206e661a673123a63;p=php

Update tests to accommodate those two extra bytes
---

diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index 51bab40a54..2693f0262f 100644
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -29,7 +29,7 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar');
 __HALT_COMPILER();
 ?>
 --EXPECT--
-int(6571)
+int(6573)
 string(200) "<?php
 function __autoload($class)
 {
diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index eec4ca771c..206a92a15f 100644
--- a/ext/phar/tests/phar_create_in_cwd.phpt
+++ b/ext/phar/tests/phar_create_in_cwd.phpt
@@ -32,7 +32,7 @@ __HALT_COMPILER();
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
 --EXPECT--
-int(6571)
+int(6573)
 string(200) "<?php
 function __autoload($class)
 {
diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt
index 1e9925b065..6569b14d46 100644
--- a/ext/phar/tests/phar_createdefaultstub.phpt
+++ b/ext/phar/tests/phar_createdefaultstub.phpt
@@ -34,7 +34,7 @@ echo $e->getMessage() . "\n";
 ?>
 ===DONE===
 --EXPECT--
-string(6571) "<?php
+string(6573) "<?php
 
 $web = 'index.php';
 
@@ -45,7 +45,7 @@ include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
+if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
 Extract_Phar::go(true);
 $mimes = array(
 'phps' => 2,
@@ -143,7 +143,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'index.php';
-const LEN = 6573;
+const LEN = 6575;
 
 static function go($return = false)
 {
@@ -327,7 +327,7 @@ Extract_Phar::go();
 __HALT_COMPILER(); ?>"
 ============================================================================
 ============================================================================
-string(6582) "<?php
+string(6584) "<?php
 
 $web = 'index.php';
 
@@ -338,7 +338,7 @@ include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
+if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
 Extract_Phar::go(true);
 $mimes = array(
 'phps' => 2,
@@ -436,7 +436,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'my/custom/thingy.php';
-const LEN = 6584;
+const LEN = 6586;
 
 static function go($return = false)
 {
@@ -620,7 +620,7 @@ Extract_Phar::go();
 __HALT_COMPILER(); ?>"
 ============================================================================
 ============================================================================
-int(6962)
+int(6964)
 ============================================================================
 ============================================================================
 Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
@@ -628,7 +628,7 @@ Illegal filename passed in for stub creation, was 401 characters long, and only
 ============================================================================
 ============================================================================
 ============================================================================
-string(6584) "<?php
+string(6586) "<?php
 
 $web = 'the/web.php';
 
@@ -639,7 +639,7 @@ include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
+if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
 Extract_Phar::go(true);
 $mimes = array(
 'phps' => 2,
@@ -737,7 +737,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'my/custom/thingy.php';
-const LEN = 6586;
+const LEN = 6588;
 
 static function go($return = false)
 {
@@ -921,6 +921,6 @@ Extract_Phar::go();
 __HALT_COMPILER(); ?>"
 ============================================================================
 ============================================================================
-int(6962)
+int(6964)
 Illegal web filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
-===DONE===
\ No newline at end of file
+===DONE===
diff --git a/ext/phar/tests/phar_setdefaultstub.phpt b/ext/phar/tests/phar_setdefaultstub.phpt
index 1131ad1013..ce0077bf5c 100644
--- a/ext/phar/tests/phar_setdefaultstub.phpt
+++ b/ext/phar/tests/phar_setdefaultstub.phpt
@@ -52,7 +52,7 @@ try {
 unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar');
 ?>
 --EXPECT--
-string(6573) "<?php
+string(6575) "<?php
 
 $web = 'index.php';
 
@@ -63,7 +63,7 @@ include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
+if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
 Extract_Phar::go(true);
 $mimes = array(
 'phps' => 2,
@@ -161,7 +161,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'index.php';
-const LEN = 6573;
+const LEN = 6575;
 
 static function go($return = false)
 {
@@ -346,7 +346,7 @@ __HALT_COMPILER(); ?>
 "
 ============================================================================
 ============================================================================
-string(6584) "<?php
+string(6586) "<?php
 
 $web = 'index.php';
 
@@ -357,7 +357,7 @@ include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
+if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
 Extract_Phar::go(true);
 $mimes = array(
 'phps' => 2,
@@ -455,7 +455,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'my/custom/thingy.php';
-const LEN = 6584;
+const LEN = 6586;
 
 static function go($return = false)
 {
@@ -640,7 +640,7 @@ __HALT_COMPILER(); ?>
 "
 ============================================================================
 ============================================================================
-string(6586) "<?php
+string(6588) "<?php
 
 $web = 'the/web.php';
 
@@ -651,7 +651,7 @@ include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
+if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
 Extract_Phar::go(true);
 $mimes = array(
 'phps' => 2,
@@ -749,7 +749,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'my/custom/thingy.php';
-const LEN = 6586;
+const LEN = 6588;
 
 static function go($return = false)
 {
@@ -934,6 +934,6 @@ __HALT_COMPILER(); ?>
 "
 ============================================================================
 ============================================================================
-int(6964)
+int(6966)
 Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_convert_phar.phpt b/ext/phar/tests/tar/phar_convert_phar.phpt
index 6a40e92445..4c588720de 100644
--- a/ext/phar/tests/tar/phar_convert_phar.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar.phpt
@@ -44,12 +44,12 @@ __HALT_COMPILER();
 ?>
 --EXPECT--
 bool(false)
-int(6571)
+int(6573)
 bool(true)
 string(60) "<?php // tar-based phar archive stub file
 __HALT_COMPILER();"
 bool(true)
-int(6571)
+int(6573)
 bool(true)
-int(6571)
+int(6573)
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_convert_phar2.phpt b/ext/phar/tests/tar/phar_convert_phar2.phpt
index 0218686f1e..b744188e9a 100644
--- a/ext/phar/tests/tar/phar_convert_phar2.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar2.phpt
@@ -47,14 +47,14 @@ __HALT_COMPILER();
 ?>
 --EXPECT--
 bool(false)
-int(6571)
+int(6573)
 bool(true)
 string(60) "<?php // tar-based phar archive stub file
 __HALT_COMPILER();"
 bool(true)
 int(4096)
-int(6571)
+int(6573)
 bool(true)
 bool(true)
-int(6571)
+int(6573)
 ===DONE===
diff --git a/ext/phar/tests/tar/phar_convert_phar3.phpt b/ext/phar/tests/tar/phar_convert_phar3.phpt
index d49463cc82..0a99bca3c8 100644
--- a/ext/phar/tests/tar/phar_convert_phar3.phpt
+++ b/ext/phar/tests/tar/phar_convert_phar3.phpt
@@ -47,14 +47,14 @@ __HALT_COMPILER();
 ?>
 --EXPECT--
 bool(false)
-int(6571)
+int(6573)
 bool(true)
 string(60) "<?php // tar-based phar archive stub file
 __HALT_COMPILER();"
 bool(true)
 int(8192)
-int(6571)
+int(6573)
 bool(true)
 bool(true)
-int(6571)
+int(6573)
 ===DONE===
diff --git a/ext/phar/tests/zip/phar_convert_phar.phpt b/ext/phar/tests/zip/phar_convert_phar.phpt
index 7dffecd3a1..2713ac28e2 100644
--- a/ext/phar/tests/zip/phar_convert_phar.phpt
+++ b/ext/phar/tests/zip/phar_convert_phar.phpt
@@ -50,7 +50,7 @@ bool(true)
 string(60) "<?php // zip-based phar archive stub file
 __HALT_COMPILER();"
 bool(true)
-int(6571)
+int(6573)
 bool(true)
-int(6571)
+int(6573)
 ===DONE===