mention which setting!

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 6dee760a9c210b4d9c0ff9ca6ccc0b4621b30bf6..f76735089afdc5a35c870009876be8157e6f39e7 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1369,7 +1369,7 @@ int phar_create_or_parse_filename(char *fname, int fname_len, char *alias, int a
        if (PHAR_G(readonly) && !is_data) {
                if (options & REPORT_ERRORS) {
                        if (error) {
-                               spprintf(error, 0, "creating archive \"%s\" disabled by INI setting", fname);
+                               spprintf(error, 0, "creating archive \"%s\" disabled by ini setting (phar.readonly)", fname);
                        }
                }
                return FAILURE;

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 53eb8c82ec985436d250aa9aac72ac4a604a2a70..41ae46c21593e3dee91c345d13ec7cd37cd64ab1 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -3824,7 +3824,7 @@ PHP_METHOD(Phar, offsetSet)
        PHAR_ARCHIVE_OBJECT();
 
        if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
-               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by INI setting");
+               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by ini setting (phar.readonly)");
                return;
        }
 
@@ -3863,7 +3863,7 @@ PHP_METHOD(Phar, offsetUnset)
        PHAR_ARCHIVE_OBJECT();
 
        if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
-               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by INI setting");
+               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by ini setting (phar.readonly)");
                return;
        }
 
@@ -4125,7 +4125,7 @@ PHP_METHOD(Phar, setMetadata)
        PHAR_ARCHIVE_OBJECT();
 
        if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
-               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by INI setting");
+               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by ini setting (phar.readonly)");
                return;
        }
 
@@ -4164,7 +4164,7 @@ PHP_METHOD(Phar, delMetadata)
        PHAR_ARCHIVE_OBJECT();
 
        if (PHAR_G(readonly) && !phar_obj->arc.archive->is_data) {
-               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by INI setting");
+               zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC, "Write operations disabled by ini setting (phar.readonly)");
                return;
        }
 

