- Consistency rocks: Make all lines start with tabs for indentation

# Just as anythign else we do.
# Also saves about ~0.5k in phar.phar

7 files changed, 2178 insertions, 2178 deletions

diff --git a/ext/phar/makestub.php b/ext/phar/makestub.php
index 44e0b96337..f1e7b46dc3 100644
--- a/ext/phar/makestub.php
+++ b/ext/phar/makestub.php
@@ -4,18 +4,18 @@ $s = str_replace("\r", '', file_get_contents(dirname(__FILE__) . '/shortarc.php'
 $s .= "\nExtract_Phar::go();\n__HALT_COMPILER();";
 $news = '';
 foreach (token_get_all($s) as $token) {
-    if (is_array($token)) {
-        if ($token[0] == T_COMMENT) {
-            $token[1] = '';
-        }
-        if ($token[0] == T_WHITESPACE) {
-            $n = str_repeat("\n", substr_count($token[1], "\n"));
-            $token[1] = strlen($n) ? $n : ' ';
-        }
-        $news .= $token[1];
-    } else {
-        $news .= $token;
-    }
+	if (is_array($token)) {
+		if ($token[0] == T_COMMENT) {
+			$token[1] = '';
+		}
+		if ($token[0] == T_WHITESPACE) {
+			$n = str_repeat("\n", substr_count($token[1], "\n"));
+			$token[1] = strlen($n) ? $n : ' ';
+		}
+		$news .= $token[1];
+	} else {
+		$news .= $token;
+	}
 }
 $s = $news . ' ?>';
 $slen = strlen($s) - strlen('index.php') - strlen("000");
@@ -57,50 +57,50 @@ $s1split = str_split($s1, 2046);
 $s3split = str_split($s3, 2046);
 $took = false;
 foreach ($s1split as $i => $chunk) {
-    if ($took) {
-        $s1split[$i] = substr($chunk, 1);
-        $took = false;
-    }
-    if ($chunk[strlen($chunk) - 1] == '\\') {
-        $s1split[$i] .= $s1split[$i + 1][0];
-        $took = true;
-    }
+	if ($took) {
+		$s1split[$i] = substr($chunk, 1);
+		$took = false;
+	}
+	if ($chunk[strlen($chunk) - 1] == '\\') {
+		$s1split[$i] .= $s1split[$i + 1][0];
+		$took = true;
+	}
 }
 foreach ($s3split as $i => $chunk) {
-    if ($took) {
-        $s3split[$i] = substr($chunk, 1);
-        $took = false;
-    }
-    if ($chunk[strlen($chunk) - 1] == '\\') {
-        $s3split[$i] .= $s3split[$i + 1][0];
-        $took = true;
-    }
+	if ($took) {
+		$s3split[$i] = substr($chunk, 1);
+		$took = false;
+	}
+	if ($chunk[strlen($chunk) - 1] == '\\') {
+		$s3split[$i] .= $s3split[$i + 1][0];
+		$took = true;
+	}
 }
 $stub .= "\tstatic const char newstub0[] = \"" . $webs . '";
 ';
 foreach ($s1split as $i => $chunk) {
-    $s1count = $i + 1;
-    $stub .= "\tstatic const char newstub1_" . $i . '[] = "' . $chunk . '";
+	$s1count = $i + 1;
+	$stub .= "\tstatic const char newstub1_" . $i . '[] = "' . $chunk . '";
 ';
 }
 $stub .= "\tstatic const char newstub2[] = \"" . $s2 . "\";
 ";
 foreach ($s3split as $i => $chunk) {
-    $s3count = $i + 1;
-    $stub .= "\tstatic const char newstub3_" . $i . '[] = "' . $chunk . '";
+	$s3count = $i + 1;
+	$stub .= "\tstatic const char newstub3_" . $i . '[] = "' . $chunk . '";
 ';
 }
 $stub .= "\n\tstatic const int newstub_len = " . $slen . ";
 
 \t*len = spprintf(stub, name_len + web_len + newstub_len, \"%s%s" . str_repeat('%s', $s1count) . '%s%s%d'
-    . str_repeat('%s', $s3count) . '", newstub0, web';
+	. str_repeat('%s', $s3count) . '", newstub0, web';
 foreach ($s1split as $i => $unused) {
-    $stub .= ', newstub1_' . $i;
+	$stub .= ', newstub1_' . $i;
 }
 $stub .= ', index_php, newstub2';
 $stub .= ", name_len + web_len + newstub_len";
 foreach ($s3split as $i => $unused) {
-    $stub .= ', newstub3_' . $i;
+	$stub .= ', newstub3_' . $i;
 }
 $stub .= ");
 }";
diff --git a/ext/phar/package.php b/ext/phar/package.php
index f4d63ae21d..d7d81e2e6a 100644
--- a/ext/phar/package.php
+++ b/ext/phar/package.php
@@ -53,29 +53,29 @@ require_once 'PEAR/PackageFileManager2.php';
 PEAR::setErrorHandling(PEAR_ERROR_DIE);
 
 $options = array(
-    'filelistgenerator' => 'CVS',
-    'changelogoldtonew' => false,
-    'simpleoutput'      => true,
-    'baseinstalldir'    => '/',
-    'packagedirectory'  => dirname(__FILE__),
-    'packagefile'       => 'package.xml',
-    'clearcontents'     => true,
-    'ignore'            => array('package*.php', 'package*.xml'),
-    'dir_roles'         => array(
-         'docs'         => 'doc',
-         'examples'     => 'doc',
-         'tests'        => 'test',
-         'phar'         => 'src',
-    ),
-    'exceptions'        => array(
-         'CREDITS'            => 'doc',
-         'EXPERIMENTAL'       => 'doc',
-         'LICENSE'            => 'doc',
-         'Makefile.frag'      => 'src',
-         'phar_path_check.re' => 'src',
-         'TODO'               => 'doc',
-         'phar.phar'          => 'script',
-    ),
+	'filelistgenerator' => 'CVS',
+	'changelogoldtonew' => false,
+	'simpleoutput'      => true,
+	'baseinstalldir'    => '/',
+	'packagedirectory'  => dirname(__FILE__),
+	'packagefile'       => 'package.xml',
+	'clearcontents'     => true,
+	'ignore'            => array('package*.php', 'package*.xml'),
+	'dir_roles'         => array(
+		 'docs'         => 'doc',
+		 'examples'     => 'doc',
+		 'tests'        => 'test',
+		 'phar'         => 'src',
+	),
+	'exceptions'        => array(
+		 'CREDITS'            => 'doc',
+		 'EXPERIMENTAL'       => 'doc',
+		 'LICENSE'            => 'doc',
+		 'Makefile.frag'      => 'src',
+		 'phar_path_check.re' => 'src',
+		 'TODO'               => 'doc',
+		 'phar.phar'          => 'script',
+	),
 );
 
 $package = PEAR_PackageFileManager2::importOptions(dirname(__FILE__) . '/package.xml', $options);
@@ -100,9 +100,9 @@ $package->setNotes("\n$notes\n");
 $package->generateContents();
 
 if (isset($_GET['make']) || (isset($_SERVER['argv']) && @$_SERVER['argv'][1] == 'make')) {
-    $package->writePackageFile();
+	$package->writePackageFile();
 } else {
-    $package->debugPackageFile();
+	$package->debugPackageFile();
 }
 
 ?>
diff --git a/ext/phar/phar/clicommand.inc b/ext/phar/phar/clicommand.inc
index e08e5c3bc6..a127cb62bc 100755
--- a/ext/phar/phar/clicommand.inc
+++ b/ext/phar/phar/clicommand.inc
@@ -16,362 +16,362 @@
  */
 abstract class CLICommand
 {
-    protected $argc;
-    protected $argv;
-    protected $cmds = array();
-    protected $args = array();
-    protected $typs = array();
-
-    function __construct($argc, array $argv)
-    {
-        $this->argc = $argc;
-        $this->argv = $argv;
-        $this->cmds = self::getCommands($this);
-        $this->typs = self::getArgTyps($this);
-
-        if ($argc < 2) {
-            self::error("No command given, check ${argv[0]} help\n");
-        } elseif (!isset($this->cmds[$argv[1]]['run'])) {
-            self::error("Unknown command '${argv[1]}', check ${argv[0]} help\n");
-        } else {
-            $command = $argv[1];
-        }
-
-        if (isset($this->cmds[$command]['arg'])) {
-            $this->args = call_user_func(array($this, $this->cmds[$command]['arg']));
-            $i = 1;
-            $missing = false;
-            while (++$i < $argc) {
-                if ($argv[$i][0] == '-') {
-                    if (strlen($argv[$i]) == 2 && isset($this->args[$argv[$i][1]])) {
-                        $arg = $argv[$i][1];
-                        if (++$i >= $argc) {
-                            self::error("Missing argument to parameter '$arg' of command '$command', check ${argv[0]} help\n");
-                        } else {
-                            $this->args[$arg]['val'] = $this->checkArgTyp($arg, $i, $argc, $argv);
-                        }
-                    }  else {
-                        self::error("Unknown parameter '${argv[$i]}' to command $command, check ${argv[0]} help\n");
-                    }
-                } else {
-                    break;
-                }
-            }
-            if (isset($this->args[''])) {
-                if ($i >= $argc) {
-                    if (isset($this->args['']['require']) && $this->args['']['require']) {
-                        self::error("Missing default trailing arguments to command $command, check ${argv[0]} help\n");
-                    }
-                } else {
-                    $this->args['']['val'] = array();
-                    while($i < $argc) {
-                        $this->args['']['val'][] = $argv[$i++];
-                    }
-                }
-            } 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))
-            {
-                self::error($missing);
-            }
-        }
-
-        call_user_func(array($this, $this->cmds[$command]['run']), $this->args);
-    }
-
-    static function notice ($msg)
-    {
-        fprintf(STDERR, $msg);
-    }
-
-    static function error ($msg, $exit_code = 1) 
-    {
-        self::notice($msg);
-        exit($exit_code);
-    }
-
-    function checkArgTyp($arg, $i, $argc, $argv)
-    {
-        $typ = $this->args[$arg]['typ'];
-
-        if (isset($this->typs[$typ]['typ'])) {
-            return call_user_func(array($this, $this->typs[$typ]['typ']), $argv[$i], $this->args[$arg], $arg);
-        } else {
-            return $argv[$i];
-        }
-    }
-
-    static function getSubFuncs(CLICommand $cmdclass, $prefix, array $subs)
-    {
-        $a = array();
-        $r = new ReflectionClass($cmdclass);
-        $l = strlen($prefix);
-
-        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]))
-                        {
-                            $a[$what] = array();
-                        }
-                        $a[$what][$sub] = /*$m->class . '::' .*/ $func;
-                    }
-                }
-            }
-        }
-        return $a;
-    }
-
-    static function getCommands(CLICommand $cmdclass)
-    {
-        return self::getSubFuncs($cmdclass, 'cli_cmd_', array('arg','inf','run'));
-    }
-
-    static function getArgTyps(CLICommand $cmdclass)
-    {
-        return self::getSubFuncs($cmdclass, 'cli_arg_', array('typ'));
-    }
-
-    static function cli_arg_typ_bool($arg, $cfg, $key)
-    {
-        return (bool)$arg;
-    }
-
-    
-    static function cli_arg_typ_int($arg, $cfg, $key) 
-    {
-        if ((int)$arg != $arg) {
-            self::error("Argument to -$key must be an integer.\n");
-        }
-
-        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)
-            {
-                return $arg;
-            }
-            else
-            {
-                return '/' . $arg . '/';
-            }
-        }
-        else
-        {
-            return NULL;
-        }
-    }
-
-    static function cli_arg_typ_select($arg, $cfg, $key)
-    {
-        if (!in_array($arg, array_keys($cfg['select']))) {
-            self::error("Parameter value '$arg' not one of '" . join("', '", array_keys($cfg['select'])) . "'.\n");
-        }
-        return $arg;
-    }
-
-    static function cli_arg_typ_dir($arg, $cfg, $key)
-    {
-        $f = realpath($arg);
-
-        if ($f===false || !file_exists($f) || !is_dir($f)) {
-            self::error("Requested path '$arg' does not exist.\n");
-        }
-        return $f;
-    }
-
-    static function cli_arg_typ_file($arg)
-    {
-        $f = new SplFileInfo($arg);
-        $f = $f->getRealPath();
-        if ($f===false || !file_exists($f))
-        {
-            echo "Requested file '$arg' does not exist.\n";
-            exit(1);
-        }
-        return $f;
-    }
-
-    static function cli_arg_typ_filenew($arg, $cfg, $key)
-    {
-        $d = dirname($arg);
-        $f = realpath($d);
-        
-        if ($f === false) {
-            self::error("Path for file '$arg' does not exist.\n");
-        }
-        return $f . '/' . basename($arg);
-    }
-
-    static function cli_arg_typ_filecont($arg, $cfg, $key)
-    {
-        return file_get_contents(self::cli_arg_typ_file($arg, $cfg, $key));
-    }
-
-    function cli_get_SP2($l1, $arg_inf)
-    {
-        return str_repeat(' ', $l1 + 2 + 4 + 8);
-    }
-
-    function cli_get_SP3($l1, $l2, $arg_inf)
-    {
-        return str_repeat(' ', $l1 + 2 + 4 + 8 + 2 + $l2 + 2);
-    }
-
-    static function cli_cmd_inf_help()
-    {
-        return "This help or help for a selected command.";
-    }
-
-    private function cli_wordwrap($what, $l, $sp)
-    {
-        $p = max(79 - $l, 40);     // minimum length for paragraph
-        $b = substr($what, 0, $l); // strip out initial $l
-        $r = substr($what, $l);    // remainder
-        $r = str_replace("\n", "\n".$sp, $r); // in remainder replace \n's
-        return $b . wordwrap($r, $p, "\n".$sp);
-    }
-
-    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)
-            {
-                continue;
-            }
-            if (strlen($arg))
-            {
-                $arg = "-$arg  ";
-            }
-            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']))
-            {
-                $ls = 0;
-                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)
-                {
-                    $inf .= $this->cli_wordwrap($sp2 . "  " . sprintf("%-${ls}s  ", $opt) . $what, $l3, $sp3) . "\n";
-                }
-            }
-        }
-        if (strlen($inf))
-        {
-            if ($required)
-            {
-                return $sp . "Required arguments:\n\n" . $inf;
-            }
-            else
-            {
-                return $sp . "Optional arguments:\n\n". $inf;
-            }
-        }
-    }
-
-    function cli_cmd_arg_help()
-    {
-        return array('' => array('typ'=>'any','val'=>NULL,'inf'=>'Optional command to retrieve help for.'));
-    }
-
-    function cli_cmd_run_help()
-    {
-        $argv  = $this->argv;
-        $which = $this->args['']['val'];
-        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') {
-            		self::cli_cmd_run_help_list();
-            		exit(0);
-            	}
-                self::error("Unknown command, cannot retrieve help.\n");
-            }
-
-            $l = strlen($which);
-            $cmds = array($which => $this->cmds[$which]);
-        } else {
-            echo "\n$argv[0] <command> [options]\n\n";
-            $l = 0;
-            ksort($this->cmds);
-            foreach($this->cmds as $name => $funcs) {
-                $l = max($l, strlen($name));
-            }
-            $inf = "Commands:";
-            $lst = "";
-            $ind = strlen($inf) + 1;
-            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)
-        {
-            $inf = $name . substr($sp, strlen($name));
-            if (isset($funcs['inf']))
-            {
-                $inf .= $this->cli_wordwrap(call_user_func(array($this, $funcs['inf'])), $l, $sp) . "\n";
-                if (isset($funcs['arg']))
-                {
-                    $inf .= "\n";
-                    $inf .= $this->cli_help_get_args(array($this, $funcs['arg']), $l, $sp, true);
-                    $inf .= "\n";
-                    $inf .= $this->cli_help_get_args(array($this, $funcs['arg']), $l, $sp, false);
-                }
-            }
-            echo "$inf\n\n";
-        }
-        exit(0);
-    }
-
-    static function cli_cmd_inf_help_list()
-    {
-        return "Lists available commands.";
-    }
-
-    function cli_cmd_run_help_list()
-    {
-        ksort($this->cmds);
-        echo join(' ', array_keys($this->cmds)) . "\n";
-    }
+	protected $argc;
+	protected $argv;
+	protected $cmds = array();
+	protected $args = array();
+	protected $typs = array();
+
+	function __construct($argc, array $argv)
+	{
+		$this->argc = $argc;
+		$this->argv = $argv;
+		$this->cmds = self::getCommands($this);
+		$this->typs = self::getArgTyps($this);
+
+		if ($argc < 2) {
+			self::error("No command given, check ${argv[0]} help\n");
+		} elseif (!isset($this->cmds[$argv[1]]['run'])) {
+			self::error("Unknown command '${argv[1]}', check ${argv[0]} help\n");
+		} else {
+			$command = $argv[1];
+		}
+
+		if (isset($this->cmds[$command]['arg'])) {
+			$this->args = call_user_func(array($this, $this->cmds[$command]['arg']));
+			$i = 1;
+			$missing = false;
+			while (++$i < $argc) {
+				if ($argv[$i][0] == '-') {
+					if (strlen($argv[$i]) == 2 && isset($this->args[$argv[$i][1]])) {
+						$arg = $argv[$i][1];
+						if (++$i >= $argc) {
+							self::error("Missing argument to parameter '$arg' of command '$command', check ${argv[0]} help\n");
+						} else {
+							$this->args[$arg]['val'] = $this->checkArgTyp($arg, $i, $argc, $argv);
+						}
+					}  else {
+						self::error("Unknown parameter '${argv[$i]}' to command $command, check ${argv[0]} help\n");
+					}
+				} else {
+					break;
+				}
+			}
+			if (isset($this->args[''])) {
+				if ($i >= $argc) {
+					if (isset($this->args['']['require']) && $this->args['']['require']) {
+						self::error("Missing default trailing arguments to command $command, check ${argv[0]} help\n");
+					}
+				} else {
+					$this->args['']['val'] = array();
+					while($i < $argc) {
+						$this->args['']['val'][] = $argv[$i++];
+					}
+				}
+			} 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))
+			{
+				self::error($missing);
+			}
+		}
+
+		call_user_func(array($this, $this->cmds[$command]['run']), $this->args);
+	}
+
+	static function notice ($msg)
+	{
+		fprintf(STDERR, $msg);
+	}
+
+	static function error ($msg, $exit_code = 1) 
+	{
+		self::notice($msg);
+		exit($exit_code);
+	}
+
+	function checkArgTyp($arg, $i, $argc, $argv)
+	{
+		$typ = $this->args[$arg]['typ'];
+
+		if (isset($this->typs[$typ]['typ'])) {
+			return call_user_func(array($this, $this->typs[$typ]['typ']), $argv[$i], $this->args[$arg], $arg);
+		} else {
+			return $argv[$i];
+		}
+	}
+
+	static function getSubFuncs(CLICommand $cmdclass, $prefix, array $subs)
+	{
+		$a = array();
+		$r = new ReflectionClass($cmdclass);
+		$l = strlen($prefix);
+
+		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]))
+						{
+							$a[$what] = array();
+						}
+						$a[$what][$sub] = /*$m->class . '::' .*/ $func;
+					}
+				}
+			}
+		}
+		return $a;
+	}
+
+	static function getCommands(CLICommand $cmdclass)
+	{
+		return self::getSubFuncs($cmdclass, 'cli_cmd_', array('arg','inf','run'));
+	}
+
+	static function getArgTyps(CLICommand $cmdclass)
+	{
+		return self::getSubFuncs($cmdclass, 'cli_arg_', array('typ'));
+	}
+
+	static function cli_arg_typ_bool($arg, $cfg, $key)
+	{
+		return (bool)$arg;
+	}
+
+	
+	static function cli_arg_typ_int($arg, $cfg, $key) 
+	{
+		if ((int)$arg != $arg) {
+			self::error("Argument to -$key must be an integer.\n");
+		}
+
+		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)
+			{
+				return $arg;
+			}
+			else
+			{
+				return '/' . $arg . '/';
+			}
+		}
+		else
+		{
+			return NULL;
+		}
+	}
+
+	static function cli_arg_typ_select($arg, $cfg, $key)
+	{
+		if (!in_array($arg, array_keys($cfg['select']))) {
+			self::error("Parameter value '$arg' not one of '" . join("', '", array_keys($cfg['select'])) . "'.\n");
+		}
+		return $arg;
+	}
+
+	static function cli_arg_typ_dir($arg, $cfg, $key)
+	{
+		$f = realpath($arg);
+
+		if ($f===false || !file_exists($f) || !is_dir($f)) {
+			self::error("Requested path '$arg' does not exist.\n");
+		}
+		return $f;
+	}
+
+	static function cli_arg_typ_file($arg)
+	{
+		$f = new SplFileInfo($arg);
+		$f = $f->getRealPath();
+		if ($f===false || !file_exists($f))
+		{
+			echo "Requested file '$arg' does not exist.\n";
+			exit(1);
+		}
+		return $f;
+	}
+
+	static function cli_arg_typ_filenew($arg, $cfg, $key)
+	{
+		$d = dirname($arg);
+		$f = realpath($d);
+		
+		if ($f === false) {
+			self::error("Path for file '$arg' does not exist.\n");
+		}
+		return $f . '/' . basename($arg);
+	}
+
+	static function cli_arg_typ_filecont($arg, $cfg, $key)
+	{
+		return file_get_contents(self::cli_arg_typ_file($arg, $cfg, $key));
+	}
+
+	function cli_get_SP2($l1, $arg_inf)
+	{
+		return str_repeat(' ', $l1 + 2 + 4 + 8);
+	}
+
+	function cli_get_SP3($l1, $l2, $arg_inf)
+	{
+		return str_repeat(' ', $l1 + 2 + 4 + 8 + 2 + $l2 + 2);
+	}
+
+	static function cli_cmd_inf_help()
+	{
+		return "This help or help for a selected command.";
+	}
+
+	private function cli_wordwrap($what, $l, $sp)
+	{
+		$p = max(79 - $l, 40);     // minimum length for paragraph
+		$b = substr($what, 0, $l); // strip out initial $l
+		$r = substr($what, $l);    // remainder
+		$r = str_replace("\n", "\n".$sp, $r); // in remainder replace \n's
+		return $b . wordwrap($r, $p, "\n".$sp);
+	}
+
+	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)
+			{
+				continue;
+			}
+			if (strlen($arg))
+			{
+				$arg = "-$arg  ";
+			}
+			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']))
+			{
+				$ls = 0;
+				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)
+				{
+					$inf .= $this->cli_wordwrap($sp2 . "  " . sprintf("%-${ls}s  ", $opt) . $what, $l3, $sp3) . "\n";
+				}
+			}
+		}
+		if (strlen($inf))
+		{
+			if ($required)
+			{
+				return $sp . "Required arguments:\n\n" . $inf;
+			}
+			else
+			{
+				return $sp . "Optional arguments:\n\n". $inf;
+			}
+		}
+	}
+
+	function cli_cmd_arg_help()
+	{
+		return array('' => array('typ'=>'any','val'=>NULL,'inf'=>'Optional command to retrieve help for.'));
+	}
+
+	function cli_cmd_run_help()
+	{
+		$argv  = $this->argv;
+		$which = $this->args['']['val'];
+		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') {
+					self::cli_cmd_run_help_list();
+					exit(0);
+				}
+				self::error("Unknown command, cannot retrieve help.\n");
+			}
+
+			$l = strlen($which);
+			$cmds = array($which => $this->cmds[$which]);
+		} else {
+			echo "\n$argv[0] <command> [options]\n\n";
+			$l = 0;
+			ksort($this->cmds);
+			foreach($this->cmds as $name => $funcs) {
+				$l = max($l, strlen($name));
+			}
+			$inf = "Commands:";
+			$lst = "";
+			$ind = strlen($inf) + 1;
+			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)
+		{
+			$inf = $name . substr($sp, strlen($name));
+			if (isset($funcs['inf']))
+			{
+				$inf .= $this->cli_wordwrap(call_user_func(array($this, $funcs['inf'])), $l, $sp) . "\n";
+				if (isset($funcs['arg']))
+				{
+					$inf .= "\n";
+					$inf .= $this->cli_help_get_args(array($this, $funcs['arg']), $l, $sp, true);
+					$inf .= "\n";
+					$inf .= $this->cli_help_get_args(array($this, $funcs['arg']), $l, $sp, false);
+				}
+			}
+			echo "$inf\n\n";
+		}
+		exit(0);
+	}
+
+	static function cli_cmd_inf_help_list()
+	{
+		return "Lists available commands.";
+	}
+
+	function cli_cmd_run_help_list()
+	{
+		ksort($this->cmds);
+		echo join(' ', array_keys($this->cmds)) . "\n";
+	}
 }
 
 ?>
