A free open source IT asset/license management system
Fixed #19895 - remove PHP 8.4/8.5 deprecation notices
sudarshanvashisht7bfc92c0b9e7
diff --git a/app/Console/Commands/AuditFileStorage.php b/app/Console/Commands/AuditFileStorage.phpindex 56c88bc19f..89894acd1e 100644--- a/app/Console/Commands/AuditFileStorage.php+++ b/app/Console/Commands/AuditFileStorage.php@@ -1090,7 +1090,7 @@ class AuditFileStorage extends Commandreturn;}- fputcsv($handle, ['direction', 'table', 'id', 'type', 'file']);+ fputcsv($handle, ['direction', 'table', 'id', 'type', 'file'], escape: '\\');foreach ($rows as $row) {fputcsv($handle, [$row['direction'] ?? 'missing',@@ -1098,7 +1098,7 @@ class AuditFileStorage extends Command$row['id'],$row['type'],$row['file'],- ]);+ ], escape: '\\');}fclose($handle);diff --git a/app/Helpers/Helper.php b/app/Helpers/Helper.phpindex df2088f99b..befa8fdb2f 100644--- a/app/Helpers/Helper.php+++ b/app/Helpers/Helper.php@@ -1082,8 +1082,6 @@ class Helper{$finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension$filetype = @finfo_file($finfo, $file);- finfo_close($finfo);-if (($filetype == 'image/jpeg') || ($filetype == 'image/jpg') || ($filetype == 'image/png') || ($filetype == 'image/bmp') || ($filetype == 'image/gif') || ($filetype == 'image/avif') || ($filetype == 'image/webp')) {return $filetype;}@@ -1105,8 +1103,6 @@ class Helper{$finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension$filetype = @finfo_file($finfo, $file);- finfo_close($finfo);-if (($filetype == 'video/mp4') || ($filetype == 'video/quicktime') || ($filetype == 'video/mpeg') || ($filetype == 'video/ogg') || ($filetype == 'video/webm') || ($filetype == 'video/x-msvide')) {return $filetype;}@@ -1128,8 +1124,6 @@ class Helper{$finfo = @finfo_open(FILEINFO_MIME_TYPE); // return mime type ala mimetype extension$filetype = @finfo_file($finfo, $file);- finfo_close($finfo);-if (($filetype == 'audio/mpeg') || ($filetype == 'audio/ogg')) {return $filetype;}diff --git a/app/Http/Controllers/Account/AcceptanceController.php b/app/Http/Controllers/Account/AcceptanceController.phpindex d122f07edf..c53c9843b8 100644--- a/app/Http/Controllers/Account/AcceptanceController.php+++ b/app/Http/Controllers/Account/AcceptanceController.php@@ -512,8 +512,6 @@ class AcceptanceController extends Controller$flattened = imagecreatetruecolor($width, $height);if ($flattened === false) {- imagedestroy($source);-return null;}@@ -525,9 +523,6 @@ class AcceptanceController extends Controller$encoded = @imagepng($flattened);$output = ob_get_clean();- imagedestroy($source);- imagedestroy($flattened);-// Fail-closed if either imagepng() reported failure or the// output buffer did not produce a string. Previously fell back// to the original bytes, which bypassed the canonicalizationdiff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.phpindex b6fcc7acfe..fcbf6ceb5a 100755--- a/app/Http/Controllers/Licenses/LicensesController.php+++ b/app/Http/Controllers/Licenses/LicensesController.php@@ -395,7 +395,7 @@ class LicensesController extends Controllertrans('general.created_at'),];- fputcsv($handle, $headers);+ fputcsv($handle, $headers, escape: '\\');$formatter = new EscapeFormula('`');@@ -432,11 +432,11 @@ class LicensesController extends Controller// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {- fputcsv($handle, $values);+ fputcsv($handle, $values, escape: '\\');// CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {- fputcsv($handle, $formatter->escapeRecord($values));+ fputcsv($handle, $formatter->escapeRecord($values), escape: '\\');}}});diff --git a/app/Http/Controllers/Reports/CustomComponentReportController.php b/app/Http/Controllers/Reports/CustomComponentReportController.phpindex 9e167b697b..e368626d7e 100644--- a/app/Http/Controllers/Reports/CustomComponentReportController.php+++ b/app/Http/Controllers/Reports/CustomComponentReportController.php@@ -62,7 +62,7 @@ class CustomComponentReportController extends Controller$headerRow = $this->generateHeaders($request, $mappings);Log::debug('Adding headers: '.$this->getExecutionTime());- fputcsv($handle, $headerRow);+ fputcsv($handle, $headerRow, escape: '\\');Log::debug('Added headers: '.$this->getExecutionTime());$this->buildQuery($request)->orderBy('components.id', 'ASC')->chunk(500, function ($components) use ($handle, $request, $mappings) {@@ -88,11 +88,11 @@ class CustomComponentReportController extends Controller// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');// CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}Log::debug('-- Record '.$count.' Component ID:'.$component->id.' in '.$this->getExecutionTime());diff --git a/app/Http/Controllers/Reports/CustomConsumableReportController.php b/app/Http/Controllers/Reports/CustomConsumableReportController.phpindex a922a8022f..96362ab87c 100644--- a/app/Http/Controllers/Reports/CustomConsumableReportController.php+++ b/app/Http/Controllers/Reports/CustomConsumableReportController.php@@ -73,7 +73,7 @@ class CustomConsumableReportController extends Controller$headerRow = $this->generateHeaders($request, $mappings);Log::debug('Adding headers: '.$this->getExecutionTime());- fputcsv($handle, $headerRow);+ fputcsv($handle, $headerRow, escape: '\\');Log::debug('Added headers: '.$this->getExecutionTime());$this->buildQuery($request)->orderBy('consumables.id', 'ASC')->chunk(500, function ($consumables) use ($handle, $request, $mappings) {@@ -99,11 +99,11 @@ class CustomConsumableReportController extends Controller// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');// CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}Log::debug('-- Record '.$count.' Consumable ID:'.$consumable->id.' in '.$this->getExecutionTime());diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex cb4d325759..df71609d4a 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -97,7 +97,7 @@ class ReportsController extends Controllertrans('admin/accessories/general.total'),trans('admin/accessories/general.remaining'),];- fputcsv($handle, $header);+ fputcsv($handle, $header, escape: '\\');$formatter = new EscapeFormula('`');@@ -112,9 +112,9 @@ class ReportsController extends Controller];if (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}}});@@ -171,7 +171,7 @@ class ReportsController extends Controllertrans('admin/hardware/table.book_value'),trans('admin/hardware/table.diff'),];- fputcsv($handle, $header);+ fputcsv($handle, $header, escape: '\\');Asset::with('model', 'assignedTo', 'status', 'defaultLoc', 'assetlog')->orderBy('created_at', 'DESC')@@ -212,9 +212,9 @@ class ReportsController extends Controller];if (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}}});@@ -349,7 +349,7 @@ class ReportsController extends Controller];$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];Log::debug('Starting headers: '.$executionTime);- fputcsv($handle, $header);+ fputcsv($handle, $header, escape: '\\');$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];Log::debug('Added headers: '.$executionTime);@@ -414,11 +414,11 @@ class ReportsController extends Controller// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');// CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}}});@@ -479,7 +479,7 @@ class ReportsController extends Controllertrans('general.depreciation'),trans('general.purchase_cost'),];- fputcsv($handle, $header);+ fputcsv($handle, $header, escape: '\\');License::orderBy('created_at', 'DESC')->chunk(500, function ($licenses) use ($handle, $formatter) {foreach ($licenses as $license) {@@ -503,9 +503,9 @@ class ReportsController extends Controller];if (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}}});@@ -801,7 +801,7 @@ class ReportsController extends Controller// cell like "=cmd|'/c calc.exe'!A1" would evaluate as a// formula on a reports.view user's workstation.$headerFormatter = new EscapeFormula('`');- fputcsv($handle, $headerFormatter->escapeRecord($header));+ fputcsv($handle, $headerFormatter->escapeRecord($header), escape: '\\');$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];Log::debug('Added headers: '.$executionTime);@@ -1275,11 +1275,11 @@ class ReportsController extends Controller// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');// CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}$executionTime = microtime(true) - $_SERVER['REQUEST_TIME_FLOAT'];@@ -1343,7 +1343,7 @@ class ReportsController extends Controllertrans('admin/maintenances/form.is_warranty'),trans('admin/maintenances/form.notes'),];- fputcsv($handle, $header);+ fputcsv($handle, $header, escape: '\\');// No completed-filter here — exports every maintenance, active// or completed. Eager-load the four relations the row loop@@ -1376,9 +1376,9 @@ class ReportsController extends Controller];if (config('app.escape_formulas') === false) {- fputcsv($handle, $row);+ fputcsv($handle, $row, escape: '\\');} else {- fputcsv($handle, $formatter->escapeRecord($row));+ fputcsv($handle, $formatter->escapeRecord($row), escape: '\\');}}});diff --git a/app/Http/Controllers/SettingsController.php b/app/Http/Controllers/SettingsController.phpindex 15254e2c24..fc7608ccfa 100644--- a/app/Http/Controllers/SettingsController.php+++ b/app/Http/Controllers/SettingsController.php@@ -193,7 +193,7 @@ class SettingsController extends Controller'Item Location','Location Company','Location Company ID',- ]);+ ], escape: '\\');// Formula-escape data rows using the same helper + setting as// ReportsController's exports. Row values include user-editable@@ -205,9 +205,9 @@ class SettingsController extends Controller$formatter = new EscapeFormula('`');foreach ($mismatched as $row) {if (config('app.escape_formulas') === false) {- fputcsv($out, $row);+ fputcsv($out, $row, escape: '\\');} else {- fputcsv($out, $formatter->escapeRecord($row));+ fputcsv($out, $formatter->escapeRecord($row), escape: '\\');}}fclose($out);diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.phpindex b534a2a65a..d09c13e79e 100755--- a/app/Http/Controllers/Users/UsersController.php+++ b/app/Http/Controllers/Users/UsersController.php@@ -618,7 +618,7 @@ class UsersController extends Controllertrans('admin/licenses/table.deleted_at'),];- fputcsv($handle, $headers);+ fputcsv($handle, $headers, escape: '\\');$users = User::with('assets',@@ -700,11 +700,11 @@ class UsersController extends Controller// CSV_ESCAPE_FORMULAS is set to false in the .envif (config('app.escape_formulas') === false) {- fputcsv($handle, $values);+ fputcsv($handle, $values, escape: '\\');// CSV_ESCAPE_FORMULAS is set to true or is not set in the .env} else {- fputcsv($handle, $formatter->escapeRecord($values));+ fputcsv($handle, $formatter->escapeRecord($values), escape: '\\');}}});diff --git a/tests/Feature/CheckoutAcceptances/AcceptanceSignatureImageValidationTest.php b/tests/Feature/CheckoutAcceptances/AcceptanceSignatureImageValidationTest.phpindex 4d9a03a97d..b2761a8a7b 100644--- a/tests/Feature/CheckoutAcceptances/AcceptanceSignatureImageValidationTest.php+++ b/tests/Feature/CheckoutAcceptances/AcceptanceSignatureImageValidationTest.php@@ -34,8 +34,6 @@ class AcceptanceSignatureImageValidationTest extends TestCaseob_start();imagepng($canvas);$bytes = (string) ob_get_clean();- imagedestroy($canvas);-return $bytes;}@@ -186,8 +184,6 @@ class AcceptanceSignatureImageValidationTest extends TestCaseob_start();imagejpeg($canvas);$jpegBytes = (string) ob_get_clean();- imagedestroy($canvas);-$this->actingAs($target)->post(route('account.store-acceptance', $acceptance), ['asset_acceptance' => 'accepted',diff --git a/tests/Feature/CheckoutAcceptances/AcceptanceStorageFailureTest.php b/tests/Feature/CheckoutAcceptances/AcceptanceStorageFailureTest.phpindex 702ed4f58d..69ae362e85 100644--- a/tests/Feature/CheckoutAcceptances/AcceptanceStorageFailureTest.php+++ b/tests/Feature/CheckoutAcceptances/AcceptanceStorageFailureTest.php@@ -44,8 +44,6 @@ class AcceptanceStorageFailureTest extends TestCaseob_start();imagepng($canvas);$signaturePng = (string) ob_get_clean();- imagedestroy($canvas);-return ['asset_acceptance' => 'accepted','signature_output' => 'data:image/png;base64,' . base64_encode($signaturePng),diff --git a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.phpindex e704bb5a06..c5c85100b7 100644--- a/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php+++ b/tests/Feature/CheckoutAcceptances/Ui/AssetAcceptanceTest.php@@ -115,8 +115,6 @@ class AssetAcceptanceTest extends TestCaseob_start();imagepng($canvas);$signaturePng = (string) ob_get_clean();- imagedestroy($canvas);-$signatureOutput = 'data:image/png;base64,'.base64_encode($signaturePng);$this->actingAs($checkoutAcceptance->assignedTo)diff --git a/tests/Feature/Console/Commands/AuditFileStorageTest.php b/tests/Feature/Console/Commands/AuditFileStorageTest.phpindex 1ad89517b1..a5931fb429 100644--- a/tests/Feature/Console/Commands/AuditFileStorageTest.php+++ b/tests/Feature/Console/Commands/AuditFileStorageTest.php@@ -260,11 +260,11 @@ class AuditFileStorageTest extends TestCase$this->assertFileExists($this->csvPath);$handle = fopen($this->csvPath, 'r');- $header = fgetcsv($handle);+ $header = fgetcsv($handle, escape: '\\');$this->assertSame(['direction', 'table', 'id', 'type', 'file'], $header);$rows = [];- while (($row = fgetcsv($handle)) !== false) {+ while (($row = fgetcsv($handle, escape: '\\')) !== false) {$rows[] = array_combine($header, $row);}fclose($handle);diff --git a/tests/Feature/Console/RestoreFromBackupPruningTest.php b/tests/Feature/Console/RestoreFromBackupPruningTest.phpindex ed05027e91..93e31f932d 100644--- a/tests/Feature/Console/RestoreFromBackupPruningTest.php+++ b/tests/Feature/Console/RestoreFromBackupPruningTest.php@@ -48,7 +48,6 @@ class RestoreFromBackupPruningTest extends TestCasefile_put_contents($privateDir.'/.gitkeep', '');$prune = new ReflectionMethod(RestoreFromBackup::class, 'pruneUploadDirectories');- $prune->setAccessible(true);$prune->invoke(null, [$publicDir], [$privateDir]);$this->assertFileDoesNotExist($publicDir.'/asset-1.png');@@ -64,7 +63,6 @@ class RestoreFromBackupPruningTest extends TestCase$missing = $this->sandbox.'/does/not/exist';$prune = new ReflectionMethod(RestoreFromBackup::class, 'pruneUploadDirectories');- $prune->setAccessible(true);// Should not throw even when the enumerated directory does not exist.$prune->invoke(null, [$missing], []);@@ -89,7 +87,6 @@ class RestoreFromBackupPruningTest extends TestCasefile_put_contents($uploadsRoot.'/unrelated.txt', 'bytes');$prune = new ReflectionMethod(RestoreFromBackup::class, 'pruneUploadFiles');- $prune->setAccessible(true);$prune->invoke(null, [$uploadsRoot.'/Setting-*',$uploadsRoot.'/setting-*',@@ -121,7 +118,6 @@ class RestoreFromBackupPruningTest extends TestCasefile_put_contents($nested.'/nested.png', 'bytes');$prune = new ReflectionMethod(RestoreFromBackup::class, 'pruneUploadDirectories');- $prune->setAccessible(true);$prune->invoke(null, [$dir], []);$this->assertFileDoesNotExist($dir.'/top-level.png');diff --git a/tests/Feature/PredefinedKits/PredefinedKitConcurrencyGuardsTest.php b/tests/Feature/PredefinedKits/PredefinedKitConcurrencyGuardsTest.phpindex 38b9e980f3..367633b635 100644--- a/tests/Feature/PredefinedKits/PredefinedKitConcurrencyGuardsTest.php+++ b/tests/Feature/PredefinedKits/PredefinedKitConcurrencyGuardsTest.php@@ -151,8 +151,6 @@ class PredefinedKitConcurrencyGuardsTest extends TestCasearray $accessories,): array {$method = new ReflectionMethod($service, 'saveToDb');- $method->setAccessible(true);-return $method->invoke($service,$user,diff --git a/tests/Feature/SyncAdapters/Kandji/KandjiAdapterTest.php b/tests/Feature/SyncAdapters/Kandji/KandjiAdapterTest.phpindex 139a8e7dfd..ee1ea48efc 100644--- a/tests/Feature/SyncAdapters/Kandji/KandjiAdapterTest.php+++ b/tests/Feature/SyncAdapters/Kandji/KandjiAdapterTest.php@@ -145,7 +145,6 @@ class KandjiAdapterTest extends TestCase// native-field writer with a datetime payload.$reflection = new \ReflectionClass(\App\SyncAdapters\SyncsHostFromRecord::class);$writeNative = $reflection->getMethod('writeNative');- $writeNative->setAccessible(true);$writeNative->invoke(null, $asset, 'purchase_date', '2026-07-23T03:00:00Z', $instance, $record);// Asset casts purchase_date, so read the raw stored attribute todiff --git a/tests/Support/Importing/FileBuilder.php b/tests/Support/Importing/FileBuilder.phpindex 37b7093497..1436e864c2 100644--- a/tests/Support/Importing/FileBuilder.php+++ b/tests/Support/Importing/FileBuilder.php@@ -217,7 +217,7 @@ abstract class FileBuilder}$row = $newrow;}- fputcsv($stream, $row);+ fputcsv($stream, $row, escape: '\\');}return $filename;diff --git a/tests/Unit/Codebase/CsvEscapeArgumentTest.php b/tests/Unit/Codebase/CsvEscapeArgumentTest.phpnew file mode 100644index 0000000000..1ede2b4604--- /dev/null+++ b/tests/Unit/Codebase/CsvEscapeArgumentTest.php@@ -0,0 +1,126 @@+<?php++namespace Tests\Unit\Codebase;++use PHPUnit\Framework\TestCase;++/**+ * Codebase-shape guardrail for the CSV escape argument.+ *+ * PHP 8.4 deprecated relying on the implicit default for the `$escape`+ * parameter of `fputcsv()` and `fgetcsv()`:+ *+ * Deprecated: fputcsv(): the $escape parameter must be provided as its+ * default value will change+ *+ * The default itself did not change (it is still a single backslash), so+ * passing `escape: '\\'` explicitly is a byte-for-byte identical, zero+ * behaviour-change fix. But it has to be passed *explicitly* everywhere,+ * otherwise every CSV export and every CSV import emits a deprecation notice+ * on PHP 8.4, 8.5 and 8.6.+ *+ * This test fails if a new `fputcsv()` / `fgetcsv()` call is added without an+ * explicit `escape:` argument, so the deprecation cannot silently come back.+ */+class CsvEscapeArgumentTest extends TestCase+{+ private const SCAN_DIRS = ['app', 'tests'];+ private const CSV_FUNCTIONS = ['fputcsv', 'fgetcsv'];++ public function test_every_fputcsv_and_fgetcsv_call_passes_an_explicit_escape_argument(): void+ {+ $projectRoot = dirname(__DIR__, 3);+ $hits = [];++ foreach (self::SCAN_DIRS as $dir) {+ foreach ($this->scanPhpFiles($projectRoot.'/'.$dir) as $absolutePath) {+ $relative = ltrim(substr($absolutePath, strlen($projectRoot) + 1), '/');+ $contents = file_get_contents($absolutePath);+ if ($contents === false) continue;++ foreach ($this->findCsvCalls($contents) as $call) {+ if ($call['has_escape']) continue;+ $hits[] = $relative.':'.$call['line'].' '.$call['source'];+ }+ }+ }++ $this->assertEmpty(+ $hits,+ "Found fputcsv()/fgetcsv() call(s) without an explicit \$escape argument.\n".+ "PHP 8.4 deprecated the implicit default for \$escape, so PHP 8.4+ emits a deprecation notice for every one of these calls.\n".+ "Pass it explicitly - the default is a single backslash, so this changes nothing:\n".+ " fputcsv(\$handle, \$row, escape: '\\\\');\n\n".+ "Hits:\n".implode("\n", $hits)+ );+ }++ private function findCsvCalls(string $contents): array+ {+ $calls = [];+ $tokens = token_get_all($contents);+ $count = count($tokens);++ for ($i = 0; $i < $count; $i++) {+ $token = $tokens[$i];+ if (! is_array($token) || $token[0] !== T_STRING) continue;+ if (! in_array(strtolower($token[1]), self::CSV_FUNCTIONS, true)) continue;+ $next = $tokens[$i + 1] ?? null;+ if ($next !== '(') continue;+ $closeIndex = $this->findClosingParenthesis($tokens, $i + 1);+ if ($closeIndex === null) continue;++ $calls[] = [+ 'line' => $token[2],+ 'source' => $this->sourceLine($contents, $token[2]),+ 'has_escape' => $this->hasEscapeArgument($tokens, $i + 2, $closeIndex),+ ];+ }+ return $calls;+ }++ private function findClosingParenthesis(array $tokens, int $openIndex): ?int+ {+ $depth = 0; $count = count($tokens);+ for ($i = $openIndex; $i < $count; $i++) {+ $token = $tokens[$i];+ if ($token === '(') $depth++;+ elseif ($token === ')') {+ $depth--;+ if ($depth === 0) return $i;+ }+ }+ return null;+ }++ private function hasEscapeArgument(array $tokens, int $from, int $to): bool+ {+ for ($i = $from; $i < $to; $i++) {+ $token = $tokens[$i];+ if (is_array($token) && $token[0] === T_STRING && strtolower($token[1]) === 'escape') {+ $next = $tokens[$i + 1] ?? null;+ if ($next === ':') return true;+ }+ }+ return false;+ }++ private function sourceLine(string $contents, int $line): string+ {+ $lines = explode("\n", $contents);+ $index = $line - 1;+ return isset($lines[$index]) ? trim($lines[$index]) : '';+ }++ private function scanPhpFiles(string $dir): \Generator+ {+ $iterator = new \RecursiveIteratorIterator(+ new \RecursiveDirectoryIterator($dir, \RecursiveDirectoryIterator::SKIP_DOTS)+ );+ foreach ($iterator as $file) {+ if ($file->isFile() && $file->getExtension() === 'php') {+ yield $file->getPathname();+ }+ }+ }+}diff --git a/tests/Unit/Importer/ImporterEncodingTest.php b/tests/Unit/Importer/ImporterEncodingTest.phpindex 2cafc975be..315bcfb9dd 100644--- a/tests/Unit/Importer/ImporterEncodingTest.php+++ b/tests/Unit/Importer/ImporterEncodingTest.php@@ -211,8 +211,6 @@ class ImporterEncodingTest extends TestCase$method = (new ReflectionClass($importer))->getMethod('convertToUtf8IfNeeded');- $method->setAccessible(true);-// Empty string is not "not UTF-8" (mb_check_encoding returns true// for empty), so it short-circuits to unchanged, verifying the// helper never invents content that wasn't there.