Merge pull request #7 from parsecsv/master

update

examples/basic.php

@@ -1,8 +1,8 @@
 <pre>
 <?php
 
-
 # include parseCSV class.
+require __DIR__ . '/../vendor/autoload.php';
 use ParseCsv\Csv;
 
 

examples/conditions.php

@@ -3,6 +3,7 @@
 
 
 # include parseCSV class.
+require __DIR__ . '/../vendor/autoload.php';
 use ParseCsv\Csv;
 
 

examples/download.php

@@ -2,6 +2,7 @@
 
 
 # include parseCSV class.
+require __DIR__ . '/../vendor/autoload.php';
 use ParseCsv\Csv;
 
 

examples/limit.php

@@ -3,6 +3,7 @@
 
 
 # include parseCSV class.
+require __DIR__ . '/../vendor/autoload.php';
 use ParseCsv\Csv;
 
 

parsecsv.lib.php

@@ -0,0 +1,23 @@
+<?php
+
+// This file should not be used at all! It purely exists to reduce the
+// maintenance burden for existing code using this repo.
+
+// Check if people used Composer to include this project in theirs
+if (!file_exists(__DIR__ . '/vendor/autoload.php')) {
+    die(
+        "Please run `composer dump-autoload` to build the autoloader.\n\n" .
+        "Actually, you should consider not including/requiring this file \n" .
+        "  " . __FILE__ . "\n" .
+        "Just run `composer require parsecsv/php-parsecsv` and look at the \n" .
+        "'examples' directory of this repository."
+    );
+}
+
+require __DIR__ . '/vendor/autoload.php';
+
+// This wrapper class should not be used by new projects. Please look at the
+// examples to find the up-to-date way of using this repo.
+class parseCSV extends ParseCsv\Csv {
+
+}

tests/methods/ConstructTest.php

@@ -1,18 +1,18 @@
 <?php
+
 namespace ParseCsv\tests\methods;
 
 use ParseCsv\Csv;
 use PHPUnit\Framework\TestCase;
 
-class ConstructTest extends TestCase
-{
+class ConstructTest extends TestCase {
 
     /**
      * CSV
      * The Csv object
      *
      * @access protected
-     * @var [Csv]
+     * @var    Csv
      */
     protected $csv = null;
 
@@ -71,4 +71,21 @@ class ConstructTest extends TestCase
         $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;
+            if ($script_file != 'download.php') {
+                $this->assertContains('<td>', ob_get_clean());
+            }
+        }
+    }
 }

tests/methods/ParseTest.php

@@ -178,10 +178,10 @@ class ParseTest extends TestCase
     }
 
     public function autoQuotesDataProvider() {
-        return [
-            'double-enclosure' => ['tests/methods/fixtures/auto-double-enclosure.csv', '"'],
-            'single-enclosure' => ['tests/methods/fixtures/auto-single-enclosure.csv', "'"],
-        ];
+        return array(
+            array('auto-double-enclosure.csv', '"'),
+            array('auto-single-enclosure.csv', "'"),
+        );
     }
 
     /**
@@ -194,7 +194,7 @@ class ParseTest extends TestCase
      */
     public function testAutoQuotes($file, $enclosure) {
         $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);
     }

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/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',
+        ]);
+    }
+}