diff --git a/ext/phar/phar/directorytreeiterator.inc b/ext/phar/phar/directorytreeiterator.inc
index 8e65d0db12..c75380344f 100755
--- a/ext/phar/phar/directorytreeiterator.inc
+++ b/ext/phar/phar/directorytreeiterator.inc
@@ -40,7 +40,7 @@ class DirectoryTreeIterator extends RecursiveIteratorIterator
 			$tree .= $this->getSubIterator($l)->hasNext() ? '| ' : '  ';
 		}
 		return $tree . ($this->getSubIterator($l)->hasNext() ? '|-' : '\-') 
-		       . $this->getSubIterator($l)->__toString();
+			   . $this->getSubIterator($l)->__toString();
 	}
 
 	/** Aggregates the inner iterator
diff --git a/ext/phar/phar/phar.php b/ext/phar/phar/phar.php
index 68a437b206..85a54528e4 100755
--- a/ext/phar/phar/phar.php
+++ b/ext/phar/phar/phar.php
@@ -14,38 +14,38 @@ if (!extension_loaded('phar'))
 {
 	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()))
-    {
-	    stream_wrapper_register('phar', 'PHP_Archive');
-    }
-    if (!class_exists('Phar',0)) {
-	    require 'phar://'.__FILE__.'/phar.inc';
-    }
+		echo "Neither Extension Phar nor class PHP_Archive are available.\n";
+		exit(1);
+	}
+	if (!in_array('phar', stream_get_wrappers()))
+	{
+		stream_wrapper_register('phar', 'PHP_Archive');
+	}
+	if (!class_exists('Phar',0)) {
+		require 'phar://'.__FILE__.'/phar.inc';
+	}
 }
 
 foreach(array("SPL", "Reflection") as $ext)
 {
-    if (!extension_loaded($ext))
-    {
-        echo "$argv[0] requires PHP extension $ext.\n";
-        exit(1);
-    }
+	if (!extension_loaded($ext))
+	{
+		echo "$argv[0] requires PHP extension $ext.\n";
+		exit(1);
+	}
 }
 
 function command_include($file)
 {
-    $file = 'phar://' . __FILE__ . '/' . $file;
-    if (file_exists($file)) {
-        include($file);
-    }
+	$file = 'phar://' . __FILE__ . '/' . $file;
+	if (file_exists($file)) {
+		include($file);
+	}
 }
 
 function command_autoload($classname)
 {
-    command_include(strtolower($classname) . '.inc');
+	command_include(strtolower($classname) . '.inc');
 }
 
 Phar::mapPhar();
diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc
index 67e1dbe594..02dbe8858d 100755
--- a/ext/phar/phar/pharcommand.inc
+++ b/ext/phar/phar/pharcommand.inc
@@ -24,380 +24,380 @@
  */
 class PharCommand extends CLICommand
 {
-    // {{{ public function cli_get_SP2
-    public function cli_get_SP2($l1, $arg_inf)
-    {
-        return str_repeat(' ', $l1 + 2 + 4 + 9);
-    }
-    // }}}
-    // {{{ public function cli_get_SP3
-    /**
-     * Cli Get SP3
-     *
-     * @param string $l1      Eleven
-     * @param string $l2      Twelve
-     * @param string $arg_inf 
-     * @return string  The repeated string.
-     */
-    function cli_get_SP3($l1, $l2, $arg_inf)
-    {
-        return str_repeat(' ', $l1 + 2 + 4 + 9 + 2 + $l2 + 2);
-    }
-    // }}}
-    // {{{ static function phar_args
-    /**
-     * Phar arguments
-     * 
-     * This function contains all the phar commands
-     *
-     * @param  string $which    Which argument is chosen.
-     * @param  string $phartype The type of phar, specific file to work on
-     * @return unknown
-     */
-    static function phar_args($which, $phartype)
-    {
-        $phar_args = array(
-            'a' => array(
-                'typ' => 'alias',
-                'val' => NULL,
-                'inf' => '<alias>  Provide an alias name for the phar file.'
-            ),
-            'b' => array(
-                'typ' => 'any',
-                'val' => NULL,
-                'inf' => '<bang>   Hash-bang line to start the archive (e.g. #!/usr/bin/php). The hash '
-                         .'         mark itself \'#!\' and the newline character are optional.'
-            ),
-            'c' => array(
-                'typ' => 'compalg',
-                'val' => NULL,
-                'inf' => '<algo>   Compression algorithm.',
-                'select' => array(
-                    '0'    => 'No compression',
-                    'none' => 'No compression',
-                    'auto' => 'Automatically select compression algorithm'
-                )
-            ),
-            'e' => array(
-                'typ' => 'entry',
-                'val' => NULL,
-                'inf' => '<entry>  Name of entry to work on (must include PHAR internal directory name if any).'
-            ),
-            'f' => array(
-                'typ' => $phartype,
-                'val' => NULL,
-                'inf' => '<file>   Specifies the phar file to work on.'
-            ),
-            'h' => array(
-                'typ' => 'select',
-                'val' => NULL,
-                'inf' => '<method> Selects the hash algorithmn.',
-                'select' => array('md5' => 'MD5','sha1' => 'SHA1')
-            ),
-            'i' => array(
-                'typ' => 'regex',
-                'val' => NULL,
-                'inf' => '<regex>  Specifies a regular expression for input files.'
-            ),
-            'k' => array(
-                'typ' => 'any',
-                'val' => NULL,
-                'inf' => '<index>  Subscription index to work on.',
-            ),
-            'l' => array(
-                'typ' => 'int',
-                'val' => 0,
-                'inf' => '<level>  Number of preceeding subdirectories to strip from file entries',
-            ),
-            'm' => array(
-                'typ' => 'any',
-                'val' => NULL,
-                'inf' => '<meta>   Meta data to store with entry (serialized php data).'
-            ),
-            'p' => array(
-                'typ' => 'loader',
-                'val' => NULL,
-                'inf' => '<loader> Location of PHP_Archive class file (pear list-files PHP_Archive).'
-                         .'You can use \'0\' or \'1\' to locate it automatically using the mentioned '
-                         .'pear command. When using \'0\' the command does not error out when the '
-                         .'class file cannot be located. This switch also adds some code around the '
-                         .'stub so that class PHP_Archive gets registered as phar:// stream wrapper '
-                         .'if necessary. And finally this switch will add the file phar.inc from '
-                         .'this package and load it to ensure class Phar is present.'
-                         ,
-            ),
-            's' => array(
-                'typ' => 'file',
-                'val' => NULL,
-                'inf' => '<stub>   Select the stub file.'
-            ),
-            'x' => array(
-                'typ' => 'regex',
-                'val' => NULL,
-                'inf' => '<regex>  Regular expression for input files to exclude.'
-            ),
-            'y' => array(
-            	'typ' => 'privkey',
-            	'val' => NULL,
-            	'inf' => 'Private key for OpenSSL signing.',
-            ),
-        );
+	// {{{ public function cli_get_SP2
+	public function cli_get_SP2($l1, $arg_inf)
+	{
+		return str_repeat(' ', $l1 + 2 + 4 + 9);
+	}
+	// }}}
+	// {{{ public function cli_get_SP3
+	/**
+	 * Cli Get SP3
+	 *
+	 * @param string $l1      Eleven
+	 * @param string $l2      Twelve
+	 * @param string $arg_inf 
+	 * @return string  The repeated string.
+	 */
+	function cli_get_SP3($l1, $l2, $arg_inf)
+	{
+		return str_repeat(' ', $l1 + 2 + 4 + 9 + 2 + $l2 + 2);
+	}
+	// }}}
+	// {{{ static function phar_args
+	/**
+	 * Phar arguments
+	 * 
+	 * This function contains all the phar commands
+	 *
+	 * @param  string $which    Which argument is chosen.
+	 * @param  string $phartype The type of phar, specific file to work on
+	 * @return unknown
+	 */
+	static function phar_args($which, $phartype)
+	{
+		$phar_args = array(
+			'a' => array(
+				'typ' => 'alias',
+				'val' => NULL,
+				'inf' => '<alias>  Provide an alias name for the phar file.'
+			),
+			'b' => array(
+				'typ' => 'any',
+				'val' => NULL,
+				'inf' => '<bang>   Hash-bang line to start the archive (e.g. #!/usr/bin/php). The hash '
+						 .'         mark itself \'#!\' and the newline character are optional.'
+			),
+			'c' => array(
+				'typ' => 'compalg',
+				'val' => NULL,
+				'inf' => '<algo>   Compression algorithm.',
+				'select' => array(
+					'0'    => 'No compression',
+					'none' => 'No compression',
+					'auto' => 'Automatically select compression algorithm'
+				)
+			),
+			'e' => array(
+				'typ' => 'entry',
+				'val' => NULL,
+				'inf' => '<entry>  Name of entry to work on (must include PHAR internal directory name if any).'
+			),
+			'f' => array(
+				'typ' => $phartype,
+				'val' => NULL,
+				'inf' => '<file>   Specifies the phar file to work on.'
+			),
+			'h' => array(
+				'typ' => 'select',
+				'val' => NULL,
+				'inf' => '<method> Selects the hash algorithmn.',
+				'select' => array('md5' => 'MD5','sha1' => 'SHA1')
+			),
+			'i' => array(
+				'typ' => 'regex',
+				'val' => NULL,
+				'inf' => '<regex>  Specifies a regular expression for input files.'
+			),
+			'k' => array(
+				'typ' => 'any',
+				'val' => NULL,
+				'inf' => '<index>  Subscription index to work on.',
+			),
+			'l' => array(
+				'typ' => 'int',
+				'val' => 0,
+				'inf' => '<level>  Number of preceeding subdirectories to strip from file entries',
+			),
+			'm' => array(
+				'typ' => 'any',
+				'val' => NULL,
+				'inf' => '<meta>   Meta data to store with entry (serialized php data).'
+			),
+			'p' => array(
+				'typ' => 'loader',
+				'val' => NULL,
+				'inf' => '<loader> Location of PHP_Archive class file (pear list-files PHP_Archive).'
+						 .'You can use \'0\' or \'1\' to locate it automatically using the mentioned '
+						 .'pear command. When using \'0\' the command does not error out when the '
+						 .'class file cannot be located. This switch also adds some code around the '
+						 .'stub so that class PHP_Archive gets registered as phar:// stream wrapper '
+						 .'if necessary. And finally this switch will add the file phar.inc from '
+						 .'this package and load it to ensure class Phar is present.'
+						 ,
+			),
+			's' => array(
+				'typ' => 'file',
+				'val' => NULL,
+				'inf' => '<stub>   Select the stub file.'
+			),
+			'x' => array(
+				'typ' => 'regex',
+				'val' => NULL,
+				'inf' => '<regex>  Regular expression for input files to exclude.'
+			),
+			'y' => array(
+				'typ' => 'privkey',
+				'val' => NULL,
+				'inf' => 'Private key for OpenSSL signing.',
+			),
+		);
 
-        if (extension_loaded('zlib')) {
-            $phar_args['c']['select']['gz']    = 'GZip compression';
-            $phar_args['c']['select']['gzip']  = 'GZip compression';
-        }
+		if (extension_loaded('zlib')) {
+			$phar_args['c']['select']['gz']    = 'GZip compression';
+			$phar_args['c']['select']['gzip']  = 'GZip compression';
+		}
 
-        if (extension_loaded('bz2')) {
-            $phar_args['c']['select']['bz2']   = 'BZip2 compression';
-            $phar_args['c']['select']['bzip2'] = 'BZip2 compression';
-        }
+		if (extension_loaded('bz2')) {
+			$phar_args['c']['select']['bz2']   = 'BZip2 compression';
+			$phar_args['c']['select']['bzip2'] = 'BZip2 compression';
+		}
 
-        $hash_avail = Phar::getSupportedSignatures();
-        $hash_optional = array('SHA-256' => 'SHA256',
-                               'SHA-512' => 'SHA512',
-                               'OpenSSL' => 'OpenSSL');
-        foreach($hash_optional as $key => $name)
-        {
-        	if (in_array($key, $hash_avail)) {
-            	$phar_args['h']['select'][strtolower($name)] = $name;
-            }
-        }
+		$hash_avail = Phar::getSupportedSignatures();
+		$hash_optional = array('SHA-256' => 'SHA256',
+							   'SHA-512' => 'SHA512',
+							   'OpenSSL' => 'OpenSSL');
+		foreach($hash_optional as $key => $name)
+		{
+			if (in_array($key, $hash_avail)) {
+				$phar_args['h']['select'][strtolower($name)] = $name;
+			}
+		}
 
-        $args = array();
+		$args = array();
 
-        foreach($phar_args as $lkey => $cfg) {
-            $ukey     = strtoupper($lkey);
-            $required = strpos($which, $ukey) !== false;
-            $optional = strpos($which, $lkey) !== false;
+		foreach($phar_args as $lkey => $cfg) {
+			$ukey     = strtoupper($lkey);
+			$required = strpos($which, $ukey) !== false;
+			$optional = strpos($which, $lkey) !== false;
 
-            if ($required || $optional) {
-                $args[$lkey] = $cfg;
-                $args[$lkey]['required'] = $required;
-            }
-        }
-        return $args;
-    }
-    // }}}
-    // {{{ static function strEndsWith
-    /**
-     * String Ends With
-     * 
-     * Wether a string end with another needle.
-     *
-     * @param string $haystack  The haystack
-     * @param string $needle    The needle.
-     * @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)
-    {
-        return substr($haystack, -strlen($needle)) == $needle;
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_loader
-    /**
-     * Argument type loader
-     *
-     * @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 
-     * @return string $arg  The argument.
-     */
-    static function cli_arg_typ_loader($arg, $cfg, $key)
-    {
-        if (($arg == '0' || $arg == '1') && !file_exists($arg)) {
-            $found = NULL;
-            $apiver = `pear -q info PHP_Archive 2>/dev/null|grep 'API Version'`;
-            $apiver = trim(substr($apiver, strlen('API Version')));
-            if ($apiver) {
-                self::notice("Pear package PHP_Archive: API Version: $apiver.\n");
-                $files  = split("\n", `pear list-files PHP_Archive`);
-                $phpdir = `pear config-get php_dir 2>/dev/null`;
-                $phpdir = trim($phpdir);
-                self::notice("Pear package PHP_Archive: $phpdir.\n");
-                if (is_dir($phpdir)) {
-                    foreach($files as $ent) {
-                        $matches = NULL;
-                        if (preg_match(",^php[ \t]+([^ \t].*[\\\\/]PHP[\\\\/]Archive\.php)$,", $ent, $matches)) {
-                            $sub = $matches[1];
-                            if (strpos($sub, $phpdir) !== 0) {
-                                $found = NULL;
-                                break;
-                            }
-                            $found = $sub;
-                            break;
-                        }
-                    }
-                } else {
-                    self::notice("Pear package PHP_Archive: corrupt or inaccessible base dir: $php_dir.\n");
-                }
-            }
-            if (isset($found)) {
-                self::notice("Pear package PHP_Archive: $found.\n");
-            } else {
-                $msg = "Pear package PHP_Archive or Archive.php class file not found.\n";
-                if ($arg == '0') {
-                    self::notice($msg);
-                } else {
-                    self::error($msg);
-                }
-            }
-            $arg = $found;
-        }
-        return self::cli_arg_typ_file($arg);
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_pharnew
-    /**
-     * Argument type new phar
-     *
-     * @param  string $arg  The new phar component.
-     * @param  string $cfg  Configuration to pass to a new file
-     * @param  string $key  The key 
-     * @return string $arg  The new argument file.
-     */
-    static function cli_arg_typ_pharnew($arg, $cfg, $key)
-    {
-        $arg = self::cli_arg_typ_filenew($arg, $cfg, $key);
-        if (!Phar::isValidPharFilename($arg)) {
-            self::error("Phar files must have file extension '.phar', '.phar.php', '.phar.bz2' or '.phar.gz'.\n");
-        }
-        return $arg;
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_pharfile
-    /**
-     * Argument type existing Phar file
-     * 
-     * Return filenam eof an existing Phar.
-     *
-     * @param  string $arg      The file in the phar to open.
-     * @param  string $cfg      The configuration information
-     * @param  string $key      The key information.
-     * @return string $pharfile The name of the loaded Phar file.
-     * @note The Phar will be loaded
-     */
-    static function cli_arg_typ_pharfile($arg, $cfg, $key)
-    {
-        try {
-            $pharfile = self::cli_arg_typ_file($arg, $cfg, $key);
+			if ($required || $optional) {
+				$args[$lkey] = $cfg;
+				$args[$lkey]['required'] = $required;
+			}
+		}
+		return $args;
+	}
+	// }}}
+	// {{{ static function strEndsWith
+	/**
+	 * String Ends With
+	 * 
+	 * Wether a string end with another needle.
+	 *
+	 * @param string $haystack  The haystack
+	 * @param string $needle    The needle.
+	 * @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)
+	{
+		return substr($haystack, -strlen($needle)) == $needle;
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_loader
+	/**
+	 * Argument type loader
+	 *
+	 * @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 
+	 * @return string $arg  The argument.
+	 */
+	static function cli_arg_typ_loader($arg, $cfg, $key)
+	{
+		if (($arg == '0' || $arg == '1') && !file_exists($arg)) {
+			$found = NULL;
+			$apiver = `pear -q info PHP_Archive 2>/dev/null|grep 'API Version'`;
+			$apiver = trim(substr($apiver, strlen('API Version')));
+			if ($apiver) {
+				self::notice("Pear package PHP_Archive: API Version: $apiver.\n");
+				$files  = split("\n", `pear list-files PHP_Archive`);
+				$phpdir = `pear config-get php_dir 2>/dev/null`;
+				$phpdir = trim($phpdir);
+				self::notice("Pear package PHP_Archive: $phpdir.\n");
+				if (is_dir($phpdir)) {
+					foreach($files as $ent) {
+						$matches = NULL;
+						if (preg_match(",^php[ \t]+([^ \t].*[\\\\/]PHP[\\\\/]Archive\.php)$,", $ent, $matches)) {
+							$sub = $matches[1];
+							if (strpos($sub, $phpdir) !== 0) {
+								$found = NULL;
+								break;
+							}
+							$found = $sub;
+							break;
+						}
+					}
+				} else {
+					self::notice("Pear package PHP_Archive: corrupt or inaccessible base dir: $php_dir.\n");
+				}
+			}
+			if (isset($found)) {
+				self::notice("Pear package PHP_Archive: $found.\n");
+			} else {
+				$msg = "Pear package PHP_Archive or Archive.php class file not found.\n";
+				if ($arg == '0') {
+					self::notice($msg);
+				} else {
+					self::error($msg);
+				}
+			}
+			$arg = $found;
+		}
+		return self::cli_arg_typ_file($arg);
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_pharnew
+	/**
+	 * Argument type new phar
+	 *
+	 * @param  string $arg  The new phar component.
+	 * @param  string $cfg  Configuration to pass to a new file
+	 * @param  string $key  The key 
+	 * @return string $arg  The new argument file.
+	 */
+	static function cli_arg_typ_pharnew($arg, $cfg, $key)
+	{
+		$arg = self::cli_arg_typ_filenew($arg, $cfg, $key);
+		if (!Phar::isValidPharFilename($arg)) {
+			self::error("Phar files must have file extension '.phar', '.phar.php', '.phar.bz2' or '.phar.gz'.\n");
+		}
+		return $arg;
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_pharfile
+	/**
+	 * Argument type existing Phar file
+	 * 
+	 * Return filenam eof an existing Phar.
+	 *
+	 * @param  string $arg      The file in the phar to open.
+	 * @param  string $cfg      The configuration information
+	 * @param  string $key      The key information.
+	 * @return string $pharfile The name of the loaded Phar file.
+	 * @note The Phar will be loaded
+	 */
+	static function cli_arg_typ_pharfile($arg, $cfg, $key)
+	{
+		try {
+			$pharfile = self::cli_arg_typ_file($arg, $cfg, $key);
 
-            if (!Phar::loadPhar($pharfile)) {
-                self::error("Unable to open phar '$arg'\n");
-            }
+			if (!Phar::loadPhar($pharfile)) {
+				self::error("Unable to open phar '$arg'\n");
+			}
 
-            return $pharfile;
-        } catch(Exception $e) {
-            self::error("Exception while opening phar '$arg':\n" . $e->getMessage() . "\n");
-        }
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_pharurl
-    /**
-     * Argument type Phar url-like
-     * 
-     * Check the argument as cli_arg_Typ_phar and return its name prefixed 
-     * with phar://
-     * 
-     * Ex:
-     * <code>
-     *  $arg = 'pharchive.phar/file.php';
-     *  cli_arg_typ_pharurl($arg)
-     * </code>
-     *
-     * @param  string $arg The url-like phar archive to retrieve.
-     * @return string The phar file-archive.
-     */
-    static function cli_arg_typ_pharurl($arg, $cfg, $key)
-    {
-        return 'phar://' . self::cli_arg_typ_pharfile($arg, $cfg, $key);
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_phar
-    /**
-     * Cli argument type phar
-     *
-     * @param  string $arg  The phar archive to use.
-     * @return object new Phar of the passed argument.
-     */
-    static function cli_arg_typ_phar($arg, $cfg, $key)
-    {
-        try {
-            return new Phar(self::cli_arg_typ_pharfile($arg, $cfg, $key));
-        } catch(Exception $e) {
-            self::error("Exception while opening phar '$argv':\n" . $e->getMessage() . "\n");
-        }
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_entry
-    /**
-     * Argument type Entry name
-     *
-     * @param  string $arg The argument (the entry)
-     * @return string $arg The entry itself.
-     */
-    static function cli_arg_typ_entry($arg, $cfg, $key)
-    {
-        // no further check atm, maybe check for no '/' at beginning
-        return $arg;
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_compalg
-    /**
-     * Argument type compression algorithm
-     *
-     * @param  string $arg  The phar selection
-     * @param  string $cfg  The config option.
-     * @param  string $key  The key information.
-     * @return string $arg  The selected algorithm
-     */
-    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')) {
-                    $arg = 'gz';
-                } elseif (extension_loaded('bz2')) {
-                    $arg = 'bz2';
-                } else {
-                    $arg = '0';
-                }
-                break;
-        }
-        return $arg;
-    }
-    // }}}
-    // {{{ static function cli_arg_typ_privkey
-    /**
-     * Argument type private key (for OpenSSL signing)
-     *
-     * @param  string $arg  The phar selection
-     * @param  string $cfg  The config option.
-     * @param  string $key  The key information.
-     * @return string $arg  The selected algorithm
-     */
-    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))
-        {
-        	self::error("Cannot specifiy private key without OpenSSL support.\n");
-        }
-        return $arg;
-    }
-    // }}}
-    // {{{ static function phar_check_hash
-    /**
-     * Check whether hash method is valid.
-     *
-     * @return Hash constant to be used.
-     */
+			return $pharfile;
+		} catch(Exception $e) {
+			self::error("Exception while opening phar '$arg':\n" . $e->getMessage() . "\n");
+		}
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_pharurl
+	/**
+	 * Argument type Phar url-like
+	 * 
+	 * Check the argument as cli_arg_Typ_phar and return its name prefixed 
+	 * with phar://
+	 * 
+	 * Ex:
+	 * <code>
+	 *  $arg = 'pharchive.phar/file.php';
+	 *  cli_arg_typ_pharurl($arg)
+	 * </code>
+	 *
+	 * @param  string $arg The url-like phar archive to retrieve.
+	 * @return string The phar file-archive.
+	 */
+	static function cli_arg_typ_pharurl($arg, $cfg, $key)
+	{
+		return 'phar://' . self::cli_arg_typ_pharfile($arg, $cfg, $key);
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_phar
+	/**
+	 * Cli argument type phar
+	 *
+	 * @param  string $arg  The phar archive to use.
+	 * @return object new Phar of the passed argument.
+	 */
+	static function cli_arg_typ_phar($arg, $cfg, $key)
+	{
+		try {
+			return new Phar(self::cli_arg_typ_pharfile($arg, $cfg, $key));
+		} catch(Exception $e) {
+			self::error("Exception while opening phar '$argv':\n" . $e->getMessage() . "\n");
+		}
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_entry
+	/**
+	 * Argument type Entry name
+	 *
+	 * @param  string $arg The argument (the entry)
+	 * @return string $arg The entry itself.
+	 */
+	static function cli_arg_typ_entry($arg, $cfg, $key)
+	{
+		// no further check atm, maybe check for no '/' at beginning
+		return $arg;
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_compalg
+	/**
+	 * Argument type compression algorithm
+	 *
+	 * @param  string $arg  The phar selection
+	 * @param  string $cfg  The config option.
+	 * @param  string $key  The key information.
+	 * @return string $arg  The selected algorithm
+	 */
+	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')) {
+					$arg = 'gz';
+				} elseif (extension_loaded('bz2')) {
+					$arg = 'bz2';
+				} else {
+					$arg = '0';
+				}
+				break;
+		}
+		return $arg;
+	}
+	// }}}
+	// {{{ static function cli_arg_typ_privkey
+	/**
+	 * Argument type private key (for OpenSSL signing)
+	 *
+	 * @param  string $arg  The phar selection
+	 * @param  string $cfg  The config option.
+	 * @param  string $key  The key information.
+	 * @return string $arg  The selected algorithm
+	 */
+	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))
+		{
+			self::error("Cannot specifiy private key without OpenSSL support.\n");
+		}
+		return $arg;
+	}
+	// }}}
+	// {{{ static function phar_check_hash
+	/**
+	 * Check whether hash method is valid.
+	 *
+	 * @return Hash constant to be used.
+	 */
 	function phar_check_hash($hash, $privkey)
 	{
 		switch($hash)
@@ -411,1151 +411,1151 @@ class PharCommand extends CLICommand
 			case 'sha512':
 				return Phar::SHA512;
 			case 'openssl':
-    	    	if (!$privkey)
-        		{
-        			self::error("Cannot use OpenSSL signing without key.\n");
-        		}
-	        	return Phar::OPENSSL;
-        }
-    }
-	// }}}
-    // {{{ static function cli_cmd_inf_pack
-    /**
-     * Information pack
-     *
-     * @return string A description about packing files into a Phar archive.
-     */
-    static function cli_cmd_inf_pack()
-    {
-        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 " .
-               "then point -p argument to PHP/Archive.php.\n";
-    }
-    // }}}
-    // {{{ static function cli_cmd_arg_pack
-    /**
-     * Pack a new phar infos
-     *
-     * @return array  $args  The arguments for a new Phar archive.
-     */
-    static function cli_cmd_arg_pack()
-    {
-        $args = self::phar_args('abcFhilpsxy', 'pharnew');
-        
-        $args[''] = array(
-            '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;
-    }
-    // }}}
-    // {{{ function phar_set_stub_begin
-    /**
-     * Set the stub
-     */
-    public function phar_set_stub_begin(Phar $phar, $stub, $loader = NULL, $hashbang = NULL)
-    {
-        if (isset($stub)) {
-            $c = file_get_contents($stub);
+				if (!$privkey)
+				{
+					self::error("Cannot use OpenSSL signing without key.\n");
+				}
+				return Phar::OPENSSL;
+		}
+	}
+	// }}}
+	// {{{ static function cli_cmd_inf_pack
+	/**
+	 * Information pack
+	 *
+	 * @return string A description about packing files into a Phar archive.
+	 */
+	static function cli_cmd_inf_pack()
+	{
+		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 " .
+			   "then point -p argument to PHP/Archive.php.\n";
+	}
+	// }}}
+	// {{{ static function cli_cmd_arg_pack
+	/**
+	 * Pack a new phar infos
+	 *
+	 * @return array  $args  The arguments for a new Phar archive.
+	 */
+	static function cli_cmd_arg_pack()
+	{
+		$args = self::phar_args('abcFhilpsxy', 'pharnew');
+		
+		$args[''] = array(
+			'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;
+	}
+	// }}}
+	// {{{ function phar_set_stub_begin
+	/**
+	 * Set the stub
+	 */
+	public function phar_set_stub_begin(Phar $phar, $stub, $loader = NULL, $hashbang = NULL)
+	{
+		if (isset($stub)) {
+			$c = file_get_contents($stub);
 
-            if (substr($c, 0, 2) == '#!') {
-                if (strpos($c, "\n") !== false) {
-                    if (!isset($hashbang)) {
-                        $hashbang = substr($c, 0, strpos($c, "\n") + 1);
-                    }
-                    $c = substr($c, strpos($c, "\n") + 1);
-                } else {
-                    if (!isset($hashbang)) {
-                        $hashbang = $c;
-                    }
-                    $c = NULL;
-                }
-            }
+			if (substr($c, 0, 2) == '#!') {
+				if (strpos($c, "\n") !== false) {
+					if (!isset($hashbang)) {
+						$hashbang = substr($c, 0, strpos($c, "\n") + 1);
+					}
+					$c = substr($c, strpos($c, "\n") + 1);
+				} else {
+					if (!isset($hashbang)) {
+						$hashbang = $c;
+					}
+					$c = NULL;
+				}
+			}
 
-            if (isset($hashbang)) {
-                if (substr($hashbang, 0, 2) != '#!') {
-                    $hashbang = '#!' . $hashbang;
-                }
-                if (substr($hashbang, -1) != "\n") {
-                    $hashbang .= "\n";
-                }
-            } else {
-            	$hashbang = "";
-            }
+			if (isset($hashbang)) {
+				if (substr($hashbang, 0, 2) != '#!') {
+					$hashbang = '#!' . $hashbang;
+				}
+				if (substr($hashbang, -1) != "\n") {
+					$hashbang .= "\n";
+				}
+			} else {
+				$hashbang = "";
+			}
 
-            if (isset($loader)) {
-                $s = "<?php if (!class_exists('PHP_Archive')) {\n?>";
-                $s .= file_get_contents($loader);
-                $s .= "<?php\n";
-                $s .= "}\n";
-                $s .= "if (!in_array('phar', stream_get_wrappers())) {\n";
-                $s .= "\tstream_wrapper_register('phar', 'PHP_Archive');\n";
-                $s .= "}\n";
-                $s .= "if (!class_exists('Phar',0)) {\n";
-                $s .= "\tinclude 'phar://'.__FILE__.'/phar.inc';\n";
-                $s .= "}\n";
-                $s .= '?>';
-                $s .= $c;
+			if (isset($loader)) {
+				$s = "<?php if (!class_exists('PHP_Archive')) {\n?>";
+				$s .= file_get_contents($loader);
+				$s .= "<?php\n";
+				$s .= "}\n";
+				$s .= "if (!in_array('phar', stream_get_wrappers())) {\n";
+				$s .= "\tstream_wrapper_register('phar', 'PHP_Archive');\n";
+				$s .= "}\n";
+				$s .= "if (!class_exists('Phar',0)) {\n";
+				$s .= "\tinclude 'phar://'.__FILE__.'/phar.inc';\n";
+				$s .= "}\n";
+				$s .= '?>';
+				$s .= $c;
 
-                $phar->setStub($hashbang . $s);
-            } else {
-                $phar->setStub($hashbang . $c);
-            }
-            return new SplFileInfo($stub);
-        }
-        return NULL;
-    }
-    // }}}
-    // {{{ function phar_set_stub_end
-    /**
-     * Set stub end
-     */
-    public function phar_set_stub_end(Phar $phar, $stub, $loader = NULL)
-    {
-        if (isset($stub) && isset($loader)) {
-            if (substr(__FILE__, -15) == 'pharcommand.inc') {
-                self::phar_add_file($phar, 0, 'phar.inc', 'phar://'.__FILE__.'/phar.inc', NULL);
-            } else {
-                self::phar_add_file($phar, 0, 'phar.inc', dirname(__FILE__).'/phar/phar.inc', NULL);
-            }
-        }
-    }
-    // }}}
-    // {{{ function cli_cmd_run_pack
-    /**
-     * Pack a new Phar
-     * 
-     * This function will try to pack a new Phar archive.
-     * 
-     * @see Exit to make sure that we are done.
-     */
-    public function cli_cmd_run_pack()
-    {
-        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");
-        }
+				$phar->setStub($hashbang . $s);
+			} else {
+				$phar->setStub($hashbang . $c);
+			}
+			return new SplFileInfo($stub);
+		}
+		return NULL;
+	}
+	// }}}
+	// {{{ function phar_set_stub_end
+	/**
+	 * Set stub end
+	 */
+	public function phar_set_stub_end(Phar $phar, $stub, $loader = NULL)
+	{
+		if (isset($stub) && isset($loader)) {
+			if (substr(__FILE__, -15) == 'pharcommand.inc') {
+				self::phar_add_file($phar, 0, 'phar.inc', 'phar://'.__FILE__.'/phar.inc', NULL);
+			} else {
+				self::phar_add_file($phar, 0, 'phar.inc', dirname(__FILE__).'/phar/phar.inc', NULL);
+			}
+		}
+	}
+	// }}}
+	// {{{ function cli_cmd_run_pack
+	/**
+	 * Pack a new Phar
+	 * 
+	 * This function will try to pack a new Phar archive.
+	 * 
+	 * @see Exit to make sure that we are done.
+	 */
+	public function cli_cmd_run_pack()
+	{
+		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");
+		}
 
