diff --git a/src/ext/json.php b/src/ext/json.php index 59301d0..615809c 100644 --- a/src/ext/json.php +++ b/src/ext/json.php @@ -2,7 +2,6 @@ namespace nur\sery\ext; use Exception; -use nur\sery\cl; use nur\sery\ext\json\JsonException; use nur\sery\file; use nur\sery\os\IOException; diff --git a/src/file.php b/src/file.php index 784b910..c5c30a4 100644 --- a/src/file.php +++ b/src/file.php @@ -12,7 +12,7 @@ use nur\sery\file\TmpfileWriter; * Class file: outils pour gérer les fichiers */ class file { - private static function fix_dash($file) { + static function fix_dash($file) { if ($file === "-") $file = null; return $file; } diff --git a/src/file/csv/CsvReader.php b/src/file/csv/CsvReader.php index 3eb3f9d..4fe6287 100644 --- a/src/file/csv/CsvReader.php +++ b/src/file/csv/CsvReader.php @@ -1,6 +1,7 @@ input); + $reader = new FileReader(file::fix_dash($this->input)); $inputEncoding = $this->inputEncoding; if ($inputEncoding !== null) { $reader->appendFilter("convert.iconv.$inputEncoding.utf-8");