moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 11:56:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-83335 core: Explicitly specify escape with fgetcsv/fputcsv

Browse source 
PHP 8.4 requires that a value be provided for the `$escape` parameter to
both `fgetcsv()` and `fputcsv()`.
This commit is contained in:
Andrew Nicols 2024-10-02 09:10:50 +08:00
parent ab5692acdf
commit b29615a6f0
No known key found for this signature in database
GPG key ID: 6D1E3157C8CFBF14
9 changed files with 26 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
analytics/classes/dataset_manager.php
View file

@ -148,7 +148,7 @@ class dataset_manager {
return false;
}
foreach ($data as $line) {
fputcsv($fh, $line);
fputcsv($fh, $line, escape: '\\');
}
fclose($fh);
@ -290,12 +290,12 @@ class dataset_manager {
$rh = $file->get_content_file_handle();
// Copy the var names as they are, all files should have the same var names.
$varnames = fgetcsv($rh);
$varnames = fgetcsv($rh, escape: '\\');
$analysablesvalues[] = fgetcsv($rh);
$analysablesvalues[] = fgetcsv($rh, escape: '\\');
// Copy the columns as they are, all files should have the same columns.
$columns = fgetcsv($rh);
$columns = fgetcsv($rh, escape: '\\');
}
// Merge analysable values skipping the ones that are the same in all analysables.
@ -316,9 +316,9 @@ class dataset_manager {
throw new \moodle_exception('errorcannotwritedataset', 'analytics', '', $tmpfilepath);
}
fputcsv($wh, $varnames);
fputcsv($wh, $values);
fputcsv($wh, $columns);
fputcsv($wh, $varnames, escape: '\\');
fputcsv($wh, $values, escape: '\\');
fputcsv($wh, $columns, escape: '\\');
// Iterate through all files and add them to the tmp one. We don't want file contents in memory.
foreach ($files as $file) {
@ -402,11 +402,11 @@ class dataset_manager {
$calculations = array();
$headers = fgetcsv($rh);
$headers = fgetcsv($rh, escape: '\\');
// Get rid of the sampleid column name.
array_shift($headers);
while ($columns = fgetcsv($rh)) {
while ($columns = fgetcsv($rh, escape: '\\')) {
$uniquesampleid = array_shift($columns);
// Unfortunately fgetcsv does not respect line's var types.