felipe Tue, 06 Jul 2010 00:25:52 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=301016
Log:
- Fixed tests
Changed paths:
U
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
U
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
U
php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
U
php/php-src/branches/PHP_5_3/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
U php/php-src/branches/PHP_5_3/ext/date/tests/bug51393.phpt
U php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt
U
php/php-src/branches/PHP_5_3/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
U
php/php-src/trunk/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
U php/php-src/trunk/ext/date/tests/bug51393.phpt
U php/php-src/trunk/ext/date/tests/date_diff.phpt
U
php/php-src/trunk/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
U
php/php-src/trunk/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
U
php/php-src/trunk/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
U
php/php-src/trunk/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
Modified: php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -64,10 +64,7 @@
?>
--EXPECTF--
-
-Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26
-
-Strict Standards: %s for class NewAndOldCtor in %s on line 31
+Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
Constructor of NewCtor: __construct
Constructor of ExtendsNewCtor: __construct
Constructor of OldCtor: OldCtor
@@ -79,4 +76,4 @@
Constructor of D1: __construct
Constructor of D2: C
No constructor for X
-No constructor for Y
\ No newline at end of file
+No constructor for Y
Modified: php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -88,8 +88,6 @@
?>
--EXPECTF--
Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
-
-Strict Standards: %s for class NewAndOldCtor in %s on line %d
New-style constructor:
bool(true)
Modified: php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
===================================================================
--- php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_2/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -64,10 +64,7 @@
?>
--EXPECTF--
-
-Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26
-
-Strict Standards: %s for class NewAndOldCtor in %s on line 31
+Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
Constructor of NewCtor: __construct
Constructor of ExtendsNewCtor: __construct
Constructor of OldCtor: OldCtor
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -26,7 +26,7 @@
--EXPECT--
*** Testing DateTimeZone::listAbbreviations() : basic functionality ***
string(5) "array"
-int(338)
+int(399)
-- Format a sample entry --
array(4) {
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/bug51393.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/bug51393.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/bug51393.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -1,5 +1,7 @@
--TEST--
Bug #51393 (DateTime::createFromFormat() fails if format string contains timezone)
+--INI--
+date.timezone=UTC
--FILE--
<?php
$dt = DateTime::createFromFormat('O', '+0800');
Modified: php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_3/ext/date/tests/date_diff.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -1,5 +1,7 @@
--TEST--
Extensive test for date_diff().
+--INI--
+date.timezone=UTC
--FILE--
<?php
$ok = 0;
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/directory/DirectoryClass_basic_001.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/directory/DirectoryClass_basic_001.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -35,13 +35,25 @@
}
- Methods [3] {
- Method [ <internal%s> public method close ] {
+ Method [ <internal:standard> public method close ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $dir_handle ]
+ }
}
- Method [ <internal%s> public method rewind ] {
+ Method [ <internal:standard> public method rewind ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $dir_handle ]
+ }
}
- Method [ <internal%s> public method read ] {
+ Method [ <internal:standard> public method read ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $dir_handle ]
+ }
}
}
}
@@ -50,4 +62,4 @@
}
Warning: Directory::read(): Unable to find my handle property in %s on line 15
-bool(false)
\ No newline at end of file
+bool(false)
Modified: php/php-src/trunk/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/date/tests/DateTimeZone_listAbbreviations_basic1.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -26,7 +26,7 @@
--EXPECT--
*** Testing DateTimeZone::listAbbreviations() : basic functionality ***
string(5) "array"
-int(338)
+int(399)
-- Format a sample entry --
array(4) {
Modified: php/php-src/trunk/ext/date/tests/bug51393.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/bug51393.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/date/tests/bug51393.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -1,5 +1,7 @@
--TEST--
Bug #51393 (DateTime::createFromFormat() fails if format string contains timezone)
+--INI--
+date.timezone=UTC
--FILE--
<?php
$dt = DateTime::createFromFormat('O', '+0800');
Modified: php/php-src/trunk/ext/date/tests/date_diff.phpt
===================================================================
--- php/php-src/trunk/ext/date/tests/date_diff.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/date/tests/date_diff.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -1,5 +1,7 @@
--TEST--
Extensive test for date_diff().
+--INI--
+date.timezone=UTC
--FILE--
<?php
$ok = 0;
Modified: php/php-src/trunk/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt
===================================================================
--- php/php-src/trunk/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/reflection/tests/ReflectionClass_getConstructor_basic.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -64,10 +64,7 @@
?>
--EXPECTF--
-
-Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26
-
-Strict Standards: %s for class NewAndOldCtor in %s on line 31
+Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
Constructor of NewCtor: __construct
Constructor of ExtendsNewCtor: __construct
Constructor of OldCtor: OldCtor
@@ -79,4 +76,4 @@
Constructor of D1: __construct
Constructor of D2: C
No constructor for X
-No constructor for Y
\ No newline at end of file
+No constructor for Y
Modified: php/php-src/trunk/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt
===================================================================
--- php/php-src/trunk/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/reflection/tests/ReflectionMethod_constructor_basic.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -86,8 +86,6 @@
?>
--EXPECTF--
Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
-
-Strict Standards: %s for class NewAndOldCtor in %s on line %d
New-style constructor:
bool(true)
Modified: php/php-src/trunk/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt
===================================================================
--- php/php-src/trunk/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/reflection/tests/ReflectionObject_getConstructor_basic.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -64,10 +64,7 @@
?>
--EXPECTF--
-
-Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line 26
-
-Strict Standards: %s for class NewAndOldCtor in %s on line 31
+Strict Standards: Redefining already defined constructor for class OldAndNewCtor in %s on line %d
Constructor of NewCtor: __construct
Constructor of ExtendsNewCtor: __construct
Constructor of OldCtor: OldCtor
Modified: php/php-src/trunk/ext/standard/tests/directory/DirectoryClass_basic_001.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/directory/DirectoryClass_basic_001.phpt 2010-07-05 21:52:21 UTC (rev 301015)
+++ php/php-src/trunk/ext/standard/tests/directory/DirectoryClass_basic_001.phpt 2010-07-06 00:25:52 UTC (rev 301016)
@@ -35,13 +35,25 @@
}
- Methods [3] {
- Method [ <internal%s> public method close ] {
+ Method [ <internal:standard> public method close ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $dir_handle ]
+ }
}
- Method [ <internal%s> public method rewind ] {
+ Method [ <internal:standard> public method rewind ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $dir_handle ]
+ }
}
- Method [ <internal%s> public method read ] {
+ Method [ <internal:standard> public method read ] {
+
+ - Parameters [1] {
+ Parameter #0 [ <optional> $dir_handle ]
+ }
}
}
}
@@ -50,4 +62,4 @@
}
Warning: Directory::read(): Unable to find my handle property in %s on line 15
-bool(false)
\ No newline at end of file
+bool(false)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
