Changeset 1509

Timestamp:

01/31/12 23:02:18 (16 months ago)

Author:

Torben Brodt

Message:

tool to remove unused namespaces

Files:

• namespace-unused (modified) (2 diffs)

namespace-unused

@@ -19 +19 @@
         echo $filename;
 
-        $useblock = $block = array();
+        $block = file($filename);
+        $useblock = array();
         $i = 0;
-        foreach(file($filename) as $line) {
+        foreach($block as $line) {
                 if(preg_match('/^use .*(?: |\\\)([a-zA-Z]+);$/', $line, $res)) {
                         $useblock[$i] = $res[1];
                 }
-                $block[$i] = $line;
                 $i++;
         }
@@ -31 +31 @@
         
         if($useblock) {
-                $regexp = '/(?:new ('.implode("|", $useblock).')|('.implode("|", $useblock).')::[^\W]+|(?:extends|implements) ('.implode("|", $useblock).'))/';
+                $regexp = '/(?:new ('.implode("|", $useblock).')(?: |\()'.
+                        '|('.implode("|", $useblock).')::[^\W]+'.
+                        '|(?:extends|implements) ('.implode("|", $useblock).')(?: |$)'.
+                        '|(?:catch \(('.implode("|", $useblock).') )'.
+                ')/';
                 preg_match_all($regexp, implode("", $block), $res);
                 if($res) {
-                        foreach(array_merge((array)$res[1], (array)$res[2], (array)$res[3]) as $className) {
+                        $res = array_merge((array)$res[1], (array)$res[2], (array)$res[3], (array)$res[4]);
+                        foreach($res as $className) {
                                 if(!isset($flipped[$className])) {
                                         continue;