diff options
| author | Anatol Belski <ab@php.net> | 2015-08-21 15:13:39 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2015-08-21 15:13:39 +0200 |
| commit | 2b9c7f881a30767b0aeed94e88cc978544e78094 (patch) | |
| tree | d8eb9a909d9a3d3edc7a73584763d64766167cf6 | |
| parent | aa23bc6d1d2a559555a8b9033b2d26b5bca13567 (diff) | |
| download | php-git-2b9c7f881a30767b0aeed94e88cc978544e78094.tar.gz | |
fix tests
| -rw-r--r-- | ext/iconv/tests/iconv_basic_001.phpt | 2 | ||||
| -rw-r--r-- | ext/phar/tests/bug69453.phpt | 6 | ||||
| -rw-r--r-- | ext/phar/tests/create_path_error.phpt | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/ext/iconv/tests/iconv_basic_001.phpt b/ext/iconv/tests/iconv_basic_001.phpt index 079eb670e1..9f33f6b110 100644 --- a/ext/iconv/tests/iconv_basic_001.phpt +++ b/ext/iconv/tests/iconv_basic_001.phpt @@ -5,7 +5,7 @@ Rodrigo Prado de Jesus <royopa [at] gmail [dot] com> --SKIPIF-- <?php extension_loaded('iconv') or die('skip iconv extension is not available'); ?> <?php if(substr(PHP_OS, 0, 3) == 'WIN' ) {die('skip not for windows');} ?> -<?php if(setlocale(LC_ALL, "en_US.utf8",) === false) { die('skip en_US.utf8 locales not available'); } ?> +<?php if(setlocale(LC_ALL, "en_US.utf8") === false) { die('skip en_US.utf8 locales not available'); } ?> --FILE-- <?php setlocale(LC_ALL, "en_US.utf8"); diff --git a/ext/phar/tests/bug69453.phpt b/ext/phar/tests/bug69453.phpt index 4a2a37f00a..ddd2992ae0 100644 --- a/ext/phar/tests/bug69453.phpt +++ b/ext/phar/tests/bug69453.phpt @@ -14,8 +14,8 @@ $r = new Phar($fname, 0); ==DONE== --EXPECTF-- -exception 'UnexpectedValueException' with message 'phar error: "%s/bug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d +exception 'UnexpectedValueException' with message 'phar error: "%s%ebug69453.tar.phar" is a corrupted tar file (checksum mismatch of file "")' in %s:%d Stack trace: -#0 %s/bug69453.php(%d): Phar->__construct('%s', 0) +#0 %s%ebug69453.php(%d): Phar->__construct('%s', 0) #1 {main} -==DONE==
\ No newline at end of file +==DONE== diff --git a/ext/phar/tests/create_path_error.phpt b/ext/phar/tests/create_path_error.phpt index 886ba81925..fe2cd3e22b 100644 --- a/ext/phar/tests/create_path_error.phpt +++ b/ext/phar/tests/create_path_error.phpt @@ -75,11 +75,11 @@ string(5) "query" 6: 7: 8: -9:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -10:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -11:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -12:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character -13:Error: file_put_contents(phar:///%s): failed to open stream: phar error: invalid path "%s" contains illegal character +9:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +10:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +11:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +12:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character +13:Error: file_put_contents(phar://%s): failed to open stream: phar error: invalid path "%s" contains illegal character Exception: Entry a does not exist and cannot be created: phar error: invalid path "a" contains illegal character ===DONE=== |