From: Ant Phillips <ant@php.net>
Date: Thu, 1 May 2008 12:36:44 +0000 (+0000)
Subject: open_basedir tests for directory functions
X-Git-Tag: RELEASE_2_0_0b1~122
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=07dc6d94b6cbfc64357547bc2d754230ee857419;p=php

open_basedir tests for directory functions
---

diff --git a/ext/standard/tests/dir/open_basedir_dir.phpt b/ext/standard/tests/dir/open_basedir_dir.phpt
index 3f800371ac..5e3cc7aa16 100644
--- a/ext/standard/tests/dir/open_basedir_dir.phpt
+++ b/ext/standard/tests/dir/open_basedir_dir.phpt
@@ -66,19 +66,19 @@ Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.
 
 Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
 bool(false)
-object(Directory)#1 (2) {
+object(Directory)#%d (2) {
   ["path"]=>
   string(%d) "%s/test/ok/"
   ["handle"]=>
   resource(%d) of type (stream)
 }
-object(Directory)#1 (2) {
+object(Directory)#%d (2) {
   ["path"]=>
   string(%d) "%s/test/ok"
   ["handle"]=>
   resource(%d) of type (stream)
 }
-object(Directory)#1 (2) {
+object(Directory)#%d (2) {
   ["path"]=>
   string(%d) "%s/test/ok/../ok"
   ["handle"]=>
@@ -132,19 +132,19 @@ Warning: dir(): open_basedir restriction in effect. File(%s/test/bad/../bad/bad.
 
 Warning: dir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
 bool(false)
-object(Directory)#1 (2) {
+object(Directory)#%d (2) {
   [u"path"]=>
   unicode(%d) "%s/test/ok/"
   [u"handle"]=>
   resource(%d) of type (stream)
 }
-object(Directory)#1 (2) {
+object(Directory)#%d (2) {
   [u"path"]=>
   unicode(%d) "%s/test/ok"
   [u"handle"]=>
   resource(%d) of type (stream)
 }
-object(Directory)#1 (2) {
+object(Directory)#%d (2) {
   [u"path"]=>
   unicode(%d) "%s/test/ok/../ok"
   [u"handle"]=>
diff --git a/ext/standard/tests/dir/open_basedir_opendir.phpt b/ext/standard/tests/dir/open_basedir_opendir.phpt
index d67c22a093..077a5116b4 100644
--- a/ext/standard/tests/dir/open_basedir_opendir.phpt
+++ b/ext/standard/tests/dir/open_basedir_opendir.phpt
@@ -66,8 +66,8 @@ Warning: opendir(): open_basedir restriction in effect. File(%s/test/bad/../bad/
 
 Warning: opendir(%s/test/bad/../bad/bad.txt): failed to open dir: Operation not permitted in %s on line %d
 bool(false)
-resource(8) of type (stream)
-resource(9) of type (stream)
-resource(10) of type (stream)
+resource(%d) of type (stream)
+resource(%d) of type (stream)
+resource(%d) of type (stream)
 *** Finished testing open_basedir configuration [opendir] ***