dmitry Mon Aug 15 03:55:41 2005 EDT
Modified files:
/php-src/ext/dom/tests dom003.phpt
/php-src/ext/pdo/tests pdo_005.phpt pdo_018.phpt
/php-src/ext/spl/tests array_003.phpt array_007.phpt array_017.phpt
bug31185.phpt
/php-src/ext/standard/tests/array 007.phpt array_intersect_1.phpt
/php-src/tests/classes __set__get_005.phpt array_access_009.phpt
array_access_010.phpt array_access_011.phpt
clone_003.phpt private_members.phpt
Log:
Tests are fixed according to new var_dump()/pront_r() format (to pass in
non-unicode mode)
http://cvs.php.net/diff.php/php-src/ext/dom/tests/dom003.phpt?r1=1.10&r2=1.11&ty=u
Index: php-src/ext/dom/tests/dom003.phpt
diff -u php-src/ext/dom/tests/dom003.phpt:1.10
php-src/ext/dom/tests/dom003.phpt:1.11
--- php-src/ext/dom/tests/dom003.phpt:1.10 Thu Jun 23 06:57:52 2005
+++ php-src/ext/dom/tests/dom003.phpt Mon Aug 15 03:55:34 2005
@@ -22,15 +22,15 @@
--EXPECTF--
--- Catch exception with try/catch
object(DOMException)#%d (6) {
- ["message:protected"]=>
+ ["message":protected]=>
string(23) "Hierarchy Request Error"
- ["string:private"]=>
+ ["string":"Exception":private]=>
string(0) ""
- ["file:protected"]=>
+ ["file":protected]=>
string(%d) "%sdom003.php"
- ["line:protected"]=>
+ ["line":protected]=>
int(8)
- ["trace:private"]=>
+ ["trace":"Exception":private]=>
array(1) {
[0]=>
array(6) {
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_005.phpt?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/pdo/tests/pdo_005.phpt
diff -u php-src/ext/pdo/tests/pdo_005.phpt:1.4
php-src/ext/pdo/tests/pdo_005.phpt:1.5
--- php-src/ext/pdo/tests/pdo_005.phpt:1.4 Thu Jul 7 11:32:31 2005
+++ php-src/ext/pdo/tests/pdo_005.phpt Mon Aug 15 03:55:38 2005
@@ -83,27 +83,27 @@
object(TestBase)#%d (3) {
["id"]=>
string(1) "1"
- ["val:protected"]=>
+ ["val":protected]=>
string(1) "A"
- ["val2:private"]=>
+ ["val2":"TestBase":private]=>
string(2) "AA"
}
[1]=>
object(TestBase)#%d (3) {
["id"]=>
string(1) "2"
- ["val:protected"]=>
+ ["val":protected]=>
string(1) "B"
- ["val2:private"]=>
+ ["val2":"TestBase":private]=>
string(2) "BB"
}
[2]=>
object(TestBase)#%d (3) {
["id"]=>
string(1) "3"
- ["val:protected"]=>
+ ["val":protected]=>
string(1) "C"
- ["val2:private"]=>
+ ["val2":"TestBase":private]=>
string(2) "CC"
}
}
@@ -113,39 +113,39 @@
array(3) {
[0]=>
object(TestDerived)#%d (5) {
- ["row:protected"]=>
+ ["row":protected]=>
int(0)
["id"]=>
string(1) "1"
- ["val:protected"]=>
+ ["val":protected]=>
string(1) "A"
- ["val2:private"]=>
+ ["val2":"TestBase":private]=>
NULL
["val2"]=>
string(2) "AA"
}
[1]=>
object(TestDerived)#%d (5) {
- ["row:protected"]=>
+ ["row":protected]=>
int(1)
["id"]=>
string(1) "2"
- ["val:protected"]=>
+ ["val":protected]=>
string(1) "B"
- ["val2:private"]=>
+ ["val2":"TestBase":private]=>
NULL
["val2"]=>
string(2) "BB"
}
[2]=>
object(TestDerived)#%d (5) {
- ["row:protected"]=>
+ ["row":protected]=>
int(2)
["id"]=>
string(1) "3"
- ["val:protected"]=>
+ ["val":protected]=>
string(1) "C"
- ["val2:private"]=>
+ ["val2":"TestBase":private]=>
NULL
["val2"]=>
string(2) "CC"
http://cvs.php.net/diff.php/php-src/ext/pdo/tests/pdo_018.phpt?r1=1.11&r2=1.12&ty=u
Index: php-src/ext/pdo/tests/pdo_018.phpt
diff -u php-src/ext/pdo/tests/pdo_018.phpt:1.11
php-src/ext/pdo/tests/pdo_018.phpt:1.12
--- php-src/ext/pdo/tests/pdo_018.phpt:1.11 Wed Jul 20 01:27:00 2005
+++ php-src/ext/pdo/tests/pdo_018.phpt Mon Aug 15 03:55:38 2005
@@ -231,39 +231,39 @@
object(TestBase)#%d (3) {
["BasePub"]=>
string(7) "#Public"
- ["BasePro:protected"]=>
+ ["BasePro":protected]=>
string(10) "#Protected"
- ["BasePri:private"]=>
+ ["BasePri":"TestBase":private]=>
string(8) "#Private"
}
[1]=>
object(TestDerived)#%d (6) {
["BasePub"]=>
string(14) "#DerivedPublic"
- ["BasePro:protected"]=>
+ ["BasePro":protected]=>
string(17) "#DerivdeProtected"
["DerivedPub"]=>
string(7) "#Public"
- ["DerivedPro:protected"]=>
+ ["DerivedPro":protected]=>
string(10) "#Protected"
- ["DerivedPri:private"]=>
+ ["DerivedPri":"TestDerived":private]=>
string(7) "Private"
- ["BasePri:private"]=>
+ ["BasePri":"TestBase":private]=>
string(7) "Private"
}
[2]=>
object(TestLeaf)#%d (6) {
["BasePub"]=>
string(14) "#DerivedPublic"
- ["BasePro:protected"]=>
+ ["BasePro":protected]=>
string(17) "#DerivdeProtected"
["DerivedPub"]=>
string(7) "#Public"
- ["DerivedPro:protected"]=>
+ ["DerivedPro":protected]=>
string(10) "#Protected"
- ["DerivedPri:private"]=>
+ ["DerivedPri":"TestDerived":private]=>
string(7) "Private"
- ["BasePri:private"]=>
+ ["BasePri":"TestBase":private]=>
string(7) "Private"
}
}
http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_003.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/spl/tests/array_003.phpt
diff -u php-src/ext/spl/tests/array_003.phpt:1.2
php-src/ext/spl/tests/array_003.phpt:1.3
--- php-src/ext/spl/tests/array_003.phpt:1.2 Sun Apr 25 07:14:11 2004
+++ php-src/ext/spl/tests/array_003.phpt Mon Aug 15 03:55:39 2005
@@ -43,7 +43,7 @@
(
[pub] => public
[pro:protected] => protected
- [pri:private] => private
+ [pri:test:private] => private
[imp] => implicit
[dyn] => dynamic
)
@@ -51,7 +51,7 @@
(
[pub] => public
[pro:protected] => protected
- [pri:private] => private
+ [pri:test:private] => private
[imp] => implicit
[dyn] => dynamic
)
http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_007.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/array_007.phpt
diff -u php-src/ext/spl/tests/array_007.phpt:1.1
php-src/ext/spl/tests/array_007.phpt:1.2
--- php-src/ext/spl/tests/array_007.phpt:1.1 Sun Apr 25 07:14:11 2004
+++ php-src/ext/spl/tests/array_007.phpt Mon Aug 15 03:55:39 2005
@@ -47,7 +47,7 @@
(
[pub] => public
[pro:protected] => protected
- [pri:private] => private
+ [pri:test:private] => private
[imp] => implicit
[dyn] => dynamic
)
@@ -55,7 +55,7 @@
(
[pub] => public
[pro:protected] => protected
- [pri:private] => private
+ [pri:test:private] => private
[imp] => implicit
[dyn] => dynamic
)
http://cvs.php.net/diff.php/php-src/ext/spl/tests/array_017.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/spl/tests/array_017.phpt
diff -u php-src/ext/spl/tests/array_017.phpt:1.1
php-src/ext/spl/tests/array_017.phpt:1.2
--- php-src/ext/spl/tests/array_017.phpt:1.1 Sun Jun 19 20:19:18 2005
+++ php-src/ext/spl/tests/array_017.phpt Mon Aug 15 03:55:39 2005
@@ -263,9 +263,9 @@
object(ArrayObjectEx)#1 (5) {
["pub1"]=>
int(1)
- ["pro1:protected"]=>
+ ["pro1":protected]=>
int(2)
- ["pri1:private"]=>
+ ["pri1":"ArrayObjectEx":private]=>
int(3)
["imp1"]=>
int(4)
@@ -297,9 +297,9 @@
object(ArrayIteratorEx)#3 (5) {
["pub2"]=>
int(1)
- ["pro2:protected"]=>
+ ["pro2":protected]=>
int(2)
- ["pri2:private"]=>
+ ["pri2":"ArrayIteratorEx":private]=>
int(3)
["imp2"]=>
int(4)
@@ -343,9 +343,9 @@
object(ArrayIteratorEx)#2 (5) {
["pub2"]=>
int(1)
- ["pro2:protected"]=>
+ ["pro2":protected]=>
int(2)
- ["pri2:private"]=>
+ ["pri2":"ArrayIteratorEx":private]=>
int(3)
["imp2"]=>
int(4)
@@ -401,9 +401,9 @@
object(ArrayObjectEx)#1 (5) {
["pub1"]=>
int(1)
- ["pro1:protected"]=>
+ ["pro1":protected]=>
int(2)
- ["pri1:private"]=>
+ ["pri1":"ArrayObjectEx":private]=>
int(3)
["imp1"]=>
int(4)
@@ -433,9 +433,9 @@
object(ArrayIteratorEx)#2 (5) {
["pub1"]=>
int(1)
- ["pro1:protected"]=>
+ ["pro1":protected]=>
int(2)
- ["pri1:private"]=>
+ ["pri1":"ArrayObjectEx":private]=>
int(3)
["imp1"]=>
int(4)
@@ -477,9 +477,9 @@
object(ArrayIteratorEx)#3 (5) {
["pub1"]=>
int(1)
- ["pro1:protected"]=>
+ ["pro1":protected]=>
int(2)
- ["pri1:private"]=>
+ ["pri1":"ArrayObjectEx":private]=>
int(3)
["imp1"]=>
int(4)
@@ -533,9 +533,9 @@
object(ArrayObjectEx)#1 (5) {
["pub1"]=>
int(1)
- ["pro1:protected"]=>
+ ["pro1":protected]=>
int(2)
- ["pri1:private"]=>
+ ["pri1":"ArrayObjectEx":private]=>
int(3)
["imp1"]=>
int(4)
@@ -567,9 +567,9 @@
object(ArrayIteratorEx)#3 (5) {
["pub2"]=>
int(1)
- ["pro2:protected"]=>
+ ["pro2":protected]=>
int(2)
- ["pri2:private"]=>
+ ["pri2":"ArrayIteratorEx":private]=>
int(3)
["imp2"]=>
int(4)
@@ -613,9 +613,9 @@
object(ArrayIteratorEx)#2 (5) {
["pub2"]=>
int(1)
- ["pro2:protected"]=>
+ ["pro2":protected]=>
int(2)
- ["pri2:private"]=>
+ ["pri2":"ArrayIteratorEx":private]=>
int(3)
["imp2"]=>
int(4)
http://cvs.php.net/diff.php/php-src/ext/spl/tests/bug31185.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/ext/spl/tests/bug31185.phpt
diff -u php-src/ext/spl/tests/bug31185.phpt:1.2
php-src/ext/spl/tests/bug31185.phpt:1.3
--- php-src/ext/spl/tests/bug31185.phpt:1.2 Sat Mar 19 10:15:32 2005
+++ php-src/ext/spl/tests/bug31185.phpt Mon Aug 15 03:55:39 2005
@@ -50,7 +50,7 @@
CAUGHT: FAIL
FooBar Object
(
- [array:private] => Array
+ [array:FooBar:private] => Array
(
[0] => 0
[1] => 1
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/007.phpt?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/standard/tests/array/007.phpt
diff -u php-src/ext/standard/tests/array/007.phpt:1.9
php-src/ext/standard/tests/array/007.phpt:1.10
--- php-src/ext/standard/tests/array/007.phpt:1.9 Thu May 20 17:13:14 2004
+++ php-src/ext/standard/tests/array/007.phpt Mon Aug 15 03:55:39 2005
@@ -310,21 +310,21 @@
array(3) {
["0.1"]=>
object(cr)#1 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
object(cr)#2 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
object(cr)#3 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
@@ -388,21 +388,21 @@
array(3) {
["0.1"]=>
object(cr)#1 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
object(cr)#2 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
object(cr)#3 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
@@ -466,35 +466,35 @@
array(5) {
["0.1"]=>
object(cr)#1 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
object(cr)#2 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
object(cr)#3 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
}
[1]=>
object(cr)#4 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
object(cr)#5 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
int(-15)
@@ -558,14 +558,14 @@
array(2) {
["0.5"]=>
object(cr)#2 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
object(cr)#3 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
@@ -629,21 +629,21 @@
array(3) {
["0.1"]=>
object(cr)#1 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
["0.5"]=>
object(cr)#2 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(12)
["public_member"]=>
int(12)
}
[0]=>
object(cr)#3 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(23)
["public_member"]=>
int(23)
http://cvs.php.net/diff.php/php-src/ext/standard/tests/array/array_intersect_1.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/ext/standard/tests/array/array_intersect_1.phpt
diff -u php-src/ext/standard/tests/array/array_intersect_1.phpt:1.5
php-src/ext/standard/tests/array/array_intersect_1.phpt:1.6
--- php-src/ext/standard/tests/array/array_intersect_1.phpt:1.5 Thu May 20
17:13:14 2004
+++ php-src/ext/standard/tests/array/array_intersect_1.phpt Mon Aug 15
03:55:40 2005
@@ -205,21 +205,21 @@
array(3) {
["0.1"]=>
object(cr)#1 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(9)
["public_member"]=>
int(9)
}
[1]=>
object(cr)#4 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
object(cr)#5 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
int(-15)
@@ -344,14 +344,14 @@
array(2) {
[1]=>
object(cr)#4 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
object(cr)#5 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
int(-15)
@@ -476,14 +476,14 @@
array(2) {
[1]=>
object(cr)#4 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
object(cr)#5 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
int(-15)
@@ -549,14 +549,14 @@
array(2) {
[1]=>
object(cr)#4 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(4)
["public_member"]=>
int(4)
}
[2]=>
object(cr)#5 (2) {
- ["priv_member:private"]=>
+ ["priv_member":"cr":private]=>
int(-15)
["public_member"]=>
int(-15)
http://cvs.php.net/diff.php/php-src/tests/classes/__set__get_005.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/tests/classes/__set__get_005.phpt
diff -u php-src/tests/classes/__set__get_005.phpt:1.1
php-src/tests/classes/__set__get_005.phpt:1.2
--- php-src/tests/classes/__set__get_005.phpt:1.1 Sun Mar 6 20:43:02 2005
+++ php-src/tests/classes/__set__get_005.phpt Mon Aug 15 03:55:40 2005
@@ -56,7 +56,7 @@
Test::__set
AutoGen::__get
object(Test)#%d (1) {
- ["x:protected"]=>
+ ["x":protected]=>
array(1) {
["baz"]=>
string(5) "Check"
http://cvs.php.net/diff.php/php-src/tests/classes/array_access_009.phpt?r1=1.2&r2=1.3&ty=u
Index: php-src/tests/classes/array_access_009.phpt
diff -u php-src/tests/classes/array_access_009.phpt:1.2
php-src/tests/classes/array_access_009.phpt:1.3
--- php-src/tests/classes/array_access_009.phpt:1.2 Sun Jun 19 17:52:38 2005
+++ php-src/tests/classes/array_access_009.phpt Mon Aug 15 03:55:40 2005
@@ -130,7 +130,7 @@
===ArrayOverloading===
ArrayProxy::__construct(0)
object(ArrayProxy)#1 (2) {
- ["object:private"]=>
+ ["object":"ArrayProxy":private]=>
object(Peoples)#2 (1) {
["person"]=>
array(1) {
@@ -141,7 +141,7 @@
}
}
}
- ["element:private"]=>
+ ["element":"ArrayProxy":private]=>
int(0)
}
ArrayProxy::__construct(0)
@@ -167,7 +167,7 @@
ArrayProxy::offsetUnset(0, name)
ArrayProxy::__construct(0)
object(ArrayProxy)#1 (2) {
- ["object:private"]=>
+ ["object":"ArrayProxy":private]=>
object(Peoples)#2 (1) {
["person"]=>
array(1) {
@@ -176,7 +176,7 @@
}
}
}
- ["element:private"]=>
+ ["element":"ArrayProxy":private]=>
int(0)
}
ArrayProxy::__construct(0)
http://cvs.php.net/diff.php/php-src/tests/classes/array_access_010.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/tests/classes/array_access_010.phpt
diff -u php-src/tests/classes/array_access_010.phpt:1.1
php-src/tests/classes/array_access_010.phpt:1.2
--- php-src/tests/classes/array_access_010.phpt:1.1 Sun Jun 19 18:09:53 2005
+++ php-src/tests/classes/array_access_010.phpt Mon Aug 15 03:55:41 2005
@@ -104,7 +104,7 @@
===ArrayOverloading===
ArrayReferenceProxy::__construct(Array)
object(ArrayReferenceProxy)#1 (2) {
- ["object:private"]=>
+ ["object":"ArrayReferenceProxy":private]=>
object(Peoples)#2 (1) {
["person"]=>
array(1) {
@@ -115,7 +115,7 @@
}
}
}
- ["element:private"]=>
+ ["element":"ArrayReferenceProxy":private]=>
&array(1) {
["name"]=>
string(3) "Foo"
@@ -144,7 +144,7 @@
ArrayReferenceProxy::offsetUnset(Array, name)
ArrayReferenceProxy::__construct(Array)
object(ArrayReferenceProxy)#1 (2) {
- ["object:private"]=>
+ ["object":"ArrayReferenceProxy":private]=>
object(Peoples)#2 (1) {
["person"]=>
array(1) {
@@ -153,7 +153,7 @@
}
}
}
- ["element:private"]=>
+ ["element":"ArrayReferenceProxy":private]=>
&array(0) {
}
}
http://cvs.php.net/diff.php/php-src/tests/classes/array_access_011.phpt?r1=1.1&r2=1.2&ty=u
Index: php-src/tests/classes/array_access_011.phpt
diff -u php-src/tests/classes/array_access_011.phpt:1.1
php-src/tests/classes/array_access_011.phpt:1.2
--- php-src/tests/classes/array_access_011.phpt:1.1 Sun Jun 19 18:18:07 2005
+++ php-src/tests/classes/array_access_011.phpt Mon Aug 15 03:55:41 2005
@@ -113,7 +113,7 @@
===ArrayOverloading===
ArrayAccessReferenceProxy::__construct(0)
object(ArrayAccessReferenceProxy)#1 (3) {
- ["object:private"]=>
+ ["object":"ArrayAccessReferenceProxy":private]=>
object(Peoples)#2 (1) {
["person"]=>
&array(1) {
@@ -124,7 +124,7 @@
}
}
}
- ["oarray:private"]=>
+ ["oarray":"ArrayAccessReferenceProxy":private]=>
&array(1) {
[0]=>
array(1) {
@@ -132,7 +132,7 @@
string(3) "Foo"
}
}
- ["element:private"]=>
+ ["element":"ArrayAccessReferenceProxy":private]=>
int(0)
}
ArrayAccessReferenceProxy::__construct(0)
@@ -158,7 +158,7 @@
ArrayAccessReferenceProxy::offsetUnset(0, name)
ArrayAccessReferenceProxy::__construct(0)
object(ArrayAccessReferenceProxy)#1 (3) {
- ["object:private"]=>
+ ["object":"ArrayAccessReferenceProxy":private]=>
object(Peoples)#2 (1) {
["person"]=>
&array(1) {
@@ -167,13 +167,13 @@
}
}
}
- ["oarray:private"]=>
+ ["oarray":"ArrayAccessReferenceProxy":private]=>
&array(1) {
[0]=>
array(0) {
}
}
- ["element:private"]=>
+ ["element":"ArrayAccessReferenceProxy":private]=>
int(0)
}
ArrayAccessReferenceProxy::__construct(0)
http://cvs.php.net/diff.php/php-src/tests/classes/clone_003.phpt?r1=1.5&r2=1.6&ty=u
Index: php-src/tests/classes/clone_003.phpt
diff -u php-src/tests/classes/clone_003.phpt:1.5
php-src/tests/classes/clone_003.phpt:1.6
--- php-src/tests/classes/clone_003.phpt:1.5 Tue Feb 3 16:52:46 2004
+++ php-src/tests/classes/clone_003.phpt Mon Aug 15 03:55:41 2005
@@ -43,7 +43,7 @@
[p4] => A
[p5] => test:5
[p2] => base:2
- [p6:private] => base:6
+ [p6:base:private] => base:6
)
Clown
test Object
@@ -53,6 +53,6 @@
[p4] => A
[p5] => clone:5
[p2] => base:2
- [p6:private] => base:6
+ [p6:base:private] => base:6
)
Done
http://cvs.php.net/diff.php/php-src/tests/classes/private_members.phpt?r1=1.3&r2=1.4&ty=u
Index: php-src/tests/classes/private_members.phpt
diff -u php-src/tests/classes/private_members.phpt:1.3
php-src/tests/classes/private_members.phpt:1.4
--- php-src/tests/classes/private_members.phpt:1.3 Sat Aug 9 16:13:44 2003
+++ php-src/tests/classes/private_members.phpt Mon Aug 15 03:55:41 2005
@@ -60,44 +60,44 @@
derived Object
(
[member] => derived::member (default)
- [member:private] => base::member
+ [member:base:private] => base::member
)
derived::test
derived Object
(
[member] => derived::member (default)
- [member:private] => base::member
+ [member:base:private] => base::member
)
base::__construct(end)
base::test
derived Object
(
[member] => derived::member (default)
- [member:private] => base::member
+ [member:base:private] => base::member
)
base::test
derived Object
(
[member] => derived::member (default)
- [member:private] => base::member
+ [member:base:private] => base::member
)
derived::test
derived Object
(
[member] => derived::member (default)
- [member:private] => base::member
+ [member:base:private] => base::member
)
derived::__construct(end)
base::test
derived Object
(
[member] => derived::member
- [member:private] => base::member
+ [member:base:private] => base::member
)
derived::test
derived Object
(
[member] => derived::member
- [member:private] => base::member
+ [member:base:private] => base::member
)
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
