change PharFileInfo->setUncompressed to decompress

[DOC]

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index c72d6939982f39304eb6172de7926b32b7d0b757..eb272507a08b7c97399e9343eaec270dff863b0b 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -3659,10 +3659,10 @@ PHP_METHOD(PharFileInfo, setCompressedBZIP2)
 }
 /* }}} */
 
-/* {{{ proto int PharFileInfo::setUncompressed()
- * Instructs the Phar class to uncompress the current file
+/* {{{ proto int PharFileInfo::decompress()
+ * Instructs the Phar class to decompress the current file
  */
-PHP_METHOD(PharFileInfo, setUncompressed)
+PHP_METHOD(PharFileInfo, decompress)
 {
        char *fname, *error;
        int fname_len;
@@ -3689,12 +3689,12 @@ PHP_METHOD(PharFileInfo, setUncompressed)
        }
        if (!phar_has_zlib) {
                zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC,
-                       "Cannot uncompress Gzip-compressed file, zlib extension is not enabled");
+                       "Cannot decompress Gzip-compressed file, zlib extension is not enabled");
                return;
        }
        if (!phar_has_bz2) {
                zend_throw_exception_ex(spl_ce_BadMethodCallException, 0 TSRMLS_CC,
-                       "Cannot uncompress Bzip2-compressed file, bz2 extension is not enabled");
+                       "Cannot decompress Bzip2-compressed file, bz2 extension is not enabled");
                return;
        }
        if (!entry_obj->ent.entry->fp) {
@@ -3943,7 +3943,7 @@ zend_function_entry php_entry_methods[] = {
        PHP_ME(PharFileInfo, setCompressedBZIP2, NULL,                       0)
        PHP_ME(PharFileInfo, setCompressedGZ,    NULL,                       0)
        PHP_ME(PharFileInfo, setMetadata,        arginfo_phar_setMetadata,   0)
-       PHP_ME(PharFileInfo, setUncompressed,    NULL,                       0)
+       PHP_ME(PharFileInfo, decompress,         NULL,                       0)
        {NULL, NULL, NULL}
 };
 #endif /* HAVE_SPL */

diff --git a/ext/phar/tests/phar_oo_compressed_001.phpt b/ext/phar/tests/phar_oo_compressed_001.phpt
index b97a07c7d89ab7424c44d1ad1e9771504ff6faeb..9db5dedfd7fd067483a47649e24fb82510733066 100644 (file)
--- a/ext/phar/tests/phar_oo_compressed_001.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001.phpt
@@ -29,7 +29,7 @@ var_dump(file_get_contents($pname . '/c'));
 var_dump($phar['c']->isCompressed());
 
 $phar['a'] = 'new a';
-$phar['a']->setUncompressed();
+$phar['a']->decompress();
 $phar['b'] = 'new b';
 $phar['b']->setCompressedGZ();
 $phar['d'] = 'new d';

diff --git a/ext/phar/tests/phar_oo_compressed_001b.phpt b/ext/phar/tests/phar_oo_compressed_001b.phpt
index 78323357e2322e02de46ca33fafa3252eb194bcc..3171244912fcfc886d1092d952dd5bec5c4b45ed 100755 (executable)
--- a/ext/phar/tests/phar_oo_compressed_001b.phpt
+++ b/ext/phar/tests/phar_oo_compressed_001b.phpt
@@ -29,7 +29,7 @@ var_dump(file_get_contents($pname . '/c'));
 var_dump($phar['c']->isCompressed());
 
 $phar['a'] = 'new a';
-$phar['a']->setUncompressed();
+$phar['a']->decompress();
 $phar['b'] = 'new b';
 $phar['b']->setCompressedBZip2();
 $phar['d'] = 'new d';