cellog Sun, 26 Jul 2009 00:35:17 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=286336
Log:
fix tar front controller tests for php6
Changed paths:
U pecl/phar/trunk/tests/tar/files/frontcontroller12.phar.inc
U pecl/phar/trunk/tests/tar/files/frontcontroller12.phar.tar
U pecl/phar/trunk/tests/tar/files/frontcontroller3.phar.inc
U pecl/phar/trunk/tests/tar/files/frontcontroller3.phar.tar
U pecl/phar/trunk/tests/tar/files/frontcontroller4.phar.inc
U pecl/phar/trunk/tests/tar/files/frontcontroller4.phar.tar
U pecl/phar/trunk/tests/tar/frontcontroller21.phar.phpt
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller12.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller12.phar.tar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller3.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller3.phar.tar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller4.phar.inc
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller4.phar.tar
U
php/php-src/branches/PHP_5_3/ext/phar/tests/tar/frontcontroller21.phar.phpt
U php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller12.phar.inc
U php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller12.phar.tar
U php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller3.phar.inc
U php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller3.phar.tar
U php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller4.phar.inc
U php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller4.phar.tar
U php/php-src/trunk/ext/phar/tests/tar/frontcontroller21.phar.phpt
Modified: pecl/phar/trunk/tests/tar/files/frontcontroller12.phar.inc
===================================================================
--- pecl/phar/trunk/tests/tar/files/frontcontroller12.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ pecl/phar/trunk/tests/tar/files/frontcontroller12.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -3,13 +3,13 @@
$a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.tar');
$a['index.php'] = '<?php
var_dump($_SERVER["PHP_SELF"]);
-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"]);
+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"]);
';
$a->setStub('<?php
Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
Modified: pecl/phar/trunk/tests/tar/files/frontcontroller12.phar.tar
===================================================================
(Binary files differ)
Modified: pecl/phar/trunk/tests/tar/files/frontcontroller3.phar.inc
===================================================================
--- pecl/phar/trunk/tests/tar/files/frontcontroller3.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ pecl/phar/trunk/tests/tar/files/frontcontroller3.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -7,7 +7,7 @@
$a->setStub('<?php
function s($a)
{
- static $b = array("/hi" => "a.phps");
+ static $b = array(b"/hi" => b"a.phps");
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: pecl/phar/trunk/tests/tar/files/frontcontroller3.phar.tar
===================================================================
(Binary files differ)
Modified: pecl/phar/trunk/tests/tar/files/frontcontroller4.phar.inc
===================================================================
--- pecl/phar/trunk/tests/tar/files/frontcontroller4.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ pecl/phar/trunk/tests/tar/files/frontcontroller4.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -7,7 +7,7 @@
$a->setStub('<?php
function s($a)
{
- static $b = array("/hi" => false);
+ static $b = array(b"/hi" => false);
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: pecl/phar/trunk/tests/tar/files/frontcontroller4.phar.tar
===================================================================
(Binary files differ)
Modified: pecl/phar/trunk/tests/tar/frontcontroller21.phar.phpt
===================================================================
--- pecl/phar/trunk/tests/tar/frontcontroller21.phar.phpt 2009-07-26 00:28:50 UTC (rev 286335)
+++ pecl/phar/trunk/tests/tar/frontcontroller21.phar.phpt 2009-07-26 00:35:17 UTC (rev 286336)
@@ -14,8 +14,8 @@
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
+%unicode|string%(10) "/index.php"
string(10) "/index.php"
-string(10) "/index.php"
string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
string(18) "/index.php?test=hi"
string(37) "/frontcontroller21.phar.php/index.php"
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller12.phar.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller12.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller12.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -3,13 +3,13 @@
$a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.tar');
$a['index.php'] = '<?php
var_dump($_SERVER["PHP_SELF"]);
-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"]);
+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"]);
';
$a->setStub('<?php
Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller12.phar.tar
===================================================================
(Binary files differ)
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller3.phar.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller3.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller3.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -7,7 +7,7 @@
$a->setStub('<?php
function s($a)
{
- static $b = array("/hi" => "a.phps");
+ static $b = array(b"/hi" => b"a.phps");
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller3.phar.tar
===================================================================
(Binary files differ)
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller4.phar.inc
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller4.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller4.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -7,7 +7,7 @@
$a->setStub('<?php
function s($a)
{
- static $b = array("/hi" => false);
+ static $b = array(b"/hi" => false);
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/files/frontcontroller4.phar.tar
===================================================================
(Binary files differ)
Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/tar/frontcontroller21.phar.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/tar/frontcontroller21.phar.phpt 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/tar/frontcontroller21.phar.phpt 2009-07-26 00:35:17 UTC (rev 286336)
@@ -14,8 +14,8 @@
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
+%unicode|string%(10) "/index.php"
string(10) "/index.php"
-string(10) "/index.php"
string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
string(18) "/index.php?test=hi"
string(37) "/frontcontroller21.phar.php/index.php"
Modified: php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller12.phar.inc
===================================================================
--- php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller12.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller12.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -3,13 +3,13 @@
$a = new Phar(dirname(__FILE__) . '/frontcontroller12.phar.tar');
$a['index.php'] = '<?php
var_dump($_SERVER["PHP_SELF"]);
-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"]);
+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"]);
';
$a->setStub('<?php
Phar::mungServer(array("PHP_SELF", "SCRIPT_NAME", "SCRIPT_FILENAME", "REQUEST_URI"));
Modified: php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller12.phar.tar
===================================================================
(Binary files differ)
Modified: php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller3.phar.inc
===================================================================
--- php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller3.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller3.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -7,7 +7,7 @@
$a->setStub('<?php
function s($a)
{
- static $b = array("/hi" => "a.phps");
+ static $b = array(b"/hi" => b"a.phps");
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller3.phar.tar
===================================================================
(Binary files differ)
Modified: php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller4.phar.inc
===================================================================
--- php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller4.phar.inc 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller4.phar.inc 2009-07-26 00:35:17 UTC (rev 286336)
@@ -7,7 +7,7 @@
$a->setStub('<?php
function s($a)
{
- static $b = array("/hi" => false);
+ static $b = array(b"/hi" => false);
if (isset($b[$a])) return $b[$a];
return $a;
}
Modified: php/php-src/trunk/ext/phar/tests/tar/files/frontcontroller4.phar.tar
===================================================================
(Binary files differ)
Modified: php/php-src/trunk/ext/phar/tests/tar/frontcontroller21.phar.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/tar/frontcontroller21.phar.phpt 2009-07-26 00:28:50 UTC (rev 286335)
+++ php/php-src/trunk/ext/phar/tests/tar/frontcontroller21.phar.phpt 2009-07-26 00:35:17 UTC (rev 286336)
@@ -14,8 +14,8 @@
--EXPECTHEADERS--
Content-type: text/html; charset=UTF-8
--EXPECTF--
+%unicode|string%(10) "/index.php"
string(10) "/index.php"
-string(10) "/index.php"
string(%d) "phar://%sfrontcontroller21.phar.php/index.php"
string(18) "/index.php?test=hi"
string(37) "/frontcontroller21.phar.php/index.php"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
