Changeset 1511

Timestamp:

02/05/12 16:47:28 (3 months ago)

Author:

Torben Brodt

Message:

update namespace tools

Files:

• namespace-global-local (added)
• namespace-unused (modified) (2 diffs)
• namespace-use-order (modified) (3 diffs)

namespace-unused

@@ -1 +1 @@
 #!/usr/bin/php
 <?php
+# remove unused use statements
 if(!isset($_SERVER['argv'][1]) || in_array($_SERVER['argv'][1], array('--help', '-h', '-?'))) {
         help();
@@ -15 +16 @@
 }
 
-
 function updateFile($filename) {
         echo $filename;
 
         $block = file($filename);
-        $useblock = array();
-        $i = 0;
-        foreach($block as $line) {
+        $regexp = $matches = array();
+        foreach($block as $i => $line) {
                 if(preg_match('/^use .*(?: |\\\)([a-zA-Z]+);$/', $line, $res)) {
-                        $useblock[$i] = $res[1];
+                        $regexp[$i] = $res[1];
+                        $matches[$res[1]] = array(
+                                'line' => $i,
+                                'hits' => 0
+                        );
                 }
-                $i++;
         }
-        $flipped = array_flip($useblock);
         
-        if($useblock) {
-                $regexp = '/(?:new ('.implode("|", $useblock).')(?: |\()'.
-                        '|('.implode("|", $useblock).')::[^\W]+'.
-                        '|(?:extends|implements) ('.implode("|", $useblock).')(?: |$)'.
-                        '|(?:catch \(('.implode("|", $useblock).') )'.
-                ')/';
+        // sort by length to avoid matching prefixes
+        if($regexp) {
+                $sortArray = $tmp = array();
+                foreach($regexp as $idx => $obj) {
+                        $sortArray[$idx] = strlen($obj);
+                        $tmp[$idx."x"] = $obj;
+                }
+
+                $regexp = array();
+                array_multisort($sortArray, SORT_DESC, $tmp);
+                foreach($tmp as $idx => $obj) {
+                        $regexp[substr($idx, 0, -1)] = $obj;
+                }
+        }
+        
+        $hit = false;
+        if($matches) {
+                $regexp = '/('.implode("|", $regexp).')/';
                 preg_match_all($regexp, implode("", $block), $res);
                 if($res) {
-                        $res = array_merge((array)$res[1], (array)$res[2], (array)$res[3], (array)$res[4]);
-                        foreach($res as $className) {
-                                if(!isset($flipped[$className])) {
-                                        continue;
-                                }
-                                $idx = $flipped[$className];
-                                unset($useblock[$idx]);
+                        foreach($res[1] as $className) {
+                                $matches[$className]['hits']++;
                         }
                 }
-                if($useblock) {
-                        foreach($useblock as $idx => $line) {
-                                unset($block[$idx]);
+                
+                foreach($matches as $row) {
+                        if($row['hits'] == 1) {
+                                echo "\n\t- remove #".$row['line'].': '.$block[$row['line']];
+                                unset($block[$row['line']]);
+                                $hit = true;
                         }
                 }
         }
 
-        if($useblock) {
+        if($hit) {
                 file_put_contents($filename, implode("", $block));
                 echo "\tchanged\n";

namespace-use-order

@@ -1 +1 @@
 #!/usr/bin/php
 <?php
+# sorts namespace-use clauses in a directory way
 if(!isset($_SERVER['argv'][1]) || in_array($_SERVER['argv'][1], array('--help', '-h', '-?'))) {
         help();
@@ -14 +15 @@
         }
 }
-
 
 function updateFile($filename) {
@@ -99 +99 @@
                 }
                 // sort: alphabetical order
-                asort($dir);
-                asort($file);
+                natcasesort($dir);
+                natcasesort($file);
                 $sort = array_merge(array_keys($dir), array_keys($file));