[PHP-DOC] cvs: pecl /phar phar_object.c /phar/tests phar_oo_compressed_001.phpt phar_oo_compressed_001b.phpt

[Greg Beaver]

cellog          Fri Apr 11 12:56:53 2008 UTC

  Modified files:              
    /pecl/phar  phar_object.c 
    /pecl/phar/tests    phar_oo_compressed_001.phpt 
                        phar_oo_compressed_001b.phpt 
  Log:
  change PharFileInfo->setUncompressed to decompress
  [DOC]
  
http://cvs.php.net/viewvc.cgi/pecl/phar/phar_object.c?r1=1.200&r2=1.201&diff_format=u
Index: pecl/phar/phar_object.c
diff -u pecl/phar/phar_object.c:1.200 pecl/phar/phar_object.c:1.201
--- pecl/phar/phar_object.c:1.200       Fri Apr 11 04:20:14 2008
+++ pecl/phar/phar_object.c     Fri Apr 11 12:56:52 2008
@@ -17,7 +17,7 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: phar_object.c,v 1.200 2008/04/11 04:20:14 cellog Exp $ */
+/* $Id: phar_object.c,v 1.201 2008/04/11 12:56:52 cellog Exp $ */
 
 #include "phar_internal.h"
 #include "func_interceptors.h"
@@ -3659,10 +3659,10 @@
 }
 /* }}} */
 
-/* {{{ 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 @@
        }
        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 @@
        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 */
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_compressed_001.phpt?r1=1.5&r2=1.6&diff_format=u
Index: pecl/phar/tests/phar_oo_compressed_001.phpt
diff -u pecl/phar/tests/phar_oo_compressed_001.phpt:1.5 
pecl/phar/tests/phar_oo_compressed_001.phpt:1.6
--- pecl/phar/tests/phar_oo_compressed_001.phpt:1.5     Wed Feb 20 13:11:38 2008
+++ pecl/phar/tests/phar_oo_compressed_001.phpt Fri Apr 11 12:56:52 2008
@@ -29,7 +29,7 @@
 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';
http://cvs.php.net/viewvc.cgi/pecl/phar/tests/phar_oo_compressed_001b.phpt?r1=1.4&r2=1.5&diff_format=u
Index: pecl/phar/tests/phar_oo_compressed_001b.phpt
diff -u pecl/phar/tests/phar_oo_compressed_001b.phpt:1.4 
pecl/phar/tests/phar_oo_compressed_001b.phpt:1.5
--- pecl/phar/tests/phar_oo_compressed_001b.phpt:1.4    Wed Feb 20 13:11:38 2008
+++ pecl/phar/tests/phar_oo_compressed_001b.phpt        Fri Apr 11 12:56:52 2008
@@ -29,7 +29,7 @@
 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';