File tree Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Expand file tree Collapse file tree 1 file changed +3
-6
lines changed Original file line number Diff line number Diff line change 8
8
use Misery \Component \Common \Processor \ProcessorAwareTrait ;
9
9
use Misery \Component \Csv \Exception \InvalidCsvElementSizeException ;
10
10
11
- class CsvParser implements CsvInterface, CursorInterface, ProcessorAwareInterface
11
+ class CsvParser implements CsvInterface, CursorInterface
12
12
{
13
- use ProcessorAwareTrait;
14
-
15
13
public const DELIMITER = '; ' ;
16
14
public const ENCLOSURE = '" ' ;
17
15
public const ESCAPE = '\\' ;
@@ -36,7 +34,6 @@ public function __construct(
36
34
\SplFileObject::DROP_NEW_LINE
37
35
);
38
36
$ file ->setCsvControl ($ delimiter , $ enclosure , $ escapeChar );
39
- $ this ->processor = new NullDataProcessor ();
40
37
41
38
$ this ->setHeaders ();
42
39
}
@@ -102,11 +99,11 @@ public function current()
102
99
103
100
// here we need to use the filter
104
101
$ row = @array_combine ($ this ->headers , $ current );
105
- if (null === $ row ) {
102
+ if (false === $ row || null === $ row ) {
106
103
throw new InvalidCsvElementSizeException ($ this ->file ->getFilename (), $ this ->key ());
107
104
}
108
105
109
- return $ this -> processor -> processRow ( $ row) ;
106
+ return $ row ;
110
107
}
111
108
112
109
/**
You can’t perform that action at this time.
0 commit comments