Update tests to match new stub length

diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index 960157134821ca9c35aa6a5bb8c2a4ce4cb82050..5932deee1c332cf03070a35123c2d581adda2508 100644 (file)
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -29,20 +29,17 @@ unlink(dirname(__FILE__) . '/brandnewphar.phar');
 __HALT_COMPILER();
 ?>
 --EXPECT--
-string(6591) "<?php
+string(6571) "<?php
 
-$web = '0';
+$web = 'index.php';
 
 if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {
 Phar::interceptFileFuncs();
-if ($web) {
 Phar::webPhar(null, $web);
-}
 include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if ($web) {
 if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
 Extract_Phar::go(true);
 $mimes = array(
@@ -132,7 +129,6 @@ readfile($a);
 exit;
 }
 }
-}
 
 class Extract_Phar
 {
@@ -142,7 +138,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'index.php';
-const LEN = 6591;
+const LEN = 6573;
 
 static function go($return = false)
 {

diff --git a/ext/phar/tests/phar_create_in_cwd.phpt b/ext/phar/tests/phar_create_in_cwd.phpt
index a3f8f1d7b1464f34b0da448a14117b3d20064b77..eec4ca771c5845925dccba24b6ec9f00eb7690bf 100644 (file)
--- 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(6591)
+int(6571)
 string(200) "<?php
 function __autoload($class)
 {

diff --git a/ext/phar/tests/phar_createdefaultstub.phpt b/ext/phar/tests/phar_createdefaultstub.phpt
index 7bca0511e916e708369c89dad079bad58497206c..1e9925b065a74cdc1190dc8f59800bc9b9b57c26 100644 (file)
--- a/ext/phar/tests/phar_createdefaultstub.phpt
+++ b/ext/phar/tests/phar_createdefaultstub.phpt
@@ -34,20 +34,17 @@ echo $e->getMessage() . "\n";
 ?>
 ===DONE===
 --EXPECT--
-string(6591) "<?php
+string(6571) "<?php
 
-$web = '0';
+$web = 'index.php';
 
 if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {
 Phar::interceptFileFuncs();
-if ($web) {
 Phar::webPhar(null, $web);
-}
 include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if ($web) {
 if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
 Extract_Phar::go(true);
 $mimes = array(
@@ -137,7 +134,6 @@ readfile($a);
 exit;
 }
 }
-}
 
 class Extract_Phar
 {
@@ -147,7 +143,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'index.php';
-const LEN = 6591;
+const LEN = 6573;
 
 static function go($return = false)
 {
@@ -331,20 +327,17 @@ Extract_Phar::go();
 __HALT_COMPILER(); ?>"
 ============================================================================
 ============================================================================
-string(6602) "<?php
+string(6582) "<?php
 
-$web = '0';
+$web = 'index.php';
 
 if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {
 Phar::interceptFileFuncs();
-if ($web) {
 Phar::webPhar(null, $web);
-}
 include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if ($web) {
 if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
 Extract_Phar::go(true);
 $mimes = array(
@@ -434,7 +427,6 @@ readfile($a);
 exit;
 }
 }
-}
 
 class Extract_Phar
 {
@@ -444,7 +436,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'my/custom/thingy.php';
-const LEN = 6603;
+const LEN = 6584;
 
 static function go($return = false)
 {
@@ -628,7 +620,7 @@ Extract_Phar::go();
 __HALT_COMPILER(); ?>"
 ============================================================================
 ============================================================================
-int(6982)
+int(6962)
 ============================================================================
 ============================================================================
 Illegal filename passed in for stub creation, was 401 characters long, and only 400 or less is allowed
@@ -636,20 +628,17 @@ Illegal filename passed in for stub creation, was 401 characters long, and only
 ============================================================================
 ============================================================================
 ============================================================================
-string(6612) "<?php
+string(6584) "<?php
 
 $web = 'the/web.php';
 
 if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {
 Phar::interceptFileFuncs();
-if ($web) {
 Phar::webPhar(null, $web);
-}
 include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
 return;
 }
 
-if ($web) {
 if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST')) {
 Extract_Phar::go(true);
 $mimes = array(
@@ -739,7 +728,6 @@ readfile($a);
 exit;
 }
 }
-}
 
 class Extract_Phar
 {
@@ -749,7 +737,7 @@ const GZ = 0x1000;
 const BZ2 = 0x2000;
 const MASK = 0x3000;
 const START = 'my/custom/thingy.php';
-const LEN = 6614;
+const LEN = 6586;
 
 static function go($return = false)
 {
@@ -933,6 +921,6 @@ Extract_Phar::go();
 __HALT_COMPILER(); ?>"
 ============================================================================
 ============================================================================
-int(6990)
+int(6962)
 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