Merge branch 'develop' into feature/standalone-phar-executable

Author: weynhamz

PHPCtags.class.php

@@ -1,6 +1,8 @@
 <?php
 class PHPCtags
 {
+    const VERSION = 0.3;
+
     private $mFile;
 
     private $mFiles;
@@ -343,18 +345,26 @@ private function process($file)
                     continue;
                 }
 
-                $this->setMFile((string) $filename);
+                try {
+                    $this->setMFile((string) $filename);
+                    $this->mStructs = array_merge(
+                        $this->mStructs,
+                        $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE)
+                    );
+                } catch(Exception $e) {
+                    echo "PHPParser: {$e->getMessage()} - {$filename}".PHP_EOL;
+                }
+            }
+        } else {
+            try {
+                $this->setMFile($file);
                 $this->mStructs = array_merge(
                     $this->mStructs,
                     $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE)
                 );
+            } catch(Exception $e) {
+                echo "PHPParser: {$e->getMessage()} - {$filename}".PHP_EOL;
             }
-        } else {
-            $this->setMFile($file);
-            $this->mStructs = array_merge(
-                $this->mStructs,
-                $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE)
-            );
         }
     }
 }

bootstrap.php

@@ -11,9 +11,9 @@
     );
 }
 
-$version = <<<'EOF'
-Version: 0.3
+$version = PHPCtags::VERSION;
 
+$copyright = <<<'EOF'
 Exuberant Ctags compatiable PHP enhancement, Copyright (C) 2012 Techlive Zheng
 Addresses: <techlivezheng@gmail.com>, https://github.com/techlivezheng/phpctags
 EOF;
@@ -95,15 +95,17 @@
 }
 
 if (isset($options['help'])) {
-    echo $version;
+    echo "Version: ".$version."\n\n".$copyright;
     echo PHP_EOL;
     echo PHP_EOL;
     echo $options_info;
+    echo PHP_EOL;
     exit;
 }
 
 if (isset($options['version'])) {
-    echo $version;
+    echo "Version: ".$version."\n\n".$copyright;
+    echo PHP_EOL;
     exit;
 }
 
@@ -157,7 +159,7 @@
     } else if ($options['sort'] == 'foldcase') {
         $options['sort'] = 'foldcase';
     } else {
-        die('phpctags: Invalid value for "sort" option');
+        die('phpctags: Invalid value for "sort" option'.PHP_EOL);
     }
 // option -n is equivalent to --sort=no
 } else if (isset($options['u'])) {
@@ -179,15 +181,15 @@
     if ($options['append'] === FALSE || yes_or_no($options['append']) == 'yes') {
         $options['a'] = FALSE;
     } else if (yes_or_no($options['append']) != 'no') {
-        die('phpctags: Invalid value for "append" option');
+        die('phpctags: Invalid value for "append" option'.PHP_EOL);
     }
 }
 
 if (isset($options['recurse'])) {
     if ($options['recurse'] === FALSE || yes_or_no($options['recurse']) == 'yes') {
         $options['R'] = FALSE;
     } else if (yes_or_no($options['recurse']) != 'no') {
-        die('phpctags: Invalid value for "recurse" option');
+        die('phpctags: Invalid value for "recurse" option'.PHP_EOL);
     }
 }
 
@@ -201,7 +203,7 @@
     $ctags->addFiles($argv);
     $result = $ctags->export();
 } catch (Exception $e) {
-    die("phpctags: {$e->getMessage()}");
+    die("phpctags: {$e->getMessage()}".PHP_EOL);
 }
 
 // write to a specified file
@@ -214,7 +216,18 @@
 } else {
     $tagfile = fopen('tags', isset($options['a']) ? 'a' : 'w');
 }
-fwrite($tagfile, $result);
+
+$mode = ($options['sort'] == 'yes' ? 1 : ($options['sort'] == 'foldcase' ? 2 : 0));
+$tagline = <<<EOF
+!_TAG_FILE_FORMAT\t2\t/extended format; --format=1 will not append ;" to lines/
+!_TAG_FILE_SORTED\t{$mode}\t/0=unsorted, 1=sorted, 2=foldcase/
+!_TAG_PROGRAM_AUTHOR\ttechlivezheng\t/techlivezheng@gmail.com/
+!_TAG_PROGRAM_NAME\tphpctags\t//
+!_TAG_PROGRAM_URL\thttps://github.com/techlivezheng/phpctags\t/official site/
+!_TAG_PROGRAM_VERSION\t${version}\t//\n
+EOF;
+
+fwrite($tagfile, $tagline.$result);
 fclose($tagfile);
 
 function yes_or_no($arg) {