diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2025-06-12 11:48:54 +0100 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2025-06-12 11:48:54 +0100 |
| commit | 7be8e0b644896a14c27af597279ef38a2f9e3d43 (patch) | |
| tree | 6f50b7ebd7eb2c13bfdee96cd17e177c11ce91f5 | |
| parent | 5dc8cec00e6377245eb3abcf8059ecd6b11b489a (diff) | |
| download | webtrees-7be8e0b644896a14c27af597279ef38a2f9e3d43.tar.gz webtrees-7be8e0b644896a14c27af597279ef38a2f9e3d43.tar.bz2 webtrees-7be8e0b644896a14c27af597279ef38a2f9e3d43.zip | |
Fix: #5167 - fgetcsv() requires escape parameter from PHP 8.4
| -rw-r--r-- | app/Http/RequestHandlers/MapDataImportAction.php | 2 | ||||
| -rw-r--r-- | phpstan-baseline.neon | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/app/Http/RequestHandlers/MapDataImportAction.php b/app/Http/RequestHandlers/MapDataImportAction.php index 891fd634b9..aa16d2b59e 100644 --- a/app/Http/RequestHandlers/MapDataImportAction.php +++ b/app/Http/RequestHandlers/MapDataImportAction.php @@ -135,7 +135,7 @@ class MapDataImportAction implements RequestHandlerInterface } } else { rewind($fp); - while (($row = fgetcsv($fp, 0, MapDataService::CSV_SEPARATOR)) !== false) { + while (($row = fgetcsv(stream: $fp, separator: MapDataService::CSV_SEPARATOR, escape: '\\')) !== false) { // Skip the header if (!is_numeric($row[0])) { continue; diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 96f5f442f2..9a3c87bf3f 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -2245,25 +2245,25 @@ parameters: path: app/Http/RequestHandlers/MapDataImportAction.php - - message: '#^Parameter \#1 \$stream of function fgetcsv expects resource, mixed given\.$#' + message: '#^Parameter \#1 \$stream of function rewind expects resource, mixed given\.$#' identifier: argument.type count: 1 path: app/Http/RequestHandlers/MapDataImportAction.php - - message: '#^Parameter \#1 \$stream of function rewind expects resource, mixed given\.$#' + message: '#^Parameter \#1 \$stream of function stream_get_contents expects resource, mixed given\.$#' identifier: argument.type count: 1 path: app/Http/RequestHandlers/MapDataImportAction.php - - message: '#^Parameter \#1 \$stream of function stream_get_contents expects resource, mixed given\.$#' + message: '#^Parameter \#1 \$uploaded_file of class Fisharebest\\Webtrees\\Exceptions\\FileUploadException constructor expects Psr\\Http\\Message\\UploadedFileInterface\|null, mixed given\.$#' identifier: argument.type count: 1 path: app/Http/RequestHandlers/MapDataImportAction.php - - message: '#^Parameter \#1 \$uploaded_file of class Fisharebest\\Webtrees\\Exceptions\\FileUploadException constructor expects Psr\\Http\\Message\\UploadedFileInterface\|null, mixed given\.$#' + message: '#^Parameter \$stream of function fgetcsv expects resource, mixed given\.$#' identifier: argument.type count: 1 path: app/Http/RequestHandlers/MapDataImportAction.php |