SplFileInfoValue::getDisplayValue: Return short path

jnvsor · Nov 3, 2024 · 66c2a45 · 66c2a45
1 parent ecbe3f6
commit 66c2a45
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/build/kint.phar b/build/kint.phar
diff --git a/src/Renderer/Text/SplFileInfoPlugin.php b/src/Renderer/Text/SplFileInfoPlugin.php
@@ -49,6 +49,9 @@ public function render(AbstractValue $v): ?string
         }
 
         $out .= $this->renderer->renderHeader($v);
+        if (null !== $v->getDisplayValue()) {
+            $out .= ':';
+        }
         $out .= ' '.$this->renderer->colorValue($this->renderer->escape($r->getValue())).PHP_EOL;
 
         return $out;

diff --git a/src/Value/Representation/SplFileInfoRepresentation.php b/src/Value/Representation/SplFileInfoRepresentation.php
@@ -50,7 +50,8 @@ public function __construct(SplFileInfo $fileInfo)
         $typename = 'Unknown file';
 
         try {
-            if (\strlen($path) && $fileInfo->getRealPath()) {
+            // SplFileInfo::getRealPath will return cwd when path is ''
+            if ('' !== $path && $fileInfo->getRealPath()) {
                 $perms = $fileInfo->getPerms();
                 $size = $fileInfo->getSize();
                 $owner = $fileInfo->getOwner();

diff --git a/src/Value/SplFileInfoValue.php b/src/Value/SplFileInfoValue.php
@@ -34,15 +34,20 @@
 
 class SplFileInfoValue extends InstanceValue
 {
+    /** @psalm-readonly */
+    protected string $path;
     /** @psalm-readonly */
     protected ?int $filesize = null;
 
     public function __construct(ContextInterface $context, SplFileInfo $info)
     {
         parent::__construct($context, \get_class($info), \spl_object_hash($info), \spl_object_id($info));
 
+        $this->path = $info->getPathname();
+
         try {
-            if (\strlen($info->getPathname()) && $info->getRealPath()) {
+            // SplFileInfo::getRealPath will return cwd when path is ''
+            if ('' !== $this->path && $info->getRealPath()) {
                 $this->filesize = $info->getSize();
             }
         } catch (RuntimeException $e) {
@@ -73,4 +78,15 @@ public function getDisplaySize(): ?string
 
         return $size['value'].$size['unit'];
     }
+
+    public function getDisplayValue(): ?string
+    {
+        $shortpath = Utils::shortenPath($this->path);
+
+        if ($shortpath !== $this->path) {
+            return $shortpath;
+        }
+
+        return parent::getDisplayValue();
+    }
 }
diff --git a/tests/Value/Representation/SplFileInfoRepresentationTest.php b/tests/Value/Representation/SplFileInfoRepresentationTest.php
@@ -180,6 +180,11 @@ public function fileProvider()
                 '----------     ',
                 'Unknown file',
             ],
+            'garbage' => [
+                'asdffffff',
+                '----------     asdffffff',
+                'Unknown file',
+            ],
         ];
     }