sfox Fri Aug 1 13:42:56 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/phar clicommand.inc directorygraphiterator.inc
directorytreeiterator.inc
invertedregexiterator.inc phar.inc phar.php
pharcommand.inc
Log:
- Merge ws/cs fixes to bring all branches into sync
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/clicommand.inc?r1=1.23.4.3&r2=1.23.4.4&diff_format=u
Index: php-src/ext/phar/phar/clicommand.inc
diff -u php-src/ext/phar/phar/clicommand.inc:1.23.4.3
php-src/ext/phar/phar/clicommand.inc:1.23.4.4
--- php-src/ext/phar/phar/clicommand.inc:1.23.4.3 Fri Aug 1 06:16:35 2008
+++ php-src/ext/phar/phar/clicommand.inc Fri Aug 1 13:42:56 2008
@@ -4,7 +4,7 @@
* @ingroup Phar
* @brief class CLICommand
* @author Marcus Boerger
- * @date 2007 - 2007
+ * @date 2007 - 2008
*
* Phar Command
*/
@@ -57,6 +57,7 @@
break;
}
}
+
if (isset($this->args[''])) {
if ($i >= $argc) {
if (isset($this->args['']['require'])
&& $this->args['']['require']) {
@@ -71,14 +72,14 @@
} else if ($i < $argc) {
self::error("Unexpected default arguments to
command $command, check ${argv[0]} help\n");
}
-
+
foreach($this->args as $arg => $inf) {
if (strlen($arg) && !isset($inf['val']) &&
isset($inf['required']) && $inf['required']) {
$missing .= "Missing parameter '-$arg'
to command $command, check ${argv[0]} help\n";
}
}
- if (strlen($missing))
- {
+
+ if (strlen($missing)) {
self::error($missing);
}
}
@@ -91,7 +92,7 @@
fprintf(STDERR, $msg);
}
- static function error ($msg, $exit_code = 1)
+ static function error ($msg, $exit_code = 1)
{
self::notice($msg);
exit($exit_code);
@@ -114,19 +115,14 @@
$r = new ReflectionClass($cmdclass);
$l = strlen($prefix);
- foreach($r->getMethods() as $m)
- {
- if (substr($m->name, 0, $l) == $prefix)
- {
- foreach($subs as $sub)
- {
+ foreach($r->getMethods() as $m) {
+ if (substr($m->name, 0, $l) == $prefix) {
+ foreach($subs as $sub) {
$what = substr($m->name,
$l+strlen($sub)+1);
$func = $prefix . $sub . '_' . $what;
$what = str_replace('_', '-', $what);
- if ($r->hasMethod($func))
- {
- if (!isset($a[$what]))
- {
+ if ($r->hasMethod($func)) {
+ if (!isset($a[$what])) {
$a[$what] = array();
}
$a[$what][$sub] = /*$m->class .
'::' .*/ $func;
@@ -152,8 +148,7 @@
return (bool)$arg;
}
-
- static function cli_arg_typ_int($arg, $cfg, $key)
+ static function cli_arg_typ_int($arg, $cfg, $key)
{
if ((int)$arg != $arg) {
self::error("Argument to -$key must be an integer.\n");
@@ -161,22 +156,16 @@
return (int)$arg;
}
-
+
static function cli_arg_typ_regex($arg, $cfg, $key)
{
- if (strlen($arg))
- {
- if (strlen($arg) > 1 && $arg[0] == $arg[strlen($arg)-1]
&& strpos('/,', $arg) !== false)
- {
+ if (strlen($arg)) {
+ if (strlen($arg) > 1 && $arg[0] == $arg[strlen($arg)-1]
&& strpos('/,', $arg) !== false) {
return $arg;
- }
- else
- {
+ } else {
return '/' . $arg . '/';
}
- }
- else
- {
+ } else {
return NULL;
}
}
@@ -203,8 +192,7 @@
{
$f = new SplFileInfo($arg);
$f = $f->getRealPath();
- if ($f===false || !file_exists($f))
- {
+ if ($f===false || !file_exists($f)) {
echo "Requested file '$arg' does not exist.\n";
exit(1);
}
@@ -215,7 +203,7 @@
{
$d = dirname($arg);
$f = realpath($d);
-
+
if ($f === false) {
self::error("Path for file '$arg' does not exist.\n");
}
@@ -254,46 +242,37 @@
private function cli_help_get_args($func, $l, $sp, $required)
{
$inf = "";
- foreach(call_user_func($func, $l, $sp) as $arg => $conf)
- {
- if ((isset($conf['required']) && $conf['required']) !=
$required)
- {
+ foreach(call_user_func($func, $l, $sp) as $arg => $conf) {
+ if ((isset($conf['required']) && $conf['required']) !=
$required) {
continue;
}
- if (strlen($arg))
- {
+
+ if (strlen($arg)) {
$arg = "-$arg ";
- }
- else
- {
+ } else {
$arg = "... ";
}
+
$sp2 = $this->cli_get_SP2($l, $inf);
$l2 = strlen($sp2);
$inf .= $this->cli_wordwrap($sp . $arg . $conf['inf'],
$l2, $sp2) . "\n";
- if (isset($conf['select']) && count($conf['select']))
- {
+
+ if (isset($conf['select']) && count($conf['select'])) {
$ls = 0;
- foreach($conf['select'] as $opt => $what)
- {
+ foreach($conf['select'] as $opt => $what) {
$ls = max($ls, strlen($opt));
}
$sp3 = $this->cli_get_SP3($l, $ls, $inf);
$l3 = strlen($sp3);
- foreach($conf['select'] as $opt => $what)
- {
+ foreach($conf['select'] as $opt => $what) {
$inf .= $this->cli_wordwrap($sp2 . " "
. sprintf("%-${ls}s ", $opt) . $what, $l3, $sp3) . "\n";
}
}
}
- if (strlen($inf))
- {
- if ($required)
- {
+ if (strlen($inf)) {
+ if ($required) {
return $sp . "Required arguments:\n\n" . $inf;
- }
- else
- {
+ } else {
return $sp . "Optional arguments:\n\n". $inf;
}
}
@@ -308,12 +287,11 @@
{
$argv = $this->argv;
$which = $this->args['']['val'];
- if (isset($which))
- {
+ if (isset($which)) {
if (count($which) != 1) {
self::error("More than one command given.\n");
}
-
+
$which = $which[0];
if (!array_key_exists($which, $this->cmds)) {
if (strtolower($which) == 'commands') {
@@ -335,22 +313,18 @@
$inf = "Commands:";
$lst = "";
$ind = strlen($inf) + 1;
- foreach($this->cmds as $name => $funcs)
- {
+ foreach($this->cmds as $name => $funcs) {
$lst .= ' ' . $name;
}
echo $this->cli_wordwrap($inf.$lst, $ind, str_repeat('
', $ind)) . "\n\n";
$cmds = $this->cmds;
}
$sp = str_repeat(' ', $l + 2);
- foreach($cmds as $name => $funcs)
- {
+ foreach($cmds as $name => $funcs) {
$inf = $name . substr($sp, strlen($name));
- if (isset($funcs['inf']))
- {
+ if (isset($funcs['inf'])) {
$inf .=
$this->cli_wordwrap(call_user_func(array($this, $funcs['inf'])), $l, $sp) .
"\n";
- if (isset($funcs['arg']))
- {
+ if (isset($funcs['arg'])) {
$inf .= "\n";
$inf .=
$this->cli_help_get_args(array($this, $funcs['arg']), $l, $sp, true);
$inf .= "\n";
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/directorygraphiterator.inc?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/phar/phar/directorygraphiterator.inc
diff -u php-src/ext/phar/phar/directorygraphiterator.inc:1.1
php-src/ext/phar/phar/directorygraphiterator.inc:1.1.6.1
--- php-src/ext/phar/phar/directorygraphiterator.inc:1.1 Thu May 10
20:55:27 2007
+++ php-src/ext/phar/phar/directorygraphiterator.inc Fri Aug 1 13:42:56 2008
@@ -4,7 +4,7 @@
* @ingroup Examples
* @brief class DirectoryGraphIterator
* @author Marcus Boerger
- * @date 2003 - 2005
+ * @date 2003 - 2008
*
* SPL - Standard PHP Library
*/
@@ -23,9 +23,9 @@
new ParentIterator(
new RecursiveDirectoryIterator($path,
RecursiveDirectoryIterator::KEY_AS_FILENAME
)
- ),
+ ),
CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD
- ),
+ ),
parent::SELF_FIRST
);
}
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/directorytreeiterator.inc?r1=1.1.6.1&r2=1.1.6.2&diff_format=u
Index: php-src/ext/phar/phar/directorytreeiterator.inc
diff -u php-src/ext/phar/phar/directorytreeiterator.inc:1.1.6.1
php-src/ext/phar/phar/directorytreeiterator.inc:1.1.6.2
--- php-src/ext/phar/phar/directorytreeiterator.inc:1.1.6.1 Fri Aug 1
06:16:35 2008
+++ php-src/ext/phar/phar/directorytreeiterator.inc Fri Aug 1 13:42:56 2008
@@ -4,7 +4,7 @@
* @ingroup Examples
* @brief class DirectoryTreeIterator
* @author Marcus Boerger
- * @date 2003 - 2005
+ * @date 2003 - 2008
*
* SPL - Standard PHP Library
*/
@@ -24,27 +24,27 @@
parent::__construct(
new RecursiveCachingIterator(
new RecursiveDirectoryIterator($path,
RecursiveDirectoryIterator::KEY_AS_FILENAME
- ),
+ ),
CachingIterator::CALL_TOSTRING|CachingIterator::CATCH_GET_CHILD
- ),
+ ),
parent::SELF_FIRST
);
}
/** @return the current element prefixed with ASCII graphics
- */
+ */
function current()
{
$tree = '';
for ($l=0; $l < $this->getDepth(); $l++) {
$tree .= $this->getSubIterator($l)->hasNext() ? '| ' :
' ';
}
- return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' :
'\-')
- . $this->getSubIterator($l)->__toString();
+ return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' :
'\-')
+ .
$this->getSubIterator($l)->__toString();
}
/** Aggregates the inner iterator
- */
+ */
function __call($func, $params)
{
return call_user_func_array(array($this->getSubIterator(),
$func), $params);
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/invertedregexiterator.inc?r1=1.2&r2=1.2.6.1&diff_format=u
Index: php-src/ext/phar/phar/invertedregexiterator.inc
diff -u php-src/ext/phar/phar/invertedregexiterator.inc:1.2
php-src/ext/phar/phar/invertedregexiterator.inc:1.2.6.1
--- php-src/ext/phar/phar/invertedregexiterator.inc:1.2 Mon May 21 16:44:23 2007
+++ php-src/ext/phar/phar/invertedregexiterator.inc Fri Aug 1 13:42:56 2008
@@ -4,7 +4,7 @@
* @ingroup Phar
* @brief class InvertedRegexIterator
* @author Marcus Boerger
- * @date 2007 - 2007
+ * @date 2007 - 2008
*
* Inverted RegexIterator
*/
@@ -17,7 +17,7 @@
class InvertedRegexIterator extends RegexIterator
{
/** @return !RegexIterator::accept()
- */
+ */
function accept()
{
return !RegexIterator::accept();
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/phar.inc?r1=1.1&r2=1.1.6.1&diff_format=u
Index: php-src/ext/phar/phar/phar.inc
diff -u php-src/ext/phar/phar/phar.inc:1.1
php-src/ext/phar/phar/phar.inc:1.1.6.1
--- php-src/ext/phar/phar/phar.inc:1.1 Mon May 28 21:13:57 2007
+++ php-src/ext/phar/phar/phar.inc Fri Aug 1 13:42:56 2008
@@ -5,7 +5,7 @@
* @ingroup Phar
* @brief class Phar
* @author Marcus Boerger
- * @date 2007 - 2007
+ * @date 2007 - 2008
*
* Phar Command
*/
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/phar.php?r1=1.10.4.1&r2=1.10.4.2&diff_format=u
Index: php-src/ext/phar/phar/phar.php
diff -u php-src/ext/phar/phar/phar.php:1.10.4.1
php-src/ext/phar/phar/phar.php:1.10.4.2
--- php-src/ext/phar/phar/phar.php:1.10.4.1 Fri Aug 1 06:16:35 2008
+++ php-src/ext/phar/phar/phar.php Fri Aug 1 13:42:56 2008
@@ -5,20 +5,18 @@
* @ingroup Phar
* @brief class CLICommand
* @author Marcus Boerger
- * @date 2007 - 2007
+ * @date 2007 - 2008
*
* Phar Command
*/
if (!extension_loaded('phar'))
{
- if (!class_exists('PHP_Archive', 0))
- {
+ if (!class_exists('PHP_Archive', 0)) {
echo "Neither Extension Phar nor class PHP_Archive are
available.\n";
exit(1);
}
- if (!in_array('phar', stream_get_wrappers()))
- {
+ if (!in_array('phar', stream_get_wrappers())) {
stream_wrapper_register('phar', 'PHP_Archive');
}
if (!class_exists('Phar',0)) {
@@ -28,8 +26,7 @@
foreach(array("SPL", "Reflection") as $ext)
{
- if (!extension_loaded($ext))
- {
+ if (!extension_loaded($ext)) {
echo "$argv[0] requires PHP extension $ext.\n";
exit(1);
}
@@ -54,4 +51,6 @@
new PharCommand($argc, $argv);
-__HALT_COMPILER(); ?>
\ No newline at end of file
+__HALT_COMPILER();
+
+?>
\ No newline at end of file
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.10&r2=1.49.2.11&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.10
php-src/ext/phar/phar/pharcommand.inc:1.49.2.11
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.10 Fri Aug 1 06:16:35 2008
+++ php-src/ext/phar/phar/pharcommand.inc Fri Aug 1 13:42:56 2008
@@ -5,7 +5,7 @@
* @ingroup Phar
* @brief class CLICommand
* @author Marcus Boerger
- * @date 2007 - 2007
+ * @date 2007 - 2008
*
* Phar Command
*/
@@ -36,7 +36,7 @@
*
* @param string $l1 Eleven
* @param string $l2 Twelve
- * @param string $arg_inf
+ * @param string $arg_inf
* @return string The repeated string.
*/
function cli_get_SP3($l1, $l2, $arg_inf)
@@ -157,8 +157,8 @@
$hash_optional = array('SHA-256' => 'SHA256',
'SHA-512' =>
'SHA512',
'OpenSSL' =>
'OpenSSL');
- foreach($hash_optional as $key => $name)
- {
+
+ foreach($hash_optional as $key => $name) {
if (in_array($key, $hash_avail)) {
$phar_args['h']['select'][strtolower($name)] =
$name;
}
@@ -183,11 +183,11 @@
/**
* String Ends With
*
- * Wether a string end with another needle.
+ * Whether a string ends with another needle.
*
* @param string $haystack The haystack
* @param string $needle The needle.
- * @return mixed false if doesn't end with anything, the string
+ * @return mixed false if doesn't end with anything, the string
* substr'ed if the string ends with the needle.
*/
static function strEndsWith($haystack, $needle)
@@ -199,10 +199,10 @@
/**
* Argument type loader
*
- * @param string $arg Either 'auto', 'optional' or an filename that
+ * @param string $arg Either 'auto', 'optional' or an filename that
* contains class PHP_Archive
* @param string $cfg Configuration to pass to a new file
- * @param string $key The key
+ * @param string $key The key
* @return string $arg The argument.
*/
static function cli_arg_typ_loader($arg, $cfg, $key)
@@ -255,7 +255,7 @@
*
* @param string $arg The new phar component.
* @param string $cfg Configuration to pass to a new file
- * @param string $key The key
+ * @param string $key The key
* @return string $arg The new argument file.
*/
static function cli_arg_typ_pharnew($arg, $cfg, $key)
@@ -271,7 +271,7 @@
/**
* Argument type existing Phar file
*
- * Return filenam eof an existing Phar.
+ * Return filename of an existing Phar.
*
* @param string $arg The file in the phar to open.
* @param string $cfg The configuration information
@@ -298,7 +298,7 @@
/**
* Argument type Phar url-like
*
- * Check the argument as cli_arg_Typ_phar and return its name prefixed
+ * Check the argument as cli_arg_Typ_phar and return its name prefixed
* with phar://
*
* Ex:
@@ -356,7 +356,7 @@
static function cli_arg_typ_compalg($arg, $cfg, $key)
{
$arg = self::cli_arg_typ_select($arg, $cfg, $key);
-
+
switch($arg) {
case 'auto':
if (extension_loaded('zlib')) {
@@ -383,7 +383,7 @@
static function cli_arg_typ_privkey($arg, $cfg, $key)
{
$arg = self::cli_arg_typ_string($arg, $cfg, $key);
-
+
$hash_avail = Phar::getSupportedSignatures();
if ($arg && !in_array('OpenSSL', $hash_avail))
{
@@ -400,8 +400,7 @@
*/
function phar_check_hash($hash, $privkey)
{
- switch($hash)
- {
+ switch($hash) {
case 'md5':
return Phar::MD5;
case 'sha1':
@@ -411,8 +410,7 @@
case 'sha512':
return Phar::SHA512;
case 'openssl':
- if (!$privkey)
- {
+ if (!$privkey) {
self::error("Cannot use OpenSSL signing
without key.\n");
}
return Phar::OPENSSL;
@@ -427,10 +425,10 @@
*/
static function cli_cmd_inf_pack()
{
- return "Pack files into a PHAR archive.\n" .
+ return "Pack files into a PHAR archive.\n" .
"When using -s <stub>, then the stub file is being "
.
"excluded from the list of input files/dirs." .
- "To create an archive that contains PEAR class
PHP_Archiave " .
+ "To create an archive that contains PEAR class
PHP_Archive " .
"then point -p argument to PHP/Archive.php.\n";
}
// }}}
@@ -443,15 +441,14 @@
static function cli_cmd_arg_pack()
{
$args = self::phar_args('abcFhilpsxy', 'pharnew');
-
+
$args[''] = array(
- 'typ' => 'any',
- 'val' => NULL,
- 'required' => 1,
+ 'typ' => 'any',
+ 'val' => NULL,
+ 'required' => 1,
'inf' => ' Any number of input files and
directories. If -i is in use then ONLY files and matching thegiven regular
expression are being packed. If -x is given then files matching that regular
expression are NOT being packed.',
-
);
-
+
return $args;
}
// }}}
@@ -540,7 +537,7 @@
if (ini_get('phar.readonly')) {
self::error("Creating phar files is disabled by ini
setting 'phar.readonly'.\n");
}
-
+
if (!Phar::canWrite()) {
self::error("Creating phar files is disabled,
Phar::canWrite() returned false.\n");
}
@@ -585,12 +582,11 @@
$phar->compressFiles(Phar::BZ2);
break;
default:
- $phar->decompressFiles();;
+ $phar->decompressFiles();
break;
}
- if ($hash)
- {
+ if ($hash) {
$phar->setSignatureAlgorithm($hash, $privkey);
}
@@ -607,9 +603,9 @@
*
* @param Phar $phar The phar object.
* @param string $input The input directory
- * @param string $regex The regex use in RegexIterator.
+ * @param string $regex The regex used in RegexIterator.
* @param string $invregex The InvertedRegexIterator expression.
- * @param SplFileInfo $stub Stub file object
+ * @param SplFileInfo $stub Stub file object
* @param mixed $compress Compression algorithm or NULL
* @param boolean $noloader Whether to prevent adding the loader
*/
@@ -688,7 +684,7 @@
/**
* Echo directory
*
- * @param string $pn
+ * @param string $pn
* @param unknown_type $f
*/
public function phar_dir_echo($pn, $f)
@@ -758,7 +754,7 @@
{
$this->phar_dir_operation(
new DirectoryTreeIterator(
- $this->args['f']['val']),
+ $this->args['f']['val']),
array($this, 'phar_dir_echo')
);
}
@@ -799,7 +795,7 @@
{
$a = $this->phar_dir_operation(
new DirectoryGraphIterator(
- $this->args['f']['val']),
+ $this->args['f']['val']),
array($this, 'phar_dir_echo')
);
if (!$a) {
@@ -829,13 +825,13 @@
static function cli_cmd_arg_extract()
{
$args = self::phar_args('Fix', 'phar');
-
+
$args[''] = array(
- 'type' => 'dir',
- 'val' => '.',
+ 'type' => 'dir',
+ 'val' => '.',
'inf' => ' Directory to extract to (defaults to
\'.\').',
);
-
+
return $args;
}
// }}}
@@ -850,7 +846,7 @@
public function cli_cmd_run_extract()
{
$dir = $this->args['']['val'];
-
+
if (is_array($dir)) {
if (count($dir) != 1) {
self::error("Only one target directory
allowed.\n");
@@ -858,7 +854,7 @@
$dir = $dir[0];
}
}
-
+
$phar = $this->args['f']['val'];
$base = $phar->getPathname();
$bend = strpos($base, '.phar');
@@ -867,8 +863,8 @@
$blen = strlen($base);
$this->phar_dir_operation(
- new RecursiveIteratorIterator($phar),
- array($this, 'phar_dir_extract'),
+ new RecursiveIteratorIterator($phar),
+ array($this, 'phar_dir_extract'),
array($blen, $dir)
);
}
@@ -891,17 +887,17 @@
$dir = $args[1];
$sub = substr($pn, $blen);
$target = $dir . '/' . $sub;
-
+
if (!file_exists(dirname($target))) {
if (!is_writable(dirname($target))) {
self::error("Operation could not be
completed\n");
}
-
+
mkdir(dirname($target));
}
-
+
echo "$sub";
-
+
if ([EMAIL PROTECTED]($f, $target)) {
echo " ...error\n";
} else {
@@ -942,9 +938,9 @@
$phar = $this->args['f']['val'];
$entry = $this->args['e']['val'];
- $phar->startBuffering();
- unset($phar[$entry]);
- $phar->stopBuffering();
+ $phar->startBuffering();
+ unset($phar[$entry]);
+ $phar->stopBuffering();
}
// }}}
// {{{ static function cli_cmd_inf_add
@@ -966,9 +962,9 @@
{
$args = self::phar_args('acFilx', 'phar');
$args[''] = array(
- 'type' => 'any',
- 'val' => NULL,
- 'required' => 1,
+ 'type' => 'any',
+ 'val' => NULL,
+ 'required' => 1,
'inf' => ' Any number of input files and
directories. If -i is in use then ONLY files and matching thegiven regular
expression are being packed. If -x is given then files matching that regular
expression are NOT being packed.',
);
return $args;
@@ -1011,7 +1007,7 @@
*/
public function cli_cmd_inf_stub_set()
{
- return "Set the stub of a PHAR file. " .
+ return "Set the stub of a PHAR file. " .
"If no input file is specified as stub then stdin is
being used.";
}
// }}}
@@ -1019,7 +1015,7 @@
/**
* Set the argument stub
*
- * @return string arguments for a stub
+ * @return string arguments for a stub
*/
public function cli_cmd_arg_stub_set()
{
@@ -1053,7 +1049,7 @@
*/
public function cli_cmd_inf_stub_get()
{
- return "Get the stub of a PHAR file. " .
+ return "Get the stub of a PHAR file. " .
"If no output file is specified as stub then stdout
is being used.";
}
// }}}
@@ -1192,12 +1188,12 @@
/**
* Cli Command Inf Meta Set
*
- * @return string A description
+ * @return string A description
*/
public function cli_cmd_inf_meta_set()
{
- return "Set meta data of a PHAR entry or a PHAR package using
serialized input. " .
- "If no input file is specified for meta data then
stdin is being used." .
+ return "Set meta data of a PHAR entry or a PHAR package using
serialized input. " .
+ "If no input file is specified for meta data then
stdin is being used." .
"You can also specify a particular index using -k.
In that case the metadata is " .
"expected to be an array and the value of the given
index is being set. If " .
"the metadata is not present or empty a new array
will be created. If the " .
@@ -1257,7 +1253,7 @@
} else {
$meta = unserialize($meta);
}
-
+
if (isset($entry)) {
$phar[$entry]->setMetadata($meta);
} else {
@@ -1275,7 +1271,7 @@
public function cli_cmd_inf_meta_get()
{
return "Get meta information of a PHAR entry or a PHAR package
in serialized from. " .
- "If no output file is specified for meta data then
stdout is being used.\n" .
+ "If no output file is specified for meta data then
stdout is being used.\n" .
"You can also specify a particular index using -k.
In that case the metadata is " .
"expected to be an array and the value of the given
index is returned using echo " .
"rather than using serialize. If that index does not
exist or no meta data is " .
@@ -1344,8 +1340,8 @@
*/
public function cli_cmd_inf_meta_del()
{
- return "Delete meta information of a PHAR entry or a PHAR
package.\n" .
- "If -k is given then the metadata is expected to be
an array " .
+ return "Delete meta information of a PHAR entry or a PHAR
package.\n" .
+ "If -k is given then the metadata is expected to be
an array " .
"and the given index is being deleted.\n" .
"If something was deleted the return value is 0
otherwise it is 1.";
}
@@ -1420,7 +1416,7 @@
*/
public function cli_cmd_inf_info()
{
- return "Get information about a PHAR package.\n" .
+ return "Get information about a PHAR package.\n" .
"By using -k it is possible to return a single
value.";
}
// }}}
@@ -1482,9 +1478,9 @@
$ucount++;
$csize += $ent->getSize();
}
-
+
$usize += $ent->getSize();
-
+
if ($ent->hasMetadata()) {
$mcount++;
}
@@ -1510,12 +1506,12 @@
echo $infos[$index];
exit(0);
}
-
+
$l = 0;
foreach($infos as $which => $val) {
$l = max(strlen($which), $l);
}
-
+
foreach($infos as $which => $val) {
echo $which . ':' . str_repeat(' ', $l + 1 -
strlen($which)) . $val . "\n";
}
@@ -1554,7 +1550,7 @@
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision: 1.49.2.10 $',
+ 'phar.phar version' => '$Revision: 1.49.2.11 $',
'Phar EXT version' => $use_ext ? phpversion('phar') :
'Not available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
