Fix current namespace.

Author: prwater

src/Importing.php

@@ -184,6 +184,19 @@ public function simplyFullyQualifiedName(string $fullyQualifiedName): string
     return $this->replace[$fullyQualifiedName] ?? $fullyQualifiedName;
   }
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Returns true if and only if the a name space is the global or current namespace.
+   *
+   * @param string $namespace The namespace.
+   *
+   * @return bool
+   */
+  private function isGlobalOrCurrentNamespace(string $namespace): bool
+  {
+    return ($namespace===$this->namespace || $namespace==='');
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Returns raw data about classes to import.
@@ -204,12 +217,13 @@ private function prepare0(): array
                        'namespace'            => $namespace,
                        'name'                 => $name,
                        'alias'                => null,
-                       'import'               => ($namespace!==$this->namespace && $namespace!=='')];
+                       'import'               => !$this->isGlobalOrCurrentNamespace($namespace)];
     }
 
     foreach ($rawImports as &$rawImport)
     {
-      if (self::collision1($rawImports, $rawImport['fully_qualified_name']))
+      if (!$this->isGlobalOrCurrentNamespace($rawImport['namespace']) &&
+        self::collision1($rawImports, $rawImport['fully_qualified_name']))
       {
         $i = 1;
         do
@@ -275,7 +289,7 @@ private function prepare2(array $rawImports): void
     $this->replace = [];
     foreach ($rawImports as $rawImport)
     {
-      if ($rawImport['import'])
+      if ($rawImport['namespace']!=='')
       {
         $this->replace[$rawImport['fully_qualified_name']] = $rawImport['alias'] ?? $rawImport['name'];
       }

test/ImportingTest.php

@@ -89,6 +89,7 @@ public function testCollision3(): void
     $importing->addClass('\\Foo\\Bar\\ClassTwoAlias1');
     $importing->addClass('\\Foo\\Bar\\ClassTwoAlias2');
     $importing->addClass('\\Foo\\Bar\\ClassThree');
+    $importing->addClass('\\Throwable');
 
     $importing->prepare();
 
@@ -101,12 +102,13 @@ public function testCollision3(): void
 
     self::assertSame($expected, $importing->imports());
 
-    $expected = ['\\Foo\\Bar\\ClassTwoAlias1' => 'ClassTwoAlias1',
-                 '\\Foo\\Bar\\ClassTwoAlias2' => 'ClassTwoAlias2',
-                 '\\Foo\\Bar\\ClassThree'     => 'ClassThree',
-                 '\\Bar\\Foo\\ClassTwo'       => 'ClassTwoAlias3',
-                 '\\Foo\\Bar\\ClassOne'       => 'ClassOne',
-                 '\\Foo\\Bar\\ClassTwo'       => 'ClassTwoAlias4'];
+    $expected = ['\\'.__NAMESPACE__.'\\ClassTwo' => 'ClassTwo',
+                 '\\Foo\\Bar\\ClassTwoAlias1'    => 'ClassTwoAlias1',
+                 '\\Foo\\Bar\\ClassTwoAlias2'    => 'ClassTwoAlias2',
+                 '\\Foo\\Bar\\ClassThree'        => 'ClassThree',
+                 '\\Bar\\Foo\\ClassTwo'          => 'ClassTwoAlias3',
+                 '\\Foo\\Bar\\ClassOne'          => 'ClassOne',
+                 '\\Foo\\Bar\\ClassTwo'          => 'ClassTwoAlias4'];
 
     self::assertSame($expected, $importing->replacePairs());
   }
@@ -125,6 +127,34 @@ public function testNoImports(): void
     self::assertSame([], $importing->replacePairs());
   }
 
+  //--------------------------------------------------------------------------------------------------------------------
+  /**
+   * Simple test with 3 distinct classes and a global name.
+   */
+  public function testSameNamespace(): void
+  {
+    $importing = new Importing(__NAMESPACE__);
+    $importing->addClass(__NAMESPACE__.'\\ClassOne');
+    $importing->addClass(__NAMESPACE__.'\\ClassTwo');
+    $importing->addClass(__NAMESPACE__.'\\ClassThree');
+    $importing->addClass('\\Throwable');
+
+    $importing->prepare();
+
+    self::assertSame([], $importing->imports());
+
+    $expected = ['\\'.__NAMESPACE__.'\\ClassThree' => 'ClassThree',
+                 '\\'.__NAMESPACE__.'\\ClassOne'   => 'ClassOne',
+                 '\\'.__NAMESPACE__.'\\ClassTwo'   => 'ClassTwo'];
+
+    self::assertSame($expected, $importing->replacePairs());
+
+    self::assertSame('ClassOne', $importing->simplyFullyQualifiedName(__NAMESPACE__.'\\ClassOne'));
+    self::assertSame('ClassTwo', $importing->simplyFullyQualifiedName(__NAMESPACE__.'\\ClassTwo'));
+    self::assertSame('ClassThree', $importing->simplyFullyQualifiedName(__NAMESPACE__.'\\ClassThree'));
+    self::assertSame('\\Throwable', $importing->simplyFullyQualifiedName('\\Throwable'));
+  }
+
   //--------------------------------------------------------------------------------------------------------------------
   /**
    * Simple test with 3 distinct classes.
@@ -158,7 +188,7 @@ public function testSimpleCase(): void
   /**
    * Simple test with 3 distinct classes and a global name.
    */
-  public function testSimpleCaseWIthGlobalName(): void
+  public function testSimpleCaseWithGlobalName(): void
   {
     $importing = new Importing(__NAMESPACE__);
     $importing->addClass('\\Foo\\Bar\\ClassOne');