Pass options array to export method instead of the whole class

Author: weynhamz

PHPCtags.class.php

@@ -7,9 +7,7 @@ class PHPCtags
 
     private $mParser;
 
-    private $mOptions;
-
-    public function __construct($file, $options=array())
+    public function __construct($file)
     {
         //@todo Check for existence
         $this->mFile = $file;
@@ -23,7 +21,6 @@ public function __construct($file, $options=array())
             'i' => 'interface',
         );
         $this->mParser = new PHPParser_Parser(new PHPParser_Lexer);
-        $this->mOptions = $options;
     }
 
     private function getNodeAccess($node)
@@ -143,7 +140,7 @@ private function struct($node, $parent=array())
         return $structs;
     }
 
-    private function render($structs)
+    private function render($structs, $options)
     {
         $str = '';
         $lines = file($this->mFile);
@@ -159,37 +156,37 @@ private function render($structs)
 
             $str .= "\t" . $this->mFile;
 
-            if ($this->mOptions['excmd'] == 'number') {
+            if ($options['excmd'] == 'number') {
                 $str .= "\t" . $struct['line'];
             } else { //excmd == 'mixed' or 'pattern', default behavior
                 $str .= "\t" . "/^" . rtrim($lines[$struct['line'] - 1], "\n") . "$/";
             }
 
-            if ($this->mOptions['format'] == 1) {
+            if ($options['format'] == 1) {
                 $str .= "\n";
                 continue;
             }
 
             $str .= ";\"";
 
             #field=k, kind of tag as single letter
-            if (in_array('k', $this->mOptions['fields'])) {
-                in_array('z', $this->mOptions['fields']) && $str .= "kind:";
+            if (in_array('k', $options['fields'])) {
+                in_array('z', $options['fields']) && $str .= "kind:";
                 $str .= "\t" . $struct['kind'];
             } else
             #field=K, kind of tag as fullname
-            if (in_array('K', $this->mOptions['fields'])) {
-                in_array('z', $this->mOptions['fields']) && $str .= "kind:";
+            if (in_array('K', $options['fields'])) {
+                in_array('z', $options['fields']) && $str .= "kind:";
                 $str .= "\t" . $this->mKinds[$struct['kind']];
             }
 
             #field=n
-            if (in_array('n', $this->mOptions['fields'])) {
+            if (in_array('n', $options['fields'])) {
                 $str .= "\t" . "line:" . $struct['line'];
             }
 
             #field=s
-            if (in_array('s', $this->mOptions['fields']) && !empty($struct['scope'])) {
+            if (in_array('s', $options['fields']) && !empty($struct['scope'])) {
                 $scope = array_pop($struct['scope']);
                 list($type,$name) = each($scope);
                 switch ($type) {
@@ -206,7 +203,7 @@ private function render($structs)
             }
 
             #field=a
-            if (in_array('a', $this->mOptions['fields']) && !empty($struct['access'])) {
+            if (in_array('a', $options['fields']) && !empty($struct['access'])) {
                 $str .= "\t" . "access:" . $struct['access'];
             }
 
@@ -215,9 +212,9 @@ private function render($structs)
         return $str;
     }
 
-    public function export()
+    public function export($options)
     {
         $structs = $this->struct($this->mParser->parse(file_get_contents($this->mFile)));
-        echo $this->render($structs);
+        echo $this->render($structs,$options);
     }
 }

phpctags

@@ -37,5 +37,5 @@ if(isset($options['fields'])) {
     $options['fields'] = array('k','s');
 }
 
-$ctags = new PHPCtags($file, $options);
-$ctags->export();
+$ctags = new PHPCtags($file);
+$ctags->export($options);

tests/PHPCtagsTest.php

@@ -15,13 +15,7 @@ class PHPCtagsTest extends PHPUnit_Framework_TestCase
      */
     protected function setUp()
     {
-        $options = array(
-            'excmd' => 'pattern',
-            'fields' => array('n','k','s','S','a'),
-            'format' => 2,
-        );
-
-        $this->object = new PHPCtags(__DIR__ . '/PHPCtagsTest.example.php', $options);
+        $this->object = new PHPCtags(__DIR__ . '/PHPCtagsTest.example.php');
     }
 
     /**
@@ -37,7 +31,13 @@ protected function tearDown()
      */
     public function testExport()
     {
-        $this->object->export();
+        $options = array(
+            'excmd' => 'pattern',
+            'fields' => array('n','k','s','S','a'),
+            'format' => 2,
+        );
+
+        $this->object->export($options);
     }
 
 }