diff --git a/ext/phar/stream.c b/ext/phar/stream.c
index a357ba0da566bfaae0a55978ec1b062dd387b436..e36fd5dd95e27db3aba780058dc27c1269fb6b39 100644 (file)
--- a/ext/phar/stream.c
+++ b/ext/phar/stream.c
@@ -108,7 +108,7 @@ php_url* phar_parse_url(php_stream_wrapper *wrapper, char *filename, char *mode,
                }
                if (PHAR_G(readonly) && (!pphar || !(*pphar)->is_data)) {
                        if (!(options & PHP_STREAM_URL_STAT_QUIET)) {
-                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: write operations disabled by INI setting");
+                               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: write operations disabled by ini setting (phar.readonly)");
                        }
                        php_url_free(resource);
                        return NULL;
@@ -727,7 +727,7 @@ static int phar_wrapper_unlink(php_stream_wrapper *wrapper, char *url, int optio
        }
        if (PHAR_G(readonly) && (!pphar || !(*pphar)->is_data)) {
                php_url_free(resource);
-               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: write operations disabled by INI setting");
+               php_stream_wrapper_log_error(wrapper, options TSRMLS_CC, "phar error: write operations disabled by ini setting (phar.readonly)");
                return 0;
        }
 

diff --git a/ext/phar/tests/badparameters.phpt b/ext/phar/tests/badparameters.phpt
index d4291e622757ee523bccccfd996ca61ebc25bf57..6fa2c93497143cda43cce10a4922261159b583ee 100644 (file)
--- a/ext/phar/tests/badparameters.phpt
+++ b/ext/phar/tests/badparameters.phpt
@@ -172,15 +172,15 @@ Warning: Phar::offsetGet() expects parameter 1 to be %string, array given in %sb
 Warning: Phar::offsetSet() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d
 
 Warning: PharData::offsetUnset() expects parameter 1 to be %string, array given in %sbadparameters.php on line %d
-Write operations disabled by INI setting
+Write operations disabled by ini setting (phar.readonly)
 
 Warning: Phar::addEmptyDir() expects parameter 1 to be %string, array given in %sbadparameters.php on line %d
 
 Warning: Phar::addFile() expects parameter 1 to be %string, array given in %sbadparameters.php on line %d
 
 Warning: Phar::addFromString() expects exactly 2 parameters, 1 given in %sbadparameters.php on line %d
-Write operations disabled by INI setting
+Write operations disabled by ini setting (phar.readonly)
 
 Warning: Phar::setMetadata() expects exactly 1 parameter, 2 given in %sbadparameters.php on line %d
-Write operations disabled by INI setting
+Write operations disabled by ini setting (phar.readonly)
 ===DONE===

diff --git a/ext/phar/tests/create_new_phar_b.phpt b/ext/phar/tests/create_new_phar_b.phpt
index 8f1298245c9e2c1fd3b6e2eeb0592c3971f3057b..09e9dc8223ec939c136be20cad2dc71ca8301725 100755 (executable)
--- a/ext/phar/tests/create_new_phar_b.phpt
+++ b/ext/phar/tests/create_new_phar_b.phpt
@@ -18,7 +18,7 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: phar error: write operations disabled by INI setting in %screate_new_phar_b.php on line %d
+Warning: file_put_contents(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %screate_new_phar_b.php on line %d
 
 Warning: include(phar://%screate_new_phar_b.phar.php/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
 

diff --git a/ext/phar/tests/delete_in_phar_b.phpt b/ext/phar/tests/delete_in_phar_b.phpt
index d26f51cbf1408f672543d18d2130933609e3be76..2b8529854936d7355601418e964e70319a0c70cd 100755 (executable)
--- a/ext/phar/tests/delete_in_phar_b.phpt
+++ b/ext/phar/tests/delete_in_phar_b.phpt
@@ -37,7 +37,7 @@ This is a
 This is b
 This is b/c
 
-Warning: unlink(): phar error: write operations disabled by INI setting in %sdelete_in_phar_b.php on line %d
+Warning: unlink(): phar error: write operations disabled by ini setting (phar.readonly) in %sdelete_in_phar_b.php on line %d
 ===AFTER===
 This is a
 This is b

diff --git a/ext/phar/tests/open_for_write_existing_b.phpt b/ext/phar/tests/open_for_write_existing_b.phpt
index f0474372ae4f5ae09e201be02ead9069bb6ebee2..7b23daa8c6876a0142a593ba393bbc491521802f 100755 (executable)
--- a/ext/phar/tests/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/open_for_write_existing_b.phpt
@@ -36,7 +36,7 @@ include $pname . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_b.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_b.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_existing_b_5_2.phpt b/ext/phar/tests/open_for_write_existing_b_5_2.phpt
index 453d702d857a08b48069d00d67507626920a8f50..cf15f7901cb232abb0f43aa4044b1b969b7a046e 100644 (file)
--- a/ext/phar/tests/open_for_write_existing_b_5_2.phpt
+++ b/ext/phar/tests/open_for_write_existing_b_5_2.phpt
@@ -34,7 +34,7 @@ include $pname . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_b_5_2.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_b_5_2.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_b_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %spen_for_write_existing_b_5_2.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_existing_c.phpt b/ext/phar/tests/open_for_write_existing_c.phpt
index 3f1d76bacdb031e4077a9a3116fdf23bf8c09cba..ac4e98612cf2dc56b5f37f39d38934a7a140d17b 100755 (executable)
--- a/ext/phar/tests/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/open_for_write_existing_c.phpt
@@ -30,7 +30,7 @@ include $pname . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_c.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_c.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_existing_c_5_2.phpt b/ext/phar/tests/open_for_write_existing_c_5_2.phpt
index 2ef41e9439ac339cbebdb2a35921f621b20a3c88..9745db75677965ce0a9a820e10c5a983a758febf 100644 (file)
--- a/ext/phar/tests/open_for_write_existing_c_5_2.phpt
+++ b/ext/phar/tests/open_for_write_existing_c_5_2.phpt
@@ -28,7 +28,7 @@ include $pname . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_c_5_2.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_c_5_2.phar.php/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_c_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c_5_2.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_newfile_b.phpt b/ext/phar/tests/open_for_write_newfile_b.phpt
index 9cfeeccec50baf24b0cba44db4c3caa607d53955..271bfeb17ccba87b32bb3211864b561ad1d49f71 100755 (executable)
--- a/ext/phar/tests/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b.phpt
@@ -38,7 +38,7 @@ include $pname . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_b.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_b.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/open_for_write_newfile_b_5_2.phpt
index 6cb61b74c480e78fcf852cb343179e6444828a11..4967c4c0f70642c06b0fb3121d491153531d5f5d 100644 (file)
--- a/ext/phar/tests/open_for_write_newfile_b_5_2.phpt
+++ b/ext/phar/tests/open_for_write_newfile_b_5_2.phpt
@@ -36,7 +36,7 @@ include $pname . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_b_5_2.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_b_5_2.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_b_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b_5_2.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_newfile_c.phpt b/ext/phar/tests/open_for_write_newfile_c.phpt
index fc509a5a5c15ad6c7bf75038359f0cb893c593c0..4275ce19160bcfba6638e923117f215258fad307 100755 (executable)
--- a/ext/phar/tests/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c.phpt
@@ -32,7 +32,7 @@ include $pname . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_c.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_c.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
 

diff --git a/ext/phar/tests/open_for_write_newfile_c_5_2.phpt b/ext/phar/tests/open_for_write_newfile_c_5_2.phpt
index f2718495de3e8c77227905d5690bf3a5260a2c47..6d06a9c2884500e616ccc474a5d8682bc135e240 100644 (file)
--- a/ext/phar/tests/open_for_write_newfile_c_5_2.phpt
+++ b/ext/phar/tests/open_for_write_newfile_c_5_2.phpt
@@ -30,7 +30,7 @@ include $pname . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.php'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_c_5_2.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_c_5_2.phar.php/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_c_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c_5_2.php on line %d
 

diff --git a/ext/phar/tests/phar_oo_011b.phpt b/ext/phar/tests/phar_oo_011b.phpt
index 37a0e570a541aca74b97e098496c0a93a3d06a31..03f4f5fc54d7c3e3312a8b2298aee8d330e44539 100755 (executable)
--- a/ext/phar/tests/phar_oo_011b.phpt
+++ b/ext/phar/tests/phar_oo_011b.phpt
@@ -35,5 +35,5 @@ unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
-Exception: Write operations disabled by INI setting
+Exception: Write operations disabled by ini setting (phar.readonly)
 ===DONE===

diff --git a/ext/phar/tests/phar_oo_012b.phpt b/ext/phar/tests/phar_oo_012b.phpt
index 01cf77698646c8ebd01b2a09f192dc1b31259861..6d6c60f7edd67eb56056ee0830d8fa52a93b9f41 100755 (executable)
--- a/ext/phar/tests/phar_oo_012b.phpt
+++ b/ext/phar/tests/phar_oo_012b.phpt
@@ -38,5 +38,5 @@ unlink(dirname(__FILE__) . '/files/phar_oo_test.phar.php');
 __halt_compiler();
 ?>
 --EXPECTF--
-Exception: Write operations disabled by INI setting
+Exception: Write operations disabled by ini setting (phar.readonly)
 ===DONE===

diff --git a/ext/phar/tests/security.phpt b/ext/phar/tests/security.phpt
index 2d54db7908b3b3aef184b368ec41bfd43e690386..747bc8bb19ad6e55627d45592d27acb3b6793efd 100644 (file)
--- a/ext/phar/tests/security.phpt
+++ b/ext/phar/tests/security.phpt
@@ -32,5 +32,5 @@ include $fname2;
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.1.php'); ?>
 --EXPECT--
 bool(false)
-Write operations disabled by INI setting
+Write operations disabled by ini setting (phar.readonly)
 ===DONE===
\ No newline at end of file

diff --git a/ext/phar/tests/tar/create_new_phar_b.phpt b/ext/phar/tests/tar/create_new_phar_b.phpt
index a608be470575efeece660bfb132a7568b724b1a7..e59f3dd236b01dc570c26bb101abcbe30473b2f7 100644 (file)
--- a/ext/phar/tests/tar/create_new_phar_b.phpt
+++ b/ext/phar/tests/tar/create_new_phar_b.phpt
@@ -18,7 +18,7 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: phar error: write operations disabled by INI setting in %screate_new_phar_b.php on line %d
+Warning: file_put_contents(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %screate_new_phar_b.php on line %d
 
 Warning: include(phar://%screate_new_phar_b.phar.tar/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
 

diff --git a/ext/phar/tests/tar/delete_in_phar_b.phpt b/ext/phar/tests/tar/delete_in_phar_b.phpt
index 2af1c66debdbf80d65877b2d67774dd63dd61f50..df0c6f32121c8262b0189ed60a2ecd6dbf1b6349 100644 (file)
--- a/ext/phar/tests/tar/delete_in_phar_b.phpt
+++ b/ext/phar/tests/tar/delete_in_phar_b.phpt
@@ -40,7 +40,7 @@ This is a
 This is b
 This is b/c
 
-Warning: unlink(): phar error: write operations disabled by INI setting in %sdelete_in_phar_b.php on line %d
+Warning: unlink(): phar error: write operations disabled by ini setting (phar.readonly) in %sdelete_in_phar_b.php on line %d
 ===AFTER===
 This is a
 This is b

diff --git a/ext/phar/tests/tar/open_for_write_existing_b.phpt b/ext/phar/tests/tar/open_for_write_existing_b.phpt
index c8dcd3cb72ed5ce29aa79b2b4673696939c80971..82d328698ae3b3ae0c0793b17432806cc26d830d 100755 (executable)
--- a/ext/phar/tests/tar/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b.phpt
@@ -49,7 +49,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_b.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_b.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_existing_b.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt b/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt
index 2a2228e8767500c9af2b54425a16d02919c6a4b7..c73d577d431b6a2defb16f52e311254e22772cfc 100644 (file)
--- a/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_b_5_2.phpt
@@ -47,7 +47,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_b_5_2.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_b_5_2.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_b_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_b_5_2.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_existing_c.phpt b/ext/phar/tests/tar/open_for_write_existing_c.phpt
index 92955808859f2b3dd4c5cfc49357b28754732a5b..1e55fd7a26abe1bc6b45a81fb398c6997eb12657 100755 (executable)
--- a/ext/phar/tests/tar/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c.phpt
@@ -43,7 +43,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_c.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_c.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt b/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt
index f58312893d27661059aebe528d721d98b0c0fabc..a496bc597f67ca8fa758f260d91c631471432267 100644 (file)
--- a/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt
+++ b/ext/phar/tests/tar/open_for_write_existing_c_5_2.phpt
@@ -41,7 +41,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_c_5_2.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_c_5_2.phar.tar/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_c_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c_5_2.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_newfile_b.phpt b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
index f322ac27ad7fba115d692dc38a87360fb9dbf747..9e4438f2b9337706c616b311ab38894e482f2a02 100755 (executable)
--- a/ext/phar/tests/tar/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b.phpt
@@ -50,7 +50,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_b.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_b.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt
index 2af7b6e80f6c50608b5dbad268eb391c73ebf08e..14b89a84328a01f47e32dd584066c54b6c61a4ff 100644 (file)
--- a/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_b_5_2.phpt
@@ -48,7 +48,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_b_5_2.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_b_5_2.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_b_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b_5_2.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_newfile_c.phpt b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
index 1925162015948cfaa2adf51ea5cbb7ed64ae35b5..224bd693ae79d6dc673d6e6ee9cef37c0ad7d4ba 100755 (executable)
--- a/ext/phar/tests/tar/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c.phpt
@@ -43,7 +43,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_c.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_c.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
 

diff --git a/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt b/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt
index 13c8d6fb7297ebd907da8e14666340ab336f6b39..ea34b77a4037a0bd0e14975d843a1e453c9184f2 100644 (file)
--- a/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt
+++ b/ext/phar/tests/tar/open_for_write_newfile_c_5_2.phpt
@@ -41,7 +41,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.tar'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_c_5_2.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_c_5_2.phar.tar/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_c_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c_5_2.php on line %d
 

diff --git a/ext/phar/tests/zip/create_new_phar_b.phpt b/ext/phar/tests/zip/create_new_phar_b.phpt
index e6a5398f64b48f4967dd0a65f65dc8c67458957f..7057059095308e2b588de919fb0b8ee04af5cfe2 100644 (file)
--- a/ext/phar/tests/zip/create_new_phar_b.phpt
+++ b/ext/phar/tests/zip/create_new_phar_b.phpt
@@ -18,7 +18,7 @@ include 'phar://' . dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.pha
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by INI setting in %screate_new_phar_b.php on line %d
+Warning: file_put_contents(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %screate_new_phar_b.php on line %d
 
 Warning: include(phar://%screate_new_phar_b.phar.zip/a.php): failed to open stream: %s in %screate_new_phar_b.php on line %d
 

diff --git a/ext/phar/tests/zip/delete_in_phar_b.phpt b/ext/phar/tests/zip/delete_in_phar_b.phpt
index 7bc3a2bf1a6970abe728b2d35bbf32232c7b6713..9db114a3fffca1cfc3b13e8612bfd8486ada50e0 100644 (file)
--- a/ext/phar/tests/zip/delete_in_phar_b.phpt
+++ b/ext/phar/tests/zip/delete_in_phar_b.phpt
@@ -39,7 +39,7 @@ This is a
 This is b
 This is b/c
 
-Warning: unlink(): phar error: write operations disabled by INI setting in %sdelete_in_phar_b.php on line %d
+Warning: unlink(): phar error: write operations disabled by ini setting (phar.readonly) in %sdelete_in_phar_b.php on line %d
 ===AFTER===
 This is a
 This is b

diff --git a/ext/phar/tests/zip/open_for_write_existing_b.phpt b/ext/phar/tests/zip/open_for_write_existing_b.phpt
index afb73f61c53da57e6a1d6bea48a18aececd4f9ab..b5ee4518c26e48813cc480559afe7377459fdec4 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_existing_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b.phpt
@@ -46,7 +46,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_b.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_b.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_b.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt b/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt
index 30cafcf82e5bf6aa0af0926d9130ba257f35ad45..3f741c62f7ad1831ae92d03a9b0a78acdbc44a32 100644 (file)
--- a/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_b_5_2.phpt
@@ -44,7 +44,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_b_5_2.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_b_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_b_5_2.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_b_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %spen_for_write_existing_b_5_2.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_existing_c.phpt b/ext/phar/tests/zip/open_for_write_existing_c.phpt
index 1d4e8f345f619ae6641e0e04e32e59bd9ded97e9..6a0fd5276093743a533e1fbd7b4652599aab859c 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_existing_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c.phpt
@@ -40,7 +40,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_c.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_c.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %spen_for_write_existing_c.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_existing_c_5_2.phpt b/ext/phar/tests/zip/open_for_write_existing_c_5_2.phpt
index 24bc8d5111ad1e7967cae6a1e46e8e1d27b2cabe..cbe2be8edfccb4e7d30ecda2ef0e437be9abcc28 100644 (file)
--- a/ext/phar/tests/zip/open_for_write_existing_c_5_2.phpt
+++ b/ext/phar/tests/zip/open_for_write_existing_c_5_2.phpt
@@ -38,7 +38,7 @@ include $alias . '/b/c.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_existing_c_5_2.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_existing_c_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_existing_c_5_2.phar.zip/b/c.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_existing_c_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_existing_c_5_2.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_newfile_b.phpt b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
index 1a57206acc4e46d4def2f7ab19505edeef1d4655..8187727c63b70fda65e5a07f190289fd27162994 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_newfile_b.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b.phpt
@@ -49,7 +49,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_b.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_b.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_b.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt b/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt
index e390a3a410cdde269aefd408fb65759103fd8c9e..9d6e7b97a555966e09702df169ed26559d30b5bb 100644 (file)
--- a/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_b_5_2.phpt
@@ -47,7 +47,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_b_5_2.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_b_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_b_5_2.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_b_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_b_5_2.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_newfile_c.phpt b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
index e9c68aa07e9da3a1fd72acf79e968ec7bf2f816c..6cb32fb87e7a9e5c0a148f3284d2663e9c11e7e3 100755 (executable)
--- a/ext/phar/tests/zip/open_for_write_newfile_c.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c.phpt
@@ -43,7 +43,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_c.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_c.php on line %d
 
 Warning: fwrite() expects parameter 1 to be resource, boolean given in %sopen_for_write_newfile_c.php on line %d
 

diff --git a/ext/phar/tests/zip/open_for_write_newfile_c_5_2.phpt b/ext/phar/tests/zip/open_for_write_newfile_c_5_2.phpt
index 20c1d338a7f73450256bc4cc72ce2f4081615c7b..d7b9ac0256c62bbde8715ec7cb9fed9c197cb36b 100644 (file)
--- a/ext/phar/tests/zip/open_for_write_newfile_c_5_2.phpt
+++ b/ext/phar/tests/zip/open_for_write_newfile_c_5_2.phpt
@@ -41,7 +41,7 @@ include $alias . '/b/new.php';
 <?php unlink(dirname(__FILE__) . '/' . basename(__FILE__, '.clean.php') . '.phar.zip'); ?>
 --EXPECTF--
 
-Warning: fopen(phar://%sopen_for_write_newfile_c_5_2.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by INI setting in %sopen_for_write_newfile_c_5_2.php on line %d
+Warning: fopen(phar://%sopen_for_write_newfile_c_5_2.phar.zip/b/new.php): failed to open stream: phar error: write operations disabled by ini setting (phar.readonly) in %sopen_for_write_newfile_c_5_2.php on line %d
 
 Warning: fwrite(): supplied argument is not a valid stream resource in %sopen_for_write_newfile_c_5_2.php on line %d