@@ -35,9 +35,9 @@ |
||
| 35 | 35 | // in this case we really only care about newlines so we pass in a comma as the delim |
| 36 | 36 | $str = $this->replaceQuotedSpecialChars($data, ','); |
| 37 | 37 | $eols = [ |
| 38 | - static::EOL_WINDOWS => "\r\n", // 0x0D - 0x0A - Windows, DOS OS/2 |
|
| 39 | - static::EOL_UNIX => "\n", // 0x0A - - Unix, OSX |
|
| 40 | - static::EOL_OTHER => "\r", // 0x0D - - Other |
|
| 38 | + static::EOL_WINDOWS => "\r\n", // 0x0D - 0x0A - Windows, DOS OS/2 |
|
| 39 | + static::EOL_UNIX => "\n", // 0x0A - - Unix, OSX |
|
| 40 | + static::EOL_OTHER => "\r", // 0x0D - - Other |
|
| 41 | 41 | ]; |
| 42 | 42 | |
| 43 | 43 | $curCount = 0; |
@@ -20,18 +20,18 @@ |
||
| 20 | 20 | |
| 21 | 21 | class SniffQuoteAndDelimByAdjacency extends AbstractSniffer |
| 22 | 22 | { |
| 23 | - /** |
|
| 24 | - * Guess quote and delimiter character(s) |
|
| 25 | - * |
|
| 26 | - * If there are quoted values within the data, it is often easiest to guess the quote and delimiter characters at |
|
| 27 | - * the same time by analyzing their adjacency to one-another. That is to say, in cases where certain values are |
|
| 28 | - * wrapped in quotes, it can often be determined what not only that quote character is, but also the delimiter |
|
| 29 | - * because it is often on either side of the quote character. |
|
| 30 | - * |
|
| 31 | - * @param string $data The data to analyze |
|
| 32 | - * |
|
| 33 | - * @return string[] |
|
| 34 | - */ |
|
| 23 | + /** |
|
| 24 | + * Guess quote and delimiter character(s) |
|
| 25 | + * |
|
| 26 | + * If there are quoted values within the data, it is often easiest to guess the quote and delimiter characters at |
|
| 27 | + * the same time by analyzing their adjacency to one-another. That is to say, in cases where certain values are |
|
| 28 | + * wrapped in quotes, it can often be determined what not only that quote character is, but also the delimiter |
|
| 29 | + * because it is often on either side of the quote character. |
|
| 30 | + * |
|
| 31 | + * @param string $data The data to analyze |
|
| 32 | + * |
|
| 33 | + * @return string[] |
|
| 34 | + */ |
|
| 35 | 35 | public function sniff($data) |
| 36 | 36 | { |
| 37 | 37 | /** |
@@ -68,7 +68,7 @@ |
||
| 68 | 68 | if (is_null($eol)) { |
| 69 | 69 | $eol = "\r\n|\r|\n"; |
| 70 | 70 | } |
| 71 | - return preg_replace_callback('/([\'"])(.*)\1/imsU', function ($matches) use ($delim, $eol) { |
|
| 71 | + return preg_replace_callback('/([\'"])(.*)\1/imsU', function($matches) use ($delim, $eol) { |
|
| 72 | 72 | $ret = preg_replace("/({$eol})/", self::PLACEHOLDER_NEWLINE, $matches[0]); |
| 73 | 73 | if (!is_null($delim)) { |
| 74 | 74 | $ret = str_replace($delim, self::PLACEHOLDER_DELIM, $ret); |