Fixed issues based on @mr-russ's PR.

1. Following ctags's behavior, use -V for verbose.
2. Use real path for file_get_contens and file_exists inside phar stub to avoid a weird PHP bug.

Conflicts:
	PHPCtags.class.php
	bootstrap.php

Author: markwu

PHPCtags.class.php

@@ -394,6 +394,8 @@ private function full_render() {
 
     public function export()
     {
+        $start = microtime(true);
+
         if (empty($this->mFiles)) {
             throw new PHPCtagsException('No File specified.');
         }
@@ -402,17 +404,25 @@ public function export()
             $this->process($file);
         }
 
-        return $this->full_render();
+        $content = $this->full_render();
+
+        $end = microtime(true);
+
+        if ($this->mOptions['V']) {
+            echo "It tooks ".($end-$start)." seconds.\n";
+        }
+
+        return $content;
     }
 
     private function process($file)
     {
         // Load the tag md5 data to skip unchanged files.
-        if (!isset($this->tagdata) && isset($this->cachefile) && file_exists($this->cachefile)) {
+        if (!isset($this->tagdata) && isset($this->cachefile) && file_exists(realpath($this->cachefile))) {
             if ($this->mOptions['v']) {
                 echo "Loaded cache file.".PHP_EOL;
             }
-            $this->tagdata = unserialize(file_get_contents($this->cachefile));
+            $this->tagdata = unserialize(file_get_contents(realpath($this->cachefile)));
         }
 
         if (is_dir($file) && isset($this->mOptions['R'])) {
@@ -438,14 +448,14 @@ private function process($file)
                 try {
                     $this->process_single_file($filename);
                 } catch(Exception $e) {
-                    echo "PHPParser: {$e->getMessage()} - {$filename}".PHP_EOL;
+                    echo "\nPHPParser: {$e->getMessage()} - {$filename}\n";
                 }
             }
         } else {
             try {
                     $this->process_single_file($filename);
             } catch(Exception $e) {
-                echo "PHPParser: {$e->getMessage()} - {$file}".PHP_EOL;
+                echo "PHPParser: {$e->getMessage()} - {$filename}".PHP_EOL;
             }
         }
     }
@@ -457,24 +467,20 @@ private function process_single_file($filename)
         }
         $this->filecount++;
 
-        $startfile = microtime(true);
-
         $this->setMFile((string) $filename);
         $file = file_get_contents($this->mFile);
         $md5 = md5($file);
         if (isset($this->tagdata[$this->mFile][$md5])) {
             // The file is the same as the previous time we analyzed and saved.
             $this->mLines[$this->mFile] = $this->tagdata[$this->mFile][$md5];
-            if ($this->mOptions['v']) {
+            if ($this->mOptions['V']) {
                 echo ".";
             }
             return;
         }
 
         $struct = $this->struct($this->mParser->parse($file), TRUE);
-        $finishfile = microtime(true);
         $this->mLines[$this->mFile] = $this->render($struct);
-        $finishmerge = microtime(true);
         $this->tagdata[$this->mFile][$md5] = $this->mLines[$this->mFile];
         if ($this->mOptions['debug']) {
             echo "Parse: ".($finishfile - $startfile).", Merge: ".($finishmerge-$finishfile)."; (".$this->filecount.")".$this->mFile.PHP_EOL;
@@ -487,6 +493,6 @@ private function process_single_file($filename)
 
 class PHPCtagsException extends Exception {
     public function __toString() {
-        return "PHPCtags: {$this->message}\n";
+        return "\nPHPCtags: {$this->message}\n";
     }
 }

bootstrap.php

@@ -18,7 +18,7 @@
 Addresses: <techlivezheng@gmail.com>, https://github.com/techlivezheng/phpctags
 EOF;
 
-$options = getopt('aC:f:Nno:RuvV', array(
+$options = getopt('aC:f:Nno:RuV', array(
     'append::',
     'debug',
     'exclude:',
@@ -28,6 +28,7 @@
     'help',
     'recurse::',
     'sort::',
+    'verbose::',
     'version',
     'memory::',
 ));
@@ -48,8 +49,12 @@
   -o   Alternative for -f.
   -R   Equivalent to --recurse.
   -u   Equivalent to --sort=no.
+<<<<<<< HEAD
   -v   Equivalent to --verbose.
   -V   Equivalent to --version.
+=======
+  -V   Equivalent to --verbose.
+>>>>>>> a86869b... Fixed issues based on @mr-russ's PR.
   --append=[yes|no]
        Should tags should be appended to existing tag file [no]?
   --debug
@@ -72,7 +77,13 @@
        Recurse into directories supplied on command line [no].
   --sort=[yes|no|foldcase]
        Should tags be sorted (optionally ignoring case) [yes]?.
+<<<<<<< HEAD
   --Version
+=======
+  --verbose=[yes|no]
+       Enable verbose messages describing actions on each source file.
+  --version
+>>>>>>> a86869b... Fixed issues based on @mr-russ's PR.
        Print version identifier to standard output.
 EOF;
 
@@ -89,9 +100,17 @@
 }
 while ($key = array_pop($argv_)) unset($argv[$key]);
 
-// option -V is an alternative to --version
+// option -V is an alternative to --verbose
 if (isset($options['V'])) {
-    $options['version'] = FALSE;
+    $options['verbose'] = 'yes';
+}
+
+if (isset($options['verbose'])) {
+    if ($options['verbose'] === FALSE || yes_or_no($options['verbose']) == 'yes') {
+        $options['V'] = 'yes';
+    } else if (yes_or_no($options['verbose']) != 'no') {
+        die('phpctags: Invalid value for "verbose" option'.PHP_EOL);
+    }
 }
 
 if (!isset($options['debug'])) {