Continued:

[core.git] / framework / main / classes / file_directories / text / input / csv / class_CsvInputFile.php

diff --git a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
index e004980beed146284a8875d8ebe0fd9873801966..efd42eb1159e27309049738974cfacf065348b22 100644 (file)
--- a/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
+++ b/framework/main/classes/file_directories/text/input/csv/class_CsvInputFile.php
@@ -1,4 +1,14 @@
 <?php
+// Own namespace
+namespace Org\Mxchange\CoreFramework\Filesystem\Input\Csv;
+
+// Import framework stuff
+use Org\Mxchange\CoreFramework\Filesystem\Text\BaseInputTextFile;
+use Org\Mxchange\CoreFramework\Stream\Filesystem\CsvInputStreamer;
+
+// Import SPL stuff
+use \SplFileInfo;
+
 /**
  * A CSV file input class for writing CSV files
  *
@@ -35,18 +45,15 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
        /**
         * Creates an instance of this File class and prepares it for usage
         *
-        * @param       $fileName               Name of the index file
+        * @param       $infoInstance   An instance of a SplFileInfo class
         * @return      $fileInstance   An instance of this File class
         */
-       public final static function createCsvInputFile ($fileName) {
+       public final static function createCsvInputFile (SplFileInfo $infoInstance) {
                // Get a new instance
                $fileInstance = new CsvInputFile();
 
-               // Set file name
-               $fileInstance->setFileName($fileName);
-
                // Init this abstract file
-               $fileInstance->initFile($fileName);
+               $fileInstance->initFile($infoInstance);
 
                // Return the prepared instance
                return $fileInstance;
@@ -95,7 +102,7 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                $lineArray = array();
 
                // Whether the parser reads a quoted string (which may contain the column separator again)
-               $isInQuotes = FALSE;
+               $isInQuotes = false;
 
                // Init column data
                $column = '';
@@ -109,7 +116,7 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                        //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] idx=%s,char=%s ...', __METHOD__, __LINE__, $idx, $char));
 
                        // Is the column separator found and not within quotes?
-                       if (($isInQuotes === FALSE) && ($char == $columnSeparator)) {
+                       if (($isInQuotes === false) && ($char == $columnSeparator)) {
                                // Debug message
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] Adding column=%s ...', __METHOD__, __LINE__, $column));
 
@@ -129,7 +136,7 @@ class CsvInputFile extends BaseInputTextFile implements CsvInputStreamer {
                                //* NOISY-DEBUG: */ self::createDebugInstance(__CLASS__, __LINE__)->debugOutput(sprintf('[%s:%d:] column=%s ...', __METHOD__, __LINE__, $column));
 
                                // $column must be empty at this point if we are at starting quote
-                               assert(($isInQuotes === TRUE) || (empty($column)));
+                               assert(($isInQuotes === true) || (empty($column)));
 
                                // Double-quote found, so flip variable
                                $isInQuotes = (!$isInQuotes);