-        $alias    = $this->args['a']['val'];
-        $hashbang = $this->args['b']['val'];
-        $archive  = $this->args['f']['val'];
-        $hash     = $this->args['h']['val'];
-        $privkey  = $this->args['y']['val'];
-        $regex    = $this->args['i']['val'];
-        $level    = $this->args['l']['val'];
-        $loader   = $this->args['p']['val'];
-        $stub     = $this->args['s']['val'];
-        $invregex = $this->args['x']['val'];
-        $input    = $this->args['']['val'];
+		$alias    = $this->args['a']['val'];
+		$hashbang = $this->args['b']['val'];
+		$archive  = $this->args['f']['val'];
+		$hash     = $this->args['h']['val'];
+		$privkey  = $this->args['y']['val'];
+		$regex    = $this->args['i']['val'];
+		$level    = $this->args['l']['val'];
+		$loader   = $this->args['p']['val'];
+		$stub     = $this->args['s']['val'];
+		$invregex = $this->args['x']['val'];
+		$input    = $this->args['']['val'];
 
 		$hash = self::phar_check_hash($hash, $privkey);
 
-        $phar  = new Phar($archive, 0, $alias);
+		$phar  = new Phar($archive, 0, $alias);
 
-        $phar->startBuffering();
+		$phar->startBuffering();
 
