Fix status command handling of symlinks, and especially broken ones, fixes #9169

4 years ago · e6b45e853a
parent 960413da3a
commit e6b45e853a
1 changed files with 6 additions and 6 deletions
--- a/src/Composer/Package/Comparer/Comparer.php
+++ b/src/Composer/Package/Comparer/Comparer.php
@ -102,21 +102,21 @@ class Comparer
        if ($dh = opendir($dir)) {
            while ($file = readdir($dh)) {
                if ($file !== '.' && $file !== '..') {
-                    if (is_dir($dir.'/'.$file)) {
+                    if (is_link($dir.'/'.$file)) {
+                        $array[$dir][$file] = readlink($dir.'/'.$file);
+                    } elseif (is_dir($dir.'/'.$file)) {
                        if (!count($array)) {
                            $array[0] = 'Temp';
                        }
                        if (!$this->doTree($dir.'/'.$file, $array)) {
                            return false;
                        }
-                    } else {
-                        if (filesize($dir.'/'.$file)) {
+                    } elseif (is_file($dir.'/'.$file) && filesize($dir.'/'.$file)) {
                        set_time_limit(30);
                        $array[$dir][$file] = md5_file($dir.'/'.$file);
                    }
                }
            }
-            }
            if (count($array) > 1 && isset($array['0'])) {
                unset($array['0']);
            }