s/getContents/getContent/

diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c
index 3ea15a613ccec1c09856849954b8b7f1c0d711f3..c23ea9c0daf8b2d0095efe3557e95687d8aaac34 100755 (executable)
--- 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 3f093adb312e2d191b41ccb8bca074ceeb1505bd..76b3e647133d5e67b0280e637e9aae0956704933 100644 (file)
--- 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 c2a16f23d750eef3e834c86dbd58c179da66c897..d63480d0177ad4b4f5c6ecccf27b0e0f408d89f5 100644 (file)
--- 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--