-        $stub = $this->phar_set_stub_begin($phar, $stub, $loader, $hashbang);
+		$stub = $this->phar_set_stub_begin($phar, $stub, $loader, $hashbang);
 
-        if (!is_array($input)) {
-            $this->phar_add($phar, $level, $input, $regex, $invregex, $stub, NULL, isset($loader));
-        } else {
-            foreach($input as $i) {
-                $this->phar_add($phar, $level, $i, $regex, $invregex, $stub, NULL, isset($loader));
-            }
-        }
+		if (!is_array($input)) {
+			$this->phar_add($phar, $level, $input, $regex, $invregex, $stub, NULL, isset($loader));
+		} else {
+			foreach($input as $i) {
+				$this->phar_add($phar, $level, $i, $regex, $invregex, $stub, NULL, isset($loader));
+			}
+		}
 
-        $this->phar_set_stub_end($phar, $stub, $loader);
+		$this->phar_set_stub_end($phar, $stub, $loader);
 
-        switch($this->args['c']['val']) {
-            case 'gz':
-            case 'gzip':
-                $phar->compressFiles(Phar::GZ);
-                break;
-            case 'bz2':
-            case 'bzip2':
-                $phar->compressFiles(Phar::BZ2);
-                break;
-            default:
-                $phar->decompressFiles();;
-                break;
-        }
+		switch($this->args['c']['val']) {
+			case 'gz':
+			case 'gzip':
+				$phar->compressFiles(Phar::GZ);
+				break;
+			case 'bz2':
+			case 'bzip2':
+				$phar->compressFiles(Phar::BZ2);
+				break;
+			default:
+				$phar->decompressFiles();;
+				break;
+		}
 
-        if ($hash)
-        {
-            $phar->setSignatureAlgorithm($hash, $privkey);
-        }
+		if ($hash)
+		{
+			$phar->setSignatureAlgorithm($hash, $privkey);
+		}
 
