Fix the result when comparing directories where the parent comes befo…

…re the child
theseer · Sep 18, 2023 · e921138 · e921138
1 parent af2f9e6
commit e921138
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/PathComparator.php b/src/PathComparator.php
@@ -20,14 +20,14 @@ public function __construct(array $directories) {
         }
 
         public function getCommonBase() {
-            if (count($this->directories) == 0) {
+            if (count($this->directories) === 0) {
                 return '/';
             }
             $result = $this->directories[0];
             foreach($this->directories as $dir) {
-                $result = substr($dir, 0, $this->commonPrefix($result, $dir));
+                $result = substr($dir, 0, $this->commonPrefix($result, $dir)).'/';
             }
-            return ($result ?: '/');
+            return (rtrim($result, '/') ?: '/');
         }
 
 

diff --git a/tests/PathComparatorTest.php b/tests/PathComparatorTest.php
@@ -25,6 +25,9 @@ public function directoriesProvider() {
                 'two' => array(
                     array(__DIR__, dirname(__DIR__)), dirname(__DIR__)
                 ),
+                'shortfirst' => array(
+                    array(dirname(__DIR__), __DIR__), dirname(__DIR__)
+                ),
                 'parents' => array(
                     array(__DIR__ . '/../src', __DIR__ . '/../tests/_data'), dirname(__DIR__)
                 ),