Merge pull request #7 from adamwojs/issue_3

Added support for non-namespaced files

Author: adamwojs

src/Analyzer/NamespaceAnalyzer.php

@@ -27,6 +27,17 @@ public function getNamespaces(): array
 
         $imports = $this->getImportsPerNamespace();
 
+        if (empty($imports)) {
+            // Global namespace without imports
+            return [
+                new NamespaceInfo(
+                    "",
+                    new Range(0, $this->tokens->count()),
+                    []
+                )
+            ];
+        }
+
         $this->tokens->rewind();
         foreach ($this->tokens as $index => $token) {
             if (!$token->isGivenKind(T_NAMESPACE)) {
@@ -42,9 +53,14 @@ public function getNamespaces(): array
             ));
 
             $scope = $this->getNamespaceScope($declarationEndIndex);
-            $namespaceImports = array_filter($imports, function (ImportInfo $info) use ($scope) {
-                return $scope->inRange($info->getDeclaration()->getStartIndex());
-            });
+
+            $namespaceImports = [];
+            foreach ($imports as $shortName => $import) {
+                if ($scope->inRange($import->getDeclaration()->getStartIndex())) {
+                    $namespaceImports[$shortName] = $import;
+                    unset($imports[$shortName]);
+                }
+            }
 
             $namespaces[] = new NamespaceInfo(
                 $namespaceName,
@@ -53,6 +69,14 @@ public function getNamespaces(): array
             );
         }
 
+        if (!empty($imports)) {
+            $namespaces[] = new NamespaceInfo(
+                "",
+                $this->getNamespaceScope(reset($imports)->getDeclaration()->getStartIndex()),
+                $imports
+            );
+        }
+
         return $namespaces;
     }
 

src/Analyzer/Range.php

@@ -56,4 +56,9 @@ public function inRange(int $index): bool
 
         return true;
     }
+
+    public function __toString()
+    {
+        return sprintf("[%s,%s]", $this->startIndex, $this->endIndex ?? 'INF');
+    }
 }

src/Fixer/Phpdoc/ForceFQCNFixer.php

@@ -59,21 +59,20 @@ public function fix(SplFileInfo $file, Tokens $tokens): void
 
         $tokens->rewind();
 
-        $currentNamespace = null;
         foreach ($tokens as $index => $token) {
-            if ($token->isGivenKind(T_NAMESPACE)) {
-                $namespaceFQCN = $this->getNamespaceDeclaration($tokens, $index);
+            if ($token->isGivenKind(T_DOC_COMMENT)) {
+                $currentNamespace = null;
                 foreach ($namespaces as $namespace) {
-                    if ($namespace->getName() == $namespaceFQCN) {
+                    if ($namespace->getScope()->inRange($index)) {
                         $currentNamespace = $namespace;
                         break;
                     }
                 }
 
-                continue;
-            }
+                if ($currentNamespace === null) {
+                    continue;
+                }
 
-            if ($token->isGivenKind(T_DOC_COMMENT)) {
                 $docBlock = new DocBlock($token->getContent());
 
                 $annotations = $docBlock->getAnnotationsOfType(Annotation::getTagsWithTypes());
@@ -129,21 +128,4 @@ private function fixAnnotation(NamespaceInfo $currentNamespace, Annotation $anno
             $annotation->setTypes($types);
         }
     }
-
-    /**
-     * @param \PhpCsFixer\Tokenizer\Tokens $tokens
-     * @param int $index
-     *
-     * @return string
-     */
-    private function getNamespaceDeclaration(Tokens $tokens, int $index): string
-    {
-        $declarationStartIndex = $index;
-        $declarationEndIndex = $tokens->getNextTokenOfKind($index, [';', '{']);
-
-        return trim($tokens->generatePartialCode(
-            $declarationStartIndex + 1,
-            $declarationEndIndex - 1
-        ));
-    }
 }