Merge pull request #65 from bp1222/master

Add support to specify new file formats, or to ignore, defaults

Author: Gianluca Arbezzano

PHPCtags.class.php

@@ -445,7 +445,7 @@ private function process($file)
                 )
             );
 
-            $extensions = array('.php', '.php3', '.php4', '.php5', '.phps');
+            $extensions = $this->mOptions['extensions'];
 
             foreach ($iterator as $filename) {
                 if (!in_array(substr($filename, strrpos($filename, '.')), $extensions)) {

bootstrap.php

@@ -25,6 +25,7 @@
     'excmd::',
     'fields::',
     'kinds::',
+    'extensions::',
     'format::',
     'help',
     'recurse::',
@@ -64,6 +65,8 @@
        Include selected extension fields (flags: "afmikKlnsStz") [fks].
   --kinds=[+|-]flags
        Enable/disable tag kinds [cmfpvditn]
+  --extensions=[+|-]extension[,[+|-]]extension
+       Enable/disable file extensions [+.php,+.php3,+.php4,+.php5,+.phps]
   --format=level
        Force output of specified tag file format [2].
   --help
@@ -177,6 +180,22 @@
     $options['kinds'] = str_split($options['kinds']);
 }
 
+$default_extensions = array('.php', '.php3', '.php4', '.php5', '.phps');
+if (!isset($options['extensions'])) {
+    $options['extensions'] = $default_extensions;
+} else {
+    $extensions = explode(',', $options['extensions']);
+    $options['extensions'] = $default_extensions;
+    foreach ($extensions as $ext) {
+        if ($ext[0] == '+') {
+            $options['extensions'][] = substr($ext, 1);
+        } elseif ($ext[0] == '-') {
+            $options['extensions'] = array_diff($options['extensions'], array(substr($ext, 1)));
+        } else {
+            die('phpctags: Invalid value for "extensions" option ' . $ext . PHP_EOL);
+        }
+    }
+}
 
 // handle -u or --sort options
 if (isset($options['sort'])) {

tests/Acceptance/ExtensionsText.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace tests\PHPCTags\Acceptance;
+
+final class ExtensionsTest extends AcceptanceTestCase
+{
+    /**
+     * @test
+     */
+    public function itUsesDefaultExtensions()
+    {
+        $this->givenSourceFile('new_extension.inc', <<<EOS
+<?php
+
+class TestClass 
+{
+	function publicMethod() {
+        }
+}
+EOS
+        );
+
+        $this->runPHPCtags();
+        $this->assertTagsFileHeaderIsCorrect();
+
+        $this->assertTagsFileContainsNoTagsFromFile('new_extension.inc');
+    }
+
+    /**
+     * @test
+     */
+    public function itUsesCustomExtensions()
+    {
+        $this->givenSourceFile('new_extension.inc', <<<EOS
+<?php
+
+class TestClass 
+{
+	public function publicMethod() {
+        }
+}
+EOS
+        );
+
+        $this->runPHPCtags(array('--extensions=+.inc'));
+        $this->assertTagsFileHeaderIsCorrect();
+        $this->assertNumberOfTagsInTagsFileIs(2);
+
+        $this->assertTagsFileContainsTag(
+            'new_extension.inc',
+            'TestClass',
+            self::KIND_CLASS,
+            3
+        );
+        $this->assertTagsFileContainsTag(
+            'new_extension.inc',
+            'publicMethod',
+            self::KIND_METHOD,
+            5,
+            'class:TestClass',
+            'public'
+        );
+    }
+}