From: Greg Beaver <cellog@php.net>
Date: Fri, 11 Apr 2008 12:56:53 +0000 (+0000)
Subject: change PharFileInfo->setUncompressed to decompress
X-Git-Tag: RELEASE_2_0_0b1~455
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c07a07ea684f7ba25ccc2de17a014ae180e38ade;p=php

change PharFileInfo->setUncompressed to decompress
[DOC]
---

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index c72d693998..eb272507a0 100755
--- 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 b97a07c7d8..9db5dedfd7 100644
--- 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 78323357e2..3171244912 100755
--- 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';