refactor(database): defer whereColumn caller lookup

memleakd · memleakd · commit 95d543756818 · 2026-05-04T14:47:20.000+02:00
Signed-off-by: memleakd &lt;121398829+memleakd@users.noreply.github.com&gt;
diff --git a/system/Database/BaseBuilder.php b/system/Database/BaseBuilder.php
@@ -784,11 +784,12 @@ public function orWhereColumn(string $first, string $second, ?bool $escape = nul
      */
     protected function whereColumnHaving(string $qbKey, string $first, string $second, string $type = 'AND ', ?bool $escape = null)
     {
-        $caller             = debug_backtrace(0, 2)[1]['function'];
         [$first, $operator] = $this->parseWhereColumnFirst($first);
         $second             = trim($second);
 
         if ($first === '' || $second === '') {
+            $caller = debug_backtrace(0, 2)[1]['function'];
+
             throw new InvalidArgumentException(sprintf('%s() expects $first and $second to be non-empty strings', $caller));
         }
 

Original file line number	Diff line number	Diff line change
`@@ -784,11 +784,12 @@ public function orWhereColumn(string $first, string $second, ?bool $escape = nul`
`784`	`784`	`*/`
`785`	`785`	`protected function whereColumnHaving(string $qbKey, string $first, string $second, string $type = 'AND ', ?bool $escape = null)`
`786`	`786`	`{`
`787`		`- $caller = debug_backtrace(0, 2)[1]['function'];`
`788`	`787`	`[$first, $operator] = $this->parseWhereColumnFirst($first);`
`789`	`788`	`$second = trim($second);`
`790`	`789`
`791`	`790`	`if ($first === '' \|\| $second === '') {`
	`791`	`+ $caller = debug_backtrace(0, 2)[1]['function'];`
	`792`	`+`
`792`	`793`	`throw new InvalidArgumentException(sprintf('%s() expects $first and $second to be non-empty strings', $caller));`
`793`	`794`	`}`
`794`	`795`