Newer Rector versions don’t have AddCoversClassAttributeRector anymore

https://github.com/rectorphp/rector-phpunit/pull/561/

.editorconfig

@@ -13,3 +13,9 @@ insert_final_newline = true
 
 [composer.json]
 indent_size = 4
+
+[Makefile]
+indent_style = tab
+
+[*.yml,*.yaml]
+indent_size = 2

.gitattributes

@@ -0,0 +1,9 @@
+/.editorconfig export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/ChangeLog.txt export-ignore
+/examples export-ignore
+/Makefile export-ignore
+/ruleset.xml export-ignore
+/tests export-ignore

.github/workflows/phpunit.yml

@@ -0,0 +1,82 @@
+---
+name: PHPUnit
+on:
+  push:
+
+jobs:
+  test_php_82_and_newer:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php_version:
+          - "8.3"
+          - "8.2"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Update PHPUnit
+        run: composer require phpunit/phpunit --dev -W
+      - name: Install dependencies
+        run: composer update
+      - name: Validate dependencies
+        run: composer validate
+      - name: install Rector
+        run: composer require rector/rector --dev -W
+      - name: run Rector
+        run: cd tests && ../vendor/bin/phpunit --migrate-configuration
+        shell: bash
+      - name: run Rector
+        run: cd tests && ../vendor/bin/rector process .
+        shell: bash
+      - name: Run tests
+        run: vendor/bin/phpunit --configuration tests/phpunit.xml
+  test_php_81_and_lower:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        php_version:
+          - "8.1"
+          - "8.0"
+          - "7.4"
+          - "7.3"
+          - "7.2"
+          - "7.1"
+    steps:
+      - uses: actions/checkout@v3
+      - uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php_version }}
+        env:
+          COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "::set-output name=dir::$(composer config cache-files-dir)"
+      - name: Cache composer dependencies
+        uses: actions/cache@v4
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Update PHPUnit
+        run: composer require phpunit/phpunit --dev -W
+      - name: Install dependencies
+        run: composer update
+      - name: Validate dependencies
+        run: composer validate
+      - name: Run tests
+        run: vendor/bin/phpunit --configuration tests/phpunit.xml

.gitignore

@@ -1,6 +1,14 @@
 *.bak
+.env
+.envrc
 /.idea
+/.vscode
+/composer-setup.php
+/composer.lock
+/coverage_clover.xml
+/docker-compose.yml
+/examples/people.csv
 /phive.xml
+/tests/.phpunit.result.cache
 /tools
-composer.lock
+/vendor/
-vendor/

.travis.yml

@@ -1,19 +0,0 @@
-language: php
-
-php:
-  - 7.2
-  - 7.1
-  - 7.0
-  - 5.6
-  - 5.5
-  - 5.4
-
-script:
-  - phpunit --version
-  - phpunit --configuration tests/phpunit.xml
-
-notifications:
-  email:
-    - will.knauss@gmail.com
-  on_success: never
-  on_failure: always

ChangeLog.txt

