Merge branch 'feature/add-memory-limit' into develop

Author: weynhamz

PHPCtags.class.php

@@ -225,32 +225,9 @@ private function render($structs, $options)
 
     public function export($file, $options)
     {
-        // if the memory limit option is set and is valid, adjust memory
-        if (isset($options['memory'])) {
-            $memory_limit = trim($options['memory']);
-            if ($this->isMemoryLimitValid($memory_limit)) {
-                ini_set('memory_limit', $memory_limit);
-            }
-        }
         //@todo Check for existence
         $this->mFile = $file;
         $structs = $this->struct($this->mParser->parse(file_get_contents($this->mFile)), TRUE);
         return $this->render($structs, $options);
     }
-
-    private static function isMemoryLimitValid($memory_limit) {
-        if ($memory_limit == "-1") {
-            // no memory limit
-            return true;
-        } elseif (is_numeric($memory_limit) && $memory_limit > 0) {
-            // memory limit provided in bytes
-            return true;
-        } elseif (preg_match("/\d+\s*[KMG]/", $memory_limit)) {
-            // memory limit provided in human readable sizes
-            // as specified here: http://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes
-            return true;
-        }
-
-        return false;
-    }
 }

phpctags

@@ -53,6 +53,14 @@ if(!isset($options['fields'])) {
     $options['fields'] = str_split($options['fields']);
 }
 
+// if the memory limit option is set and is valid, adjust memory
+if (isset($options['memory'])) {
+    $memory_limit = trim($options['memory']);
+    if (isMemoryLimitValid($memory_limit)) {
+        ini_set('memory_limit', $memory_limit);
+    }
+}
+
 if(isset($options['append'])) {
     if ($options['append'] === FALSE || yes_or_no($options['append']) == 'yes') {
         $options['a'] = FALSE;
@@ -114,3 +122,19 @@ function yes_or_no($arg) {
         return false;
     }
 }
+
+function isMemoryLimitValid($memory_limit) {
+    if ($memory_limit == "-1") {
+        // no memory limit
+        return true;
+    } elseif (is_numeric($memory_limit) && $memory_limit > 0) {
+        // memory limit provided in bytes
+        return true;
+    } elseif (preg_match("/\d+\s*[KMG]/", $memory_limit)) {
+        // memory limit provided in human readable sizes
+        // as specified here: http://www.php.net/manual/en/faq.using.php#faq.using.shorthandbytes
+        return true;
+    }
+
+    return false;
+}