Is BaseFileHelper::normalizePath not handling the current path (.) correctly?

[skotos]

When I execute the following I get an error...

vendor/bin/apidoc api . /tmp/docs

I've traced this to the \yii\helpers\BaseFileHelper::normalizePath function turning "." into a blank string. Should it instead leave a simple "." as a reference to the current directory?

The following patch would accomplish this, but it would also mean normalizePath('./test') === "./test" (not "test"). What would be best for the framework?

diff --git a/framework/helpers/BaseFileHelper.php b/framework/helpers/BaseFileHelper.php
index 0974d8d..5cc30e5 100644
--- a/framework/helpers/BaseFileHelper.php
+++ b/framework/helpers/BaseFileHelper.php
@@ -49,8 +49,10 @@ class BaseFileHelper
         $parts = [];
         foreach (explode($ds, $path) as $part) {
             if ($part === '..' && !empty($parts) && end($parts) !== '..') {
-                array_pop($parts);
-            } elseif ($part === '.' || $part === '' && !empty($parts)) {
+                if (array_pop($parts) === ".") {
+                    $parts[] = '..';
+                }
+            } elseif (( $part === '.' || $part === '' ) && !empty($parts)) {
                 continue;
             } else {
                 $parts[] = $part;
diff --git a/tests/unit/framework/helpers/FileHelperTest.php b/tests/unit/framework/helpers/FileHelperTest.php
index b8822df..7d6ce9b 100644
--- a/tests/unit/framework/helpers/FileHelperTest.php
+++ b/tests/unit/framework/helpers/FileHelperTest.php
@@ -369,10 +369,13 @@ class FileHelperTest extends TestCase
         $this->assertEquals("..{$ds}c", FileHelper::normalizePath('//a/.\\b//..//..//../../c'));

         // relative paths
+        $this->assertEquals(".", FileHelper::normalizePath('.'));
+        $this->assertEquals(".", FileHelper::normalizePath('./'));
         $this->assertEquals("..{$ds}..{$ds}a", FileHelper::normalizePath('../..\\a'));
         $this->assertEquals("..{$ds}..{$ds}a", FileHelper::normalizePath('../..\\a/../a'));
         $this->assertEquals("..{$ds}..{$ds}b", FileHelper::normalizePath('../..\\a/../b'));
         $this->assertEquals("..{$ds}a", FileHelper::normalizePath('./..\\a'));
+        $this->assertEquals("..{$ds}a", FileHelper::normalizePath('././..\\a'));
         $this->assertEquals("..{$ds}a", FileHelper::normalizePath('./..\\a/../a'));
         $this->assertEquals("..{$ds}b", FileHelper::normalizePath('./..\\a/../b'));
     }

[skotos]

If you like the above patch, I can do a pull request on it.

[samdark]

@skotos I think normalizePath('./test') should still give you test.

[skotos]

That's what I thought. I'll submit a pull request after I tweak it.

[skotos]

Sorry, I accidently created the Pull Request as #3529

[cebe]

I've traced this to the \yii\helpers\BaseFileHelper::normalizePath function turning "." into a blank string. Should it instead leave a simple "." as a reference to the current directory?

isn't a blank string and . equivalent for current dir?

[samdark]

Not in case when a command requires input. If it's . it is considered an argument with current dir as a values. If it's empty it's considered as missing argument.

[cebe]

okay but what is the problem then? normalizePath is called after the arguments have been given.

[skotos]

$ php -r "var_dump(is_dir('.'));" (true) $ php -r "var_dump(is_dir(''));" (false)

$ php -r "var_dump(scandir(''));"
PHP Warning:  scandir(): Directory name cannot be empty in Command line code on line 1
bool(false)

$ php -r "var_dump(scandir('.'));"
array(4) {
  [0]=>
  string(1) "."
  [1]=>
  string(2) ".."
  [2]=>
  string(3) "bar"
  [3]=>
  string(3) "foo"
}

[cebe]

thanks, its clear now.