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

reformat code

Browse Source
This commit is contained in:
Susann Sgorzaly
2018-02-26 06:57:40 +01:00
parent f8fe4cad03
commit ba4cc0672a
1 changed files with 35 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/Csv.php
View File

@@ -1,4 +1,5 @@
<?php <?php
namespace ParseCsv; namespace ParseCsv;
use ParseCsv\enums\SortEnum; use ParseCsv\enums\SortEnum;
@@ -332,17 +333,17 @@ class Csv {
* Constructor * Constructor
* Class constructor * Class constructor
* *
* @param string|null $input The CSV string or a direct filepath * @param string|null $input The CSV string or a direct filepath
* @param integer|null $offset Number of rows to ignore from the beginning * @param integer|null $offset Number of rows to ignore from the beginning
* of the data * of the data
* @param integer|null $limit Limits the number of returned rows to * @param integer|null $limit Limits the number of returned rows to
* specified amount * specified amount
* @param string|null $conditions Basic SQL-like conditions for row * @param string|null $conditions Basic SQL-like conditions for row
* matching * matching
* @param null|true $keep_file_data Keep raw file data in memory after * @param null|true $keep_file_data Keep raw file data in memory after
* successful parsing (useful for debugging) * successful parsing (useful for debugging)
*/ */
public function __construct($input = NULL, $offset = NULL, $limit = NULL, $conditions = NULL, $keep_file_data = NULL) { public function __construct($input = null, $offset = null, $limit = null, $conditions = null, $keep_file_data = null) {
$this->init($offset, $limit, $conditions, $keep_file_data); $this->init($offset, $limit, $conditions, $keep_file_data);
if (!empty($input)) { if (!empty($input)) {
@@ -351,16 +352,16 @@ class Csv {
} }
/** /**
* @param integer|null $offset Number of rows to ignore from the beginning * @param integer|null $offset Number of rows to ignore from the beginning
* of the data * of the data
* @param integer|null $limit Limits the number of returned rows to * @param integer|null $limit Limits the number of returned rows to
* specified amount * specified amount
* @param string|null $conditions Basic SQL-like conditions for row * @param string|null $conditions Basic SQL-like conditions for row
* matching * matching
* @param null|true $keep_file_data Keep raw file data in memory after * @param null|true $keep_file_data Keep raw file data in memory after
* successful parsing (useful for debugging) * successful parsing (useful for debugging)
*/ */
public function init($offset = NULL, $limit = NULL, $conditions = NULL, $keep_file_data = NULL) { public function init($offset = null, $limit = null, $conditions = null, $keep_file_data = null) {
if (!is_null($offset)) { if (!is_null($offset)) {
$this->offset = $offset; $this->offset = $offset;
} }
@@ -393,7 +394,7 @@ class Csv {
* *
* @return bool True on success * @return bool True on success
*/ */
public function parse($input = NULL, $offset = NULL, $limit = NULL, $conditions = NULL) { public function parse($input = null, $offset = null, $limit = null, $conditions = null) {
if (is_null($input)) { if (is_null($input)) {
$input = $this->file; $input = $this->file;
} }
@@ -409,8 +410,7 @@ class Csv {
if (strlen($input) <= PHP_MAXPATHLEN && is_readable($input)) { if (strlen($input) <= PHP_MAXPATHLEN && is_readable($input)) {
$this->file = $input; $this->file = $input;
$this->data = $this->parse_file(); $this->data = $this->parse_file();
} } else {
else {
$this->file = null; $this->file = null;
$this->file_data = &$input; $this->file_data = &$input;
$this->data = $this->parse_string(); $this->data = $this->parse_string();
@@ -926,12 +926,19 @@ class Csv {
*/ */
protected function _validate_row_condition($row, $condition) { protected function _validate_row_condition($row, $condition) {
$operators = array( $operators = array(
'=', 'equals', 'is', '=',
'!=', 'is not', 'equals',
'<', 'is less than', 'is',
'>', 'is greater than', '!=',
'<=', 'is less than or equals', 'is not',
'>=', 'is greater than or equals', '<',
'is less than',
'>',
'is greater than',
'<=',
'is less than or equals',
'>=',
'is greater than or equals',
'contains', 'contains',
'does not contain', 'does not contain',
); );