@@ -159,7 +159,7 @@ |
||
| 159 | 159 | $d = $this->getDialect(); |
| 160 | 160 | $fields = collect(s($line) |
| 161 | 161 | ->trimRight($d->getLineTerminator()) |
| 162 | - ->split($d->getDelimiter() . "(?=([^\"]*\"[^\"]*\")*[^\"]*$)")); |
|
| 162 | + ->split($d->getDelimiter()."(?=([^\"]*\"[^\"]*\")*[^\"]*$)")); |
|
| 163 | 163 | if (!is_null($this->header)) { |
| 164 | 164 | // @todo there may be cases where this gives a false positive... |
| 165 | 165 | if (count($fields) == count($this->header)) { |
@@ -120,7 +120,7 @@ |
||
| 120 | 120 | $field = s($field); |
| 121 | 121 | if ($field->contains($d->getQuoteChar())) { |
| 122 | 122 | $escapeChar = $d->isDoubleQuote() ? $d->getQuoteChar() : '\\' /*$d->getEscapeChar()*/; |
| 123 | - $field = $field->replace($d->getQuoteChar(), $d->getQuoteChar() . $d->getQuoteChar()); |
|
| 123 | + $field = $field->replace($d->getQuoteChar(), $d->getQuoteChar().$d->getQuoteChar()); |
|
| 124 | 124 | } |
| 125 | 125 | $field = $field->surround($d->getQuoteChar()); |
| 126 | 126 | } |