Added authors and web links to source and issues

Replace fread with file_get_contents to avoid the 8192 byte limit

.travis.yml

@@ -6,9 +6,9 @@ php:
   - 7.0
   - 5.6
   - 5.5
-  - 5.4
 
 script:
+  - phpunit --version
   - phpunit --configuration tests/phpunit.xml
 
 notifications:

ChangeLog.txt

@@ -1,3 +1,45 @@
+ParseCSV dev-master
+-----------------------------------
+Date: unreleased
+
+- New function getTotalDataRowCount() - useful if
+  $limit is set - see pull request #122.
+
+- Dropped support for PHP 5.4
+
+- Added support for Laravel-style collections via the
+  new getCollection() function - see
+  https://github.com/parsecsv/parsecsv-for-php/pull/134
+
+-----------------------------------
+
+
+ParseCSV 1.0.0
+-----------------------------------
+Date: 3-March-2018
+
+- Renamed class from parseCSV to Csv and added name-
+  space "ParseCsv" for PSR compliance.
+
+- Added support for MS Excel's "sep=" to detect the
+  delimiter (Issue #60).
+
+- Added data type detection - function getDatatypes()
+  guesses the type of each column.
+
+- MIME: output() sends correct MIME type to browser
+  if the separator is a tab char (Issue #79).
+
+- Added support for mb_convert_encoding() instead of
+  iconv() - see issue #109.
+
+- A number of minor bug fixes - see GitHub issues.
+
+- Added many more unit tests.
+
+-----------------------------------
+
+
 parseCSV 0.4.3 beta
 -----------------------------------
 Date: 1-July-2008
@@ -159,7 +201,7 @@ Date: 2-Jan-2007
 
 - Added auto() function to automatically detect
   delimiter character.
-  Useful for user upload incase delimiter is
+  Useful for user upload in case delimiter is
   comma (,), tab, or semi-colon (;). Some
   versions of MS Excel for Windows use
   semi-colons instead of commas when saving to

README.md

@@ -1,32 +1,20 @@
-# parseCSV
+# ParseCsv
 
-parseCSV is an easy to use PHP class that reads and writes CSV data properly. It
+ParseCsv is an easy-to-use PHP class that reads and writes CSV data properly. It
 fully conforms to the specifications outlined on the on the
 [Wikipedia article][CSV] (and thus RFC 4180). It has many advanced features which help make your
 life easier when dealing with CSV data.
 
-You may not need a library at all: before using parseCSV, please make sure if PHP's own `str_getcsv()`, ``fgetcvs()`` or `fputcsv()` meets your needs.
+You may not need a library at all: before using ParseCsv, please make sure if PHP's own `str_getcsv()`, ``fgetcvs()`` or `fputcsv()` meets your needs.
 
 This library was originally created in early 2007 by [jimeh](https://github.com/jimeh) due to the lack of built-in
 and third-party support for handling CSV data in PHP.
 
 [csv]: http://en.wikipedia.org/wiki/Comma-separated_values
 
-## Installation
-Installation is easy using Composer. Include the following in your composer.json
-```
-"parsecsv/php-parsecsv": "0.4.5"
-```
-
-You may also manually include the parsecsv.lib.php file
-```php
-require_once 'parsecsv.lib.php';
-```
-
 ## Features
 
-* parseCSV is the only complete and fully featured CSV solution for PHP (as
+* ParseCsv is a complete and fully featured CSV solution for PHP
-  far as I know).
 * Supports enclosed values, enclosed commas, double quotes and new lines.
 * Automatic delimiter character detection.
 * Sort data by specific fields/columns.
@@ -36,24 +24,45 @@ require_once 'parsecsv.lib.php';
 * Error detection for incorrectly formatted input. It attempts to be
   intelligent, but can not be trusted 100% due to the structure of CSV, and
   how different programs like Excel for example outputs CSV data.
-* Support for character encoding conversion using PHP's _iconv_ function
+* Support for character encoding conversion using PHP's
-  (requires PHP 5).
+  `iconv()` and `mb_convert_encoding()` functions.
-* Supports PHP 5.4 and higher. It certainly works with PHP 7.2
+* Supports PHP 5.5 and higher.
+  It certainly works with PHP 7.2 and all versions in between.
 
+## Installation
+
+Installation is easy using Composer. Just run the following on the
+command line:
+```
+composer require parsecsv/php-parsecsv
+```
+
+If you don't use a framework such as Drupal, Laravel, Symfony, Yii etc.,
+you may have to manually include Composer's autoloader file in your PHP
+script:
+```php
+require_once __DIR__ . '/vendor/autoload.php';
+```
+
+#### Without composer
+Not recommended, but technically possible: you can also clone the
+repository or extract the
+[ZIP](https://github.com/parsecsv/parsecsv-for-php/archive/master.zip).
+To use ParseCSV, you then have to add a `require 'parsecsv.lib.php';` line.
 
 ## Example Usage
 
 **General**
 
 ```php
-$csv = new parseCSV('data.csv');
+$csv = new ParseCsv\Csv('data.csv');
 print_r($csv->data);
 ```
 
 **Tab delimited, and encoding conversion**
 
 ```php
-$csv = new parseCSV();
+$csv = new ParseCsv\Csv();
 $csv->encoding('UTF-16', 'UTF-8');
 $csv->delimiter = "\t";
 $csv->parse('data.tsv');
@@ -63,15 +72,49 @@ print_r($csv->data);
 **Auto-detect delimiter character**
 
 ```php
-$csv = new parseCSV();
+$csv = new ParseCsv\Csv();
 $csv->auto('data.csv');
 print_r($csv->data);
 ```
 
+**Parse data with offset**
+* ignoring the first X (e.g. two) rows
+```php
+$csv = new ParseCsv\Csv();
+$csv->offset = 2;
+$csv->parse('data.csv');
+print_r($csv->data);
+```
+
+**Limit the number of returned data rows**
+```php
+$csv = new ParseCsv\Csv();
+$csv->limit = 5;
+$csv->parse('data.csv');
+print_r($csv->data);
+```
+
+**Get total number of data rows without parsing whole data**
+* Excluding heading line if present (see $csv->header property)
+```php
+$csv = new ParseCsv\Csv();
+$csv->load_data('data.csv');
+$count = $csv->getTotalDataRowCount();
+print_r($count);
+```
+
+**Get most common data type for each column (Requires PHP >= 5.5)**
+
+```php
+$csv = new ParseCsv\Csv('data.csv');
+$csv->getDatatypes()
+print_r($csv->data_types);
+```
+
 **Modify data in a CSV file**
 
 ```php
-$csv = new parseCSV();
+$csv = new ParseCsv\Csv();
 $csv->sort_by = 'id';
 $csv->parse('data.csv');
 # "4" is the value of the "id" column of the CSV row
@@ -82,7 +125,7 @@ $csv->save();
 **Replace field names or set ones if missing**
 
 ```php
-$csv = new parseCSV();
+$csv = new ParseCsv\Csv();
 $csv->fields = ['id', 'name', 'category']
 $csv->parse('data.csv');
 ```
@@ -92,15 +135,15 @@ $csv->parse('data.csv');
 _Only recommended when you know the exact structure of the file._
 
 ```php
-$csv = new parseCSV();
+$csv = new ParseCsv\Csv();
 $csv->save('data.csv', array(array('1986', 'Home', 'Nowhere', '')), true);
 ```
 
-**Convert 2D array to csv data and send headers to browser to treat output as
+**Convert 2D array to CSV data and send headers to browser to treat output as
 a file and download it**
 
 ```php
-$csv = new parseCSV();
+$csv = new ParseCsv\Csv();
 $csv->output('movies.csv', $array, array('field 1', 'field 2'), ',');
 ```
 
@@ -108,7 +151,7 @@ For more complex examples, see the ``tests`` and `examples` directories.
 
 ## Credits
 
-* parseCSV is based on the concept of [Ming Hong Ng][ming]'s [CsvFileParser][]
+* ParseCsv is based on the concept of [Ming Hong Ng][ming]'s [CsvFileParser][]
   class.
 
 [ming]: http://minghong.blogspot.com/
@@ -146,3 +189,5 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+[![Build Status](https://travis-ci.org/parsecsv/parsecsv-for-php.svg?branch=master)](https://travis-ci.org/parsecsv/parsecsv-for-php)

composer.json

@@ -10,14 +10,38 @@
         {
             "name": "William Knauss",
             "email": "will.knauss@gmail.com"
+        },
+        {
+            "name": "Susann Sgorzaly",
+            "homepage": "https://github.com/susgo"
+        },
+        {
+            "name": "Christian Bläul",
+            "homepage": "https://github.com/Fonata"
         }
     ],
-    "autoload": {
+    "autoload":{
-        "classmap": [
+        "psr-4":{
-            "."
+            "ParseCsv\\": "src",
-        ]
+            "ParseCsv\\extensions\\": "src\\extensions"
+        }
+    },
+    "autoload-dev":{
+        "psr-4":{
+            "ParseCsv\\tests\\": "tests"
+        }
+    },
+    "require": {
+        "php": ">=5.5"
     },
     "require-dev": {
         "phpunit/phpunit": "4.1.*"
+    },
+    "suggest": {
+        "illuminate/support": "Fluent array interface for map functions"
+    },
+    "support": {
+        "issues": "https://github.com/parsecsv/parsecsv-for-php/issues",
+        "source": "https://github.com/parsecsv/parsecsv-for-php"
     }
 }

examples/basic.php

@@ -1,13 +1,13 @@
 <pre>
 <?php
 
-
 # include parseCSV class.
-require_once('../parsecsv.lib.php');
+require __DIR__ . '/../vendor/autoload.php';
+use ParseCsv\Csv;
 
 
 # create new parseCSV object.
-$csv = new parseCSV();
+$csv = new Csv();
 
 
 # Parse '_books.csv' using automatic delimiter detection...

examples/conditions.php

@@ -3,11 +3,12 @@
 
 
 # include parseCSV class.
-require_once('../parsecsv.lib.php');
+require __DIR__ . '/../vendor/autoload.php';
+use ParseCsv\Csv;
 
 
 # create new parseCSV object.
-$csv = new parseCSV();
+$csv = new Csv();
 
 
 # Example conditions:

examples/download.php

@@ -2,11 +2,12 @@
 
 
 # include parseCSV class.
-require_once('../parsecsv.lib.php');
+require __DIR__ . '/../vendor/autoload.php';
+use ParseCsv\Csv;
 
 
 # create new parseCSV object.
-$csv = new parseCSV();
+$csv = new Csv();
 
 
 # Parse '_books.csv' using automatic delimiter detection...

examples/limit.php

@@ -3,11 +3,12 @@
 
 
 # include parseCSV class.
-require_once('../parsecsv.lib.php');
+require __DIR__ . '/../vendor/autoload.php';
+use ParseCsv\Csv;
 
 
 # create new parseCSV object.
-$csv = new parseCSV();
+$csv = new Csv();
 
 
 # if sorting is enabled, the whole CSV file

src/enums/AbstractEnum.php

@@ -0,0 +1,40 @@
+<?php
+namespace ParseCsv\enums;
+
+use ReflectionClass;
+
+abstract class AbstractEnum {
+    /**
+     * Creates a new value of some type
+     *
+     * @param mixed $value
+     *
+     * @throws \UnexpectedValueException if incompatible type is given.
+     */
+    public function __construct($value)
+    {
+        if (!$this->isValid($value)) {
+            throw new \UnexpectedValueException("Value '$value' is not part of the enum " . get_called_class());
+        }
+        $this->value = $value;
+    }
+
+    public static function getConstants(){
+        $class = get_called_class();
+        $reflection = new \ReflectionClass($class);
+
+        return $reflection->getConstants();
+    }
+
+    /**
+     * Check if enum value is valid
+     *
+     * @param $value
+     *
+     * @return bool
+     */
+    public static function isValid($value)
+    {
+        return in_array($value, static::getConstants(), true);
+    }
+}

src/enums/DatatypeEnum.php

@@ -0,0 +1,120 @@
+<?php
+
+namespace ParseCsv\enums;
+
+/**
+ * Class DatatypeEnum
+ *
+ * @package ParseCsv\enums
+ *
+ * todo: needs a basic parent enum class for error handling.
+ */
+class DatatypeEnum extends AbstractEnum {
+
+    const __DEFAULT = self::TYPE_STRING;
+
+    const TYPE_STRING = 'string';
+
+    const TYPE_FLOAT = 'float';
+
+    const TYPE_INT = 'integer';
+
+    const TYPE_BOOL = 'boolean';
+
+    const TYPE_DATE = 'date';
+
+    const REGEX_FLOAT = '/(^[+-]?$)|(^[+-]?[0-9]+([,.][0-9])?[0-9]*(e[+-]?[0-9]+)?$)/';
+
+    const REGEX_INT = '/^[-+]?[0-9]\d*$/';
+
+    const REGEX_BOOL = '/^(?i:true|false)$/';
+
+    /**
+     * Define validator functions here.
+     *
+     * @var array
+     *
+     * @uses isValidFloat
+     * @uses isValidInteger
+     * @uses isValidBoolean
+     * @uses isValidDate
+     */
+    private static $validators = array(
+        self::TYPE_STRING => null,
+        self::TYPE_INT => 'isValidInteger',
+        self::TYPE_BOOL => 'isValidBoolean',
+        self::TYPE_FLOAT => 'isValidFloat',
+        self::TYPE_DATE => 'isValidDate',
+    );
+
+    /**
+     * Checks data type for given string.
+     *
+     * @param string $value
+     *
+     * @return bool|string
+     */
+    public static function getValidTypeFromSample($value) {
+        $value = trim((string) $value);
+
+        if (empty($value)) {
+            return false;
+        }
+
+        foreach (self::$validators as $type => $validator) {
+            if ($validator === null) {
+                continue;
+            }
+
+            if (method_exists(__CLASS__, $validator) && self::$validator($value)) {
+                return $type;
+            }
+        }
+
+        return self::__DEFAULT;
+    }
+
+    /**
+     * Check if string is float value.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    private static function isValidFloat($value) {
+        return (bool) preg_match(self::REGEX_FLOAT, $value);
+    }
+
+    /**
+     * Check if string is integer value.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    private static function isValidInteger($value) {
+        return (bool) preg_match(self::REGEX_INT, $value);
+    }
+
+    /**
+     * Check if string is boolean.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    private static function isValidBoolean($value) {
+        return (bool) preg_match(self::REGEX_BOOL, $value);
+    }
+
+    /**
+     * Check if string is date.
+     *
+     * @param string $value
+     *
+     * @return bool
+     */
+    private static function isValidDate($value) {
+        return (bool) strtotime($value);
+    }
+}

src/enums/FileProcessingModeEnum.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace ParseCsv\enums;
+
+
+/**
+ * Class FileProcessingEnum
+ *
+ * @package ParseCsv\enums
+ *
+ * todo extends a basic enum class after merging #121
+ */
+class FileProcessingModeEnum {
+
+    const __default = self::MODE_FILE_OVERWRITE;
+
+    const MODE_FILE_APPEND = true;
+
+    const MODE_FILE_OVERWRITE = false;
+
+    public static function getAppendMode($mode) {
+        if ($mode == self::MODE_FILE_APPEND){
+            return 'ab';
+        }
+
+        return 'wb';
+    }
+}

src/enums/SortEnum.php

@@ -0,0 +1,28 @@
+<?php
+namespace ParseCsv\enums;
+
+
+class SortEnum extends AbstractEnum {
+    const __DEFAULT = self::SORT_TYPE_REGULAR;
+
+    const SORT_TYPE_REGULAR = 'regular';
+
+    const SORT_TYPE_NUMERIC = 'numeric';
+
+    const SORT_TYPE_STRING = 'string';
+
+    private static $sorting = array(
+        self::SORT_TYPE_REGULAR => SORT_REGULAR,
+        self::SORT_TYPE_STRING => SORT_STRING,
+        self::SORT_TYPE_NUMERIC => SORT_NUMERIC
+    );
+
+    public static function getSorting($type){
+        if (array_key_exists($type, self::$sorting)){
+            return self::$sorting[$type];
+        }
+
+        return self::$sorting[self::__DEFAULT];
+    }
+
+}

src/extensions/DatatypeTrait.php

@@ -0,0 +1,113 @@
+<?php
+
+namespace ParseCsv\extensions;
+
+use ParseCsv\enums\DatatypeEnum;
+
+trait DatatypeTrait {
+
+    /**
+     * Datatypes
+     * Datatypes of CSV data-columns
+     *
+     * @access public
+     * @var array
+     */
+    public $data_types = [];
+
+    /**
+     * Check data type for one column.
+     * Check for most commonly data type for one column.
+     *
+     * @access private
+     *
+     * @param  array $datatypes
+     *
+     * @return string|false
+     */
+    private function getMostFrequentDatatypeForColumn($datatypes) {
+        // remove 'false' from array (can happen if CSV cell is empty)
+        $typesFiltered = array_filter($datatypes);
+
+        if (empty($typesFiltered)) {
+            return false;
+        }
+
+        $typesFreq = array_count_values($typesFiltered);
+        arsort($typesFreq);
+        reset($typesFreq);
+
+        return key($typesFreq);
+
+    }
+
+    /**
+     * Check data type foreach Column
+     * Check data type for each column and returns the most commonly.
+     *
+     * Requires PHP >= 5.5
+     *
+     * @access public
+     *
+     * @uses   DatatypeEnum::getValidTypeFromSample
+     *
+     * @return array|bool
+     */
+    public function getDatatypes() {
+        if (empty($this->data)) {
+            $this->data = $this->parse_string();
+        }
+        if (!is_array($this->data)) {
+            throw new \UnexpectedValueException('No data set yet.');
+        }
+
+        $result = [];
+        foreach ($this->titles as $cName) {
+            $column = array_column($this->data, $cName);
+            $cDatatypes = array_map(DatatypeEnum::class . '::getValidTypeFromSample', $column);
+
+            $result[$cName] = $this->getMostFrequentDatatypeForColumn($cDatatypes);
+        }
+
+        $this->data_types = $result;
+
+        return !empty($this->data_types) ? $this->data_types : [];
+    }
+
+    /**
+     * Check data type of titles / first row for auto detecting if this could be
+     * a heading line.
+     *
+     * Requires PHP >= 5.5
+     *
+     * @access public
+     *
+     * @uses   DatatypeEnum::getValidTypeFromSample
+     *
+     * @return bool
+     */
+    public function autoDetectFileHasHeading(){
+        if (empty($this->data)){
+            throw new \UnexpectedValueException('No data set yet.');
+        }
+
+        if ($this->heading){
+            $firstRow = $this->titles;
+        } else {
+            $firstRow = $this->data[0];
+        }
+
+        $firstRow = array_filter($firstRow);
+        if (empty($firstRow)){
+            return false;
+        }
+
+        $firstRowDatatype = array_map(DatatypeEnum::class . '::getValidTypeFromSample', $firstRow);
+
+        if ($this->getMostFrequentDatatypeForColumn($firstRowDatatype) !== DatatypeEnum::TYPE_STRING){
+            return false;
+        }
+
+        return true;
+    }
+}

tests/Bootstrap.php

@@ -1,11 +1,13 @@
 <?php
+chdir(__DIR__ . '/..');
+if (!file_exists('vendor/autoload.php')) {
+    `composer dump-autoload`;
+}
 
-$dir = realpath(__DIR__);
+require __DIR__ . '/../vendor/autoload.php';
-defined('BASE') OR define('BASE', dirname($dir) . '/');
 
-require_once BASE . 'parsecsv.lib.php';
+if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) {
-
-if (!class_exists('PHPUnit\Framework\TestCase')) {
     // we run on an older PHPUnit version without namespaces.
     require_once __DIR__ . '/PHPUnit_Framework_TestCase.inc.php';
 }
+

tests/example_files/multiple_empty_lines.csv

@@ -0,0 +1,22 @@
+ID,dID,createdAt,else1,else2,else3,else4,else5,user,else6,else7,else8,else9,else10,else11,else12,else13,else14,else15,else16,else17,else18,else19,else20,else21,else22,else23,else24,else25,else26,else27,else28,else29,else30,else31,else32,else33,else34,else35,else36,else37,else38
+418,0,2017-05-16,,,2018-01-22,22.01.2018 10:00:09,,admin,Ja,,10001,Abweichung,,10001,v1,1,ddd,100,1000,,HH,,v1,0,401,1,2,H1,,-1,10,1,111,Ja,2017-01-01,,12,0,11109,HH-100,default
+419,0,2017-05-16,,,2017-05-16,14.07.2017 09:58:09,,admin,Ja,,,Abweichung,,10002,v2,1,ddd,200,500,DD,DD,,v2,1,402,2,4,H2,,-2,100,1,1111,Ja,2017-01-01,1,13,1,11109,DD-200,default 
+438,0,2017-05-16,,,2017-05-16,14.07.2017 09:58:29,,admin,Ja,,10021,Abweichung,,10021,v3,4,ddd,300,400,DD,DD,,v3,0,421,1,,H3,,-1,106,1,111,Ja,2017-05-08,,2,1,11109,DD-300,default
+440,0,2017-05-16,,,,14.07.2017 09:58:53,,admin,Ja,,,Alt,,10023,v4,3,,400,500,BE,DD,,v4,1,423,3,,H4,,-3,143,1,1111,Ja,2017-01-01,1,33,1,11108,BE-400,default
+441,0,2017-05-16,,,,14.07.2017 09:59:19,,admin,Ja,,,Fehlt,,10024,v5,3,,500,,BE,,,v5,2,424,4,,H5,,0,1435,0,111,Ja,2017-01-01,,12,1,0,BE-500,default
+442,0,2017-05-16,,,,14.07.2017 10:00:46,,admin,Ja,,,Neu,,10025,v6,3,,100,,DD,,,v6,435,425,1,,H6,,0,10,0,1111,Ja,2017-01-01,,102,1,0,DD-100,default
+443,0,2017-05-16,,,2017-07-04,14.07.2017 10:01:12,,admin,Ja,,,OK,,10026,v7,3,,200,200,DD,DD,,v7,32,426,2,2,H7,,0,100,0,111,Ja,2017-01-01,,77,1,0,DD-200,default
+444,0,2017-05-16,,,,14.07.2017 10:02:13,,admin,Ja,,,Fehlt,,10027,v8,3,,300,,BE,,,v8,45,427,3,,H8,,0,200,0,1111,Ja,2017-01-01,,44,3,0,BE-300,default
+445,0,2017-05-16,,,,14.07.2017 10:02:38,,admin,Ja,,,Fehlt,,10028,v9,3,,100,,BE,,,v9,45,428,4,,H9,,0,400,0,111,Ja,2017-01-01,,44,1,0,BE-100,default
+446,0,2017-05-16,,,,14.07.2017 10:03:01,,admin,Ja,,,Fehlt,,10029,v10,3,,,400,,DD,,v10,45,429,,,H10,,0,1124,0,1111,Ja,2017-01-01,,89,1,0,,default
+
+
+
+
+
+
+
+
+
+
+

tests/example_files/waiver_field_separator.csv

@@ -0,0 +1,6 @@
+keyword
+liability waiver
+release of liability form
+release of liability
+sample waiver
+sample waiver form

tests/methods/ConstructTest.php

@@ -1,69 +1,68 @@
 <?php
 
-class ConstructTest extends PHPUnit\Framework\TestCase {
+namespace ParseCsv\tests\methods;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+class ConstructTest extends TestCase {
 
     /**
-     * CSV
+     * @var Csv object
-     * The parseCSV object
-     *
-     * @access protected
-     * @var [parseCSV]
      */
     protected $csv = null;
 
-    /**
-     * Setup
-     * Setup our test environment objects
-     *
-     * @access public
-     */
-    public function setUp() {
-        //setup parse CSV
-        #$this->csv = new parseCSV();
-    }
-
-    /**
-     * Tear down
-     * Tear down our test environment objects
-     *
-     * @access public
-     */
-    public function tearDown() {
-        $this->csv = null;
-    }
-
     public function test_offset_param() {
         $offset = 10;
-        $this->csv = new parseCSV(null, $offset);
+        $this->csv = new Csv(null, $offset);
         $this->assertTrue(is_numeric($this->csv->offset));
         $this->assertEquals($offset, $this->csv->offset);
     }
 
     public function test_limit_param() {
         $limit = 10;
-        $this->csv = new parseCSV(null, null, $limit);
+        $this->csv = new Csv(null, null, $limit);
         $this->assertTrue(is_numeric($this->csv->limit));
         $this->assertEquals($limit, $this->csv->limit);
     }
 
     public function test_conditions_param() {
         $conditions = 'some column NOT value';
-        $this->csv = new parseCSV(null, null, null, $conditions);
+        $this->csv = new Csv(null, null, null, $conditions);
         $this->assertTrue(is_string($this->csv->conditions));
         $this->assertEquals($conditions, $this->csv->conditions);
     }
 
     public function test_keep_file_data_param() {
         $keep = true;
-        $this->csv = new parseCSV(null, null, null, null, $keep);
+        $this->csv = new Csv(null, null, null, null, $keep);
         $this->assertTrue(is_bool($this->csv->keep_file_data));
         $this->assertEquals($keep, $this->csv->keep_file_data);
     }
 
     public function test_input_param() {
         $csv = "col1,col2,col3\r\nval1,val2,val3\r\nval1A,val2A,val3A\r\n";
-        $this->csv = new parseCSV($csv, null, null, null, true);
+        $this->csv = new Csv($csv, null, null, null, true);
         $this->assertTrue(is_string($this->csv->file_data));
         $this->assertEquals($csv, $this->csv->file_data);
     }
+
+    /**
+     * @runInSeparateProcess because download.php uses header()
+     *
+     * @see                  https://github.com/sebastianbergmann/phpunit/issues/720#issuecomment-10421092
+     */
+    public function testCodeExamples() {
+        chdir('examples');
+        foreach (glob('*.php') as $script_file) {
+            ob_start();
+            /** @noinspection PhpIncludeInspection */
+            require $script_file;
+            $ob_get_clean = ob_get_clean();
+            if ($script_file != 'download.php') {
+                $this->assertContains('<td>', $ob_get_clean);
+            }
+        }
+        chdir('..');
+    }
 }

tests/methods/DataRowCountTest.php

@@ -0,0 +1,82 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+
+class DataRowCountTest extends TestCase {
+
+    /**
+     * CSV
+     * The CSV object
+     *
+     * @access protected
+     * @var Csv
+     */
+    protected $csv;
+
+    /**
+     * Setup
+     * Setup our test environment objects
+     *
+     * @access public
+     */
+    public function setUp() {
+        $this->csv = new Csv();
+    }
+
+    public function countRowsProvider() {
+        return [
+            'auto-double-enclosure' => [
+                'auto-double-enclosure.csv',
+                2,
+            ],
+            'auto-single-enclosure' => [
+                'auto-single-enclosure.csv',
+                2,
+            ],
+            'UTF-8_sep_row' => [
+                'datatype.csv',
+                3,
+            ],
+        ];
+    }
+
+    /**
+     * @dataProvider countRowsProvider
+     *
+     * @param string $file
+     * @param int    $expectedRows
+     */
+    public function testGetTotalRowCountFromFile($file, $expectedRows) {
+        $this->csv->heading = true;
+        $this->csv->load_data(__DIR__ . '/fixtures/' . $file);
+        $this->assertEquals($expectedRows, $this->csv->getTotalDataRowCount());
+    }
+
+    public function testGetTotalRowCountMissingEndingLineBreak() {
+        $this->csv->heading = false;
+        $this->csv->enclosure = '"';
+        $sInput = "86545235689,a\r\n34365587654,b\r\n13469874576,\"c\r\nd\"";
+        $this->csv->load_data($sInput);
+        $this->assertEquals(3, $this->csv->getTotalDataRowCount());
+    }
+
+    public function testGetTotalRowCountSingleEnclosure() {
+        $this->csv->heading = false;
+        $this->csv->enclosure = "'";
+        $sInput = "86545235689,a\r\n34365587654,b\r\n13469874576,\'c\r\nd\'";
+        $this->csv->load_data($sInput);
+        $this->assertEquals(3, $this->csv->getTotalDataRowCount());
+    }
+
+    public function testGetTotalRowCountSingleRow() {
+        $this->csv->heading = false;
+        $this->csv->enclosure = "'";
+        $sInput = "86545235689";
+        $this->csv->load_data($sInput);
+        $this->assertEquals(1, $this->csv->getTotalDataRowCount());
+    }
+}

tests/methods/DatatypeTest.php

@@ -0,0 +1,69 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: sgorzaly
+ * Date: 19.02.18
+ * Time: 20:52
+ */
+
+namespace ParseCsv\tests\methods;
+
+use PHPUnit\Framework\TestCase;
+use ParseCsv\enums\DatatypeEnum;
+
+class DatatypeTest extends TestCase
+{
+    public function testSampleIsValidInteger(){
+        $this->assertEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('1'));
+        $this->assertEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('+1'));
+        $this->assertEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('-1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('--1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('test'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('1.0'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('1,0'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('1,1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('0.1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('true'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('2018-02-19'));
+    }
+
+    public function testSampleIsValidBool(){
+        $this->assertEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('true'));
+        $this->assertEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('TRUE'));
+        $this->assertEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('false'));
+        $this->assertEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('FALSE'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('FALS'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('test'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('0'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('0.1'));
+    }
+
+    public function testSampleIsValidFloat(){
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1.0'));
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('-1.1'));
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('+1,1'));
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1,1'));
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1,1'));
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1e-03'));
+        $this->assertEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1e+03'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('test'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1,,1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('1..1'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('2018-02-19'));
+    }
+
+    public function testSampleIsValidDate(){
+        $this->assertEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('2018-02-19'));
+        $this->assertEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('18-2-19'));
+        $this->assertEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('01.02.2018'));
+        $this->assertEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('1.2.18'));
+        $this->assertEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('07/31/2018'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('31/07/2018'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('1-2'));
+        $this->assertEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('1.2.'));
+        $this->assertNotEquals(DatatypeEnum::TYPE_DATE, DatatypeEnum::getValidTypeFromSample('test'));
+    }
+
+}

tests/methods/OldRequireTest.php

@@ -0,0 +1,45 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+use PHPUnit\Framework\TestCase;
+
+/**
+ * This test checks for backwards compatibility: Does it work to
+ *   - require the old "parsecsv.lib.php" instead of composer autoloading?
+ *   - use the old class name "parseCSV"?
+ */
+class OldRequireTest extends TestCase {
+
+    protected function setUp() {
+        rename('vendor/autoload.php', '__autoload');
+    }
+
+    protected function tearDown() {
+        rename('__autoload', 'vendor/autoload.php');
+    }
+
+    /**
+     * @runInSeparateProcess so that disabled autoloading has an effect
+     */
+    public function testOldLibWithoutComposer() {
+
+        file_put_contents('__eval.php', '<?php require "parsecsv.lib.php"; new \ParseCsv\Csv;');
+        exec("php __eval.php", $output, $return_var);
+        unlink('__eval.php');
+        $this->assertEquals($output, []);
+        $this->assertEquals(0, $return_var);
+    }
+
+    /**
+     * @runInSeparateProcess so that disabled autoloading has an effect
+     */
+    public function testOldLibWithOldClassName() {
+
+        file_put_contents('__eval.php', '<?php require "parsecsv.lib.php"; new parseCSV;');
+        exec("php __eval.php", $output, $return_var);
+        unlink('__eval.php');
+        $this->assertEquals($output, []);
+        $this->assertEquals(0, $return_var);
+    }
+}

tests/methods/OutputTest.php

@@ -0,0 +1,21 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+class OutputTest extends TestCase {
+
+    /**
+     * @runInSeparateProcess because download.php uses header()
+     */
+    public function testOutputWithFourParameters() {
+        $csv = new Csv();
+        $data = [0 => ['a', 'b', 'c'], 1 => ['d', 'e', 'f']];
+        $fields = ['col1', 'col2', 'col3'];
+        $output = $csv->output('test.csv', $data, $fields, ',');
+        $expected = "col1,col2,col3\ra,b,c\rd,e,f\r";
+        self::assertEquals($expected, $output);
+    }
+}

tests/methods/ParseTest.php

@@ -1,13 +1,14 @@
 <?php
 
-class ParseTest extends PHPUnit\Framework\TestCase {
+namespace ParseCsv\tests\methods;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+class ParseTest extends TestCase {
 
     /**
-     * CSV
+     * @var Csv object
-     * The parseCSV object
-     *
-     * @access protected
-     * @var parseCSV
      */
     protected $csv;
 
@@ -18,16 +19,16 @@ class ParseTest extends PHPUnit\Framework\TestCase {
      * @access public
      */
     public function setUp() {
-        $this->csv = new parseCSV();
+        $this->csv = new Csv();
     }
 
-    public function test_parse() {
+    public function testParse() {
         // can we trick 'is_readable' into whining? See #67.
-        $this->parse_repetitive_string('c:/looks/like/a/path');
+        $this->parseRepetitiveString('c:/looks/like/a/path');
-        $this->parse_repetitive_string('http://looks/like/an/url');
+        $this->parseRepetitiveString('http://looks/like/an/url');
     }
 
-    private function parse_repetitive_string($content) {
+    private function parseRepetitiveString($content) {
         $this->csv->delimiter = ';';
         $this->csv->heading = false;
         $success = $this->csv->parse(str_repeat($content . ';', 500));
@@ -39,9 +40,28 @@ class ParseTest extends PHPUnit\Framework\TestCase {
         $this->assertEquals($expected_data, $row);
     }
 
-    public function test_sep_row_auto_detection_UTF8_no_BOM() {
+    /**
-        $this->_autoparse_magazine_file(
+     * @depends      testParse
-            __DIR__ . '/../example_files/UTF-8_sep_row_but_no_BOM.csv');
+     *
+     * @dataProvider autoDetectionProvider
+     *
+     * @param string $file
+     */
+    public function testSepRowAutoDetection($file) {
+        // This file (parse_test.php) is encoded in UTF-8, hence comparison will
+        // fail unless we to this:
+        $this->csv->output_encoding = 'UTF-8';
+
+        $this->csv->auto($file);
+        $this->assertEquals($this->_get_magazines_data(), $this->csv->data);
+    }
+
+    public function autoDetectionProvider() {
+        return [
+            'UTF8_no_BOM' => [__DIR__ . '/../example_files/UTF-8_sep_row_but_no_BOM.csv'],
+            'UTF8' => [__DIR__ . '/../example_files/UTF-8_with_BOM_and_sep_row.csv'],
+            'UTF16' => [__DIR__ . '/../example_files/UTF-16LE_with_BOM_and_sep_row.csv'],
+        ];
     }
 
     public function testSingleColumnWithZeros() {
@@ -67,7 +87,8 @@ class ParseTest extends PHPUnit\Framework\TestCase {
         $this->csv->enclosure = '"';
         $sInput = "86545235689,a\r\n34365587654,b\r\n13469874576,\"c\r\nd\"";
         $expected_data = [86545235689, 34365587654, 13469874576];
-        $actual_data = $this->csv->parse_string($sInput);
+
+        $actual_data = $this->invokeMethod($this->csv, 'parse_string', array($sInput));
         $actual_column = array_map('reset', $actual_data);
         $this->assertEquals($expected_data, $actual_column);
         $this->assertEquals([
@@ -77,26 +98,7 @@ class ParseTest extends PHPUnit\Framework\TestCase {
         ], array_map('next', $actual_data));
     }
 
-    public function test_sep_row_auto_detection_UTF8() {
+    public function testSingleColumn() {
-        $this->_autoparse_magazine_file(
-            __DIR__ . '/../example_files/UTF-8_with_BOM_and_sep_row.csv');
-    }
-
-    public function test_sep_row_auto_detection_UTF16() {
-        $this->_autoparse_magazine_file(
-            __DIR__ . '/../example_files/UTF-16LE_with_BOM_and_sep_row.csv');
-    }
-
-    protected function _autoparse_magazine_file($file) {
-        // This file (parse_test.php) is encoded in UTF-8, hence comparison will
-        // fail unless we to this:
-        $this->csv->output_encoding = 'UTF-8';
-
-        $this->csv->auto($file);
-        $this->assertEquals($this->_get_magazines_data(), $this->csv->data);
-    }
-
-    public function test_single_column() {
         $this->csv->auto(__DIR__ . '/../example_files/single_column.csv');
         $expected = [
             ['SMS' => '0444'],
@@ -107,11 +109,8 @@ class ParseTest extends PHPUnit\Framework\TestCase {
         $this->assertEquals($expected, $this->csv->data);
     }
 
-    public function test_Piwik_data() {
+    public function testMatomoData() {
-        if (!function_exists('array_column')) {
+        // Matomo (Piwik) export cannot be read with
-            // function only available in PHP >= 5.5
-            return;
-        }
         $this->csv->use_mb_convert_encoding = true;
         $this->csv->output_encoding = 'UTF-8';
         $this->csv->auto(__DIR__ . '/../example_files/Piwik_API_download.csv');
@@ -130,6 +129,65 @@ class ParseTest extends PHPUnit\Framework\TestCase {
         ], $aCity);
     }
 
+    public function testWithMultipleNewlines() {
+        $this->csv->auto(__DIR__ . '/../example_files/multiple_empty_lines.csv');
+        $aElse9 = array_column($this->csv->data, 'else9');
+
+        /** @noinspection SpellCheckingInspection */
+        $this->assertEquals([
+            'Abweichung',
+            'Abweichung',
+            'Abweichung',
+            'Alt',
+            'Fehlt',
+            'Neu',
+            'OK',
+            'Fehlt',
+            'Fehlt',
+            'Fehlt',
+        ], $aElse9);
+    }
+
+    /**
+     * @depends testSepRowAutoDetection
+     */
+    public function testGetColumnDatatypes() {
+        $this->csv->auto(__DIR__ . '/fixtures/datatype.csv');
+        $this->csv->getDatatypes();
+        $expected = [
+            'title' => 'string',
+            'isbn' => 'string',
+            'publishedAt' => 'date',
+            'published' => 'boolean',
+            'count' => 'integer',
+            'price' => 'float',
+        ];
+
+        $this->assertEquals($expected, $this->csv->data_types);
+    }
+
+    /**
+     * @depends testSepRowAutoDetection
+     */
+    public function testAutoDetectFileHasHeading() {
+        $this->csv->auto(__DIR__ . '/fixtures/datatype.csv');
+        $this->assertTrue($this->csv->autoDetectFileHasHeading());
+
+        $this->csv->heading = false;
+        $this->csv->auto(__DIR__ . '/fixtures/datatype.csv');
+        $this->assertTrue($this->csv->autoDetectFileHasHeading());
+
+        $this->csv->heading = false;
+        $sInput = "86545235689\r\n34365587654\r\n13469874576";
+        $this->csv->auto($sInput);
+        $this->assertFalse($this->csv->autoDetectFileHasHeading());
+
+        $this->csv->heading = true;
+        $sInput = "86545235689\r\n34365587654\r\n13469874576";
+        $this->csv->auto($sInput);
+        $this->assertFalse($this->csv->autoDetectFileHasHeading());
+    }
+
     protected function _get_magazines_data() {
         return [
             [
@@ -152,21 +210,53 @@ class ParseTest extends PHPUnit\Framework\TestCase {
 
     public function autoQuotesDataProvider() {
         return array(
-            array('tests/methods/fixtures/auto-double-enclosure.csv', '"'),
+            array('auto-double-enclosure.csv', '"'),
-            array('tests/methods/fixtures/auto-single-enclosure.csv', "'"),
+            array('auto-single-enclosure.csv', "'"),
         );
     }
 
     /**
+     * @depends      testSepRowAutoDetection
+     *
      * @dataProvider autoQuotesDataProvider
      *
      * @param string $file
      * @param string $enclosure
      */
     public function testAutoQuotes($file, $enclosure) {
-        $csv = new parseCSV();
+        $csv = new Csv();
-        $csv->auto($file, true, null, null, $enclosure);
+        $csv->auto(__DIR__ . '/fixtures/' . $file, true, null, null, $enclosure);
         $this->assertArrayHasKey('column1', $csv->data[0], 'Data parsed incorrectly with enclosure ' . $enclosure);
         $this->assertEquals('value1', $csv->data[0]['column1'], 'Data parsed incorrectly with enclosure ' . $enclosure);
     }
+
+    /**
+     * Call protected/private method of a class.
+     *
+     * @param object &$object    Instantiated object that we will run method on.
+     * @param string $methodName Method name to call
+     * @param array  $parameters Array of parameters to pass into method.
+     *
+     * @return mixed Method return.
+     */
+    private function invokeMethod(&$object, $methodName, array $parameters = array()) {
+        $reflection = new \ReflectionClass(get_class($object));
+        $method = $reflection->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method->invokeArgs($object, $parameters);
+    }
+
+    public function testWaiverFieldSeparator() {
+        $this->assertSame(false, $this->csv->auto(__DIR__ . '/../example_files/waiver_field_separator.csv'));
+        $expected = [
+            'liability waiver',
+            'release of liability form',
+            'release of liability',
+            'sample waiver',
+            'sample waiver form',
+        ];
+        $actual = array_column($this->csv->data, 'keyword');
+        $this->assertSame($expected, $actual);
+    }
 }

tests/methods/SaveTest.php

@@ -1,8 +1,13 @@
 <?php
+namespace ParseCsv\tests\methods;
 
-class SaveTest extends PHPUnit\Framework\TestCase {
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
 
-    /** @var parseCSV */
+class SaveTest extends TestCase
+{
+
+    /** @var Csv */
     private $csv;
 
     private $temp_filename;
@@ -11,7 +16,7 @@ class SaveTest extends PHPUnit\Framework\TestCase {
      * Setup our test environment objects; will be called before each test.
      */
     public function setUp() {
-        $this->csv = new parseCSV();
+        $this->csv = new Csv();
         $this->csv->auto(__DIR__ . '/../example_files/single_column.csv');
 
         // Remove last 2 lines to simplify comparison
@@ -44,6 +49,13 @@ class SaveTest extends PHPUnit\Framework\TestCase {
         $this->saveAndCompare($expected);
     }
 
+    public function testSaveWithNewHeader() {
+        $this->csv->linefeed = "\n";
+        $this->csv->titles = array("NewTitle");
+        $expected = "NewTitle\n0444\n5555\n";
+        $this->saveAndCompare($expected);
+    }
+
     public function testSaveWithoutHeader() {
         $this->csv->linefeed = "\n";
         $this->csv->heading = false;

tests/methods/UnparseTest.php

@@ -0,0 +1,83 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+
+class UnparseTest extends Testcase {
+
+    /** @var Csv */
+    private $csv;
+
+    /**
+     * Setup our test environment objects; will be called before each test.
+     */
+    public function setUp() {
+        $this->csv = new Csv();
+        $this->csv->auto(__DIR__ . '/fixtures/auto-double-enclosure.csv');
+    }
+
+    public function testUnparseWithParameters() {
+        $fields = array('a' => 'AA', 'b' => 'BB');
+        $data = [['a' => 'value1', 'b' => 'value2']];
+        $csv_object = new Csv();
+        $csv_string = $csv_object->unparse($data, $fields);
+        $this->assertEquals("AA,BB\rvalue1,value2\r", $csv_string);
+
+        $csv_object = new Csv();
+        $csv_object->linefeed = "\n";
+        $csv_string = $csv_object->unparse([[55, 66]]);
+        $this->assertEquals("55,66\n", $csv_string);
+
+        $csv_object = new Csv();
+        $data2 = [['a' => "multi\rline", 'b' => 'value2']];
+        $csv_object->enclosure = "'";
+        $csv_string = $csv_object->unparse($data2, $fields);
+        $this->assertEquals("AA,BB\r'multi\rline',value2\r", $csv_string);
+    }
+
+    public function testUnparseDefault() {
+        $expected = "column1,column2\rvalue1,value2\rvalue3,value4\r";
+        $this->unparseAndCompare($expected);
+    }
+
+    public function testUnparseDefaultWithoutHeading() {
+        $this->csv->heading = false;
+        $this->csv->auto(__DIR__ . '/fixtures/auto-double-enclosure.csv');
+        $expected = "column1,column2\rvalue1,value2\rvalue3,value4\r";
+        $this->unparseAndCompare($expected);
+
+    }
+
+    public function testUnparseRenameFields() {
+        $expected = "C1,C2\rvalue1,value2\rvalue3,value4\r";
+        $this->unparseAndCompare($expected, array("C1", "C2"));
+    }
+
+    public function testReorderFields() {
+        $expected = "column2,column1\rvalue2,value1\rvalue4,value3\r";
+        $this->unparseAndCompare($expected, array("column2", "column1"));
+    }
+
+    public function testSubsetFields() {
+        $expected = "column1\rvalue1\rvalue3\r";
+        $this->unparseAndCompare($expected, array("column1"));
+    }
+
+    public function testReorderAndRenameFields() {
+        $fields = array(
+            'column2' => 'C2',
+            'column1' => 'C1',
+        );
+        $expected = "C2,C1\rvalue2,value1\rvalue4,value3\r";
+        $this->unparseAndCompare($expected, $fields);
+    }
+
+    private function unparseAndCompare($expected, $fields = array()) {
+        $str = $this->csv->unparse($this->csv->data, $fields);
+        $this->assertEquals($expected, $str);
+    }
+
+}

tests/methods/fixtures/datatype.csv

@@ -0,0 +1,5 @@
+sep=;
+title;isbn;publishedAt;published;count;price
+Красивая кулинария;5454-5587-3210;21.05.2011;true;1;10.99
+The Wine Connoisseurs;2547-8548-2541;12.12.2011;TRUE;;20.33
+Weißwein;1313-4545-8875;23.02.2012;false;10;10

tests/properties/BaseClass.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace ParseCsv\tests\properties;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+class BaseClass extends TestCase {
+
+    /**
+     * CSV
+     * The parseCSV object
+     *
+     * @access protected
+     * @var Csv
+     */
+    protected $csv;
+
+    /**
+     * Setup
+     * Setup our test environment objects
+     *
+     * @access public
+     */
+    public function setUp() {
+        $this->csv = new Csv();
+    }
+
+    protected function _compareWithExpected($expected) {
+        $this->csv->auto(__DIR__ . '/../../examples/_books.csv');
+        $actual = array_map(function ($row) {
+            return $row['title'];
+        }, $this->csv->data);
+        $this->assertEquals($expected, array_values($actual));
+    }
+}

tests/properties/ConditionsTest.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace ParseCsv\tests\properties;
+
+class ConditionsTest extends BaseClass {
+
+    public function testNotDanBrown() {
+        $this->csv->conditions = 'author does not contain dan brown';
+
+        $this->_compareWithExpected([
+            'The Killing Kind',
+            'The Third Secret',
+            'The Last Templar',
+            'The Traveller',
+            'Crisis Four',
+            'Prey',
+            'The Broker (Paperback)',
+            'Without Blood (Paperback)',
+            'State of Fear (Paperback)',
+            'The Rule of Four (Paperback)',
+        ]);
+    }
+
+    public function testRating() {
+        $this->csv->conditions = 'rating < 3';
+        $this->_compareWithExpected([
+            'The Killing Kind',
+            'The Third Secret',
+        ]);
+
+        $this->csv->conditions = 'rating >= 5';
+        $this->_compareWithExpected([
+            'The Traveller',
+            'Prey',
+            'State of Fear (Paperback)',
+            'Digital Fortress : A Thriller (Mass Market Paperback)',
+            'Angels & Demons (Mass Market Paperback)',
+        ]);
+    }
+
+    public function testTitleContainsSecretOrCode() {
+        $this->csv->conditions = 'title contains code OR title contains SECRET';
+
+        $this->_compareWithExpected([
+            'The Third Secret',
+            'The Da Vinci Code (Hardcover)',
+        ]);
+    }
+}

tests/properties/DefaultValuesPropertiesTest.php

@@ -1,13 +1,18 @@
 <?php
 
-class default_values_properties_Test extends PHPUnit\Framework\TestCase {
+namespace ParseCsv\tests\properties;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+class DefaultValuesPropertiesTest extends TestCase {
 
     /**
      * CSV
      * The parseCSV object
      *
      * @access protected
-     * @var [parseCSV]
+     * @var Csv
      */
     protected $csv = null;
 
@@ -19,7 +24,7 @@ class default_values_properties_Test extends PHPUnit\Framework\TestCase {
      */
     public function setUp() {
         //setup parse CSV
-        $this->csv = new parseCSV();
+        $this->csv = new Csv();
     }
 
     /**
@@ -52,7 +57,7 @@ class default_values_properties_Test extends PHPUnit\Framework\TestCase {
     }
 
     public function test_sort_type_default() {
-        $this->assertNull($this->csv->sort_type);
+        $this->assertEquals('regular', $this->csv->sort_type);
     }
 
     public function test_delimiter_default() {

tests/properties/OffsetTest.php

@@ -0,0 +1,78 @@
+<?php
+
+namespace ParseCsv\tests\properties;
+
+/**
+ * Tests related to the $offset property
+ */
+class OffsetTest extends BaseClass {
+    public function testOffsetOfOne() {
+        $this->csv->offset = 1;
+        $this->csv->auto(__DIR__ . '/../methods/fixtures/datatype.csv');
+        $this->assertCount(3, $this->csv->data);
+
+        if (!function_exists('array_column')) {
+            // function only available in PHP >= 5.5
+            return;
+        }
+        $expected = [
+            'Красивая кулинария',
+            'The Wine Connoisseurs',
+            'Weißwein',
+        ];
+        $actual = array_column($this->csv->data, 'title');
+        $this->assertEquals($expected, $actual);
+    }
+
+    public function numberRangeZeroToFourProvider() {
+        return array_map(function ($number) {
+            return [$number];
+        }, range(0, 4));
+    }
+
+    /**
+     * @dataProvider numberRangeZeroToFourProvider
+     *
+     * @param integer $offset
+     */
+    public function testOffsetOfOneNoHeader($offset) {
+        $this->csv->offset = $offset;
+        $this->csv->heading = false;
+        $this->csv->auto(__DIR__ . '/../methods/fixtures/datatype.csv');
+        $this->assertCount(4 - $offset, $this->csv->data);
+    }
+
+    public function testDataArrayKeysWhenSettingOffsetWithHeading() {
+        $this->csv->offset = 2;
+        $this->csv->auto(__DIR__ . '/../methods/fixtures/datatype.csv');
+        $expected = [
+            [
+                'title' => 'The Wine Connoisseurs',
+                'isbn' => '2547-8548-2541',
+                'publishedAt' => '12.12.2011',
+                'published' => 'TRUE',
+                'count' => '',
+                'price' => 20.33,
+            ],
+            [
+                'title' => 'Weißwein',
+                'isbn' => '1313-4545-8875',
+                'publishedAt' => '23.02.2012',
+                'published' => 'false',
+                'count' => 10,
+                'price' => 10,
+            ],
+        ];
+
+        $this->assertEquals($expected, $this->csv->data);
+    }
+
+    public function testDataArrayKeysWhenSettingOffsetWithoutHeading() {
+        $this->csv->heading = false;
+        $this->csv->offset = 2;
+        $this->csv->auto(__DIR__ . '/../methods/fixtures/datatype.csv');
+        $expected = range(0, 5, 1);
+
+        $this->assertEquals($expected, array_keys($this->csv->data[0]));
+    }
+}

tests/properties/PublicPropertiesTest.php

@@ -1,13 +1,19 @@
 <?php
 
-class worthless_properties_Test extends PHPUnit\Framework\TestCase {
+namespace ParseCsv\tests\properties;
+
+use ParseCsv\Csv;
+use ParseCsv\enums\SortEnum;
+use PHPUnit\Framework\TestCase;
+
+class PublicPropertiesTest extends TestCase {
 
     /**
      * CSV
      * The parseCSV object
      *
      * @access protected
-     * @var [parseCSV]
+     * @var Csv
      */
     protected $csv = null;
 
@@ -16,7 +22,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
      * The reflection class object
      *
      * @access protected
-     * @var [ReflectionClass]
+     * @var \ReflectionClass
      */
     protected $reflection = null;
 
@@ -24,6 +30,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
      * Reflection Properties
      * The reflected class properties
      *
+     * @var \ReflectionProperty[]
      * @access protected
      */
     protected $properties = null;
@@ -36,10 +43,10 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
      */
     public function setUp() {
         //setup parse CSV
-        $this->csv = new parseCSV();
+        $this->csv = new Csv();
 
         //setup the reflection class
-        $this->reflection = new ReflectionClass($this->csv);
+        $this->reflection = new \ReflectionClass($this->csv);
 
         //setup the reflected class properties
         $this->properties = $this->reflection->getProperties();
@@ -65,7 +72,7 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
      * @access public
      */
     public function test_propertiesCount() {
-        $this->assertCount(28, $this->properties);
+        $this->assertCount(29, $this->properties);
     }
 
     /**
@@ -107,11 +114,12 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
             'error',
             'error_info',
             'titles',
-            'data'
+            'data',
+            'data_types',
         );
 
         // Find our real properties
-        $real_properties = array_map(function (ReflectionProperty $property) {
+        $real_properties = array_map(function (\ReflectionProperty $property) {
             return $property->getName();
         }, $this->properties);
 
@@ -129,7 +137,8 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
     public function test_count_public_properties() {
         $counter = 0;
 
-        for ($a = 0; $a < count($this->properties); $a++) {
+        $propertiesCount = count($this->properties);
+        for ($a = 0; $a < $propertiesCount; $a++) {
             if ($this->properties[$a]->isPublic() === true) {
                 $counter++;
             }
@@ -137,4 +146,26 @@ class worthless_properties_Test extends PHPUnit\Framework\TestCase {
 
         $this->assertCount($counter, $this->properties);
     }
+
+    public function testDefaultSortTypeIsRegular(){
+        $this->assertEquals(SortEnum::SORT_TYPE_REGULAR,  $this->csv->sort_type);
+    }
+
+    public function testSetSortType(){
+        $this->csv->sort_type = 'numeric';
+        $this->assertEquals(SortEnum::SORT_TYPE_NUMERIC,  $this->csv->sort_type);
+
+        $this->csv->sort_type = 'string';
+        $this->assertEquals(SortEnum::SORT_TYPE_STRING,  $this->csv->sort_type);
+    }
+
+    public function testGetSorting(){
+        $this->csv->sort_type = 'numeric';
+        $sorting = SortEnum::getSorting($this->csv->sort_type);
+        $this->assertEquals(SORT_NUMERIC,  $sorting);
+
+        $this->csv->sort_type = 'string';
+        $sorting = SortEnum::getSorting($this->csv->sort_type);
+        $this->assertEquals(SORT_STRING,  $sorting);
+    }
 }

tests/properties/SortByTest.php

@@ -0,0 +1,60 @@
+<?php
+
+namespace ParseCsv\tests\properties;
+
+class SortByTest extends BaseClass {
+
+    public function testSortByRating() {
+        $this->csv->sort_by = 'rating';
+        $this->csv->conditions = 'title does not contain Blood';
+        $this->_compareWithExpected([
+            // Rating 0
+            'The Killing Kind',
+            'The Third Secret',
+
+            // Rating 3
+            'The Last Templar',
+            'The Broker (Paperback)',
+
+            // Rating 4
+            'Deception Point (Paperback)',
+            'The Rule of Four (Paperback)',
+            'The Da Vinci Code (Hardcover)',
+
+            // Rating 5
+            'State of Fear (Paperback)',
+            'Prey',
+            'Digital Fortress : A Thriller (Mass Market Paperback)',
+            'Angels & Demons (Mass Market Paperback)',
+        ]);
+    }
+
+    public function testReverseSortByRating() {
+        $this->csv->sort_by = 'rating';
+        $this->csv->conditions =
+            'title does not contain Prey AND ' .
+            'title does not contain Fortress AND ' .
+            'title does not contain Blood AND ' .
+            'title does not contain Fear';
+        $this->csv->sort_reverse = true;
+        $this->_compareWithExpected([
+
+            // Rating 5
+            'Angels & Demons (Mass Market Paperback)',
+            'The Traveller',
+
+            // Rating 4
+            'The Da Vinci Code (Hardcover)',
+            'The Rule of Four (Paperback)',
+            'Deception Point (Paperback)',
+
+            // Rating 3
+            'The Broker (Paperback)',
+            'The Last Templar',
+
+            // Rating 0
+            'The Third Secret',
+            'The Killing Kind',
+        ]);
+    }
+}