zoe             Fri, 17 Jul 2009 08:18:27 +0000

URL: http://svn.php.net/viewvc?view=revision&revision=284239

Changed paths:
        U   php/php-src/branches/PHP_5_3/Zend/tests/constants_002.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/each_003.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/get_parent_class_001.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/globals_001.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/globals_002.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/globals_003.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/globals_004.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/ns_023.phpt
        U   php/php-src/branches/PHP_5_3/Zend/tests/ns_024.phpt

Log:
fix tests

Modified: php/php-src/branches/PHP_5_3/Zend/tests/constants_002.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/constants_002.phpt  2009-07-17 
07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/constants_002.phpt  2009-07-17 
08:18:27 UTC (rev 284239)
@@ -16,9 +16,3 @@
 Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
 string(%d) "foo"
 resource(%d) of type (stream)
---UEXPECTF--
-Warning: Constants may only evaluate to scalar values in %s on line %d
-
-Notice: Use of undefined constant foo - assumed 'foo' in %s on line %d
-unicode(%d) "foo"
-resource(%d) of type (stream)

Modified: php/php-src/branches/PHP_5_3/Zend/tests/each_003.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/each_003.phpt       2009-07-17 
07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/each_003.phpt       2009-07-17 
08:18:27 UTC (rev 284239)
@@ -22,16 +22,3 @@
   ["key"]=>
   int(0)
 }
---UEXPECTF--
-array(4) {
-  [1]=>
-  array(0) {
-  }
-  [u"value"]=>
-  array(0) {
-  }
-  [0]=>
-  int(0)
-  [u"key"]=>
-  int(0)
-}

Modified: php/php-src/branches/PHP_5_3/Zend/tests/get_parent_class_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/get_parent_class_001.phpt   
2009-07-17 07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/get_parent_class_001.phpt   
2009-07-17 08:18:27 UTC (rev 284239)
@@ -26,6 +26,3 @@
 --EXPECT--
 string(3) "bar"
 bool(false)
---UEXPECT--
-unicode(3) "bar"
-bool(false)

Modified: php/php-src/branches/PHP_5_3/Zend/tests/globals_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/globals_001.phpt    2009-07-17 
07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/globals_001.phpt    2009-07-17 
08:18:27 UTC (rev 284239)
@@ -1,6 +1,6 @@
 --TEST--
 globals in global scope
---INIT--
+--INI--
 variables_order="egpcs"
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/Zend/tests/globals_002.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/globals_002.phpt    2009-07-17 
07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/globals_002.phpt    2009-07-17 
08:18:27 UTC (rev 284239)
@@ -1,6 +1,6 @@
 --TEST--
 globals in local scope
---INIT--
+--INI--
 variables_order="egpcs"
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/Zend/tests/globals_003.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/globals_003.phpt    2009-07-17 
07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/globals_003.phpt    2009-07-17 
08:18:27 UTC (rev 284239)
@@ -1,6 +1,6 @@
 --TEST--
 globals in local scope - 2
---INIT--
+--INI--
 variables_order="egpcs"
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/Zend/tests/globals_004.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/globals_004.phpt    2009-07-17 
07:39:12 UTC (rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/globals_004.phpt    2009-07-17 
08:18:27 UTC (rev 284239)
@@ -1,6 +1,6 @@
 --TEST--
 globals in local scope - 3
---INIT--
+--INI--
 variables_order="egpcs"
 --FILE--
 <?php

Modified: php/php-src/branches/PHP_5_3/Zend/tests/ns_023.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/ns_023.phpt 2009-07-17 07:39:12 UTC 
(rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/ns_023.phpt 2009-07-17 08:18:27 UTC 
(rev 284239)
@@ -7,5 +7,3 @@
 var_dump(__NAMESPACE__);
 --EXPECT--
 string(8) "test\foo"
---UEXPECT--
-unicode(8) "test\foo"

Modified: php/php-src/branches/PHP_5_3/Zend/tests/ns_024.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/Zend/tests/ns_024.phpt 2009-07-17 07:39:12 UTC 
(rev 284238)
+++ php/php-src/branches/PHP_5_3/Zend/tests/ns_024.phpt 2009-07-17 08:18:27 UTC 
(rev 284239)
@@ -5,5 +5,3 @@
 var_dump(__NAMESPACE__);
 --EXPECT--
 string(0) ""
---UEXPECT--
-unicode(0) ""

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

Reply via email to