svn: /php/php-src/ branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt branches/PHP_5_4/ext/phar/tests/fgc_edgecases.phpt
branches/PHP_5_4/ext/phar/tests/readfile_edgecases.phpt trunk/ext/phar/tests/fatal_error_webphar.phpt trunk/ext/phar/tests/fgc_edgecases.phpt
trunk/ext/phar/tests/readfile_edgecases.phpt

bjori Mon, 29 Aug 2011 14:29:40 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=315705 Log: Changed error messages Changed paths: U php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt U php/php-src/branches/PHP_5_4/ext/phar/tests/fgc_edgecases.phpt U php/php-src/branches/PHP_5_4/ext/phar/tests/readfile_edgecases.phpt U php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt U php/php-src/trunk/ext/phar/tests/fgc_edgecases.phpt U php/php-src/trunk/ext/phar/tests/readfile_edgecases.phpt Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt 2011-08-29 14:27:17 UTC (rev 315704) +++ php/php-src/branches/PHP_5_4/ext/phar/tests/fatal_error_webphar.phpt 2011-08-29 14:29:40 UTC (rev 315705) @@ -15,4 +15,4 @@ --EXPECTF-- string(9) "\Web\View" -Parse error: syntax error, unexpected T_ECHO, expecting T_FUNCTION in phar://%sfatal_error_webphar.php/Web/View.php on line 380 \ No newline at end of file +Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting function (T_FUNCTION) in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/fgc_edgecases.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/phar/tests/fgc_edgecases.phpt 2011-08-29 14:27:17 UTC (rev 315704) +++ php/php-src/branches/PHP_5_4/ext/phar/tests/fgc_edgecases.phpt 2011-08-29 14:29:40 UTC (rev 315705) @@ -47,7 +47,7 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: file_get_contents() expects parameter 1 to be string, array given in %sfgc_edgecases.php on line %d +Warning: file_get_contents() expects parameter 1 to be a valid path, array given in %sfgc_edgecases.php on line %d blah <?php echo file_get_contents("foo/" . basename(__FILE__)); Modified: php/php-src/branches/PHP_5_4/ext/phar/tests/readfile_edgecases.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/phar/tests/readfile_edgecases.phpt 2011-08-29 14:27:17 UTC (rev 315704) +++ php/php-src/branches/PHP_5_4/ext/phar/tests/readfile_edgecases.phpt 2011-08-29 14:29:40 UTC (rev 315705) @@ -36,7 +36,7 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: readfile() expects parameter 1 to be string, array given in %sreadfile_edgecases.php on line %d +Warning: readfile() expects parameter 1 to be a valid path, array given in %sreadfile_edgecases.php on line %d blah <?php readfile("foo/" . basename(__FILE__)); @@ -60,4 +60,4 @@ ?> Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d -===DONE=== \ No newline at end of file +===DONE=== Modified: php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt 2011-08-29 14:27:17 UTC (rev 315704) +++ php/php-src/trunk/ext/phar/tests/fatal_error_webphar.phpt 2011-08-29 14:29:40 UTC (rev 315705) @@ -15,4 +15,4 @@ --EXPECTF-- string(9) "\Web\View" -Parse error: syntax error, unexpected T_ECHO, expecting T_FUNCTION in phar://%sfatal_error_webphar.php/Web/View.php on line 380 \ No newline at end of file +Parse error: syntax error, unexpected 'echo' (T_ECHO), expecting function (T_FUNCTION) in phar:///%sfatal_error_webphar.php/Web/View.php on line 380 Modified: php/php-src/trunk/ext/phar/tests/fgc_edgecases.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/fgc_edgecases.phpt 2011-08-29 14:27:17 UTC (rev 315704) +++ php/php-src/trunk/ext/phar/tests/fgc_edgecases.phpt 2011-08-29 14:29:40 UTC (rev 315705) @@ -47,7 +47,7 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: file_get_contents() expects parameter 1 to be string, array given in %sfgc_edgecases.php on line %d +Warning: file_get_contents() expects parameter 1 to be a valid path, array given in %sfgc_edgecases.php on line %d blah <?php echo file_get_contents("foo/" . basename(__FILE__)); Modified: php/php-src/trunk/ext/phar/tests/readfile_edgecases.phpt =================================================================== --- php/php-src/trunk/ext/phar/tests/readfile_edgecases.phpt 2011-08-29 14:27:17 UTC (rev 315704) +++ php/php-src/trunk/ext/phar/tests/readfile_edgecases.phpt 2011-08-29 14:29:40 UTC (rev 315705) @@ -36,7 +36,7 @@ <?php rmdir(dirname(__FILE__) . '/poo'); ?> <?php unlink(dirname(__FILE__) . '/foob'); ?> --EXPECTF-- -Warning: readfile() expects parameter 1 to be string, array given in %sreadfile_edgecases.php on line %d +Warning: readfile() expects parameter 1 to be a valid path, array given in %sreadfile_edgecases.php on line %d blah <?php readfile("foo/" . basename(__FILE__)); @@ -60,4 +60,4 @@ ?> Warning: readfile(phar://%sreadfile_edgecases.phar.php/oops): failed to open stream: phar error: path "oops" is a directory in phar://%sreadfile_edgecases.phar.php/foo/hi on line %d -===DONE=== \ No newline at end of file +===DONE===