-        $phar->stopBuffering();
-        exit(0);
-    }
-    // }}}
-    // {{{ static function phar_add
-    /**
-     * Add files to a phar archive.
-     *
-     * This function will take a directory and iterate through
-     * it and get the files to insert into the Phar archive.
-     * 
-     * @param Phar        $phar      The phar object.
-     * @param string      $input     The input directory
-     * @param string      $regex     The regex use in RegexIterator.
-     * @param string      $invregex  The InvertedRegexIterator expression.
-     * @param SplFileInfo $stub Stub file object    
-     * @param mixed       $compress  Compression algorithm or NULL
-     * @param boolean     $noloader  Whether to prevent adding the loader
-     */
-    static function phar_add(Phar $phar, $level, $input, $regex, $invregex, SplFileInfo $stub = NULL, $compress = NULL, $noloader = false)
-    {
-        if ($input && is_file($input) && !is_dir($input)) {
-            return self::phar_add_file($phar, $level, $input, $input, $compress);
-        }
-        $dir   = new RecursiveDirectoryIterator($input);
-        $dir   = new RecursiveIteratorIterator($dir);
+		$phar->stopBuffering();
+		exit(0);
+	}
+	// }}}
+	// {{{ static function phar_add
+	/**
+	 * Add files to a phar archive.
+	 *
+	 * This function will take a directory and iterate through
+	 * it and get the files to insert into the Phar archive.
+	 * 
+	 * @param Phar        $phar      The phar object.
+	 * @param string      $input     The input directory
+	 * @param string      $regex     The regex use in RegexIterator.
+	 * @param string      $invregex  The InvertedRegexIterator expression.
+	 * @param SplFileInfo $stub Stub file object    
+	 * @param mixed       $compress  Compression algorithm or NULL
+	 * @param boolean     $noloader  Whether to prevent adding the loader
+	 */
+	static function phar_add(Phar $phar, $level, $input, $regex, $invregex, SplFileInfo $stub = NULL, $compress = NULL, $noloader = false)
+	{
+		if ($input && is_file($input) && !is_dir($input)) {
+			return self::phar_add_file($phar, $level, $input, $input, $compress);
+		}
+		$dir   = new RecursiveDirectoryIterator($input);
+		$dir   = new RecursiveIteratorIterator($dir);
 
-        if (isset($regex)) {
-            $dir = new RegexIterator($dir, $regex);
-        }
+		if (isset($regex)) {
+			$dir = new RegexIterator($dir, $regex);
+		}
 
-        if (isset($invregex)) {
-            $dir = new InvertedRegexIterator($dir, $invregex);
-        }
+		if (isset($invregex)) {
+			$dir = new InvertedRegexIterator($dir, $invregex);
+		}
 
-        try {
-            foreach($dir as $file) {
-                if ((empty($stub) || $file->getRealPath() != $stub->getRealPath()) && !is_dir($file)) {
-                    self::phar_add_file($phar, $level, $dir->getSubPathName(), $file, $compress, $noloader);
-                }
-            }
-        } catch(Excpetion $e) {
-            self::error("Unable to complete operation on file '$file'\n" . $e->getMessage() . "\n");
-        }
-    }
-    // }}}
-    // {{{ static function phar_add_file
-    /**
-     * Add a phar file
-     *
-     * This function adds a file to a phar archive.
-     *
-     * @param Phar    $phar      The phar object
-     * @param string  $level     The level of the file.
-     * @param string  $entry     The entry point
-     * @param string  $file      The file to add to the archive
-     * @param string  $compress  The compression scheme for the file.
-     * @param boolean $noloader  Whether to prevent adding the loader
-     */
-    static function phar_add_file(Phar $phar, $level, $entry, $file, $compress, $noloader = false)
-    {
-        $entry = str_replace('//', '/', $entry);
-        while($level-- > 0 && ($p = strpos($entry, '/')) !== false) {
-            $entry = substr($entry, $p+1);
-        }
+		try {
+			foreach($dir as $file) {
+				if ((empty($stub) || $file->getRealPath() != $stub->getRealPath()) && !is_dir($file)) {
+					self::phar_add_file($phar, $level, $dir->getSubPathName(), $file, $compress, $noloader);
+				}
+			}
+		} catch(Excpetion $e) {
+			self::error("Unable to complete operation on file '$file'\n" . $e->getMessage() . "\n");
+		}
+	}
+	// }}}
+	// {{{ static function phar_add_file
+	/**
+	 * Add a phar file
+	 *
+	 * This function adds a file to a phar archive.
+	 *
+	 * @param Phar    $phar      The phar object
+	 * @param string  $level     The level of the file.
+	 * @param string  $entry     The entry point
+	 * @param string  $file      The file to add to the archive
+	 * @param string  $compress  The compression scheme for the file.
+	 * @param boolean $noloader  Whether to prevent adding the loader
+	 */
+	static function phar_add_file(Phar $phar, $level, $entry, $file, $compress, $noloader = false)
+	{
+		$entry = str_replace('//', '/', $entry);
+		while($level-- > 0 && ($p = strpos($entry, '/')) !== false) {
+			$entry = substr($entry, $p+1);
+		}
 
-    if ($noloader && $entry == 'phar.inc') {
-        return;
-    }
+	if ($noloader && $entry == 'phar.inc') {
+		return;
+	}
 
-        echo "$entry\n";
+		echo "$entry\n";
 
-        $phar[$entry] = file_get_contents($file);
-        switch($compress) {
-            case 'gz':
-            case 'gzip':
-                $phar[$entry]->compress(Phar::GZ);
-                break;
-            case 'bz2':
-            case 'bzip2':
-                $phar[$entry]->compress(Phar::BZ2);
-                break;
-            case '0':
-                $phar[$entry]->decompress();
-                break;
-            default:
-                break;
-        }
-    }
-    // }}}
-    // {{{ public function phar_dir_echo
-    /**
-     * Echo directory
-     *
-     * @param string $pn      
-     * @param unknown_type $f
-     */
-    public function phar_dir_echo($pn, $f)
-    {
-        echo "$f\n";
-    }
-    // }}}
-    // {{{ public function phar_dir_operation
-    /**
-     * Directory operations
-     * 
-     * Phar directory operations.
-     *
-     * @param RecursiveIteratorIterator $dir  The recursiveIteratorIterator object.
-     * @param string                    $func Function to call on the iterations
-     * @param array                     $args Function arguments.
-     */
-    public function phar_dir_operation(RecursiveIteratorIterator $dir, $func, array $args = array())
-    {
-        $regex   = $this->args['i']['val'];
-        $invregex= $this->args['x']['val'];
+		$phar[$entry] = file_get_contents($file);
+		switch($compress) {
+			case 'gz':
+			case 'gzip':
+				$phar[$entry]->compress(Phar::GZ);
+				break;
+			case 'bz2':
+			case 'bzip2':
+				$phar[$entry]->compress(Phar::BZ2);
+				break;
+			case '0':
+				$phar[$entry]->decompress();
+				break;
+			default:
+				break;
+		}
+	}
+	// }}}
+	// {{{ public function phar_dir_echo
+	/**
+	 * Echo directory
+	 *
+	 * @param string $pn      
+	 * @param unknown_type $f
+	 */
+	public function phar_dir_echo($pn, $f)
+	{
+		echo "$f\n";
+	}
+	// }}}
+	// {{{ public function phar_dir_operation
+	/**
+	 * Directory operations
+	 * 
+	 * Phar directory operations.
+	 *
+	 * @param RecursiveIteratorIterator $dir  The recursiveIteratorIterator object.
+	 * @param string                    $func Function to call on the iterations
+	 * @param array                     $args Function arguments.
+	 */
+	public function phar_dir_operation(RecursiveIteratorIterator $dir, $func, array $args = array())
+	{
+		$regex   = $this->args['i']['val'];
+		$invregex= $this->args['x']['val'];
 
-        if (isset($regex)) {
-            $dir = new RegexIterator($dir, $regex);
-        }
+		if (isset($regex)) {
+			$dir = new RegexIterator($dir, $regex);
+		}
 
-        if (isset($invregex)) {
-            $dir = new InvertedRegexIterator($dir, $invregex);
-        }
+		if (isset($invregex)) {
+			$dir = new InvertedRegexIterator($dir, $invregex);
+		}
 
-        $any = false;
-        foreach($dir as $pn => $f) {
-            $any = true;
-            call_user_func($func, $pn, $f, $args);
-        }
-        return $any;
-    }
-    // {{{ static function cli_cmd_inf_list
-    /**
-     * Cli Command Info List
-     *
-     * @return string What inf does
-     */
-    static function cli_cmd_inf_list()
-    {
-        return "List contents of a PHAR archive.";
-    }
-    // }}}
-    // {{{ static function cli_cmd_arg_list
-    /**
-     * Cli Command Argument List
-     *
-     * @return arguments list
-     */
-    static function cli_cmd_arg_list()
-    {
-        return self::phar_args('Fix', 'pharurl');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_list
-    /**
-     * Cli Command Run List
-     *
-     * @see $this->phar_dir_operation
-     */
-    public function cli_cmd_run_list()
-    {
-        $this->phar_dir_operation(
-            new DirectoryTreeIterator(
-                $this->args['f']['val']), 
-                array($this, 'phar_dir_echo')
-            );
-    }
-    // }}}
-    // {{{ static function cli_command_inf_tree
-    /**
-     * Cli Command Inf Tree
-     *
-     * @return string  The description of a directory tree for a Phar archive.
-     */
-    static function cli_cmd_inf_tree()
-    {
-        return "Get a directory tree for a PHAR archive.";
-    }
-    // }}}
-    // {{{ static function cli_cmd_arg_tree
-    /**
-     * Cli Command Argument Tree
-     *
-     * @return string Arguments in URL format.
-     */
-    static function cli_cmd_arg_tree()
-    {
-        return self::phar_args('Fix', 'pharurl');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_tree
-    /**
-     * Cli Command Run Tree
-     * 
-     * Set the phar_dir_operation with a directorygraphiterator.
-     * 
-     * @see DirectoryGraphIterator
-     * @see $this->phar_dir_operation
-     *
-     */
-    public function cli_cmd_run_tree()
-    {
-        $a = $this->phar_dir_operation(
-            new DirectoryGraphIterator(
-                $this->args['f']['val']), 
-                array($this, 'phar_dir_echo')
-            );
-        if (!$a) {
-            echo "|-<root directory>\n";
-        }
-    }
-    // }}}
-    // {{{ cli_cmd_inf_extract
-    /**
-     * Cli Command Inf Extract
-     *
-     * @return string The description of the command extra to a directory.
-     */
-    static function cli_cmd_inf_extract()
-    {
-        return "Extract a PHAR package to a directory.";
-    }
-    // }}}
-    // {{{ static function cli_cmd_arg_extract
-    /**
-     * Cli Command Arguments Extract
-     * 
-     * The arguments for the extract function.
-     *
-     * @return array  The arguments for the extraction.
-     */
-    static function cli_cmd_arg_extract()
-    {
-        $args = self::phar_args('Fix', 'phar');
-        
-        $args[''] = array(
-            'type' => 'dir',  
-            'val' => '.',                 
-            'inf' => '         Directory to extract to (defaults to \'.\').',
-        );
-        
-        return $args;
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_extract
-    /**
-     * Run Extract
-     * 
-     * Run the extraction of a phar Archive.
-     *
-     * @see $this->phar_dir_operation
-     */
-    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");
-            } else {
-                $dir = $dir[0];
-            }
-        }
-        
-        $phar = $this->args['f']['val'];
-        $base = $phar->getPathname();
-        $bend = strpos($base, '.phar');
-        $bend = strpos($base, '/', $bend);
-        $base = substr($base, 0, $bend + 1);
-        $blen = strlen($base);
+		$any = false;
+		foreach($dir as $pn => $f) {
+			$any = true;
+			call_user_func($func, $pn, $f, $args);
+		}
+		return $any;
+	}
+	// {{{ static function cli_cmd_inf_list
+	/**
+	 * Cli Command Info List
+	 *
+	 * @return string What inf does
+	 */
+	static function cli_cmd_inf_list()
+	{
+		return "List contents of a PHAR archive.";
+	}
+	// }}}
+	// {{{ static function cli_cmd_arg_list
+	/**
+	 * Cli Command Argument List
+	 *
+	 * @return arguments list
+	 */
+	static function cli_cmd_arg_list()
+	{
+		return self::phar_args('Fix', 'pharurl');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_list
+	/**
+	 * Cli Command Run List
+	 *
+	 * @see $this->phar_dir_operation
+	 */
+	public function cli_cmd_run_list()
+	{
+		$this->phar_dir_operation(
+			new DirectoryTreeIterator(
+				$this->args['f']['val']), 
+				array($this, 'phar_dir_echo')
+			);
+	}
+	// }}}
+	// {{{ static function cli_command_inf_tree
+	/**
+	 * Cli Command Inf Tree
+	 *
+	 * @return string  The description of a directory tree for a Phar archive.
+	 */
+	static function cli_cmd_inf_tree()
+	{
+		return "Get a directory tree for a PHAR archive.";
+	}
+	// }}}
+	// {{{ static function cli_cmd_arg_tree
+	/**
+	 * Cli Command Argument Tree
+	 *
+	 * @return string Arguments in URL format.
+	 */
+	static function cli_cmd_arg_tree()
+	{
+		return self::phar_args('Fix', 'pharurl');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_tree
+	/**
+	 * Cli Command Run Tree
+	 * 
+	 * Set the phar_dir_operation with a directorygraphiterator.
+	 * 
+	 * @see DirectoryGraphIterator
+	 * @see $this->phar_dir_operation
+	 *
+	 */
+	public function cli_cmd_run_tree()
+	{
+		$a = $this->phar_dir_operation(
+			new DirectoryGraphIterator(
+				$this->args['f']['val']), 
+				array($this, 'phar_dir_echo')
+			);
+		if (!$a) {
+			echo "|-<root directory>\n";
+		}
+	}
+	// }}}
+	// {{{ cli_cmd_inf_extract
+	/**
+	 * Cli Command Inf Extract
+	 *
+	 * @return string The description of the command extra to a directory.
+	 */
+	static function cli_cmd_inf_extract()
+	{
+		return "Extract a PHAR package to a directory.";
+	}
+	// }}}
+	// {{{ static function cli_cmd_arg_extract
+	/**
+	 * Cli Command Arguments Extract
+	 * 
+	 * The arguments for the extract function.
+	 *
+	 * @return array  The arguments for the extraction.
+	 */
+	static function cli_cmd_arg_extract()
+	{
+		$args = self::phar_args('Fix', 'phar');
+		
+		$args[''] = array(
+			'type' => 'dir',  
+			'val' => '.',                 
+			'inf' => '         Directory to extract to (defaults to \'.\').',
+		);
+		
+		return $args;
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_extract
+	/**
+	 * Run Extract
+	 * 
+	 * Run the extraction of a phar Archive.
+	 *
+	 * @see $this->phar_dir_operation
+	 */
+	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");
+			} else {
+				$dir = $dir[0];
+			}
+		}
+		
+		$phar = $this->args['f']['val'];
+		$base = $phar->getPathname();
+		$bend = strpos($base, '.phar');
+		$bend = strpos($base, '/', $bend);
+		$base = substr($base, 0, $bend + 1);
+		$blen = strlen($base);
 
-        $this->phar_dir_operation(
-            new RecursiveIteratorIterator($phar), 
-            array($this, 'phar_dir_extract'), 
-            array($blen, $dir)
-        );
-    }
-    // }}}
-    // {{{ public function phar_dir_extract
-    /**
-     * Extract to a directory
-     * 
-     * This function will extract the content of a Phar
-     * to a directory and create new files and directories
-     * depending on the permissions on that folder.
-     *
-     * @param string $pn
-     * @param string $f     The file name
-     * @param array $args   The directory and Blen informations
-     */
-    public function phar_dir_extract($pn, $f, $args)
-    {
-        $blen   = $args[0];
-        $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 (!@copy($f, $target)) {
-            echo " ...error\n";
-        } else {
-            echo " ...ok\n";
-        }
-    }
-    // }}}
-    // {{{ static function cli_cmd_inf_delete
-    /**
-     * Delete an entry from a phar information.
-     *
-     * @return string The information
-     */
-    static function cli_cmd_inf_delete()
-    {
-        return 'Delete entry from a PHAR archive';
-    }
-    // }}}
-    // {{{ static function cli_cmd_arg_delete
-    /**
-     * The cli command argument for deleting.
-     *
-     * @return array informations about the arguments to use.
-     */
-    static function cli_cmd_arg_delete()
-    {
-        return self::phar_args('FE', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_delete
-    /**
-     * Deleting execution
-     *
-     * Execute the deleting of the file from the phar archive.
-     */
-    public function cli_cmd_run_delete()
-    {
-        $phar  = $this->args['f']['val'];
-        $entry = $this->args['e']['val'];
+		$this->phar_dir_operation(
+			new RecursiveIteratorIterator($phar), 
+			array($this, 'phar_dir_extract'), 
+			array($blen, $dir)
+		);
+	}
+	// }}}
+	// {{{ public function phar_dir_extract
+	/**
+	 * Extract to a directory
+	 * 
+	 * This function will extract the content of a Phar
+	 * to a directory and create new files and directories
+	 * depending on the permissions on that folder.
+	 *
+	 * @param string $pn
+	 * @param string $f     The file name
+	 * @param array $args   The directory and Blen informations
+	 */
+	public function phar_dir_extract($pn, $f, $args)
+	{
+		$blen   = $args[0];
+		$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 (!@copy($f, $target)) {
+			echo " ...error\n";
+		} else {
+			echo " ...ok\n";
+		}
+	}
+	// }}}
+	// {{{ static function cli_cmd_inf_delete
+	/**
+	 * Delete an entry from a phar information.
+	 *
+	 * @return string The information
+	 */
+	static function cli_cmd_inf_delete()
+	{
+		return 'Delete entry from a PHAR archive';
+	}
+	// }}}
+	// {{{ static function cli_cmd_arg_delete
+	/**
+	 * The cli command argument for deleting.
+	 *
+	 * @return array informations about the arguments to use.
+	 */
+	static function cli_cmd_arg_delete()
+	{
+		return self::phar_args('FE', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_delete
+	/**
+	 * Deleting execution
+	 *
+	 * Execute the deleting of the file from the phar archive.
+	 */
+	public function cli_cmd_run_delete()
+	{
+		$phar  = $this->args['f']['val'];
+		$entry = $this->args['e']['val'];
 
-       $phar->startBuffering();
-       unset($phar[$entry]);
-       $phar->stopBuffering();
-    }
-    // }}}
-    // {{{ static function cli_cmd_inf_add
-    /**
-     * Client comment add file information
-     *
-     * @return string The description of the feature
-     */
-    static function cli_cmd_inf_add()
-    {
-        return "Add entries to a PHAR package.";
-    }
-    // }}}
-    // {{{ static function cli_cmd_arg_add
-    /**
-     * Add a file arguments
-     */
-    static function cli_cmd_arg_add()
-    {
-        $args = self::phar_args('acFilx', 'phar');
-        $args[''] = array(
-            '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;
-    }
-    // }}}
-    // {{{ public functio cli_cmd_run_add
-    /**
-     * Add a file
-     *
-     * Run the action of adding a file to
-     * a phar archive.
-     */
-    public function cli_cmd_run_add()
-    {
-        $compress= $this->args['c']['val'];
-        $phar    = $this->args['f']['val'];
-        $regex   = $this->args['i']['val'];
-        $level   = $this->args['l']['val'];
-        $invregex= $this->args['x']['val'];
-        $input   = $this->args['']['val'];
+	   $phar->startBuffering();
+	   unset($phar[$entry]);
+	   $phar->stopBuffering();
+	}
+	// }}}
+	// {{{ static function cli_cmd_inf_add
+	/**
+	 * Client comment add file information
+	 *
+	 * @return string The description of the feature
+	 */
+	static function cli_cmd_inf_add()
+	{
+		return "Add entries to a PHAR package.";
+	}
+	// }}}
+	// {{{ static function cli_cmd_arg_add
+	/**
+	 * Add a file arguments
+	 */
+	static function cli_cmd_arg_add()
+	{
+		$args = self::phar_args('acFilx', 'phar');
+		$args[''] = array(
+			'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;
+	}
+	// }}}
+	// {{{ public functio cli_cmd_run_add
+	/**
+	 * Add a file
+	 *
+	 * Run the action of adding a file to
+	 * a phar archive.
+	 */
+	public function cli_cmd_run_add()
+	{
+		$compress= $this->args['c']['val'];
+		$phar    = $this->args['f']['val'];
+		$regex   = $this->args['i']['val'];
+		$level   = $this->args['l']['val'];
+		$invregex= $this->args['x']['val'];
+		$input   = $this->args['']['val'];
 
-        $phar->startBuffering();
+		$phar->startBuffering();
 
-        if (!is_array($input)) {
-            $this->phar_add($phar, $level, $input, $regex, $invregex, NULL, $compress);
-        } else {
-            foreach($input as $i) {
-                $this->phar_add($phar, $level, $i, $regex, $invregex, NULL, $compress);
-            }
-        }
-        $phar->stopBuffering();
-        exit(0);
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_stub_set
-    /**
-     * Set the stup of a phar file.
-     *
-     * @return string The stub set description.
-     */
-    public function cli_cmd_inf_stub_set()
-    {
-        return "Set the stub of a PHAR file. " . 
-               "If no input file is specified as stub then stdin is being used.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_stub_set
-    /**
-     * Set the argument stub
-     *
-     * @return string arguments for a stub 
-     */
-    public function cli_cmd_arg_stub_set()
-    {
-        $args = self::phar_args('bFps', 'phar');
-        $args['s']['val'] = 'php://stdin';
-        return $args;
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_stub_set
-    /**
-     * Cli Command run stub set
-     *
-     * @see   $phar->setStub()
-     */
-    public function cli_cmd_run_stub_set()
-    {
-        $hashbang = $this->args['b']['val'];
-        $phar     = $this->args['f']['val'];
-        $stub     = $this->args['s']['val'];
-        $loader   = $this->args['p']['val'];
+		if (!is_array($input)) {
+			$this->phar_add($phar, $level, $input, $regex, $invregex, NULL, $compress);
+		} else {
+			foreach($input as $i) {
+				$this->phar_add($phar, $level, $i, $regex, $invregex, NULL, $compress);
+			}
+		}
+		$phar->stopBuffering();
+		exit(0);
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_stub_set
+	/**
+	 * Set the stup of a phar file.
+	 *
+	 * @return string The stub set description.
+	 */
+	public function cli_cmd_inf_stub_set()
+	{
+		return "Set the stub of a PHAR file. " . 
+			   "If no input file is specified as stub then stdin is being used.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_stub_set
+	/**
+	 * Set the argument stub
+	 *
+	 * @return string arguments for a stub 
+	 */
+	public function cli_cmd_arg_stub_set()
+	{
+		$args = self::phar_args('bFps', 'phar');
+		$args['s']['val'] = 'php://stdin';
+		return $args;
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_stub_set
+	/**
+	 * Cli Command run stub set
+	 *
+	 * @see   $phar->setStub()
+	 */
+	public function cli_cmd_run_stub_set()
+	{
+		$hashbang = $this->args['b']['val'];
+		$phar     = $this->args['f']['val'];
+		$stub     = $this->args['s']['val'];
+		$loader   = $this->args['p']['val'];
 
-        $this->phar_set_stub_begin($phar, $stub, $loader, $hashbang);
-        $this->phar_set_stub_end($phar, $stub, $loader);
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_stub_get
-    /**
-     * Get the command stub infos.
-     *
-     * @return string a description of the stub of a Phar file.
-     */
-    public function cli_cmd_inf_stub_get()
-    {
-        return "Get the stub of a PHAR file. " .  
-               "If no output file is specified as stub then stdout is being used.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_stub_get
-    /**
-     * Get the argument stub
-     *
-     * @return array $args The arguments passed to the stub.
-     */
-    public function cli_cmd_arg_stub_get()
-    {
-        $args = self::phar_args('Fs', 'phar');
-        $args['s']['val'] = 'php://stdin';
-        return $args;
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_stub_get
-    /**
-     * Cli Command Run Stub
-     * 
-     * Get arguments and store them into a stub.
-     *
-     * @param arguments $args
-     * @see   $this->args
-     */
-    public function cli_cmd_run_stub_get($args)
-    {
-        $phar = $this->args['f']['val'];
-        $stub = $this->args['s']['val'];
+		$this->phar_set_stub_begin($phar, $stub, $loader, $hashbang);
+		$this->phar_set_stub_end($phar, $stub, $loader);
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_stub_get
+	/**
+	 * Get the command stub infos.
+	 *
+	 * @return string a description of the stub of a Phar file.
+	 */
+	public function cli_cmd_inf_stub_get()
+	{
+		return "Get the stub of a PHAR file. " .  
+			   "If no output file is specified as stub then stdout is being used.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_stub_get
+	/**
+	 * Get the argument stub
+	 *
+	 * @return array $args The arguments passed to the stub.
+	 */
+	public function cli_cmd_arg_stub_get()
+	{
+		$args = self::phar_args('Fs', 'phar');
+		$args['s']['val'] = 'php://stdin';
+		return $args;
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_stub_get
+	/**
+	 * Cli Command Run Stub
+	 * 
+	 * Get arguments and store them into a stub.
+	 *
+	 * @param arguments $args
+	 * @see   $this->args
+	 */
+	public function cli_cmd_run_stub_get($args)
+	{
+		$phar = $this->args['f']['val'];
+		$stub = $this->args['s']['val'];
 
-        file_put_contents($stub, $phar->getStub());
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_compress
-    /**
-     * Cli Command Inf Compress
-     * 
-     * Cli Command compress informations
-     *
-     * @return string A description of the command.
-     */
-    public function cli_cmd_inf_compress()
-    {
-        return "Compress or uncompress all files or a selected entry.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_cmpress
-    /**
-     * Cli Command Arg Compress
-     *
-     * @return array The arguments for compress
-     */
-    public function cli_cmd_arg_compress()
-    {
-        return self::phar_args('FCe', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_compress
-    /**
-     * Cli Command Run Compress
-     *
-     * @see $this->args
-     */
-    public function cli_cmd_run_compress()
-    {
-        $phar  = $this->args['f']['val'];
-        $entry = $this->args['e']['val'];
+		file_put_contents($stub, $phar->getStub());
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_compress
+	/**
+	 * Cli Command Inf Compress
+	 * 
+	 * Cli Command compress informations
+	 *
+	 * @return string A description of the command.
+	 */
+	public function cli_cmd_inf_compress()
+	{
+		return "Compress or uncompress all files or a selected entry.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_cmpress
+	/**
+	 * Cli Command Arg Compress
+	 *
+	 * @return array The arguments for compress
+	 */
+	public function cli_cmd_arg_compress()
+	{
+		return self::phar_args('FCe', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_compress
+	/**
+	 * Cli Command Run Compress
+	 *
+	 * @see $this->args
+	 */
+	public function cli_cmd_run_compress()
+	{
+		$phar  = $this->args['f']['val'];
+		$entry = $this->args['e']['val'];
 
-        switch($this->args['c']['val']) {
-            case 'gz':
-            case 'gzip':
-                if (isset($entry)) {
-                    $phar[$entry]->compress(Phar::GZ);
-                } else {
-                    $phar->compressFiles(Phar::GZ);
-                }
-                break;
-            case 'bz2':
-            case 'bzip2':
-                if (isset($entry)) {
-                    $phar[$entry]->compress(Phar::BZ2);
-                } else {
-                    $phar->compressFiles(Phar::BZ2);
-                }
-                break;
-            default:
-                if (isset($entry)) {
-                    $phar[$entry]->decompress();
-                } else {
-                    $phar->decompressFiles();
-                }
-                break;
-        }
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_sign
-    /**
-     * Cli Command Info Signature
-     *
-     * @return string A description of the signature arguments.
-     */
-    public function cli_cmd_inf_sign()
-    {
-        return "Set signature hash algorithm.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_sign
-    /**
-     * Cli Command Argument Sign
-     *
-     * @return array Arguments for Signature
-     */
-    public function cli_cmd_arg_sign()
-    {
-        return self::phar_args('FHy', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_sign
-    /**
-     * Cli Command Run Signature
-     *
-     * @see $phar->setSignaturealgorithm
-     */
-    public function cli_cmd_run_sign()
-    {
-        $phar     = $this->args['f']['val'];
-        $hash     = $this->args['h']['val'];
-        $privkey  = $this->args['y']['val'];
+		switch($this->args['c']['val']) {
+			case 'gz':
+			case 'gzip':
+				if (isset($entry)) {
+					$phar[$entry]->compress(Phar::GZ);
+				} else {
+					$phar->compressFiles(Phar::GZ);
+				}
+				break;
+			case 'bz2':
+			case 'bzip2':
+				if (isset($entry)) {
+					$phar[$entry]->compress(Phar::BZ2);
+				} else {
+					$phar->compressFiles(Phar::BZ2);
+				}
+				break;
+			default:
+				if (isset($entry)) {
+					$phar[$entry]->decompress();
+				} else {
+					$phar->decompressFiles();
+				}
+				break;
+		}
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_sign
+	/**
+	 * Cli Command Info Signature
+	 *
+	 * @return string A description of the signature arguments.
+	 */
+	public function cli_cmd_inf_sign()
+	{
+		return "Set signature hash algorithm.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_sign
+	/**
+	 * Cli Command Argument Sign
+	 *
+	 * @return array Arguments for Signature
+	 */
+	public function cli_cmd_arg_sign()
+	{
+		return self::phar_args('FHy', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_sign
+	/**
+	 * Cli Command Run Signature
+	 *
+	 * @see $phar->setSignaturealgorithm
+	 */
+	public function cli_cmd_run_sign()
+	{
+		$phar     = $this->args['f']['val'];
+		$hash     = $this->args['h']['val'];
+		$privkey  = $this->args['y']['val'];
 
 		$hash = self::phar_check_hash($hash, $privkey);
 
-        $phar->setSignatureAlgorithm($hash, $privkey);
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_meta_set
-    /**
-     * Cli Command Inf Meta Set
-     *
-     * @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." . 
-               "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 " .
-               "metadata is present and a flat value then the return value is 1. Also using -k " .
-               "the input is been taken directly rather then being serialized.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_meta_set
-    /**
-     * Cli Command Argument Meta Set
-     *
-     * @return array  The arguments for meta set
-     */
-    public function cli_cmd_arg_meta_set()
-    {
-        return self::phar_args('FekM', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_met_set
-    /**
-     * Cli Command Run Metaset
-     *
-     * @see $phar->startBuffering
-     * @see $phar->setMetadata
-     * @see $phar->stopBuffering
-     */
-    public function cli_cmd_run_meta_set()
-    {
-        $phar  = $this->args['f']['val'];
-        $entry = $this->args['e']['val'];
-        $index = $this->args['k']['val'];
-        $meta  = $this->args['m']['val'];
+		$phar->setSignatureAlgorithm($hash, $privkey);
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_meta_set
+	/**
+	 * Cli Command Inf Meta Set
+	 *
+	 * @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." . 
+			   "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 " .
+			   "metadata is present and a flat value then the return value is 1. Also using -k " .
+			   "the input is been taken directly rather then being serialized.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_meta_set
+	/**
+	 * Cli Command Argument Meta Set
+	 *
+	 * @return array  The arguments for meta set
+	 */
+	public function cli_cmd_arg_meta_set()
+	{
+		return self::phar_args('FekM', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_met_set
+	/**
+	 * Cli Command Run Metaset
+	 *
+	 * @see $phar->startBuffering
+	 * @see $phar->setMetadata
+	 * @see $phar->stopBuffering
+	 */
+	public function cli_cmd_run_meta_set()
+	{
+		$phar  = $this->args['f']['val'];
+		$entry = $this->args['e']['val'];
+		$index = $this->args['k']['val'];
+		$meta  = $this->args['m']['val'];
 
-        $phar->startBuffering();
+		$phar->startBuffering();
 
-        if (isset($index)) {
-            if (isset($entry)) {
-                if ($phar[$entry]->hasMetadata()) {
-                    $old = $phar[$entry]->getMetadata();
-                } else {
-                    $old = array();
-                }
-            } else {
-                if ($phar->hasMetadata()) {
-                    $old = $phar->getMetadata();
-                } else {
-                    $old = array();
-                }
-            }
+		if (isset($index)) {
+			if (isset($entry)) {
+				if ($phar[$entry]->hasMetadata()) {
+					$old = $phar[$entry]->getMetadata();
+				} else {
+					$old = array();
+				}
+			} else {
+				if ($phar->hasMetadata()) {
+					$old = $phar->getMetadata();
+				} else {
+					$old = array();
+				}
+			}
 
-            if (!is_array($old)) {
-                self::error('Metadata is a flat value while an index operation was issued.');
-            }
+			if (!is_array($old)) {
+				self::error('Metadata is a flat value while an index operation was issued.');
+			}
 
-            $old[$index] = $meta;
-            $meta = $old;
-        } else {
-            $meta = unserialize($meta);
-        }
-        
-        if (isset($entry)) {
-            $phar[$entry]->setMetadata($meta);
-        } else {
-            $phar->setMetadata($meta);
-        }
-        $phar->stopBuffering();
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_met_get
-    /**
-     * Cli Command Inf Metaget
-     *
-     * @return string A description of the metaget arguments
-     */
-    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" . 
-               "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 " .
-               "present then the return value is 1.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_meta_get
-    /**
-     * Cli Command arg metaget
-     *
-     * @return array  The arguments for meta get.
-     */
-    public function cli_cmd_arg_meta_get()
-    {
-        return self::phar_args('Fek', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_meta_get
-    /**
-     * Cli Command Run Metaget
-     *
-     * @see $this->args
-     * @see $phar[$x]->hasMetadata()
-     * @see $phar->getMetadata()
-     */
-    public function cli_cmd_run_meta_get()
-    {
-        $phar  = $this->args['f']['val'];
-        $entry = $this->args['e']['val'];
-        $index = $this->args['k']['val'];
+			$old[$index] = $meta;
+			$meta = $old;
+		} else {
+			$meta = unserialize($meta);
+		}
+		
+		if (isset($entry)) {
+			$phar[$entry]->setMetadata($meta);
+		} else {
+			$phar->setMetadata($meta);
+		}
+		$phar->stopBuffering();
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_met_get
+	/**
+	 * Cli Command Inf Metaget
+	 *
+	 * @return string A description of the metaget arguments
+	 */
+	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" . 
+			   "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 " .
+			   "present then the return value is 1.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_meta_get
+	/**
+	 * Cli Command arg metaget
+	 *
+	 * @return array  The arguments for meta get.
+	 */
+	public function cli_cmd_arg_meta_get()
+	{
+		return self::phar_args('Fek', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_meta_get
+	/**
+	 * Cli Command Run Metaget
+	 *
+	 * @see $this->args
+	 * @see $phar[$x]->hasMetadata()
+	 * @see $phar->getMetadata()
+	 */
+	public function cli_cmd_run_meta_get()
+	{
+		$phar  = $this->args['f']['val'];
+		$entry = $this->args['e']['val'];
+		$index = $this->args['k']['val'];
 
-        if (isset($entry)) {
-            if (!$phar[$entry]->hasMetadata()) {
-                echo "No Metadata\n";
-                exit(1);
-            }
-            echo serialize($phar[$entry]->getMetadata());
-        } else {
-            if (!$phar->hasMetadata()) {
-                echo "No Metadata\n";
-                exit(1);
-            }
-            $meta = $phar->getMetadata();
-        }
+		if (isset($entry)) {
+			if (!$phar[$entry]->hasMetadata()) {
+				echo "No Metadata\n";
+				exit(1);
+			}
+			echo serialize($phar[$entry]->getMetadata());
+		} else {
+			if (!$phar->hasMetadata()) {
+				echo "No Metadata\n";
+				exit(1);
+			}
+			$meta = $phar->getMetadata();
+		}
 
-        if (isset($index)) {
-            if (isset($index)) {
-                if (isset($meta[$index])) {
-                    echo $meta[$index];
-                    exit(0);
-                } else {
-                    echo "No Metadata\n";
-                    exit(1);
-                }
-            } else {
-                echo serialize($meta);
-            }
-        }
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_meta_del
-    /**
-     * Cli Command Inf Metadel
-     *
-     * @return string A description of the metadel function
-     */
-    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 " . 
-               "and the given index is being deleted.\n" .
-               "If something was deleted the return value is 0 otherwise it is 1.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_meta_del
-    /**
-     * CliC ommand Arg Metadelete
-     *
-     * @return array The arguments for metadel
-     */
-    public function cli_cmd_arg_meta_del()
-    {
-        return self::phar_args('Fek', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_meta_del
-    /**
-     * Cli Command Run MetaDel
-     *
-     * @see $phar[$x]->delMetadata()
-     * @see $phar->delMetadata()
-     */
-    public function cli_cmd_run_meta_del()
-    {
-        $phar  = $this->args['f']['val'];
-        $entry = $this->args['e']['val'];
-        $index = $this->args['k']['val'];
+		if (isset($index)) {
+			if (isset($index)) {
+				if (isset($meta[$index])) {
+					echo $meta[$index];
+					exit(0);
+				} else {
+					echo "No Metadata\n";
+					exit(1);
+				}
+			} else {
+				echo serialize($meta);
+			}
+		}
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_meta_del
+	/**
+	 * Cli Command Inf Metadel
+	 *
+	 * @return string A description of the metadel function
+	 */
+	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 " . 
+			   "and the given index is being deleted.\n" .
+			   "If something was deleted the return value is 0 otherwise it is 1.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_meta_del
+	/**
+	 * CliC ommand Arg Metadelete
+	 *
+	 * @return array The arguments for metadel
+	 */
+	public function cli_cmd_arg_meta_del()
+	{
+		return self::phar_args('Fek', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_meta_del
+	/**
+	 * Cli Command Run MetaDel
+	 *
+	 * @see $phar[$x]->delMetadata()
+	 * @see $phar->delMetadata()
+	 */
+	public function cli_cmd_run_meta_del()
+	{
+		$phar  = $this->args['f']['val'];
+		$entry = $this->args['e']['val'];
+		$index = $this->args['k']['val'];
 
-        if (isset($entry)) {
-            if (isset($index)) {
-                if (!$phar[$entry]->hasMetadata()) {
-                    exit(1);
-                }
-                $meta = $phar[$entry]->getMetadata();
+		if (isset($entry)) {
+			if (isset($index)) {
+				if (!$phar[$entry]->hasMetadata()) {
+					exit(1);
+				}
+				$meta = $phar[$entry]->getMetadata();
 
-                // @todo add error message here.
-                if (!is_array($meta)) {
-                    exit(1);
-                }
+				// @todo add error message here.
+				if (!is_array($meta)) {
+					exit(1);
+				}
 
-                unset($meta[$index]);
-                $phar[$entry]->setMetadata($meta);
-            } else {
-                exit($phar[$entry]->delMetadata() ? 0 : 1);
-            }
-        } else {
-            if (isset($index)) {
-                if (!$phar->hasMetadata()) {
-                    exit(1);
-                }
+				unset($meta[$index]);
+				$phar[$entry]->setMetadata($meta);
+			} else {
+				exit($phar[$entry]->delMetadata() ? 0 : 1);
+			}
+		} else {
+			if (isset($index)) {
+				if (!$phar->hasMetadata()) {
+					exit(1);
+				}
 
-                $meta = $phar->getMetadata();
+				$meta = $phar->getMetadata();
 
-                // @todo Add error message
-                if (!is_array($meta)) {
-                    exit(1);
-                }
+				// @todo Add error message
+				if (!is_array($meta)) {
+					exit(1);
+				}
 
-                unset($meta[$index]);
-                $phar->setMetadata($meta);
-            } else {
-                exit($phar->delMetadata() ? 0 : 1);
-            }
-        }
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_info
-    /**
-     * CLi Command Inf Info
-     *
-     * @return string A description about the info commands.
-     */
-    public function cli_cmd_inf_info()
-    {
-        return "Get information about a PHAR package.\n" . 
-               "By using -k it is possible to return a single value.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_info
-    /**
-     * Cli Command Arg Infos
-     *
-     * @return array The arguments for info command.
-     */
-    public function cli_cmd_arg_info()
-    {
-        return self::phar_args('Fk', 'phar');
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_info
-    /**
-     * Cli Command Run Info
-     *
-     * @param args $args
-     */
-    public function cli_cmd_run_info()
-    {
-        $phar  = $this->args['f']['val'];
-        $index = $this->args['k']['val'];
+				unset($meta[$index]);
+				$phar->setMetadata($meta);
+			} else {
+				exit($phar->delMetadata() ? 0 : 1);
+			}
+		}
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_info
+	/**
+	 * CLi Command Inf Info
+	 *
+	 * @return string A description about the info commands.
+	 */
+	public function cli_cmd_inf_info()
+	{
+		return "Get information about a PHAR package.\n" . 
+			   "By using -k it is possible to return a single value.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_info
+	/**
+	 * Cli Command Arg Infos
+	 *
+	 * @return array The arguments for info command.
+	 */
+	public function cli_cmd_arg_info()
+	{
+		return self::phar_args('Fk', 'phar');
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_info
+	/**
+	 * Cli Command Run Info
+	 *
+	 * @param args $args
+	 */
+	public function cli_cmd_run_info()
+	{
+		$phar  = $this->args['f']['val'];
+		$index = $this->args['k']['val'];
 
-        $hash  = $phar->getSignature();
-        $infos = array();
+		$hash  = $phar->getSignature();
+		$infos = array();
 
-        if ($phar->getAlias()) {
-            $infos['Alias'] = $phar->getAlias();
-        }
+		if ($phar->getAlias()) {
+			$infos['Alias'] = $phar->getAlias();
+		}
 
-        if (!$hash) {
-            $infos['Hash-type'] = 'NONE';
-        } else {
-            $infos['Hash-type'] = $hash['hash_type'];
-            $infos['Hash'] = $hash['hash'];
-        }
+		if (!$hash) {
+			$infos['Hash-type'] = 'NONE';
+		} else {
+			$infos['Hash-type'] = $hash['hash_type'];
+			$infos['Hash'] = $hash['hash'];
+		}
 
-        $csize   = 0;
-        $usize   = 0;
-        $count   = 0;
-        $ccount  = 0;
-        $ucount  = 0;
-        $mcount  = 0;
-        $compalg = array('GZ'=>0, 'BZ2'=>0);
+		$csize   = 0;
+		$usize   = 0;
+		$count   = 0;
+		$ccount  = 0;
+		$ucount  = 0;
+		$mcount  = 0;
+		$compalg = array('GZ'=>0, 'BZ2'=>0);
 
-        foreach(new RecursiveIteratorIterator($phar) as $ent) {
-            $count++;
-            if ($ent->isCompressed()) {
-                $ccount++;
-                $csize += $ent->getCompressedSize();
-                if ($ent->isCompressed(Phar::GZ)) {
-                    $compalg['GZ']++;
-                } elseif ($ent->isCompressed(Phar::BZ2)) {
-                    $compalg['BZ2']++;
-                }
-            } else {
-                $ucount++;
-                $csize += $ent->getSize();
-            }
-            
-            $usize += $ent->getSize();
-            
-            if ($ent->hasMetadata()) {
-                $mcount++;
-            }
-        }
+		foreach(new RecursiveIteratorIterator($phar) as $ent) {
+			$count++;
+			if ($ent->isCompressed()) {
+				$ccount++;
+				$csize += $ent->getCompressedSize();
+				if ($ent->isCompressed(Phar::GZ)) {
+					$compalg['GZ']++;
+				} elseif ($ent->isCompressed(Phar::BZ2)) {
+					$compalg['BZ2']++;
+				}
+			} else {
+				$ucount++;
+				$csize += $ent->getSize();
+			}
+			
+			$usize += $ent->getSize();
+			
+			if ($ent->hasMetadata()) {
+				$mcount++;
+			}
+		}
 
-        $infos['Entries']            = $count;
-        $infos['Uncompressed-files'] = $ucount;
-        $infos['Compressed-files']   = $ccount;
-        $infos['Compressed-gz']      = $compalg['GZ'];
-        $infos['Compressed-bz2']     = $compalg['BZ2'];
-        $infos['Uncompressed-size']  = $usize;
-        $infos['Compressed-size']    = $csize;
-        $infos['Compression-ratio']  = sprintf('%.3g%%', $usize ? ($csize * 100) / $usize : 100);
-        $infos['Metadata-global']    = $phar->hasMetadata() * 1;
-        $infos['Metadata-files']     = $mcount;
-        $infos['Stub-size']          = strlen($phar->getStub());
+		$infos['Entries']            = $count;
+		$infos['Uncompressed-files'] = $ucount;
+		$infos['Compressed-files']   = $ccount;
+		$infos['Compressed-gz']      = $compalg['GZ'];
+		$infos['Compressed-bz2']     = $compalg['BZ2'];
+		$infos['Uncompressed-size']  = $usize;
+		$infos['Compressed-size']    = $csize;
+		$infos['Compression-ratio']  = sprintf('%.3g%%', $usize ? ($csize * 100) / $usize : 100);
+		$infos['Metadata-global']    = $phar->hasMetadata() * 1;
+		$infos['Metadata-files']     = $mcount;
+		$infos['Stub-size']          = strlen($phar->getStub());
 
-        if (isset($index)) {
-            if (!isset($infos[$index])) {
-                self::error("Requested value does not exist.\n");
-            }
+		if (isset($index)) {
+			if (!isset($infos[$index])) {
+				self::error("Requested value does not exist.\n");
+			}
 
-            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";
-        }
-    }
-    // }}}
-    // {{{ public function cli_cmd_inf_version
-    /**
-     * CLi Command Inf Version
-     *
-     * @return string A description about the info commands.
-     */
-    public function cli_cmd_inf_version()
-    {
-        return "Get information about the PHAR environment and the tool version.";
-    }
-    // }}}
-    // {{{ public function cli_cmd_arg_version
-    /**
-     * Cli Command Arg Version
-     *
-     * @return array The arguments for version command.
-     */
-    public function cli_cmd_arg_version()
-    {
-        return self::phar_args('', NULL);
-    }
-    // }}}
-    // {{{ public function cli_cmd_run_info
-    /**
-     * Cli Command Run Info
-     *
-     * @param args $args
-     */
-    public function cli_cmd_run_version()
-    {
-    	$use_ext = extension_loaded('phar');
-    	$version = array(
-    		'PHP Version' => phpversion(),
-    		'phar.phar version' => '$Revision$',
-    		'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available',
+			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";
+		}
+	}
+	// }}}
+	// {{{ public function cli_cmd_inf_version
+	/**
+	 * CLi Command Inf Version
+	 *
+	 * @return string A description about the info commands.
+	 */
+	public function cli_cmd_inf_version()
+	{
+		return "Get information about the PHAR environment and the tool version.";
+	}
+	// }}}
+	// {{{ public function cli_cmd_arg_version
+	/**
+	 * Cli Command Arg Version
+	 *
+	 * @return array The arguments for version command.
+	 */
+	public function cli_cmd_arg_version()
+	{
+		return self::phar_args('', NULL);
+	}
+	// }}}
+	// {{{ public function cli_cmd_run_info
+	/**
+	 * Cli Command Run Info
+	 *
+	 * @param args $args
+	 */
+	public function cli_cmd_run_version()
+	{
+		$use_ext = extension_loaded('phar');
+		$version = array(
+			'PHP Version' => phpversion(),
+			'phar.phar version' => '$Revision$',
+			'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not available',
 			'Phar API version' => Phar::apiVersion(),
 			'Phar-based phar archives' => true,
 			'Tar-based phar archives' => $use_ext,
@@ -1576,8 +1576,8 @@ class PharCommand extends CLICommand
 			}
 			printf("%-${klen}s  %s\n", $k.':', $v);
 		}
-    }
-    // }}}
+	}
+	// }}}
 }
 // }}}
 ?>
diff --git a/ext/phar/shortarc.php b/ext/phar/shortarc.php
index 1bf3baa8aa..0f1679b992 100644
--- a/ext/phar/shortarc.php
+++ b/ext/phar/shortarc.php
@@ -3,293 +3,293 @@
 $web = '000';
 
 if (in_array('phar', stream_get_wrappers()) && class_exists('Phar', 0)) {
-    Phar::interceptFileFuncs();
-    set_include_path('phar://' . __FILE__ . PATH_SEPARATOR . get_include_path());
-    Phar::webPhar(null, $web);
-    include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
-    return;
+	Phar::interceptFileFuncs();
+	set_include_path('phar://' . __FILE__ . PATH_SEPARATOR . get_include_path());
+	Phar::webPhar(null, $web);
+	include 'phar://' . __FILE__ . '/' . Extract_Phar::START;
+	return;
 }
 
 if (@(isset($_SERVER['REQUEST_URI']) && isset($_SERVER['REQUEST_METHOD']) && ($_SERVER['REQUEST_METHOD'] == 'GET' || $_SERVER['REQUEST_METHOD'] == 'POST'))) {
-    Extract_Phar::go(true);
-    $mimes = array(
-        'phps' => 2,
-        'c' => 'text/plain',
-        'cc' => 'text/plain',
-        'cpp' => 'text/plain',
-        'c++' => 'text/plain',
-        'dtd' => 'text/plain',
-        'h' => 'text/plain',
-        'log' => 'text/plain',
-        'rng' => 'text/plain',
-        'txt' => 'text/plain',
-        'xsd' => 'text/plain',
-        'php' => 1,
-        'inc' => 1,
-        'avi' => 'video/avi',
-        'bmp' => 'image/bmp',
-        'css' => 'text/css',
-        'gif' => 'image/gif',
-        'htm' => 'text/html',
-        'html' => 'text/html',
-        'htmls' => 'text/html',
-        'ico' => 'image/x-ico',
-        'jpe' => 'image/jpeg',
-        'jpg' => 'image/jpeg',
-        'jpeg' => 'image/jpeg',
-        'js' => 'application/x-javascript',
-        'midi' => 'audio/midi',
-        'mid' => 'audio/midi',
-        'mod' => 'audio/mod',
-        'mov' => 'movie/quicktime',
-        'mp3' => 'audio/mp3',
-        'mpg' => 'video/mpeg',
-        'mpeg' => 'video/mpeg',
-        'pdf' => 'application/pdf',
-        'png' => 'image/png',
-        'swf' => 'application/shockwave-flash',
-        'tif' => 'image/tiff',
-        'tiff' => 'image/tiff',
-        'wav' => 'audio/wav',
-        'xbm' => 'image/xbm',
-        'xml' => 'text/xml',
-       );
-
-    header("Cache-Control: no-cache, must-revalidate");
-    header("Pragma: no-cache");
-
-    $basename = basename(__FILE__);
-    if (!strpos($_SERVER['REQUEST_URI'], $basename)) {
-        chdir(Extract_Phar::$temp);
-        include $web;
-        return;
-    }
-    $pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));
-    if (!$pt || $pt == '/') {
-        $pt = $web;
-        header('HTTP/1.1 301 Moved Permanently');
-        header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);
-        exit;
-    }
-    $a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
-    if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
-        header('HTTP/1.0 404 Not Found');
-        echo "<html>\n <head>\n  <title>File Not Found<title>\n </head>\n <body>\n  <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
-        exit;
-    }
-    $b = pathinfo($a);
-    if (!isset($b['extension'])) {
-        header('Content-Type: text/plain');
-        header('Content-Length: ' . filesize($a));
-        readfile($a);
-        exit;
-    }
-    if (isset($mimes[$b['extension']])) {
-        if ($mimes[$b['extension']] === 1) {
-            include $a;
-            exit;
-        }
-        if ($mimes[$b['extension']] === 2) {
-            highlight_file($a);
-            exit;
-        }
-        header('Content-Type: ' .$mimes[$b['extension']]);
-        header('Content-Length: ' . filesize($a));
-        readfile($a);
-        exit;
-    }
+	Extract_Phar::go(true);
+	$mimes = array(
+		'phps' => 2,
+		'c' => 'text/plain',
+		'cc' => 'text/plain',
+		'cpp' => 'text/plain',
+		'c++' => 'text/plain',
+		'dtd' => 'text/plain',
+		'h' => 'text/plain',
+		'log' => 'text/plain',
+		'rng' => 'text/plain',
+		'txt' => 'text/plain',
+		'xsd' => 'text/plain',
+		'php' => 1,
+		'inc' => 1,
+		'avi' => 'video/avi',
+		'bmp' => 'image/bmp',
+		'css' => 'text/css',
+		'gif' => 'image/gif',
+		'htm' => 'text/html',
+		'html' => 'text/html',
+		'htmls' => 'text/html',
+		'ico' => 'image/x-ico',
+		'jpe' => 'image/jpeg',
+		'jpg' => 'image/jpeg',
+		'jpeg' => 'image/jpeg',
+		'js' => 'application/x-javascript',
+		'midi' => 'audio/midi',
+		'mid' => 'audio/midi',
+		'mod' => 'audio/mod',
+		'mov' => 'movie/quicktime',
+		'mp3' => 'audio/mp3',
+		'mpg' => 'video/mpeg',
+		'mpeg' => 'video/mpeg',
+		'pdf' => 'application/pdf',
+		'png' => 'image/png',
+		'swf' => 'application/shockwave-flash',
+		'tif' => 'image/tiff',
+		'tiff' => 'image/tiff',
+		'wav' => 'audio/wav',
+		'xbm' => 'image/xbm',
+		'xml' => 'text/xml',
+	   );
+
+	header("Cache-Control: no-cache, must-revalidate");
+	header("Pragma: no-cache");
+
+	$basename = basename(__FILE__);
+	if (!strpos($_SERVER['REQUEST_URI'], $basename)) {
+		chdir(Extract_Phar::$temp);
+		include $web;
+		return;
+	}
+	$pt = substr($_SERVER['REQUEST_URI'], strpos($_SERVER['REQUEST_URI'], $basename) + strlen($basename));
+	if (!$pt || $pt == '/') {
+		$pt = $web;
+		header('HTTP/1.1 301 Moved Permanently');
+		header('Location: ' . $_SERVER['REQUEST_URI'] . '/' . $pt);
+		exit;
+	}
+	$a = realpath(Extract_Phar::$temp . DIRECTORY_SEPARATOR . $pt);
+	if (!$a || strlen(dirname($a)) < strlen(Extract_Phar::$temp)) {
+		header('HTTP/1.0 404 Not Found');
+		echo "<html>\n <head>\n  <title>File Not Found<title>\n </head>\n <body>\n  <h1>404 - File ", $pt, " Not Found</h1>\n </body>\n</html>";
+		exit;
+	}
+	$b = pathinfo($a);
+	if (!isset($b['extension'])) {
+		header('Content-Type: text/plain');
+		header('Content-Length: ' . filesize($a));
+		readfile($a);
+		exit;
+	}
+	if (isset($mimes[$b['extension']])) {
+		if ($mimes[$b['extension']] === 1) {
+			include $a;
+			exit;
+		}
+		if ($mimes[$b['extension']] === 2) {
+			highlight_file($a);
+			exit;
+		}
+		header('Content-Type: ' .$mimes[$b['extension']]);
+		header('Content-Length: ' . filesize($a));
+		readfile($a);
+		exit;
+	}
 }
 
 class Extract_Phar
 {
-    static $temp;
-    static $origdir;
-    const GZ = 0x1000;
-    const BZ2 = 0x2000;
-    const MASK = 0x3000;
-    const START = 'index.php';
-    const LEN = XXXX;
-
-    static function go($return  = false)
-    {
-        $fp = fopen(__FILE__, 'rb');
-        fseek($fp, self::LEN);
-        $L = unpack('V', $a = (binary)fread($fp, 4));
-        $m = (binary)'';
-
-        do {
-            $read = 8192;
-            if ($L[1] - strlen($m) < 8192) {
-                $read = $L[1] - strlen($m);
-            }
-            $last = (binary)fread($fp, $read);
-            $m .= $last;
-        } while (strlen($last) && strlen($m) < $L[1]);
-
-        if (strlen($m) < $L[1]) {
-            die('ERROR: manifest length read was "' . 
-                strlen($m) .'" should be "' .
-                $L[1] . '"');
-        }
-
-        $info = self::_unpack($m);
-        $f = $info['c'];
-
-        if ($f & self::GZ) {
-            if (!function_exists('gzinflate')) {
-                die('Error: zlib extension is not enabled -' .
-                    ' gzinflate() function needed for zlib-compressed .phars');
-            }
-        }
-
-        if ($f & self::BZ2) {
-            if (!function_exists('bzdecompress')) {
-                die('Error: bzip2 extension is not enabled -' .
-                    ' bzdecompress() function needed for bz2-compressed .phars');
-            }
-        }
-
-        $temp = self::tmpdir();
-
-        if (!$temp || !is_writable($temp)) {
-            $sessionpath = session_save_path();
-            if (strpos ($sessionpath, ";") !== false)
-                $sessionpath = substr ($sessionpath, strpos ($sessionpath, ";")+1);
-            if (!file_exists($sessionpath) || !is_dir($sessionpath)) {
-                die('Could not locate temporary directory to extract phar');
-            }
-            $temp = $sessionpath;
-        }
-
-        $temp .= '/pharextract/'.basename(__FILE__, '.phar');
-        self::$temp = $temp;
-        self::$origdir = getcwd();
-        @mkdir($temp, 0777, true);
-        $temp = realpath($temp);
-
-        if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {
-            self::_removeTmpFiles($temp, getcwd());
-            @mkdir($temp, 0777, true);
-            @file_put_contents($temp . '/' . md5_file(__FILE__), '');
-
-            foreach ($info['m'] as $path => $file) {
-                $a = !file_exists(dirname($temp . '/' . $path));
-                @mkdir(dirname($temp . '/' . $path), 0777, true);
-                clearstatcache();
-
-                if ($path[strlen($path) - 1] == '/') {
-                    @mkdir($temp . '/' . $path, 0777);
-                } else {
-                    file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));
-                    @chmod($temp . '/' . $path, 0666);
-                }
-            }
-        }
-
-        chdir($temp);
-
-        if (!$return) {
-            include self::START;
-        }
-    }
-
-    static function tmpdir()
-    {
-        if (strpos(PHP_OS, 'WIN') !== false) {
-            if ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {
-                return $var;
-            }
-            if (is_dir('/temp') || mkdir('/temp')) {
-                return realpath('/temp');
-            }
-            return false;
-        }
-        if ($var = getenv('TMPDIR')) {
-            return $var;
-        }
-        return realpath('/tmp');
-    }
-
-    static function _unpack($m)
-    {
-        $info = unpack('V', substr($m, 0, 4));
-        // skip API version, phar flags, alias, metadata
-        $l = unpack('V', substr($m, 10, 4));
-        $m = substr($m, 14 + $l[1]);
-        $s = unpack('V', substr($m, 0, 4));
-        $o = 0;
-        $start = 4 + $s[1];
-        $ret['c'] = 0;
-
-        for ($i = 0; $i < $info[1]; $i++) {
-            // length of the file name
-            $len = unpack('V', substr($m, $start, 4));
-            $start += 4;
-            // file name
-            $savepath = substr($m, $start, $len[1]);
-            $start += $len[1];
-            // retrieve manifest data:
-            // 0 = size, 1 = timestamp, 2 = compressed size, 3 = crc32, 4 = flags
-            // 5 = metadata length
-            $ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));
-            $ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]
-                & 0xffffffff);
-            $ret['m'][$savepath][7] = $o;
-            $o += $ret['m'][$savepath][2];
-            $start += 24 + $ret['m'][$savepath][5];
-            $ret['c'] |= $ret['m'][$savepath][4] & self::MASK;
-        }
-        return $ret;
-    }
-
-    static function extractFile($path, $entry, $fp)
-    {
-        $data = '';
-        $c = $entry[2];
-
-        while ($c) {
-            if ($c < 8192) {
-                $data .= @fread($fp, $c);
-                $c = 0;
-            } else {
-                $c -= 8192;
-                $data .= @fread($fp, 8192);
-            }
-        }
-
-        if ($entry[4] & self::GZ) {
-            $data = gzinflate($data);
-        } elseif ($entry[4] & self::BZ2) {
-            $data = bzdecompress($data);
-        }
-
-        if (strlen($data) != $entry[0]) {
-            die("Invalid internal .phar file (size error " . strlen($data) . " != " .
-                $stat[7] . ")");
-        }
-
-        if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) {
-            die("Invalid internal .phar file (checksum error)");
-        }
-
-        return $data;
-    }
-
-    static function _removeTmpFiles($temp, $origdir)
-    {
-        chdir($temp);
-
-        foreach (glob('*') as $f) {
-            if (file_exists($f)) {
-                is_dir($f) ? @rmdir($f) : @unlink($f);
-                if (file_exists($f) && is_dir($f)) {
-                    self::_removeTmpFiles($f, getcwd());
-                }
-            }
-        }
-
-        @rmdir($temp);
-        clearstatcache();
-        chdir($origdir);
-    }
+	static $temp;
+	static $origdir;
+	const GZ = 0x1000;
+	const BZ2 = 0x2000;
+	const MASK = 0x3000;
+	const START = 'index.php';
+	const LEN = XXXX;
+
+	static function go($return  = false)
+	{
+		$fp = fopen(__FILE__, 'rb');
+		fseek($fp, self::LEN);
+		$L = unpack('V', $a = (binary)fread($fp, 4));
+		$m = (binary)'';
+
+		do {
+			$read = 8192;
+			if ($L[1] - strlen($m) < 8192) {
+				$read = $L[1] - strlen($m);
+			}
+			$last = (binary)fread($fp, $read);
+			$m .= $last;
+		} while (strlen($last) && strlen($m) < $L[1]);
+
+		if (strlen($m) < $L[1]) {
+			die('ERROR: manifest length read was "' . 
+				strlen($m) .'" should be "' .
+				$L[1] . '"');
+		}
+
+		$info = self::_unpack($m);
+		$f = $info['c'];
+
+		if ($f & self::GZ) {
+			if (!function_exists('gzinflate')) {
+				die('Error: zlib extension is not enabled -' .
+					' gzinflate() function needed for zlib-compressed .phars');
+			}
+		}
+
+		if ($f & self::BZ2) {
+			if (!function_exists('bzdecompress')) {
+				die('Error: bzip2 extension is not enabled -' .
+					' bzdecompress() function needed for bz2-compressed .phars');
+			}
+		}
+
+		$temp = self::tmpdir();
+
+		if (!$temp || !is_writable($temp)) {
+			$sessionpath = session_save_path();
+			if (strpos ($sessionpath, ";") !== false)
+				$sessionpath = substr ($sessionpath, strpos ($sessionpath, ";")+1);
+			if (!file_exists($sessionpath) || !is_dir($sessionpath)) {
+				die('Could not locate temporary directory to extract phar');
+			}
+			$temp = $sessionpath;
+		}
+
+		$temp .= '/pharextract/'.basename(__FILE__, '.phar');
+		self::$temp = $temp;
+		self::$origdir = getcwd();
+		@mkdir($temp, 0777, true);
+		$temp = realpath($temp);
+
+		if (!file_exists($temp . DIRECTORY_SEPARATOR . md5_file(__FILE__))) {
+			self::_removeTmpFiles($temp, getcwd());
+			@mkdir($temp, 0777, true);
+			@file_put_contents($temp . '/' . md5_file(__FILE__), '');
+
+			foreach ($info['m'] as $path => $file) {
+				$a = !file_exists(dirname($temp . '/' . $path));
+				@mkdir(dirname($temp . '/' . $path), 0777, true);
+				clearstatcache();
+
+				if ($path[strlen($path) - 1] == '/') {
+					@mkdir($temp . '/' . $path, 0777);
+				} else {
+					file_put_contents($temp . '/' . $path, self::extractFile($path, $file, $fp));
+					@chmod($temp . '/' . $path, 0666);
+				}
+			}
+		}
+
+		chdir($temp);
+
+		if (!$return) {
+			include self::START;
+		}
+	}
+
+	static function tmpdir()
+	{
+		if (strpos(PHP_OS, 'WIN') !== false) {
+			if ($var = getenv('TMP') ? getenv('TMP') : getenv('TEMP')) {
+				return $var;
+			}
+			if (is_dir('/temp') || mkdir('/temp')) {
+				return realpath('/temp');
+			}
+			return false;
+		}
+		if ($var = getenv('TMPDIR')) {
+			return $var;
+		}
+		return realpath('/tmp');
+	}
+
+	static function _unpack($m)
+	{
+		$info = unpack('V', substr($m, 0, 4));
+		// skip API version, phar flags, alias, metadata
+		$l = unpack('V', substr($m, 10, 4));
+		$m = substr($m, 14 + $l[1]);
+		$s = unpack('V', substr($m, 0, 4));
+		$o = 0;
+		$start = 4 + $s[1];
+		$ret['c'] = 0;
+
+		for ($i = 0; $i < $info[1]; $i++) {
+			// length of the file name
+			$len = unpack('V', substr($m, $start, 4));
+			$start += 4;
+			// file name
+			$savepath = substr($m, $start, $len[1]);
+			$start += $len[1];
+			// retrieve manifest data:
+			// 0 = size, 1 = timestamp, 2 = compressed size, 3 = crc32, 4 = flags
+			// 5 = metadata length
+			$ret['m'][$savepath] = array_values(unpack('Va/Vb/Vc/Vd/Ve/Vf', substr($m, $start, 24)));
+			$ret['m'][$savepath][3] = sprintf('%u', $ret['m'][$savepath][3]
+				& 0xffffffff);
+			$ret['m'][$savepath][7] = $o;
+			$o += $ret['m'][$savepath][2];
+			$start += 24 + $ret['m'][$savepath][5];
+			$ret['c'] |= $ret['m'][$savepath][4] & self::MASK;
+		}
+		return $ret;
+	}
+
+	static function extractFile($path, $entry, $fp)
+	{
+		$data = '';
+		$c = $entry[2];
+
+		while ($c) {
+			if ($c < 8192) {
+				$data .= @fread($fp, $c);
+				$c = 0;
+			} else {
+				$c -= 8192;
+				$data .= @fread($fp, 8192);
+			}
+		}
+
+		if ($entry[4] & self::GZ) {
+			$data = gzinflate($data);
+		} elseif ($entry[4] & self::BZ2) {
+			$data = bzdecompress($data);
+		}
+
+		if (strlen($data) != $entry[0]) {
+			die("Invalid internal .phar file (size error " . strlen($data) . " != " .
+				$stat[7] . ")");
+		}
+
+		if ($entry[3] != sprintf("%u", crc32((binary)$data) & 0xffffffff)) {
+			die("Invalid internal .phar file (checksum error)");
+		}
+
+		return $data;
+	}
+
+	static function _removeTmpFiles($temp, $origdir)
+	{
+		chdir($temp);
+
+		foreach (glob('*') as $f) {
+			if (file_exists($f)) {
+				is_dir($f) ? @rmdir($f) : @unlink($f);
+				if (file_exists($f) && is_dir($f)) {
+					self::_removeTmpFiles($f, getcwd());
+				}
+			}
+		}
+
+		@rmdir($temp);
+		clearstatcache();
+		chdir($origdir);
+	}
 }