From 340e9b24fcaea7e8a6fa50d3b94355effe6f7161 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Sat, 3 Feb 2007 00:45:24 +0000 Subject: [PATCH] s/isFlushing/isFlushingToPhar much clearer purpose in method name --- ext/phar/phar_object.c | 8 ++++---- ext/phar/tests/phar_begin_setstub_commit.phpt | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 758b64c73f..6935055e0a 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -225,14 +225,14 @@ PHP_METHOD(Phar, begin) } /* }}} */ -/* {{{ proto bool Phar::isFlushing() +/* {{{ proto bool Phar::isFlushingToPhar() * Returns whether write operations are flushing to disk immediately */ -PHP_METHOD(Phar, isFlushing) +PHP_METHOD(Phar, isFlushingToPhar) { PHAR_ARCHIVE_OBJECT(); - RETURN_BOOL(!phar_obj->arc.archive->donotflush); + RETURN_BOOL(phar_obj->arc.archive->donotflush); } /* }}} */ @@ -1105,7 +1105,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, isFlushing, NULL, ZEND_ACC_PUBLIC) + PHP_ME(Phar, isFlushingToPhar, 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 ed9c12b638..e8537f989e 100755 --- a/ext/phar/tests/phar_begin_setstub_commit.phpt +++ b/ext/phar/tests/phar_begin_setstub_commit.phpt @@ -9,9 +9,9 @@ phar.readonly=0 getStub()); -var_dump($p->isFlushing()); +var_dump($p->inTransaction()); $p->begin(); -var_dump($p->isFlushing()); +var_dump($p->inTransaction()); $p['a.php'] = 'setStub(''); include 'phar://brandnewphar.phar/a.php'; @@ -22,7 +22,7 @@ include 'phar://brandnewphar.phar/b.php'; var_dump($p->getStub()); $p->commit(); echo "===COMMIT===\n"; -var_dump($p->isFlushing()); +var_dump($p->inTransaction()); 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(true) bool(false) +bool(true) string(5) "Hello" string(82) "" string(5) "World" string(83) "" ===COMMIT=== -bool(true) +bool(false) string(5) "Hello" string(5) "World" string(83) "" -- 2.40.0