From d339ebc10f09717cbf655ff470095b935b15bead Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Fri, 23 Nov 2007 13:50:20 +0000 Subject: [PATCH] - WS --- ext/phar/phar/pharcommand.inc | 42 +++++++++++++++++------------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/ext/phar/phar/pharcommand.inc b/ext/phar/phar/pharcommand.inc index 7c9bcf5e17..8f2cf106f1 100755 --- a/ext/phar/phar/pharcommand.inc +++ b/ext/phar/phar/pharcommand.inc @@ -205,12 +205,12 @@ class PharCommand extends CLICommand } } if (!isset($found)) { - $msg = "Pear package PHP_Archive or Archive.php class file not found.\n"; - if ($arg == '0') { - self::notice($msg); - } else { - self::error($msg); - } + $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; } @@ -390,12 +390,12 @@ class PharCommand extends CLICommand $s .= substr($c, 0, strpos($c, "\n") + 1); } - $s .= ""; - $s .= file_get_contents($loader); + $s .= ""; + $s .= file_get_contents($loader); $s .= "'; @@ -420,11 +420,11 @@ class PharCommand extends CLICommand 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); - } + 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); + } } } // }}} @@ -460,7 +460,7 @@ class PharCommand extends CLICommand $phar->startBuffering(); - $stub = $this->phar_set_stub_begin($phar, $stub, $loader); + $stub = $this->phar_set_stub_begin($phar, $stub, $loader); if (!is_array($input)) { $this->phar_add($phar, $level, $input, $regex, $invregex, $stub, NULL, isset($loader)); @@ -470,7 +470,7 @@ class PharCommand extends CLICommand } } - $this->phar_set_stub_end($phar, $stub, $loader); + $this->phar_set_stub_end($phar, $stub, $loader); switch($this->args['c']['val']) { case 'gz': @@ -556,9 +556,9 @@ class PharCommand extends CLICommand $entry = substr($entry, $p+1); } - if ($noloader && $entry == 'phar.inc') { - return; - } + if ($noloader && $entry == 'phar.inc') { + return; + } echo "$entry\n"; @@ -933,8 +933,8 @@ class PharCommand extends CLICommand $stub = $this->args['s']['val']; $loader = $this->args['p']['val']; - $this->phar_set_stub_begin($phar, $stub, $loader); - $this->phar_set_stub_end($phar, $stub, $loader); + $this->phar_set_stub_begin($phar, $stub, $loader); + $this->phar_set_stub_end($phar, $stub, $loader); } // }}} // {{{ public function cli_cmd_inf_stub_get -- 2.40.0