Parser::noRecurseCall: Simplify logic

kint-php · Dec 30, 2024 · 9d3a86b · 9d3a86b
1 parent 9fa1184
commit 9d3a86b
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 9 deletions.
diff --git a/build/kint.phar b/build/kint.phar
diff --git a/src/Parser/Parser.php b/src/Parser/Parser.php
@@ -173,6 +173,12 @@ public function parse(&$var, ContextInterface $c): AbstractValue
 
     public function addPlugin(PluginInterface $p): void
     {
+        try {
+            $this->noRecurseCall();
+        } catch (DomainException $e) { // @codeCoverageIgnore
+            \trigger_error('Calling Kint\\Parser::addPlugin from inside a parse is deprecated', E_USER_DEPRECATED); // @codeCoverageIgnore
+        }
+
         if (!$types = $p->getTypes()) {
             return;
         }
@@ -209,24 +215,26 @@ public function addPlugin(PluginInterface $p): void
 
     public function clearPlugins(): void
     {
+        try {
+            $this->noRecurseCall();
+        } catch (DomainException $e) { // @codeCoverageIgnore
+            \trigger_error('Calling Kint\\Parser::clearPlugins from inside a parse is deprecated', E_USER_DEPRECATED); // @codeCoverageIgnore
+        }
+
         $this->plugins = [];
     }
 
     protected function noRecurseCall(): void
     {
         $bt = \debug_backtrace(DEBUG_BACKTRACE_PROVIDE_OBJECT | DEBUG_BACKTRACE_IGNORE_ARGS);
 
-        $caller_frame = [
-            'function' => __FUNCTION__,
-        ];
-
-        while (isset($bt[0]['object']) && $bt[0]['object'] === $this) {
-            $caller_frame = \array_shift($bt);
-        }
+        \reset($bt);
+        /** @psalm-var class-string $caller_frame['class'] */
+        $caller_frame = \next($bt);
 
         foreach ($bt as $frame) {
-            if (isset($frame['object']) && $frame['object'] === $this) {
-                throw new DomainException(__CLASS__.'::'.$caller_frame['function'].' cannot be called from inside a parse');
+            if (isset($frame['object']) && $frame['object'] === $this && 'parse' === $frame['function']) {
+                throw new DomainException($caller_frame['class'].'::'.$caller_frame['function'].' cannot be called from inside a parse');
             }
         }
     }

diff --git a/tests/Parser/ParserTest.php b/tests/Parser/ParserTest.php
@@ -166,6 +166,7 @@ function (&$var, $v) use ($p, &$success) {
                 try {
                     $p->setDepthLimit(43);
                 } catch (DomainException $e) {
+                    $this->assertStringStartsWith(Parser::class.'::setDepthLimit ', $e->getMessage());
                     $success = true;
                 }