Skip to content

Commit 4ea0ef8

Browse files
authored
[PHP 8.4] fgetcsv() deprecated warning in three more files (#4942)
* Fix fgetcsv parameters for better CSV parsing * Modify fgetcsv parameters for better CSV parsing * Add escape character to fgetcsv function
1 parent 6c963af commit 4ea0ef8

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

app/code/core/Mage/Dataflow/Model/Convert/Iterator/Http.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public function load()
3333
$uploader->save($path);
3434
if ($uploadFile = $uploader->getUploadedFileName()) {
3535
$fp = fopen($uploadFile, 'rb');
36-
while ($row = fgetcsv($fp)) {
36+
while ($row = fgetcsv($fp, 0, ',', '"', '\\')) {
3737
// check csv
3838
}
3939
fclose($fp);

app/code/core/Mage/Paypal/Model/Report/Settlement.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public function parseCsv($localCsv, $format = 'new')
246246

247247
$flippedSectionColumns = array_flip($sectionColumns);
248248
$fp = fopen($localCsv, 'r');
249-
while ($line = fgetcsv($fp)) {
249+
while ($line = fgetcsv($fp, 0, ',', '"', '\\')) {
250250
if (empty($line)) { // The line was empty, so skip it.
251251
continue;
252252
}

lib/Varien/Io/File.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ public function streamReadCsv($delimiter = ',', $enclosure = '"')
198198
if (!$this->_streamHandler) {
199199
return false;
200200
}
201-
return @fgetcsv($this->_streamHandler, 0, $delimiter, $enclosure);
201+
return @fgetcsv($this->_streamHandler, 0, $delimiter, $enclosure, '\\');
202202
}
203203

204204
/**

0 commit comments

Comments
 (0)