]> granicus.if.org Git - php/commitdiff
Fixed Bug #65467
authorMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 13:39:30 +0000 (15:39 +0200)
committerMichael Wallner <mike@php.net>
Mon, 30 Mar 2015 13:39:30 +0000 (15:39 +0200)
Call to undefined method cli_arg_typ_string

Use cli_arg_typ_filecontent instead.

NEWS
ext/phar/phar/pharcommand.inc

diff --git a/NEWS b/NEWS
index f073c9cf040f82a596320e64d046ab032b3cbd70..5994c4501c9d70b6cfa4ef868f0670ff2ed2e908 100644 (file)
--- 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)
 
index cb343675b557b02dd09d0f1902d0ec50f5f482ee..a58a9f060a207c567585aa4858b862d9278df83d 100644 (file)
@@ -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))