pajoye                                   Tue, 06 Dec 2011 13:34:45 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=320502

Log:
- add windows version of this test

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/phar/tests/phar_gobyebye.phpt
    U   php/php-src/branches/PHP_5_4/ext/phar/tests/phar_gobyebye.phpt
    A   php/php-src/trunk/ext/phar/tests/phar_gobyebye-win32.phpt
    U   php/php-src/trunk/ext/phar/tests/phar_gobyebye.phpt

Modified: php/php-src/branches/PHP_5_3/ext/phar/tests/phar_gobyebye.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/phar/tests/phar_gobyebye.phpt      
2011-12-06 13:16:40 UTC (rev 320501)
+++ php/php-src/branches/PHP_5_3/ext/phar/tests/phar_gobyebye.phpt      
2011-12-06 13:34:45 UTC (rev 320502)
@@ -1,7 +1,10 @@
 --TEST--
 Phar: test edge cases of intercepted functions when the underlying phar 
archive has been unlinkArchive()d
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) die("skip");
+if (!extension_loaded("phar")) die("skip");
+?>
 --INI--
 phar.readonly=0
 --FILE--

Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/phar_gobyebye.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/phar/tests/phar_gobyebye.phpt      
2011-12-06 13:16:40 UTC (rev 320501)
+++ php/php-src/branches/PHP_5_4/ext/phar/tests/phar_gobyebye.phpt      
2011-12-06 13:34:45 UTC (rev 320502)
@@ -1,7 +1,10 @@
 --TEST--
 Phar: test edge cases of intercepted functions when the underlying phar 
archive has been unlinkArchive()d
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) die("skip");
+if (!extension_loaded("phar")) die("skip");
+?>
 --INI--
 phar.readonly=0
 --FILE--
@@ -41,4 +44,4 @@
 bool(false)

 Warning: opendir(foo/hi): failed to open dir: No such file or directory in 
phar://%sphar_gobyebye.phar.php/foo/hi on line %d
-===DONE===
\ No newline at end of file
+===DONE===

Added: php/php-src/trunk/ext/phar/tests/phar_gobyebye-win32.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/phar_gobyebye-win32.phpt                   
        (rev 0)
+++ php/php-src/trunk/ext/phar/tests/phar_gobyebye-win32.phpt   2011-12-06 
13:34:45 UTC (rev 320502)
@@ -0,0 +1,48 @@
+--TEST--
+Phar: test edge cases of intercepted functions when the underlying phar 
archive has been unlinkArchive()d
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip");
+if (strpos(PHP_OS, 'WIN') !== false) die("Extra warning on Windows.");
+?>
+--INI--
+phar.readonly=0
+--FILE--
+<?php
+Phar::interceptFileFuncs();
+$fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php';
+$fname2 = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.2.php';
+$pname = 'phar://' . $fname;
+file_put_contents($fname2, '<?php Phar::unlinkArchive("' . addslashes($fname) 
. '");');
+file_put_contents($pname . '/foo/hi', '<?php
+include "' . addslashes($fname2) . '";
+readfile("foo/hi");
+fopen("foo/hi", "r");
+echo file_get_contents("foo/hi");
+var_dump(is_file("foo/hi"),is_link("foo/hi"),is_dir("foo/hi"),file_exists("foo/hi"),stat("foo/hi"));
+opendir("foo/hi");
+?>
+');
+include $pname . '/foo/hi';
+?>
+===DONE===
+--CLEAN--
+<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . 
'.phar.php'); ?>
+<?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . 
'.2.php'); ?>
+--EXPECTF--
+Warning: readfile(foo/hi): failed to open stream: No such file or directory in 
phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+
+Warning: fopen(foo/hi): failed to open stream: No such file or directory in 
phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+
+Warning: file_get_contents(foo/hi): failed to open stream: No such file or 
directory in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+
+Warning: stat(): stat failed for foo/hi in 
phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+bool(false)
+
+Warning: opendir(foo/hi,foo/hi): The system cannot find the path specified. 
(code: 3) in phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+
+Warning: opendir(foo/hi): failed to open dir: No such file or directory in 
phar://%sphar_gobyebye-win32.phar.php/foo/hi on line %d
+===DONE===

Modified: php/php-src/trunk/ext/phar/tests/phar_gobyebye.phpt
===================================================================
--- php/php-src/trunk/ext/phar/tests/phar_gobyebye.phpt 2011-12-06 13:16:40 UTC 
(rev 320501)
+++ php/php-src/trunk/ext/phar/tests/phar_gobyebye.phpt 2011-12-06 13:34:45 UTC 
(rev 320502)
@@ -1,7 +1,10 @@
 --TEST--
 Phar: test edge cases of intercepted functions when the underlying phar 
archive has been unlinkArchive()d
 --SKIPIF--
-<?php if (!extension_loaded("phar")) die("skip");?>
+<?php
+if (defined('PHP_WINDOWS_VERSION_MAJOR')) die("skip");
+if (!extension_loaded("phar")) die("skip");
+?>
 --INI--
 phar.readonly=0
 --FILE--

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to