beginWrite()/commitWrite() => begin()/commit(), note optional rollback() for 1.1

diff --git a/ext/phar/TODO b/ext/phar/TODO
index baeba18288e4d18774fcc8851d6c993d1d666e8d..1d4d849b1e75203c481ff6caf87b6e21226bf898 100644 (file)
--- a/ext/phar/TODO
+++ b/ext/phar/TODO
@@ -14,7 +14,7 @@ Version 1.0.0
  * docs on uses
  X stream context for specifying compression of a file [Marcus]
  X stream context for specifying meta-data [Greg]
- X Phar->begin()/Phar->commitWrite() for specifying a new stub to the phar,
+ X Phar->begin()/Phar->commit() for specifying a new stub to the phar,
    and deferring flush until all modifications are complete [Greg]
  X Phar->getStub() for retrieving the stub of the phar [Marcus]
  X add setUncompressed(), setCompressedGZ() and setCompressedBZ2() to 
@@ -29,4 +29,5 @@ Version 1.0.0
 Version 1.1.0
 
  * ability to have Phar object return file class as offsetGet() result
+ * [optional] Phar->rollback() to abort a write transaction
  * implement GPG signing

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 559e6867650c104b35e2fe2f3fb90ec80173a885..63502cd1db4947b779c1823cff6b04ef0ee34484 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -199,10 +199,10 @@ PHP_METHOD(Phar, getVersion)
 }
 /* }}} */
 
-/* {{{ proto void Phar::beginWrite()
+/* {{{ proto void Phar::begin()
  * Do not flush a writeable phar (save its contents) until explicitly requested
  */
-PHP_METHOD(Phar, beginWrite)
+PHP_METHOD(Phar, begin)
 {
        PHAR_ARCHIVE_OBJECT();
        
@@ -210,10 +210,10 @@ PHP_METHOD(Phar, beginWrite)
 }
 /* }}} */
 
-/* {{{ proto bool Phar::commitWrite([string|stream stub [, int len]])
+/* {{{ proto bool Phar::commit([string|stream stub [, int len]])
  * Save the contents of a modified phar, with an optional change to the stub
  */
-PHP_METHOD(Phar, commitWrite)
+PHP_METHOD(Phar, commit)
 {
        zval *stub = NULL;
        long len = -1;
@@ -952,11 +952,11 @@ zend_function_entry php_archive_methods[] = {
        PHP_ME(Phar, getSignature,          NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, getStub,               NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, getVersion,            NULL,                      ZEND_ACC_PUBLIC)
-       PHP_ME(Phar, beginWrite,            NULL,                      ZEND_ACC_PUBLIC)
+       PHP_ME(Phar, begin,                 NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, compressAllFilesGZ,    NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, compressAllFilesBZIP2, NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, uncompressAllFiles,    NULL,                      ZEND_ACC_PUBLIC)
-       PHP_ME(Phar, commitWrite,           arginfo_phar_setStub,      ZEND_ACC_PUBLIC)
+       PHP_ME(Phar, commit,                arginfo_phar_setStub,      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, offsetExists,          arginfo_phar_offsetExists, ZEND_ACC_PUBLIC)
        PHP_ME(Phar, offsetGet,             arginfo_phar_offsetExists, ZEND_ACC_PUBLIC)
        PHP_ME(Phar, offsetSet,             arginfo_phar_offsetSet,    ZEND_ACC_PUBLIC)