stas                                     Mon, 26 Dec 2011 01:08:47 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=321395

Log:
fix tests

Changed paths:
    U   php/php-src/branches/PHP_5_4/tests/lang/bug19943.phpt
    U   php/php-src/branches/PHP_5_4/tests/strings/offsets_general.phpt
    U   php/php-src/trunk/tests/lang/bug19943.phpt
    U   php/php-src/trunk/tests/strings/offsets_general.phpt

Modified: php/php-src/branches/PHP_5_4/tests/lang/bug19943.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/lang/bug19943.phpt       2011-12-26 
00:03:37 UTC (rev 321394)
+++ php/php-src/branches/PHP_5_4/tests/lang/bug19943.phpt       2011-12-26 
01:08:47 UTC (rev 321395)
@@ -5,11 +5,11 @@
        $ar = array();
        for ($count = 0; $count < 10; $count++) {
                $ar[$count]        = "$count";
-               $ar[$count]['idx'] = "$count";
+               @$ar[$count]['idx'] = "$count";
        }

        for ($count = 0; $count < 10; $count++) {
-               echo $ar[$count]." -- ".$ar[$count]['idx']."\n";
+               echo $ar[$count]." -- ".@$ar[$count]['idx']."\n";
        }
        $a = "0123456789";
        $a[9] = $a[0];

Modified: php/php-src/branches/PHP_5_4/tests/strings/offsets_general.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/strings/offsets_general.phpt     
2011-12-26 00:03:37 UTC (rev 321394)
+++ php/php-src/branches/PHP_5_4/tests/strings/offsets_general.phpt     
2011-12-26 01:08:47 UTC (rev 321395)
@@ -18,17 +18,21 @@
 var_dump($string{"foo"});
 var_dump(isset($string{"foo"}{"bar"}));
 ?>
---EXPECT--
+--EXPECTF--
 string(1) "f"
 string(1) "o"
 bool(true)
 bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
-bool(true)
+bool(false)
 string(1) "f"
 string(1) "o"
 bool(true)
 bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
-bool(true)
+bool(false)


Modified: php/php-src/trunk/tests/lang/bug19943.phpt
===================================================================
--- php/php-src/trunk/tests/lang/bug19943.phpt  2011-12-26 00:03:37 UTC (rev 
321394)
+++ php/php-src/trunk/tests/lang/bug19943.phpt  2011-12-26 01:08:47 UTC (rev 
321395)
@@ -5,11 +5,11 @@
        $ar = array();
        for ($count = 0; $count < 10; $count++) {
                $ar[$count]        = "$count";
-               $ar[$count]['idx'] = "$count";
+               @$ar[$count]['idx'] = "$count";
        }

        for ($count = 0; $count < 10; $count++) {
-               echo $ar[$count]." -- ".$ar[$count]['idx']."\n";
+               echo $ar[$count]." -- ".@$ar[$count]['idx']."\n";
        }
        $a = "0123456789";
        $a[9] = $a[0];

Modified: php/php-src/trunk/tests/strings/offsets_general.phpt
===================================================================
--- php/php-src/trunk/tests/strings/offsets_general.phpt        2011-12-26 
00:03:37 UTC (rev 321394)
+++ php/php-src/trunk/tests/strings/offsets_general.phpt        2011-12-26 
01:08:47 UTC (rev 321395)
@@ -18,17 +18,21 @@
 var_dump($string{"foo"});
 var_dump(isset($string{"foo"}{"bar"}));
 ?>
---EXPECT--
+--EXPECTF--
 string(1) "f"
 string(1) "o"
 bool(true)
 bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
-bool(true)
+bool(false)
 string(1) "f"
 string(1) "o"
 bool(true)
 bool(true)
+
+Warning: Illegal string offset 'foo' in %s line %d
 string(1) "f"
-bool(true)
+bool(false)


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

Reply via email to