优化

top-think · Jan 7, 2025 · ff9df99 · ff9df99
1 parent f576753
commit ff9df99
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 90 deletions.
diff --git a/README.md b/README.md
@@ -0,0 +1,16 @@
+# Think Dumper
+
+适配ThinkPHP的`symfony/var-dumper`，支持远程打印
+
+## 安装
+```bash
+composer require topthink/think-dumper --dev 
+```
+
+## 使用
+```php
+dump($var);
+```
+
+## 远程打印
+https://developer.topthink.com/thinkphp/dumper
diff --git a/src/Dumper.php b/src/Dumper.php
@@ -15,7 +15,7 @@ class Dumper
 {
     private static $handlers;
 
-    public static function dump($var, string $label = null)
+    public static function dump($var, ?string $label = null)
     {
         $token = env('DUMPER_TOKEN');
 

diff --git a/src/SourceContextProvider.php b/src/SourceContextProvider.php
@@ -2,10 +2,8 @@
 
 namespace think\dumper;
 
-use Symfony\Component\VarDumper\Cloner\VarCloner;
 use Symfony\Component\VarDumper\Dumper\ContextProvider\ContextProviderInterface;
-use Symfony\Component\VarDumper\Dumper\HtmlDumper;
-use Twig\Template;
+use Symfony\Component\VarDumper\VarDumper;
 
 final class SourceContextProvider implements ContextProviderInterface
 {
@@ -21,62 +19,31 @@ public function __construct(
     public function getContext(): ?array
     {
         $trace = debug_backtrace(\DEBUG_BACKTRACE_PROVIDE_OBJECT | \DEBUG_BACKTRACE_IGNORE_ARGS, $this->limit);
+        $trace = array_reverse($trace);
 
-        $file        = $trace[1]['file'];
-        $line        = $trace[1]['line'];
-        $name        = '-' === $file || 'Standard input code' === $file ? 'Standard input code' : false;
-        $fileExcerpt = false;
+        $i    = 0;
+        $file = '-';
+        $line = 0;
 
-        for ($i = 2; $i < $this->limit; ++$i) {
-            if (isset($trace[$i]['class'], $trace[$i]['function'])
-                && 'dump' === $trace[$i]['function']
-                && Dumper::class === $trace[$i]['class']
-            ) {
-                $file = $trace[$i]['file'] ?? $file;
-                $line = $trace[$i]['line'] ?? $line;
+        do {
+            $file = $trace[$i]['file'] ?? $file;
+            $line = $trace[$i]['line'] ?? $line;
 
-                while (++$i < $this->limit) {
-                    if (isset($trace[$i]['function'], $trace[$i]['file']) && empty($trace[$i]['class']) && !str_starts_with($trace[$i]['function'], 'call_user_func')) {
-                        $file = $trace[$i]['file'];
-                        $line = $trace[$i]['line'];
-
-                        break;
-                    } elseif (isset($trace[$i]['object']) && $trace[$i]['object'] instanceof Template) {
-                        $template = $trace[$i]['object'];
-                        $name     = $template->getTemplateName();
-                        $src      = method_exists($template, 'getSourceContext') ? $template->getSourceContext()
-                            ->getCode() : (method_exists($template, 'getSource') ? $template->getSource() : false);
-                        $info     = $template->getDebugInfo();
-                        if (isset($info[$trace[$i - 1]['line']])) {
-                            $line = $info[$trace[$i - 1]['line']];
-                            $file = method_exists($template, 'getSourceContext') ? $template->getSourceContext()
-                                ->getPath() : null;
-
-                            if ($src) {
-                                $src         = explode("\n", $src);
-                                $fileExcerpt = [];
-
-                                for ($i = max($line - 3, 1), $max = min($line + 3, \count($src)); $i <= $max; ++$i) {
-                                    $fileExcerpt[] = '<li' . ($i === $line ? ' class="selected"' : '') . '><code>' . $this->htmlEncode($src[$i - 1]) . '</code></li>';
-                                }
-
-                                $fileExcerpt = '<ol start="' . max($line - 3, 1) . '">' . implode("\n", $fileExcerpt) . '</ol>';
-                            }
-                        }
-                        break;
-                    }
-                }
+            $function = $trace[$i]['function'] ?? null;
+            $class    = $trace[$i]['class'] ?? null;
+            if ($function == 'dump' && ($class == null || $class == Dumper::class || $class == VarDumper::class)) {
                 break;
             }
-        }
+        } while (++$i < $this->limit);
+
+        $name = '-' === $file || 'Standard input code' === $file ? 'Standard input code' : false;
 
         if (false === $name) {
             $name = str_replace('\\', '/', $file);
             $name = substr($name, strrpos($name, '/') + 1);
         }
 
-        $context                 = ['name' => $name, 'file' => $file, 'line' => $line];
-        $context['file_excerpt'] = $fileExcerpt;
+        $context = ['name' => $name, 'file' => $file, 'line' => $line];
 
         if (null !== $this->projectDir) {
             $context['project_dir'] = $this->projectDir;
@@ -88,19 +55,4 @@ public function getContext(): ?array
         return $context;
     }
 
-    private function htmlEncode(string $s): string
-    {
-        $html = '';
-
-        $dumper = new HtmlDumper(function ($line) use (&$html) {
-            $html .= $line;
-        }, $this->charset);
-        $dumper->setDumpHeader('');
-        $dumper->setDumpBoundaries('', '');
-
-        $cloner = new VarCloner();
-        $dumper->dump($cloner->cloneVar($s));
-
-        return substr(strip_tags($html), 1, -1);
-    }
 }
diff --git a/src/helper.php b/src/helper.php
@@ -1,28 +1,8 @@
 <?php
 
-use Symfony\Component\VarDumper\Caster\ScalarStub;
+use Symfony\Component\VarDumper\VarDumper;
 use think\dumper\Dumper;
 
-function d(mixed ...$vars): mixed
-{
-    if (!$vars) {
-        Dumper::dump(new ScalarStub('🐛'));
-
-        return null;
-    }
-
-    if (array_key_exists(0, $vars) && 1 === count($vars)) {
-        Dumper::dump($vars[0]);
-        $k = 0;
-    } else {
-        foreach ($vars as $k => $v) {
-            Dumper::dump($v, is_int($k) ? 1 + $k : $k);
-        }
-    }
-
-    if (1 < count($vars)) {
-        return $vars;
-    }
-
-    return $vars[$k];
-}
+VarDumper::setHandler(function ($var, ?string $label = null) {
+    Dumper::dump($var, $label);
+});
diff --git a/tests/DumperTest.php b/tests/DumperTest.php
@@ -10,7 +10,7 @@ class DumperTest extends TestCase
     public function testDump()
     {
         Dumper::dump('aa', 'cc');
-        d(['aa' => 'bbb', 'cc' => 'dd']);
-        d($this);
+        dump(['aa' => 'bbb', 'cc' => 'dd']);
+        dump($this);
     }
 }