Browse Source

Improve actual "namespace" and "use" directives detection (fix ISSUE #35).

Daniele Alessandri 13 years ago
parent
commit
6151d6d53e
1 changed files with 2 additions and 2 deletions
  1. 2 2
      bin/createSingleFile.php

+ 2 - 2
bin/createSingleFile.php

@@ -289,8 +289,8 @@ class PhpClass {
 
         $classBuffer = preg_replace('/<\?php\s?\\n\s?/', '', $classBuffer);
         $classBuffer = preg_replace('/\s?\?>\n?/ms', '', $classBuffer);
-        $classBuffer = preg_replace('/namespace\s+.*;\s?/', '', $classBuffer);
-        $classBuffer = preg_replace_callback('/use\s+(.*)(\s+as\s+.*)?;\s?\n?/', $useExtractor, $classBuffer);
+        $classBuffer = preg_replace('/namespace\s+[\w\d_\\\]+;\s?/', '', $classBuffer);
+        $classBuffer = preg_replace_callback('/use\s+([\w\d_\\\]+)(\s+as\s+.*)?;\s?\n?/', $useExtractor, $classBuffer);
 
         $this->_body = trim($classBuffer);