@@ -1,3 +1,159 @@
+ParseCSV 1.3.2
+-----------------------------------
+Date: 07-Nov-2021
+
+Bugfix:
+- Allow _guess_delimiter to work with a single
+  row of data. As a consequence, `$csv->auto()`
+  now works for files with just one row of data.
+  See issue #206.
+
+-----------------------------------
+
+
+ParseCSV 1.3.1
+-----------------------------------
+Date: 20-Jun-2021
+
+Bugfix:
+- `parseFile()` will now set `$csv->data`.
+  Until now, the parsed data was only returned.
+  This adds consistency with `$csv->parse()`
+  for the following operations on the object.
+
+-----------------------------------
+
+
+ParseCSV 1.3.0
+-----------------------------------
+Date: 14-Apr-2021
+
+Breaking changes:
+- Passing file paths to parse() or new Csv() is now deprecated
+  and will be removed in v2.0.0. Use ->parseFile() instead.
+
+  WARNING: It will call trigger_error() for now.
+  This may still break your application, depending on your
+  php.ini config. You can add E_USER_DEPRECATED to the
+  error_reporting mask to avoid breaking your application:
+
+  Example:
+
+  error_reporting = E_ALL & ~E_DEPRECATED & ~E_STRICT & ~E_USER_DEPRECATED
+
+  This change is to avoid security issues: see issue #198.
+
+Non-breaking deprecations:
+- The function load_data() is deprecated.
+  Call loadFile() or loadDataString() instead.
+- Supplying CSV data (file content) to auto() is deprecated.
+  Please use autoDetectionForDataString().
+
+  The motivation is to make subtle gotchas less likely: when the
+  file cannot be found or read by PHP (permissions), its file path
+  would be treated like CSV data.
+- Currently, there is code to parse .php: <?...?> tags are removed
+  before the remaining file content is treated like a .csv file.
+  This rarely-used functionality will be removed in v2.0.0.
+  You are only affected if you use ParseCsv to parse .php files.
+
+New features: none
+Bug fixes: none
+-----------------------------------
+
+
+ParseCSV 1.2.1
+-----------------------------------
+Date: 25-Apr-2020
+
+Breaking changes: none
+New features: none
+Bug fixes: none
+
+Code quality:
+- Switched from PHPUnit 4 to 6 to get rid of
+  wrappers. This will reduce friction for PhpStorm users,
+  because it gets rid of the "Multiple definitions" error
+  See issue #188. Thanks to @SharkMachine for the hint.
+-----------------------------------
+
+
+ParseCSV 1.2.0
+-----------------------------------
+Date: 07-Jan-2020
+
+Breaking changes: none
+
+New features:
+- Compatible with PHP 7.4. Thanks to @andreybolonin
+  @morrislaptop @martijnengler and @fjf2002.
+- unparse() now also understands $use_mb_convert_encoding.
+- Verbal condition operators are now allowed to contain
+  upper case letters, for example:
+  $csv->conditions = 'rating IS GREATER THAN 4';
+
+Bug fixes:
+-  All filter condition operators containing "is" or "equals"
+   were broken.
+
+Code quality:
+- Improved test coverage.
+-----------------------------------
+
+
+ParseCSV 1.1.1
+-----------------------------------
+Date: 2-Feb-2019
+
+Breaking changes: none
+
+New features: none
+
+Bug fixes:
+- Function load_data: check length of input, prevents E_NOTICE
+  if too long.
+- Fixed bugs in unparse().
+
+Code quality:
+- Improved test coverage.
+-----------------------------------
+
+
+ParseCSV 1.1.0
+-----------------------------------
+Date: 9-Aug-2018
+
+Breaking changes:
+- Ignore entirely empty lines at the end of files
+  See https://github.com/parsecsv/parsecsv-for-php/pull/142
+- Dropped support for PHP 5.4. Now, you need at leas PHP 5.5.
+- Fixed parse()'s return value: return true only if $data is useful.
+
+New features:
+- Added support for Laravel-style collections via the
+  new getCollection() function - see
+  https://github.com/parsecsv/parsecsv-for-php/pull/134
+- New function getTotalDataRowCount() - useful if
+  $limit is set - see pull request #122.
+- Added requires to keep Composer-free environments working.
+
+Bug fixes:
+- Better support for streams.
+  See https://github.com/parsecsv/parsecsv-for-php/pull/147
+- Fixed output() with custom header.
+  See https://github.com/parsecsv/parsecsv-for-php/issues/132
+- Fixed bug on _validate_fields_for_unparse() if titles property
+  is used instead of fields parameter for changing the titles for
+  unparsing.
+- Fixed bug in unparse() that caused incorrect column order
+  (Issue #41).
+
+
+Code quality:
+- Improved test coverage.
+-----------------------------------
+
+
 ParseCSV 1.0.0
 -----------------------------------
 Date: 3-March-2018
@@ -12,7 +168,7 @@ Date: 3-March-2018
   guesses the type of each column.
 
 - MIME: output() sends correct MIME type to browser
-  if the separator is a tab tab (Issue #79).
+  if the separator is a tab char (Issue #79).
 
 - Added support for mb_convert_encoding() instead of
   iconv() - see issue #109.

Makefile

@@ -11,5 +11,21 @@ phpunit-dep:
 		exit 1 \
 	)
 
+# Requires:
+# - Docker: https://docker.com
+# - act: https://github.com/nektos/act
+local-ci:
+ifeq (, $(shell which act))
+define ACT_ERROR
+Consider running the following to install 'act':
+
+   curl https://raw.githubusercontent.com/nektos/act/master/install.sh | sudo bash
+
+The dependency 'act' was not found
+endef
+$(error ${ACT_ERROR})
+endif
+	act -P ubuntu-latest=shivammathur/node:latest -W .github/workflows/ci.yml
+
 .SILENT:
-.PHONY: test phpunit-dep
+.PHONY: test phpunit-dep local-ci

README.md

@@ -1,11 +1,12 @@
 # ParseCsv
+![PHPUnit](https://github.com/parsecsv/parsecsv-for-php/actions/workflows/phpunit.yml/badge.svg)
 
 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
+fully conforms to the specifications outlined 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()`, ``fgetcsv()`` 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.
@@ -26,8 +27,8 @@ and third-party support for handling CSV data in PHP.
   how different programs like Excel for example outputs CSV data.
 * Support for character encoding conversion using PHP's
   `iconv()` and `mb_convert_encoding()` functions.
-* Supports PHP 5.4 and higher.
+* Supports PHP 5.5 and higher.
-  It certainly works with PHP 7.2 and all versions in between.
+  It certainly works with PHP 8.3 and all versions in between.
 
 ## Installation
 
@@ -52,48 +53,84 @@ To use ParseCSV, you then have to add a `require 'parsecsv.lib.php';` line.
 
 ## Example Usage
 
-**General**
+**Parse a tab-delimited CSV file with encoding conversion**
 
 ```php
-$csv = new ParseCsv\Csv('data.csv');
+$csv = new \ParseCsv\Csv();
-print_r($csv->data);
-```
-
-**Tab delimited, and encoding conversion**
-
-```php
-$csv = new ParseCsv\Csv();
 $csv->encoding('UTF-16', 'UTF-8');
 $csv->delimiter = "\t";
-$csv->parse('data.tsv');
+$csv->parseFile('data.tsv');
 print_r($csv->data);
 ```
 
-**Auto-detect delimiter character**
+**Auto-detect field delimiter character**
 
 ```php
-$csv = new ParseCsv\Csv();
+$csv = new \ParseCsv\Csv();
 $csv->auto('data.csv');
 print_r($csv->data);
 ```
 
-**Modify data in a CSV file**
+**Parse data with offset**
+* ignoring the first X (e.g. two) rows
+```php
+$csv = new \ParseCsv\Csv();
+$csv->offset = 2;
+$csv->parseFile('data.csv');
+print_r($csv->data);
+```
+
+**Limit the number of returned data rows**
+```php
+$csv = new \ParseCsv\Csv();
+$csv->limit = 5;
+$csv->parseFile('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->loadFile('data.csv');
+$count = $csv->getTotalDataRowCount();
+print_r($count);
+```
+
+**Get most common data type for each column**
 
 ```php
-$csv = new ParseCsv\Csv();
+$csv = new \ParseCsv\Csv('data.csv');
+$csv->getDatatypes();
+print_r($csv->data_types);
+```
+
+**Modify data in a CSV file**
+
+Change data values:
+```php
+$csv = new \ParseCsv\Csv();
 $csv->sort_by = 'id';
-$csv->parse('data.csv');
+$csv->parseFile('data.csv');
 # "4" is the value of the "id" column of the CSV row
 $csv->data[4] = array('firstname' => 'John', 'lastname' => 'Doe', 'email' => 'john@doe.com');
 $csv->save();
 ```
 
+Enclose each data value by quotes:
+```php
+$csv = new \ParseCsv\Csv();
+$csv->parseFile('data.csv');
+$csv->enclose_all = true;
+$csv->save();
+```
+
 **Replace field names or set ones if missing**
 
 ```php
-$csv = new ParseCsv\Csv();
+$csv = new \ParseCsv\Csv();
-$csv->fields = ['id', 'name', 'category']
+$csv->fields = ['id', 'name', 'category'];
-$csv->parse('data.csv');
+$csv->parseFile('data.csv');
 ```
 
 **Add row/entry to end of CSV file**
@@ -101,20 +138,46 @@ $csv->parse('data.csv');
 _Only recommended when you know the exact structure of the file._
 
 ```php
-$csv = new ParseCsv\Csv();
+$csv = new \ParseCsv\Csv();
-$csv->save('data.csv', array(array('1986', 'Home', 'Nowhere', '')), true);
+$csv->save('data.csv', array(array('1986', 'Home', 'Nowhere', '')), /* append */ true);
 ```
 
 **Convert 2D array to CSV data and send headers to browser to treat output as
 a file and download it**
 
+Your web app users would call this an export.
+
 ```php
-$csv = new ParseCsv\Csv();
+$csv = new \ParseCsv\Csv();
-$csv->output('movies.csv', $array, array('field 1', 'field 2'), ',');
+$csv->linefeed = "\n";
+$header = array('field 1', 'field 2');
+$csv->output('movies.csv', $data_array, $header, ',');
 ```
 
 For more complex examples, see the ``tests`` and `examples` directories.
 
+## Test coverage
+
+All tests are located in the `tests` directory. To execute tests, run the following commands:
+
+````bash
+composer install
+composer run test
+````
+
+Note that PHP 8.2 and newer allow PHPUnit versions that deprecate `@annotations`. The GitHub actions use Rector to
+convert them to `#[attributes]`.
+When pushing code to GitHub, tests will be executed using GitHub Actions. The relevant configuration is in the
+file `.github/workflows/ci.yml`. To run the `test` action locally, you can execute the following command:
+
+````bash
+make local-ci
+````
+
+## Security
+
+If you discover any security related issues, please email ParseCsv@blaeul.de instead of using GitHub issues.
+
 ## Credits
 
 * ParseCsv is based on the concept of [Ming Hong Ng][ming]'s [CsvFileParser][]
@@ -126,12 +189,14 @@ For more complex examples, see the ``tests`` and `examples` directories.
 
 ## Contributors
 
+### Code Contributors
+
+This project exists thanks to all the people who contribute.
+
 Please find a complete list on the project's [contributors][] page.
 
 [contributors]: https://github.com/parsecsv/parsecsv-for-php/graphs/contributors
 
-
-
 ## License
 
 (The MIT license)

composer.json

@@ -10,21 +10,48 @@
         {
             "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": {
-        "psr-4":{
+        "psr-4": {
-            "ParseCsv\\": "src",
+            "ParseCsv\\": "src"
-            "ParseCsv\\extensions\\": "src\\extensions",
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "ParseCsv\\tests\\": "tests"
         }
     },
-    "autoload-dev":{
+    "require": {
-        "psr-4":{
+        "php": ">=5.5"
-            "ParseCsv\\tests\\": "tests"
-        }
     },
     "require-dev": {
-        "phpunit/phpunit": "4.1.*"
+        "phpunit/phpunit": "8.5.52",
+        "squizlabs/php_codesniffer": "^3.5"
+    },
+    "suggest": {
+        "illuminate/support": "Fluent array interface for map functions"
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.0.x-dev"
+        }
+    },
+    "scripts": {
+        "test": [
+            "vendor/bin/phpunit -c tests tests --disallow-test-output --coverage-clover coverage_clover.xml --whitelist src"
+        ]
+    },
+    "support": {
+        "issues": "https://github.com/parsecsv/parsecsv-for-php/issues",
+        "source": "https://github.com/parsecsv/parsecsv-for-php"
     }
 }

examples/basic.php

@@ -3,6 +3,7 @@
 
 # include parseCSV class.
 require __DIR__ . '/../vendor/autoload.php';
+
 use ParseCsv\Csv;
 
 
@@ -17,8 +18,8 @@ $csv->auto('_books.csv');
 # if its not the default comma...
 // $csv->delimiter = "\t";   # tab delimited
 
-# ...and then use the parse() function.
+# ...and then use the parseFile() function.
-// $csv->parse('_books.csv');
+// $csv->parseFile('_books.csv');
 
 
 # Output result.
@@ -40,7 +41,7 @@ $csv->auto('_books.csv');
         background-color: #FFF;
     }
 </style>
-<table border="0" cellspacing="1" cellpadding="3">
+<table>
     <tr>
         <?php foreach ($csv->titles as $value): ?>
             <th><?php echo $value; ?></th>

examples/conditions.php

@@ -4,6 +4,7 @@
 
 # include parseCSV class.
 require __DIR__ . '/../vendor/autoload.php';
+
 use ParseCsv\Csv;
 
 
@@ -16,6 +17,7 @@ $csv = new Csv();
 $csv->conditions = 'author does not contain dan brown';
 // $csv->conditions = 'rating < 4 OR author is John Twelve Hawks';
 // $csv->conditions = 'rating > 4 AND author is Dan Brown';
+// $csv->conditions = 'rating is greater than 4';
 
 
 # Parse '_books.csv' using automatic delimiter detection.
@@ -41,7 +43,7 @@ $csv->auto('_books.csv');
         background-color: #FFF;
     }
 </style>
-<table border="0" cellspacing="1" cellpadding="3">
+<table>
     <tr>
         <?php foreach ($csv->titles as $value): ?>
             <th><?php echo $value; ?></th>

examples/download.php

@@ -3,6 +3,7 @@
 
 # include parseCSV class.
 require __DIR__ . '/../vendor/autoload.php';
+
 use ParseCsv\Csv;
 
 
@@ -31,5 +32,3 @@ $csv->output('books.csv');
 # data to download the output as a CSV file. if it's not set
 # or is set to null, output will only return the generated CSV
 # output data, and will not output to the browser itself.
-
-?>

examples/limit.php

@@ -4,6 +4,7 @@
 
 # include parseCSV class.
 require __DIR__ . '/../vendor/autoload.php';
+
 use ParseCsv\Csv;
 
 
@@ -54,7 +55,7 @@ $csv->auto('_books.csv');
         background-color: #FFF;
     }
 </style>
-<table border="0" cellspacing="1" cellpadding="3">
+<table>
     <tr>
         <?php foreach ($csv->titles as $value): ?>
             <th><?php echo $value; ?></th>

examples/save_to_file_without_header_row.php

@@ -0,0 +1,27 @@
+<?php
+
+
+# include parseCSV class.
+require __DIR__ . '/../vendor/autoload.php';
+
+use ParseCsv\Csv;
+
+
+# Create new parseCSV object.
+$csv = new Csv();
+
+# When saving, don't write the header row:
+$csv->heading = false;
+
+# Specify which columns to write, and in which order.
+# We won't output the 'Awesome' column this time.
+$csv->titles = ['Age', 'Name'];
+
+# Data to write:
+$csv->data = [
+    0 => ['Name' => 'Anne', 'Age' => 45, 'Awesome' => true],
+    1 => ['Name' => 'John', 'Age' => 44, 'Awesome' => false],
+];
+
+# Then we save the file to the file system:
+$csv->save('people.csv');

parsecsv.lib.php

@@ -6,6 +6,10 @@
 
 // Check if people used Composer to include this project in theirs
 if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
+    require __DIR__ . '/src/enums/AbstractEnum.php';
+    require __DIR__ . '/src/enums/DatatypeEnum.php';
+    require __DIR__ . '/src/enums/FileProcessingModeEnum.php';
+    require __DIR__ . '/src/enums/SortEnum.php';
     require __DIR__ . '/src/extensions/DatatypeTrait.php';
     require __DIR__ . '/src/Csv.php';
 } else {

ruleset.xml

@@ -0,0 +1,3 @@
+<?xml version="1.0"?>
+<ruleset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="ParseCSV" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/squizlabs/PHP_CodeSniffer/master/phpcs.xsd">
+</ruleset>

src/enums/AbstractEnum.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace ParseCsv\enums;
+
+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

@@ -9,7 +9,7 @@ namespace ParseCsv\enums;
  *
  * todo: needs a basic parent enum class for error handling.
  */
-class DatatypeEnum {
+class DatatypeEnum extends AbstractEnum {
 
     const __DEFAULT = self::TYPE_STRING;
 

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,29 @@
+<?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

@@ -2,13 +2,15 @@
 
 namespace ParseCsv\extensions;
 
+use ParseCsv\enums\DatatypeEnum;
+
 trait DatatypeTrait {
 
     /**
-     * Datatypes
+     * Data Types
-     * Datatypes of CSV data-columns
+     * Data types of CSV data-columns, keyed by the column name. Possible values
+     * are string, float, integer, boolean, date. See DatatypeEnum.
      *
-     * @access public
      * @var array
      */
     public $data_types = [];
@@ -17,8 +19,6 @@ trait DatatypeTrait {
      * Check data type for one column.
      * Check for most commonly data type for one column.
      *
-     * @access private
-     *
      * @param array $datatypes
      *
      * @return string|false
@@ -36,7 +36,6 @@ trait DatatypeTrait {
         reset($typesFreq);
 
         return key($typesFreq);
-
     }
 
     /**
@@ -45,15 +44,13 @@ trait DatatypeTrait {
      *
      * Requires PHP >= 5.5
      *
-     * @access public
+     * @uses   DatatypeEnum::getValidTypeFromSample
-     *
-     * @uses   getDatatypeFromString
      *
      * @return array|bool
      */
     public function getDatatypes() {
         if (empty($this->data)) {
-            $this->data = $this->parse_string();
+            $this->data = $this->_parse_string();
         }
         if (!is_array($this->data)) {
             throw new \UnexpectedValueException('No data set yet.');
@@ -62,7 +59,7 @@ trait DatatypeTrait {
         $result = [];
         foreach ($this->titles as $cName) {
             $column = array_column($this->data, $cName);
-            $cDatatypes = array_map('ParseCsv\enums\DatatypeEnum::getValidTypeFromSample', $column);
+            $cDatatypes = array_map(DatatypeEnum::class . '::getValidTypeFromSample', $column);
 
             $result[$cName] = $this->getMostFrequentDatatypeForColumn($cDatatypes);
         }
@@ -71,4 +68,35 @@ trait DatatypeTrait {
 
         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
+     *
+     * @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);
+
+        return $this->getMostFrequentDatatypeForColumn($firstRowDatatype) === DatatypeEnum::TYPE_STRING;
+    }
 }

tests/Bootstrap.php

@@ -1,13 +1,8 @@
 <?php
+
 chdir(__DIR__ . '/..');
 if (!file_exists('vendor/autoload.php')) {
     `composer dump-autoload`;
 }
 
 require __DIR__ . '/../vendor/autoload.php';
-
-if (!class_exists('PHPUnit\Framework\TestCase') && class_exists('PHPUnit_Framework_TestCase')) {
-    // we run on an older PHPUnit version without namespaces.
-    require_once __DIR__ . '/PHPUnit_Framework_TestCase.inc.php';
-}
-

tests/PHPUnit_Framework_TestCase.inc.php

@@ -1,11 +0,0 @@
-<?php
-
-namespace PHPUnit\Framework;
-
-// Only needed to keep unit test code compatible with older PHPUnit versions
-
-/** @noinspection PhpUndefinedClassInspection */
-/** @noinspection AutoloadingIssuesInspection */
-class TestCase extends \PHPUnit_Framework_TestCase {
-
-}

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/single_row.csv

@@ -0,0 +1 @@
+C1,C2,C3

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

@@ -58,8 +58,16 @@ class ConstructTest extends TestCase {
             ob_start();
             /** @noinspection PhpIncludeInspection */
             require $script_file;
-            if ($script_file != 'download.php') {
+            $ob_get_clean = ob_get_clean();
-                $this->assertContains('<td>', ob_get_clean());
+            $verb = strtok($script_file, '_.');
+
+            if (!in_array($verb, ['download', 'save'], TRUE)) {
+                if (method_exists($this, 'assertStringContainsString')) {
+                    $this->assertStringContainsString('<td>', $ob_get_clean);
+                }
+                else {
+                    $this->assertContains('<td>', $ob_get_clean);
+                }
             }
         }
         chdir('..');

tests/methods/DataRowCountTest.php

@@ -0,0 +1,80 @@
+<?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;
+
+    protected function setUp(): void {
+        $this->csv = new Csv();
+    }
+
+    public static 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);
+        self::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->loadDataString($sInput);
+        self::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->loadDataString($sInput);
+        $this->assertEquals(3, $this->csv->getTotalDataRowCount());
+    }
+
+    public function testGetTotalRowCountSingleRow() {
+        $this->csv->heading = false;
+        $this->csv->enclosure = "'";
+        $sInput = "86545235689";
+        $this->csv->loadDataString($sInput);
+        $this->assertEquals(1, $this->csv->getTotalDataRowCount());
+    }
+
+    public function testGetTotalRowCountNoData() {
+        self::assertFalse($this->csv->getTotalDataRowCount());
+    }
+}

tests/methods/DatatypeTest.php

@@ -8,12 +8,12 @@
 
 namespace ParseCsv\tests\methods;
 
-use PHPUnit\Framework\TestCase;
 use ParseCsv\enums\DatatypeEnum;
+use PHPUnit\Framework\TestCase;
 
-class DatatypeTest extends TestCase
+class DatatypeTest extends TestCase {
-{
+
-    public function testSampleIsValidInteger(){
+    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'));
@@ -27,7 +27,7 @@ class DatatypeTest extends TestCase
         $this->assertNotEquals(DatatypeEnum::TYPE_INT, DatatypeEnum::getValidTypeFromSample('2018-02-19'));
     }
 
-    public function testSampleIsValidBool(){
+    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'));
@@ -39,7 +39,7 @@ class DatatypeTest extends TestCase
         $this->assertNotEquals(DatatypeEnum::TYPE_BOOL, DatatypeEnum::getValidTypeFromSample('0.1'));
     }
 
-    public function testSampleIsValidFloat(){
+    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'));
@@ -54,7 +54,7 @@ class DatatypeTest extends TestCase
         $this->assertNotEquals(DatatypeEnum::TYPE_FLOAT, DatatypeEnum::getValidTypeFromSample('2018-02-19'));
     }
 
-    public function testSampleIsValidDate(){
+    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'));

tests/methods/ExampleStream.php

@@ -0,0 +1,100 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+/**
+ * This is a very simple implementation of a stream wrapper. All URLs are mapped
+ * to just one buffer. It exists to prove that ParseCsv can read and write
+ * streams.
+ *
+ * @see https://www.php.net/manual/en/class.streamwrapper.php
+ */
+class ExampleStream {
+
+    private static $position = 0;
+
+    private static $stream_content;
+
+    public function stream_open($uri, $mode) {
+        if (strpos($mode, 'a') === false) {
+            self::$position = 0;
+        }
+        if (strpos($mode, 'w') !== false) {
+            self::$stream_content = '';
+        }
+        return true;
+    }
+
+    public function stream_read($count) {
+        $ret = substr(self::$stream_content, self::$position, $count);
+        self::$position += strlen($ret);
+        return $ret;
+    }
+
+    public function stream_write($data) {
+        $left = substr(self::$stream_content, 0, self::$position);
+        $right = substr(self::$stream_content, self::$position + strlen($data));
+        self::$stream_content = $left . $data . $right;
+        self::$position += strlen($data);
+        return strlen($data);
+    }
+
+    public function stream_stat() {
+        return ['size' => strlen(self::$stream_content)];
+    }
+
+
+    public function stream_tell() {
+        return self::$position;
+    }
+
+    public function stream_eof() {
+        return self::$position >= strlen(self::$stream_content);
+    }
+
+    public function url_stat() {
+        return ['size' => strlen(self::$stream_content)];
+    }
+
+    public function stream_seek($offset, $whence) {
+        switch ($whence) {
+            case SEEK_SET:
+                if ($offset < strlen(self::$stream_content) && $offset >= 0) {
+                    self::$position = $offset;
+                    return true;
+                } else {
+                    return false;
+                }
+                break;
+
+            case SEEK_CUR:
+                if ($offset >= 0) {
+                    self::$position += $offset;
+                    return true;
+                } else {
+                    return false;
+                }
+                break;
+
+            case SEEK_END:
+                if (strlen(self::$stream_content) + $offset >= 0) {
+                    self::$position = strlen(self::$stream_content) + $offset;
+                    return true;
+                } else {
+                    return false;
+                }
+                break;
+
+            default:
+                return false;
+        }
+    }
+
+    public function stream_lock($operation) {
+        return true;
+    }
+
+    public function stream_metadata() {
+        return false;
+    }
+}

tests/methods/ObjectThatHasToStringMethod.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+/**
+ * Class HasToString is just a helper to test if cells can be objects.
+ */
+class ObjectThatHasToStringMethod {
+
+    public function __toString() {
+        return 'some value';
+    }
+}

tests/methods/OldRequireTest.php

@@ -4,25 +4,40 @@ 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() {
+    protected function setUp(): void {
         rename('vendor/autoload.php', '__autoload');
     }
 
-    protected function tearDown() {
+    protected function tearDown(): void {
         rename('__autoload', 'vendor/autoload.php');
     }
 
     /**
-     * @runInSeparateProcess because download.php uses header()
+     * @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,23 @@
+<?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'];
+        ob_start();
+        $output = $csv->output('test.csv', $data, $fields, ',');
+        $expected = "col1,col2,col3\ra,b,c\rd,e,f\r";
+        self::assertEquals($expected, ob_get_clean());
+        self::assertEquals($expected, $output);
+    }
+}

tests/methods/ParseTest.php

@@ -4,6 +4,7 @@ namespace ParseCsv\tests\methods;
 
 use ParseCsv\Csv;
 use PHPUnit\Framework\TestCase;
+use ReflectionClass;
 
 class ParseTest extends TestCase {
 
@@ -18,32 +19,37 @@ class ParseTest extends TestCase {
      *
      * @access public
      */
-    public function setUp() {
+    protected function setUp(): void {
         $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) {
-        $this->csv->delimiter = ';';
-        $this->csv->heading = false;
-        $success = $this->csv->parse(str_repeat($content . ';', 500));
-        $this->assertEquals(true, $success);
-
-        $row = array_pop($this->csv->data);
-        $expected_data = array_fill(0, 500, $content);
-        $expected_data [] = '';
-        $this->assertEquals($expected_data, $row);
     }
 
     /**
-     * @depends      test_parse
+     * @param string $content
+     */
+    private function parseRepetitiveString($content) {
+        $this->csv->delimiter = ';';
+        $this->csv->heading = false;
+        $success = $this->csv->parse(str_repeat($content . ';', 500));
+        self::assertEquals(true, $success);
+
+        $row = array_pop($this->csv->data);
+        $expected_data = array_fill(0, 500, $content);
+        $expected_data[] = '';
+        self::assertEquals($expected_data, $row);
+    }
+
+    /**
+     * @depends      testParse
      *
      * @dataProvider autoDetectionProvider
+     *
+     * @param string $file
      */
     public function testSepRowAutoDetection($file) {
         // This file (parse_test.php) is encoded in UTF-8, hence comparison will
@@ -51,10 +57,13 @@ class ParseTest extends TestCase {
         $this->csv->output_encoding = 'UTF-8';
 
         $this->csv->auto($file);
-        $this->assertEquals($this->_get_magazines_data(), $this->csv->data);
+        self::assertEquals($this->_get_magazines_data(), $this->csv->data);
     }
 
-    public function autoDetectionProvider() {
+    /**
+     * @return array
+     */
+    public static 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'],
@@ -64,20 +73,24 @@ class ParseTest extends TestCase {
 
     public function testSingleColumnWithZeros() {
         $this->csv->delimiter = null;
-        $this->csv->parse("URL\nhttp://www.amazon.com/ROX-Ice-Ball-Maker-Original/dp/B00MX59NMQ/ref=sr_1_1?ie=UTF8&qid=1435604374&sr=8-1&keywords=rox,+ice+molds");
+        $this->csv->parse(
+            "URL\nhttp://www.amazon.com/ROX-Ice-Ball-Maker-Original/dp/B00MX59NMQ/ref=sr_1_1?ie=UTF8&qid=1435604374&sr=8-1&keywords=rox,+ice+molds"
+        );
         $row = array_pop($this->csv->data);
         $expected_data = ['URL' => 'http://www.amazon.com/ROX-Ice-Ball-Maker-Original/dp/B00MX59NMQ/ref=sr_1_1?ie=UTF8&qid=1435604374&sr=8-1&keywords=rox,+ice+molds'];
-        $this->assertEquals($expected_data, $row);
+        self::assertEquals($expected_data, $row);
     }
 
     public function testAllNumericalCsv() {
         $this->csv->heading = false;
         $sInput = "86545235689\r\n34365587654\r\n13469874576";
-        $this->assertEquals(false, $this->csv->auto($sInput));
+        self::assertEquals(false, $this->csv->autoDetectionForDataString($sInput));
-        $this->assertEquals(null, $this->csv->delimiter);
+        self::assertEquals(null, $this->csv->delimiter);
         $expected_data = explode("\r\n", $sInput);
-        $actual_data = array_map('reset', $this->csv->data);
+        $actual_data = array_map(function ($k) {
-        $this->assertEquals($expected_data, $actual_data);
+            return reset($k);
+        }, $this->csv->data);
+        self::assertEquals($expected_data, $actual_data);
     }
 
     public function testMissingEndingLineBreak() {
@@ -85,17 +98,25 @@ class ParseTest extends 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_column = array_map('reset', $actual_data);
+        $actual_data = $this->invokeMethod($this->csv, '_parse_string', [$sInput]);
-        $this->assertEquals($expected_data, $actual_column);
+        $actual_column = array_map(function ($k) {
-        $this->assertEquals([
+            return reset($k);
+        }, $actual_data);
+        self::assertEquals($expected_data, $actual_column);
+        self::assertEquals(
+            [
                 'a',
                 'b',
                 "c\r\nd",
-        ], array_map('next', $actual_data));
+            ],
+            array_map(function ($el) {
+                return next($el);
+            }, $actual_data)
+        );
     }
 
-    public function test_single_column() {
+    public function testSingleColumn() {
         $this->csv->auto(__DIR__ . '/../example_files/single_column.csv');
         $expected = [
             ['SMS' => '0444'],
@@ -103,42 +124,106 @@ class ParseTest extends TestCase {
             ['SMS' => '6606'],
             ['SMS' => '7777'],
         ];
-        $this->assertEquals($expected, $this->csv->data);
+        self::assertEquals($expected, $this->csv->data);
     }
 
-    public function test_Piwik_data() {
+    public function testSingleRow() {
-        if (!function_exists('array_column')) {
+        $this->csv->auto(__DIR__ . '/../example_files/single_row.csv');
-            // function only available in PHP >= 5.5
+        self::assertEquals([], $this->csv->data, 'Single row is detected as header');
-            return;
+        $this->csv->heading = false;
+        $this->csv->auto(__DIR__ . '/../example_files/single_row.csv');
+        $expected = [['C1', 'C2', 'C3']];
+        self::assertEquals($expected, $this->csv->data);
     }
+
+    public function testMatomoData() {
+        // Matomo (Piwik) export cannot be read with
         $this->csv->use_mb_convert_encoding = true;
         $this->csv->output_encoding = 'UTF-8';
         $this->csv->auto(__DIR__ . '/../example_files/Piwik_API_download.csv');
         $aAction27 = array_column($this->csv->data, 'url (actionDetails 27)');
-        $this->assertEquals([
+        self::assertEquals(
+            [
                 'http://application/_Main/_GraphicMeanSTD_MDI/btnConfBandOptions',
                 '',
                 '',
-        ], $aAction27);
+            ],
+            $aAction27
+        );
 
         $aCity = array_column($this->csv->data, 'city');
-        $this->assertEquals([
+        self::assertEquals(
+            [
                 'São Paulo',
                 'Johannesburg',
                 '',
-        ], $aCity);
+            ],
+            $aCity
+        );
+    }
+
+    /**
+     * Tests if we can handle BOMs in string data, in contrast to loading files.
+     */
+    public function testStringWithLeadingBOM() {
+        $string_with_bom = strtr(
+            file_get_contents(__DIR__ . '/../example_files/UTF-8_with_BOM_and_sep_row.csv'),
+            ["sep=;\n" => '']
+        );
+
+        // Is the BOM still there?
+        self::assertSame(0xEF, ord($string_with_bom));
+
+        $this->csv->output_encoding = 'UTF-8';
+        $this->csv->delimiter = ';';
+        self::assertTrue($this->csv->loadDataString($string_with_bom));
+        self::assertTrue($this->csv->parse($this->csv->file_data));
+
+        // This also tests if ::load_data removed the BOM from the data;
+        // otherwise the 'title' column would have 3 extra bytes.
+        $this->assertEquals(
+            [
+                'title',
+                'isbn',
+                'publishedAt',
+            ],
+            array_keys(reset($this->csv->data)));
+
+        $titles = array_column($this->csv->data, 'title');
+        $this->assertEquals(
+            [
+                'Красивая кулинария',
+                'The Wine Connoisseurs',
+                'Weißwein',
+            ],
+            $titles);
+    }
+
+    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() {
-        if (!function_exists('array_column')) {
-            // getDatatypes requires array_column, but that
-            // function is only available in PHP >= 5.5
-            return;
-        }
-
         $this->csv->auto(__DIR__ . '/fixtures/datatype.csv');
         $this->csv->getDatatypes();
         $expected = [
@@ -150,34 +235,42 @@ class ParseTest extends TestCase {
             'price' => 'float',
         ];
 
-        $this->assertEquals($expected, $this->csv->data_types);
+        self::assertEquals($expected, $this->csv->data_types);
     }
 
-
+    /**
-    public function testDataArrayKeysWhenSettingOffsetWithHeading() {
+     * @depends testSepRowAutoDetection
-        $this->csv->offset = 2;
+     */
+    public function testAutoDetectFileHasHeading() {
         $this->csv->auto(__DIR__ . '/fixtures/datatype.csv');
-        $expected = [
+        self::assertTrue($this->csv->autoDetectFileHasHeading());
-            'title',
-            'isbn',
-            'publishedAt',
-            'published',
-            'count',
-            'price'
-        ];
 
-        $this->assertEquals($expected, array_keys($this->csv->data[0]));
-    }
-
-    public function testDataArrayKeysWhenSettingOffsetWithoutHeading() {
         $this->csv->heading = false;
-        $this->csv->offset = 2;
         $this->csv->auto(__DIR__ . '/fixtures/datatype.csv');
-        $expected = range(0, 5, 1);
+        self::assertTrue($this->csv->autoDetectFileHasHeading());
 
-        $this->assertEquals($expected, array_keys($this->csv->data[0]));
+        $this->csv->heading = false;
+        $sInput = "86545235689\r\n34365587654\r\n13469874576";
+        $this->csv->autoDetectionForDataString($sInput);
+        self::assertFalse($this->csv->autoDetectFileHasHeading());
+
+        $this->csv->heading = true;
+        $sInput = "86545235689\r\n34365587654\r\n13469874576";
+        $this->csv->autoDetectionForDataString($sInput);
+        self::assertFalse($this->csv->autoDetectFileHasHeading());
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
+    public function testVeryLongNonExistingFile() {
+        $this->csv->parse(str_repeat('long_string', PHP_MAXPATHLEN));
+        $this->csv->auto(str_repeat('long_string', PHP_MAXPATHLEN));
+    }
+
+    /**
+     * @return array
+     */
     protected function _get_magazines_data() {
         return [
             [
@@ -198,7 +291,10 @@ class ParseTest extends TestCase {
         ];
     }
 
-    public function autoQuotesDataProvider() {
+    /**
+     * @return array
+     */
+    public static function autoQuotesDataProvider(): array {
         return array(
             array('auto-double-enclosure.csv', '"'),
             array('auto-single-enclosure.csv', "'"),
@@ -216,7 +312,50 @@ class ParseTest extends TestCase {
     public function testAutoQuotes($file, $enclosure) {
         $csv = new Csv();
         $csv->auto(__DIR__ . '/fixtures/' . $file, true, null, null, $enclosure);
-        $this->assertArrayHasKey('column1', $csv->data[0], 'Data parsed incorrectly with enclosure ' . $enclosure);
+        self::assertArrayHasKey('column1', $csv->data[0], 'Data parsed incorrectly with enclosure ' . $enclosure);
-        $this->assertEquals('value1', $csv->data[0]['column1'], 'Data parsed incorrectly with enclosure ' . $enclosure);
+        self::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, $parameters = []) {
+        $reflection = new ReflectionClass(get_class($object));
+        $method = $reflection->getMethod($methodName);
+        $method->setAccessible(true);
+
+        return $method->invokeArgs($object, $parameters);
+    }
+
+    public function testWaiverFieldSeparator() {
+        self::assertFalse($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');
+        self::assertSame($expected, $actual);
+    }
+
+    public function testEmptyInput() {
+        self::assertFalse($this->csv->parse(''));
+        self::assertFalse($this->csv->parse(null));
+        self::assertFalse($this->csv->parseFile(''));
+        self::assertFalse($this->csv->parseFile(null));
+    }
+
+    public function testParseFile() {
+        $data = $this->csv->parseFile(__DIR__ . '/fixtures/auto-double-enclosure.csv');
+        self::assertCount(2, $data);
+        self::assertEquals($data, $this->csv->data);
     }
 }

tests/methods/SaveTest.php

@@ -1,11 +1,11 @@
 <?php
+
 namespace ParseCsv\tests\methods;
 
 use ParseCsv\Csv;
 use PHPUnit\Framework\TestCase;
 
-class SaveTest extends TestCase
+class SaveTest extends TestCase {
-{
 
     /** @var Csv */
     private $csv;
@@ -13,9 +13,9 @@ class SaveTest extends TestCase
     private $temp_filename;
 
     /**
-     * Setup our test environment objects; will be called before each test.
+     * Set up our test environment objects; will be called before each test.
      */
-    public function setUp() {
+    protected function setUp(): void {
         $this->csv = new Csv();
         $this->csv->auto(__DIR__ . '/../example_files/single_column.csv');
 
@@ -49,6 +49,41 @@ class SaveTest extends TestCase
         $this->saveAndCompare($expected);
     }
 
+    public function testSaveWithNewHeader() {
+        $this->csv->linefeed = "\n";
+        $this->csv->titles = ["NewTitle"];
+        $expected = "NewTitle\n0444\n5555\n";
+        $this->saveAndCompare($expected);
+    }
+
+    public function testSaveWithDelimiterOfComma() {
+        $this->csv = new Csv();
+        $this->csv->heading = false;
+        $this->csv->delimiter = ",";
+        $this->csv->linefeed = "\n";
+        $this->csv->data = [
+            [
+                '3,21',
+                'Twitter',
+                'Monsieur',
+                'eat more vegan food',
+            ],
+            [
+                '"9,72"',
+                'newsletter',
+                'Madame',
+                '"free travel"',
+            ],
+        ];
+
+        // Yep, these double quotes are what Excel and Open Office understand.
+        $expected =
+            '"3,21",Twitter,Monsieur,eat more vegan food' . "\n" .
+            '"""9,72""",newsletter,Madame,"""free travel"""' . "\n";
+        $actual = $this->csv->unparse();
+        self::assertSame($expected, $actual);
+    }
+
     public function testSaveWithoutHeader() {
         $this->csv->linefeed = "\n";
         $this->csv->heading = false;
@@ -56,9 +91,9 @@ class SaveTest extends TestCase
         $this->saveAndCompare($expected);
     }
 
-    public function testAllQuotes() {
+    public function testEncloseAllWithQuotes() {
         $this->csv->enclose_all = true;
-        $expected = "\"SMS\"\r\"0444\"\r\"5555\"\r";
+        $expected = '"SMS"'."\r".'"0444"'."\r".'"5555"'."\r";
         $this->saveAndCompare($expected);
     }
 

tests/methods/StreamTest.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace ParseCsv\tests\methods;
+
+use ParseCsv\Csv;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * Writes roughly 1 MB of data. This is useful because of a limit of 8 KB
+ * encountered with stream operations in certain PHP versions.
+ */
+class StreamTest extends TestCase {
+
+    protected function setUp(): void {
+        static $done;
+        if ($done) {
+            // Make sure we register the stream just once - or PHP will scream.
+            return;
+        }
+
+        stream_wrapper_register("example", ExampleStream::class)
+        or die("Failed to register protocol");
+        $done = 1;
+    }
+
+    public function testReadStream() {
+        $csv = new Csv();
+
+        // Write data to our stream:
+        $filename = 'example://tmp';
+        copy(__DIR__ . '/fixtures/datatype.csv', $filename);
+        $many_dots = str_repeat('.', 1000 * 1000) . ";;;;;\n";
+        file_put_contents($filename, $many_dots, FILE_APPEND);
+
+        self::assertSame(';', $csv->auto(file_get_contents($filename)));
+        self::assertCount(4, $csv->data);
+        self::assertCount(6, reset($csv->data));
+    }
+
+    public function testWriteStream() {
+        $csv = new Csv();
+        $csv->linefeed = "\n";
+        $many_dots = str_repeat('.', 1000 * 1000);
+        $csv->data = [
+            [
+                'Name' => 'Rudolf',
+                'Question' => 'Which color is his nose?',
+            ],
+            [
+                'Name' => 'Sponge Bob',
+                'Question' => 'Which shape are his pants?',
+            ],
+            [
+                'Name' => $many_dots,
+                'Question' => 'Can you count one million dots?',
+            ],
+        ];
+
+        // Just export the first column, but with a new name
+        $csv->titles = ['Name' => 'Character'];
+
+        // Write data to our stream:
+        $filename = 'example://data';
+        copy(__DIR__ . '/fixtures/datatype.csv', $filename);
+
+        self::assertSame(true, $csv->save($filename));
+        $expected = "Character\nRudolf\nSponge Bob\n";
+        $expected .= $many_dots . "\n";
+        self::assertSame($expected, file_get_contents($filename));
+    }
+}

tests/methods/UnparseTest.php

@@ -0,0 +1,107 @@
+<?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.
+     */
+    protected function setUp(): void {
+        $this->csv = new Csv();
+        $this->csv->auto(__DIR__ . '/fixtures/auto-double-enclosure.csv');
+    }
+
+    public function testUnparseWithParameters() {
+        $fields = ['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);
+    }
+
+    /**
+     * @doesNotPerformAssertions
+     */
+    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, ["C1", "C2"]);
+    }
+
+    public function testReorderFields() {
+        $expected = "column2,column1\rvalue2,value1\rvalue4,value3\r";
+        $this->unparseAndCompare($expected, ["column2", "column1"]);
+    }
+
+    public function testSubsetFields() {
+        $expected = "column1\rvalue1\rvalue3\r";
+        $this->unparseAndCompare($expected, ["column1"]);
+    }
+
+    public function testReorderAndRenameFields() {
+        $fields = ['column2' => 'C2', 'column1' => 'C1'];
+        $expected = "C2,C1\rvalue2,value1\rvalue4,value3\r";
+        $this->unparseAndCompare($expected, $fields);
+    }
+
+    public function testUnparseDefaultFirstRowMissing() {
+        unset($this->csv->data[0]);
+        $expected = "column1,column2\rvalue3,value4\r";
+        $this->unparseAndCompare($expected);
+    }
+
+    public function testUnparseDefaultWithoutData() {
+        unset($this->csv->data[0]);
+        unset($this->csv->data[1]);
+        $expected = "column1,column2\r";
+        $this->unparseAndCompare($expected);
+    }
+
+    public function testObjectCells() {
+        $this->csv->data = [
+            [
+                'column1' => new ObjectThatHasToStringMethod(),
+                'column2' => 'boring',
+            ],
+        ];
+        $this->csv->linefeed = "\n";
+        $expected = "column1,column2\nsome value,boring\n";
+        $this->unparseAndCompare($expected);
+    }
+
+    private function unparseAndCompare($expected, $fields = []) {
+        $str = $this->csv->unparse($this->csv->data, $fields);
+        $this->assertEquals($expected, $str);
+    }
+
+}

tests/properties/BaseClass.php

@@ -11,7 +11,6 @@ class BaseClass extends TestCase {
      * CSV
      * The parseCSV object
      *
-     * @access protected
      * @var Csv
      */
     protected $csv;
@@ -19,10 +18,8 @@ class BaseClass extends TestCase {
     /**
      * Setup
      * Setup our test environment objects
-     *
-     * @access public
      */
-    public function setUp() {
+    protected function setUp(): void {
         $this->csv = new Csv();
     }
 

tests/properties/ConditionsTest.php

@@ -21,21 +21,93 @@ class ConditionsTest extends BaseClass {
         ]);
     }
 
-    public function testRating() {
+    public function testRatingEquals() {
-        $this->csv->conditions = 'rating < 3';
+        $rating_of_3 = [
-        $this->_compareWithExpected([
+            'The Last Templar',
+            'The Broker (Paperback)',
+            'Without Blood (Paperback)',
+        ];
+        $this->csv->conditions = 'rating = 3';
+        $this->_compareWithExpected($rating_of_3);
+        $this->csv->conditions = 'rating is 3';
+        $this->_compareWithExpected($rating_of_3);
+        $this->csv->conditions = 'rating equals 3';
+        $this->_compareWithExpected($rating_of_3);
+    }
+
+    public function testRatingNotEquals() {
+        $rating_not_4 = [
             'The Killing Kind',
             'The Third Secret',
-        ]);
+            'The Last Templar',
+            'The Traveller',
+            'Prey',
+            'The Broker (Paperback)',
+            'Without Blood (Paperback)',
+            'State of Fear (Paperback)',
+            'Digital Fortress : A Thriller (Mass Market Paperback)',
+            'Angels & Demons (Mass Market Paperback)',
+        ];
+//        $this->csv->conditions = 'rating != 4';
+//        $this->_compareWithExpected($rating_not_4);
+        $this->csv->conditions = 'rating is not 4';
+        $this->_compareWithExpected($rating_not_4);
+//        $this->csv->conditions = 'rating does not contain 4';
+//        $this->_compareWithExpected($rating_not_4);
+    }
 
-        $this->csv->conditions = 'rating >= 5';
+    public function testRatingLessThan() {
-        $this->_compareWithExpected([
+        $less_than_1 = [
+            'The Killing Kind',
+            'The Third Secret',
+        ];
+        $this->csv->conditions = 'rating < 1';
+        $this->_compareWithExpected($less_than_1);
+        $this->csv->conditions = 'rating is less than 1';
+        $this->_compareWithExpected($less_than_1);
+    }
+
+    public function testRatingLessOrEquals() {
+        $less_or_equals_1 = [
+            'The Killing Kind',
+            'The Third Secret',
+        ];
+        $this->csv->conditions = 'rating <= 1';
+        $this->_compareWithExpected($less_or_equals_1);
+        $this->csv->conditions = 'rating is less than or equals 1';
+        $this->_compareWithExpected($less_or_equals_1);
+    }
+
+    public function testRatingGreaterThan() {
+        $greater_4 = [
             'The Traveller',
             'Prey',
             'State of Fear (Paperback)',
             'Digital Fortress : A Thriller (Mass Market Paperback)',
             'Angels & Demons (Mass Market Paperback)',
-        ]);
+        ];
+        $this->csv->conditions = 'rating > 4';
+        $this->_compareWithExpected($greater_4);
+        $this->csv->conditions = 'rating is greater than 4';
+        $this->_compareWithExpected($greater_4);
+    }
+
+    public function testRatingGreaterOrEquals() {
+        $greater_or_equal_4 = [
+            'The Traveller',
+            'Crisis Four',
+            'Prey',
+            'State of Fear (Paperback)',
+            'The Rule of Four (Paperback)',
+            'Deception Point (Paperback)',
+            'Digital Fortress : A Thriller (Mass Market Paperback)',
+            'Angels & Demons (Mass Market Paperback)',
+            'The Da Vinci Code (Hardcover)',
+        ];
+        $this->csv->conditions = 'rating >= 4';
+        $this->_compareWithExpected($greater_or_equal_4);
+        $this->csv->conditions = 'rating is greater than or equals 4';
+        $this->_compareWithExpected($greater_or_equal_4);
     }
 
     public function testTitleContainsSecretOrCode() {

tests/properties/DefaultValuesPropertiesTest.php

@@ -16,152 +16,135 @@ class DefaultValuesPropertiesTest extends TestCase {
      */
     protected $csv = null;
 
-    /**
+    protected function setUp(): void {
-     * Setup
-     * Setup our test environment objects
-     *
-     * @access public
-     */
-    public function setUp() {
-        //setup parse CSV
         $this->csv = new Csv();
     }
 
-    /**
-     * Tear down
-     * Tear down our test environment objects
-     *
-     * @access public
-     */
-    public function tearDown() {
-        $this->csv = null;
-    }
-
     public function test_heading_default() {
-        $this->assertTrue(is_bool($this->csv->heading));
+        self::assertTrue(is_bool($this->csv->heading));
-        $this->assertTrue($this->csv->heading);
+        self::assertTrue($this->csv->heading);
     }
 
     public function test_fields_default() {
-        $this->assertTrue(is_array($this->csv->fields));
+        self::assertTrue(is_array($this->csv->fields));
-        $this->assertCount(0, $this->csv->fields);
+        self::assertCount(0, $this->csv->fields);
     }
 
     public function test_sort_by_default() {
-        $this->assertNull($this->csv->sort_by);
+        self::assertNull($this->csv->sort_by);
     }
 
     public function test_sort_reverse_default() {
-        $this->assertTrue(is_bool($this->csv->sort_reverse));
+        self::assertTrue(is_bool($this->csv->sort_reverse));
-        $this->assertFalse($this->csv->sort_reverse);
+        self::assertFalse($this->csv->sort_reverse);
     }
 
     public function test_sort_type_default() {
-        $this->assertNull($this->csv->sort_type);
+        self::assertEquals('regular', $this->csv->sort_type);
     }
 
     public function test_delimiter_default() {
-        $this->assertTrue(is_string($this->csv->delimiter));
+        self::assertTrue(is_string($this->csv->delimiter));
-        $this->assertEquals(',', $this->csv->delimiter);
+        self::assertEquals(',', $this->csv->delimiter);
     }
 
     public function test_enclosure_default() {
-        $this->assertTrue(is_string($this->csv->enclosure));
+        self::assertTrue(is_string($this->csv->enclosure));
-        $this->assertEquals('"', $this->csv->enclosure);
+        self::assertEquals('"', $this->csv->enclosure);
     }
 
     public function test_enclose_all_default() {
-        $this->assertTrue(is_bool($this->csv->enclose_all));
+        self::assertTrue(is_bool($this->csv->enclose_all));
-        $this->assertFalse($this->csv->enclose_all);
+        self::assertFalse($this->csv->enclose_all);
     }
 
     public function test_conditions_default() {
-        $this->assertNull($this->csv->conditions);
+        self::assertNull($this->csv->conditions);
     }
 
     public function test_offset_default() {
-        $this->assertNull($this->csv->offset);
+        self::assertNull($this->csv->offset);
     }
 
     public function test_limit_default() {
-        $this->assertNull($this->csv->limit);
+        self::assertNull($this->csv->limit);
     }
 
     public function test_auto_depth_default() {
-        $this->assertTrue(is_numeric($this->csv->auto_depth));
+        self::assertTrue(is_numeric($this->csv->auto_depth));
-        $this->assertEquals(15, $this->csv->auto_depth);
+        self::assertEquals(15, $this->csv->auto_depth);
     }
 
     public function test_auto_non_chars_default() {
-        $this->assertTrue(is_string($this->csv->auto_non_chars));
+        self::assertTrue(is_string($this->csv->auto_non_chars));
-        $this->assertEquals("a-zA-Z0-9\n\r", $this->csv->auto_non_chars);
+        self::assertEquals("a-zA-Z0-9\n\r", $this->csv->auto_non_chars);
     }
 
     public function test_auto_preferred_default() {
-        $this->assertTrue(is_string($this->csv->auto_preferred));
+        self::assertTrue(is_string($this->csv->auto_preferred));
-        $this->assertEquals(",;\t.:|", $this->csv->auto_preferred);
+        self::assertEquals(",;\t.:|", $this->csv->auto_preferred);
     }
 
     public function test_convert_encoding_default() {
-        $this->assertTrue(is_bool($this->csv->convert_encoding));
+        self::assertTrue(is_bool($this->csv->convert_encoding));
-        $this->assertFalse($this->csv->convert_encoding);
+        self::assertFalse($this->csv->convert_encoding);
     }
 
     public function test_input_encoding_default() {
-        $this->assertTrue(is_string($this->csv->input_encoding));
+        self::assertTrue(is_string($this->csv->input_encoding));
-        $this->assertEquals('ISO-8859-1', $this->csv->input_encoding);
+        self::assertEquals('ISO-8859-1', $this->csv->input_encoding);
     }
 
     public function test_output_encoding_default() {
-        $this->assertTrue(is_string($this->csv->output_encoding));
+        self::assertTrue(is_string($this->csv->output_encoding));
-        $this->assertEquals('ISO-8859-1', $this->csv->output_encoding);
+        self::assertEquals('ISO-8859-1', $this->csv->output_encoding);
     }
 
     public function test_linefeed_default() {
-        $this->assertTrue(is_string($this->csv->linefeed));
+        self::assertTrue(is_string($this->csv->linefeed));
-        $this->assertEquals("\r", $this->csv->linefeed);
+        self::assertEquals("\r", $this->csv->linefeed);
     }
 
     public function test_output_delimiter_default() {
-        $this->assertTrue(is_string($this->csv->output_delimiter));
+        self::assertTrue(is_string($this->csv->output_delimiter));
-        $this->assertEquals(',', $this->csv->output_delimiter);
+        self::assertEquals(',', $this->csv->output_delimiter);
     }
 
     public function test_output_filename_default() {
-        $this->assertTrue(is_string($this->csv->output_filename));
+        self::assertTrue(is_string($this->csv->output_filename));
-        $this->assertEquals('data.csv', $this->csv->output_filename);
+        self::assertEquals('data.csv', $this->csv->output_filename);
     }
 
     public function test_keep_file_data_default() {
-        $this->assertTrue(is_bool($this->csv->keep_file_data));
+        self::assertTrue(is_bool($this->csv->keep_file_data));
-        $this->assertFalse($this->csv->keep_file_data);
+        self::assertFalse($this->csv->keep_file_data);
     }
 
     public function test_file_default() {
-        $this->assertNull($this->csv->file);
+        self::assertNull($this->csv->file);
     }
 
     public function test_file_data_default() {
-        $this->assertNull($this->csv->file_data);
+        self::assertNull($this->csv->file_data);
     }
 
     public function test_error_default() {
-        $this->assertTrue(is_numeric($this->csv->error));
+        self::assertTrue(is_numeric($this->csv->error));
-        $this->assertEquals(0, $this->csv->error);
+        self::assertEquals(0, $this->csv->error);
     }
 
     public function test_error_info_default() {
-        $this->assertTrue(is_array($this->csv->error_info));
+        self::assertTrue(is_array($this->csv->error_info));
-        $this->assertCount(0, $this->csv->error_info);
+        self::assertCount(0, $this->csv->error_info);
     }
 
     public function test_titles_default() {
-        $this->assertTrue(is_array($this->csv->titles));
+        self::assertTrue(is_array($this->csv->titles));
-        $this->assertCount(0, $this->csv->titles);
+        self::assertCount(0, $this->csv->titles);
     }
 
     public function test_data_default() {
-        $this->assertTrue(is_array($this->csv->data));
+        self::assertTrue(is_array($this->csv->data));
-        $this->assertCount(0, $this->csv->data);
+        self::assertCount(0, $this->csv->data);
     }
 }

tests/properties/OffsetTest.php

@@ -0,0 +1,79 @@
+<?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 static function numberRangeZeroToFourProvider() {
+        return array_map(function ($number) {
+            return [$number];
+        }, range(0, 4));
+    }
+
+    /**
+     * @dataProvider numberRangeZeroToFourProvider
+     *
+     * @param int $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

@@ -3,6 +3,7 @@
 namespace ParseCsv\tests\properties;
 
 use ParseCsv\Csv;
+use ParseCsv\enums\SortEnum;
 use PHPUnit\Framework\TestCase;
 
 class PublicPropertiesTest extends TestCase {
@@ -40,7 +41,7 @@ class PublicPropertiesTest extends TestCase {
      *
      * @access public
      */
-    public function setUp() {
+    protected function setUp(): void {
         //setup parse CSV
         $this->csv = new Csv();
 
@@ -57,7 +58,7 @@ class PublicPropertiesTest extends TestCase {
      *
      * @access public
      */
-    public function tearDown() {
+    protected function tearDown(): void {
         $this->csv = null;
         $this->reflection = null;
         $this->properties = null;
@@ -145,4 +146,26 @@ class PublicPropertiesTest extends 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

@@ -7,6 +7,7 @@ class SortByTest extends BaseClass {
     public function testSortByRating() {
         $this->csv->sort_by = 'rating';
         $this->csv->conditions = 'title does not contain Blood';
+        if (!preg_match('/^8\.2\./', phpversion()) && !preg_match('/^8\.3\./', phpversion()))
             $this->_compareWithExpected([
                 // Rating 0
                 'The Killing Kind',
@@ -27,6 +28,27 @@ class SortByTest extends BaseClass {
                 'Digital Fortress : A Thriller (Mass Market Paperback)',
                 'Angels & Demons (Mass Market Paperback)',
             ]);
+        else
+            $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
+                'Angels & Demons (Mass Market Paperback)',
+                'State of Fear (Paperback)',
+                'Prey',
+                'Digital Fortress : A Thriller (Mass Market Paperback)',
+            ]);
     }
 
     public function testReverseSortByRating() {

tests/rector.php

@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+use Rector\Config\RectorConfig;
+use Rector\PHPUnit\AnnotationsToAttributes\Rector\ClassMethod\DataProviderAnnotationToAttributeRector;
+use Rector\PHPUnit\AnnotationsToAttributes\Rector\ClassMethod\DependsAnnotationWithValueToAttributeRector;
+use Rector\PHPUnit\CodeQuality\Rector\Class_\AddCoversClassAttributeRector;
+use Rector\PHPUnit\PHPUnit60\Rector\ClassMethod\AddDoesNotPerformAssertionToNonAssertingTestRector;
+
+return static function(RectorConfig $rectorConfig): void {
+    if (class_exists(AddCoversClassAttributeRector::class)) {
+        $rectorConfig->rule(AddCoversClassAttributeRector::class);
+    }
+    $rectorConfig->rule(DataProviderAnnotationToAttributeRector::class);
+    $rectorConfig->rule(AddDoesNotPerformAssertionToNonAssertingTestRector::class);
+    $rectorConfig->rule(DependsAnnotationWithValueToAttributeRector::class);
+};