rename begin/isFlushingToPhar/commit to startBuffering/isBuffering/stopBuffering

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index bc8ce051f02ad82adb0dc376ffeb7d23c36d6516..6dead35e4ebdde304004364e6d90fef8538ebdbd 100755 (executable)
--- a/ext/phar/phar_object.c
+++ b/ext/phar/phar_object.c
@@ -237,10 +237,10 @@ PHP_METHOD(Phar, getVersion)
 }
 /* }}} */
 
-/* {{{ proto void Phar::begin()
+/* {{{ proto void Phar::startBuffering()
  * Do not flush a writeable phar (save its contents) until explicitly requested
  */
-PHP_METHOD(Phar, begin)
+PHP_METHOD(Phar, startBuffering)
 {
        PHAR_ARCHIVE_OBJECT();
        
@@ -248,21 +248,21 @@ PHP_METHOD(Phar, begin)
 }
 /* }}} */
 
-/* {{{ proto bool Phar::isFlushingToPhar()
+/* {{{ proto bool Phar::isBuffering()
  * Returns whether write operations are flushing to disk immediately
  */
-PHP_METHOD(Phar, isFlushingToPhar)
+PHP_METHOD(Phar, isBuffering)
 {
        PHAR_ARCHIVE_OBJECT();
        
-       RETURN_BOOL(phar_obj->arc.archive->donotflush);
+       RETURN_BOOL(!phar_obj->arc.archive->donotflush);
 }
 /* }}} */
 
-/* {{{ proto bool Phar::commit()
+/* {{{ proto bool Phar::stopBuffering()
  * Save the contents of a modified phar
  */
-PHP_METHOD(Phar, commit)
+PHP_METHOD(Phar, stopBuffering)
 {
        char *error;
        PHAR_ARCHIVE_OBJECT();
@@ -1152,8 +1152,8 @@ zend_function_entry php_archive_methods[] = {
        PHP_ME(Phar, __construct,           arginfo_phar___construct,  ZEND_ACC_PRIVATE)
 #else
        PHP_ME(Phar, __construct,           arginfo_phar___construct,  ZEND_ACC_PUBLIC)
-       PHP_ME(Phar, begin,                 NULL,                      ZEND_ACC_PUBLIC)
-       PHP_ME(Phar, commit,                NULL,                      ZEND_ACC_PUBLIC)
+       PHP_ME(Phar, startBuffering,        NULL,                      ZEND_ACC_PUBLIC)
+       PHP_ME(Phar, stopBuffering,         NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, compressAllFilesGZ,    NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, compressAllFilesBZIP2, NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, count,                 NULL,                      ZEND_ACC_PUBLIC)
@@ -1162,7 +1162,7 @@ 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, isFlushingToPhar,            NULL,                      ZEND_ACC_PUBLIC)
+       PHP_ME(Phar, isBuffering,           NULL,                      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, setMetadata,           arginfo_entry_setMetadata, ZEND_ACC_PUBLIC)
        PHP_ME(Phar, setStub,               arginfo_phar_setStub,      ZEND_ACC_PUBLIC)
        PHP_ME(Phar, offsetExists,          arginfo_phar_offsetExists, ZEND_ACC_PUBLIC)

diff --git a/ext/phar/tests/phar_begin_setstub_commit.phpt b/ext/phar/tests/phar_begin_setstub_commit.phpt
index 14d8081d8601128b11a1ac56e5dd06fc775c7a7e..2d26fa440f20b71832bfcc512c687b8d1e919293 100755 (executable)
--- a/ext/phar/tests/phar_begin_setstub_commit.phpt
+++ b/ext/phar/tests/phar_begin_setstub_commit.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Phar::begin()/setStub()/commit()
+Phar::startBuffering()/setStub()/stopBuffering()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) print "skip"; ?>
 --INI--
@@ -9,9 +9,9 @@ phar.readonly=0
 <?php
 $p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
 //var_dump($p->getStub());
