diff options
| -rwxr-xr-x | ext/phar/phar_object.c | 6 | ||||
| -rw-r--r-- | ext/phar/tests/phar_oo_getcontents.phpt | 4 | ||||
| -rw-r--r-- | ext/phar/tests/phar_oo_getcontentsgz.phpt | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index 3ea15a613c..c23ea9c0da 100755 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -3586,10 +3586,10 @@ PHP_METHOD(PharFileInfo, delMetadata) } /* }}} */ -/* {{{ proto string PharFileInfo::getContents() +/* {{{ proto string PharFileInfo::getContent() * return the complete file contents of the entry (like file_get_contents) */ -PHP_METHOD(PharFileInfo, getContents) +PHP_METHOD(PharFileInfo, getContent) { char *error; php_stream *fp; @@ -3993,7 +3993,7 @@ zend_function_entry php_entry_methods[] = { PHP_ME(PharFileInfo, __destruct, NULL, 0) PHP_ME(PharFileInfo, chmod, arginfo_entry_chmod, 0) PHP_ME(PharFileInfo, delMetadata, NULL, 0) - PHP_ME(PharFileInfo, getContents, NULL, 0) + PHP_ME(PharFileInfo, getContent, NULL, 0) PHP_ME(PharFileInfo, getCompressedSize, NULL, 0) PHP_ME(PharFileInfo, getCRC32, NULL, 0) PHP_ME(PharFileInfo, getMetadata, NULL, 0) diff --git a/ext/phar/tests/phar_oo_getcontents.phpt b/ext/phar/tests/phar_oo_getcontents.phpt index 3f093adb31..76b3e64713 100644 --- a/ext/phar/tests/phar_oo_getcontents.phpt +++ b/ext/phar/tests/phar_oo_getcontents.phpt @@ -1,5 +1,5 @@ --TEST-- -Phar object: getContents() +Phar object: getContent() --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> @@ -12,7 +12,7 @@ $fname = dirname(__FILE__) . '/' . basename(__FILE__, '.php') . '.phar.php'; $phar = new Phar($fname); $phar['a'] = 'file contents this works'; -echo $phar['a']->getContents() . "\n"; +echo $phar['a']->getContent() . "\n"; ?> ===DONE=== --CLEAN-- diff --git a/ext/phar/tests/phar_oo_getcontentsgz.phpt b/ext/phar/tests/phar_oo_getcontentsgz.phpt index c2a16f23d7..d63480d017 100644 --- a/ext/phar/tests/phar_oo_getcontentsgz.phpt +++ b/ext/phar/tests/phar_oo_getcontentsgz.phpt @@ -1,5 +1,5 @@ --TEST-- -Phar object: getContents() (verify it works with compression) +Phar object: getContent() (verify it works with compression) --SKIPIF-- <?php if (!extension_loaded("phar")) die("skip"); ?> <?php if (!extension_loaded("spl")) die("skip SPL not available"); ?> @@ -18,7 +18,7 @@ $phar['a']->setCompressedGZ(); copy($fname, $fname2); $phar2 = new Phar($fname2); var_dump($phar2['a']->isCompressed()); -echo $phar2['a']->getContents() . "\n"; +echo $phar2['a']->getContent() . "\n"; ?> ===DONE=== --CLEAN-- |