summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Wallner <mike@php.net>2015-03-30 15:39:30 +0200
committerMichael Wallner <mike@php.net>2015-03-30 15:39:30 +0200
commit6de25c155e3a90c273af311d71298ec88ac61833 (patch)
tree652d9b92af7a5f7bb9d3b73bc8ddde7838e1dbdf
parent8f7e378b9f2fb4f2bb5605d9440d7d34bee6978a (diff)
downloadphp-git-6de25c155e3a90c273af311d71298ec88ac61833.tar.gz
Fixed Bug #65467
Call to undefined method cli_arg_typ_string Use cli_arg_typ_filecontent instead.
-rw-r--r--NEWS1
-rw-r--r--ext/phar/phar/pharcommand.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index f073c9cf04..5994c4501c 100644
--- a/NEWS
+++ b/NEWS
@@ -42,6 +42,7 @@ PHP NEWS
- Phar:
. Fixed bug #64343 (PharData::extractTo fails for tarball created by BSD tar).
(Mike)
+ . Fixed bug #65467 (Call to undefined method cli_arg_typ_string). (Mike)
. Fixed bug #67761 (Phar::mapPhar fails for Phars inside a path containing
".tar"). (Mike)
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index cb343675b5..a58a9f060a 100644
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
@@ -397,7 +397,7 @@ class PharCommand extends CLICommand
*/
static function cli_arg_typ_privkey($arg, $cfg, $key)
{
- $arg = self::cli_arg_typ_string($arg, $cfg, $key);
+ $arg = self::cli_arg_typ_filecont($arg, $cfg, $key);
$hash_avail = Phar::getSupportedSignatures();
if ($arg && !in_array('OpenSSL', $hash_avail))