-var_dump($p->isFlushingToPhar());
-$p->begin();
-var_dump($p->isFlushingToPhar());
+var_dump($p->isBuffering());
+$p->startBuffering();
+var_dump($p->isBuffering());
 $p['a.php'] = '<?php var_dump("Hello");';
 $p->setStub('<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>');
 include 'phar://brandnewphar.phar/a.php';
@@ -20,9 +20,9 @@ $p['b.php'] = '<?php var_dump("World");';
 $p->setStub('<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>');
 include 'phar://brandnewphar.phar/b.php';
 var_dump($p->getStub());
-$p->commit();
+$p->stopBuffering();
 echo "===COMMIT===\n";
-var_dump($p->isFlushingToPhar());
+var_dump($p->isBuffering());
 include 'phar://brandnewphar.phar/a.php';
 include 'phar://brandnewphar.phar/b.php';
 var_dump($p->getStub());
@@ -33,14 +33,14 @@ var_dump($p->getStub());
 unlink(dirname(__FILE__) . '/brandnewphar.phar');
 ?>
 --EXPECT--
-bool(false)
 bool(true)
+bool(false)
 string(5) "Hello"
 string(82) "<?php var_dump("First"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>"
 string(5) "World"
 string(83) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>"
 ===COMMIT===
-bool(false)
+bool(true)
 string(5) "Hello"
 string(5) "World"
 string(83) "<?php var_dump("Second"); Phar::mapPhar("brandnewphar.phar"); __HALT_COMPILER(); ?>"

diff --git a/ext/phar/tests/phar_commitwrite.phpt b/ext/phar/tests/phar_commitwrite.phpt
index 9e14e6067a2141b04e3bfa3e25b668725da657d6..25d8c929667ec135dbc7615190e34ea7181014c2 100644 (file)
--- a/ext/phar/tests/phar_commitwrite.phpt
+++ b/ext/phar/tests/phar_commitwrite.phpt
@@ -1,5 +1,5 @@
 --TEST--
-Phar::setStub()/commit()
+Phar::setStub()/stopBuffering()
 --SKIPIF--
 <?php if (!extension_loaded("phar")) print "skip"; ?>
 --INI--
@@ -9,7 +9,7 @@ phar.readonly=0
 <?php
 $p = new Phar(dirname(__FILE__) . '/brandnewphar.phar', 0, 'brandnewphar.phar');
 $p['file1.txt'] = 'hi';
-$p->commit();
+$p->stopBuffering();
 var_dump($p->getStub());
 $p->setStub("<?php
 function __autoload(\$class)

diff --git a/ext/phar/tests/phar_stub_error.phpt b/ext/phar/tests/phar_stub_error.phpt
index e8a3811b5d8f5d402af9eb650d3968397e9d99dd..84dbbc6f3be2f08a08ee963d1cf4a078b928c93b 100755 (executable)
--- a/ext/phar/tests/phar_stub_error.phpt
+++ b/ext/phar/tests/phar_stub_error.phpt
@@ -33,7 +33,7 @@ catch(exception $e)
 }
 var_dump($phar->getStub());
 var_dump($phar->getStub() == $stub);
-$phar->commit();
+$phar->stopBuffering();
 var_dump($phar->getStub());
 var_dump($phar->getStub() == $stub);
 

diff --git a/ext/phar/tests/phar_stub_write.phpt b/ext/phar/tests/phar_stub_write.phpt
index 56352564c898c5235ca0185198ecf62c86380850..e151b849a2e035ec88ff5bbfba38baba4dc6b8af 100755 (executable)
--- a/ext/phar/tests/phar_stub_write.phpt
+++ b/ext/phar/tests/phar_stub_write.phpt
@@ -28,7 +28,7 @@ $stub = '<?php echo "second stub\n"; __HALT_COMPILER(); ?>';
 $phar->setStub($stub);
 var_dump($phar->getStub());
 var_dump($phar->getStub() == $stub);
-$phar->commit();
+$phar->stopBuffering();
 var_dump($phar->getStub());
 var_dump($phar->getStub() == $stub);