From 9131f152ba9df655c93495a6bfc757f01ab591d7 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sat, 12 Jan 2008 22:25:40 +0000
Subject: [PATCH] new test for inclusion within phar that takes CWD into
 account

---
 ext/phar/tests/frontcontroller13.phar     | Bin 0 -> 330 bytes
 ext/phar/tests/frontcontroller13.phar.inc |  14 ++++++++++++++
 ext/phar/tests/frontcontroller22.phpt     |  18 ++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 ext/phar/tests/frontcontroller13.phar
 create mode 100644 ext/phar/tests/frontcontroller13.phar.inc
 create mode 100644 ext/phar/tests/frontcontroller22.phpt

diff --git a/ext/phar/tests/frontcontroller13.phar b/ext/phar/tests/frontcontroller13.phar
new file mode 100644
index 0000000000000000000000000000000000000000..2434b1e32d9e15fbd233b582d9ab79fb70773baf
GIT binary patch
literal 330
zcmcDqFUTn13dl$-va%{qO#(4AG_ASf<2@XGLgJnMeFHpwT!Vl@3ifuqT&)ZY49q|*
z2*iv)3;~=#Dl;!7wL%YQmOhZ<9o*^;qTgP+R=y3Yjt9uk&rj1YNi8k`sWXPE1JP_w
zx1wO`xS;AXGC`_Dp{hW1jf>`Im?|5vv&#~T;!{d<3pA8KrYZs5otc-MQ<{>hpoDCd
zk~O+=6j@|#dioH1F|}l50?l7u-aPGn;;Uo2kCz!<+vs;ca-sG)CZN;YoqU}D7|L7S

literal 0
HcmV?d00001

diff --git a/ext/phar/tests/frontcontroller13.phar.inc b/ext/phar/tests/frontcontroller13.phar.inc
new file mode 100644
index 0000000000..0bfef46853
--- /dev/null
+++ b/ext/phar/tests/frontcontroller13.phar.inc
@@ -0,0 +1,14 @@
+<?php
+@unlink(dirname(__FILE__) . '/frontcontroller13.phar');
+$a = new Phar(dirname(__FILE__) . '/frontcontroller13.phar');
+$a['index.php'] = '<?php
+var_dump("test");
+include "oof/test.php";';
+$a['oof/test.php'] = '<?php
+var_dump("oof/test.php");
+include "./hi.php";';
+$a['oof/hi.php'] = '<?php
+var_dump("hi");';
+$a->setStub('<?php
+Phar::webPhar();
+__HALT_COMPILER();');
\ No newline at end of file
diff --git a/ext/phar/tests/frontcontroller22.phpt b/ext/phar/tests/frontcontroller22.phpt
new file mode 100644
index 0000000000..8053b61bf2
--- /dev/null
+++ b/ext/phar/tests/frontcontroller22.phpt
@@ -0,0 +1,18 @@
+--TEST--
+Phar front controller include from cwd test 1
+--SKIPIF--
+<?php if (!extension_loaded("phar")) die("skip"); ?>
+--ENV--
+SCRIPT_NAME=/frontcontroller22.php/index.php
+REQUEST_URI=/frontcontroller22.php/index.php
+--FILE_EXTERNAL--
+frontcontroller13.phar
+--EXPECTHEADERS--
+Content-type: text/html
+--EXPECTF--
+string(4) "test"
+string(12) "oof/test.php"
+
+Warning: include(phar://%s/./hi.php): failed to open stream: phar error: "hi.php" is not a file in phar "%sfrontcontroller22.php" in phar://%s/oof/test.php on line %d
+
+Warning: include(): Failed opening './hi.php' for inclusion (include_path='%s') in phar://%soof/test.php on line %d
\ No newline at end of file
-- 
2.40.0