parsecsv/parsecsv-for-php
1
0
Fork 0
mirror of https://github.com/parsecsv/parsecsv-for-php.git synced 2026-02-19 08:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

readded missing return statement in parse-function

Browse Source
This commit is contained in:
Susann Sgorzaly
2018-02-23 10:14:01 +01:00
parent 343c683077
commit 249e5a24ac
1 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Csv.php
View File

@@ -394,11 +394,11 @@ class Csv {
* @return bool True on success
*/
public function parse($input = NULL, $offset = NULL, $limit = NULL, $conditions = NULL) {
if (!is_null($input)) {
$this->file = $input;
if (is_null($input)) {
$input = $this->file;
}
if (empty($this->file)) {
if (empty($input)) {
// todo: but why true?
return true;
}
@@ -406,11 +406,12 @@ class Csv {
$this->init($offset, $limit, $conditions);
if (strlen($this->file) <= PHP_MAXPATHLEN && is_readable($this->file)) {
$this->data = $this->parse_file($this->file);
if (strlen($input) <= PHP_MAXPATHLEN && is_readable($input)) {
$this->file = $input;
$this->data = $this->parse_file($input);
}
else {
$this->file_data = &$this->file;
$this->file_data = &$input;
$this->data = $this->parse_string();
}
@@ -418,6 +419,8 @@ class Csv {
return false;
}
return true;
}
/**