Merge branch 'develop' into feature/improved-console-support

Author: weynhamz

PHPCtags.class.php

@@ -20,6 +20,22 @@ public function __construct()
         $this->mParser = new PHPParser_Parser(new PHPParser_Lexer);
     }
 
+    public function setMFile($file) {
+        if(empty($file)) {
+            throw new PHPCtagsException('No File specified.');
+        }
+
+        if(!file_exists($file)) {
+            throw new PHPCtagsException('Warning: cannot open source file "' . $file . '" : No such file');
+        }
+
+        if(!is_readable($file)) {
+            throw new PHPCtagsException('Warning: cannot open source file "' . $file . '" : File is not readable');
+        }
+
+        $this->mFile = realpath($file);
+    }
+
     public static function getMKinds()
     {
         return self::$mKinds;
@@ -253,15 +269,19 @@ public function export($file, $options)
                     continue;
                 }
 
-                //@todo Check for existence
-                $this->mFile = (string) $filename;
+                $this->setMFile((string) $filename);
                 $structs += $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE);
             }
         } else {
-            //@todo Check for existence
-            $this->mFile = $file;
+            $this->setMFile($file);
             $structs += $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE);
         }
         return $this->render($structs, $options);
     }
 }
+
+class PHPCtagsException extends Exception {
+    public function __toString() {
+        return "PHPCtags: {$this->message}\n";
+    }
+}

phpctags

@@ -39,7 +39,9 @@ EOF;
     exit;
 }
 
-$file = realpath(array_pop($argv));
+array_shift($argv);
+
+$file = array_pop($argv);
 
 if(!isset($options['excmd']))
     $options['excmd'] = 'pattern';
@@ -77,8 +79,12 @@ if(isset($options['recurse'])) {
     }
 }
 
-$ctags = new PHPCtags();
-$result = $ctags->export($file, $options);
+try {
+    $ctags = new PHPCtags();
+    $result = $ctags->export($file, $options);
+} catch (Exception $e) {
+    die("phpctags: {$e->getMessage()}");
+}
 
 if (isset($options['f']) && $options['f'] !== '-') {
     $tagfile = fopen($options['f'], isset($options['a']) ? 'a' : 'w');