diff options
Diffstat (limited to 'test')
-rw-r--r-- | test/ControlsTest.php | 42 | ||||
-rw-r--r-- | test/CsvTest.php | 15 | ||||
-rw-r--r-- | test/FactoryTest.php | 5 | ||||
-rw-r--r-- | test/Plugin/ColumnConsistencyValidatorTest.php | 4 | ||||
-rw-r--r-- | test/Plugin/NullValidatorTest.php | 2 | ||||
-rw-r--r-- | test/Plugin/SkipNullValuesFormatterTest.php | 4 | ||||
-rw-r--r-- | test/ReaderTest.php | 36 | ||||
-rw-r--r-- | test/StreamFilterTest.php | 4 | ||||
-rw-r--r-- | test/WriterTest.php | 11 |
9 files changed, 58 insertions, 65 deletions
diff --git a/test/ControlsTest.php b/test/ControlsTest.php index 11f0103..3976499 100644 --- a/test/ControlsTest.php +++ b/test/ControlsTest.php @@ -2,11 +2,9 @@ namespace League\Csv\test; -use DateTime; use League\Csv\Reader; use League\Csv\Writer; use PHPUnit_Framework_TestCase; -use SplFileInfo; use SplFileObject; use SplTempFileObject; @@ -68,23 +66,23 @@ class ControlsTest extends PHPUnit_Framework_TestCase public function testAddBOMSequences() { $this->csv->setOutputBOM(Reader::BOM_UTF8); - $expected = chr(239).chr(187).chr(191)."john,doe,john.doe@example.com".PHP_EOL - ."jane,doe,jane.doe@example.com".PHP_EOL; + $expected = chr(239).chr(187).chr(191).'john,doe,john.doe@example.com'.PHP_EOL + .'jane,doe,jane.doe@example.com'.PHP_EOL; $this->assertSame($expected, $this->csv->__toString()); } public function testGetBomOnInputWithNoBOM() { - $expected = "john,doe,john.doe@example.com".PHP_EOL - ."jane,doe,jane.doe@example.com".PHP_EOL; + $expected = 'john,doe,john.doe@example.com'.PHP_EOL + .'jane,doe,jane.doe@example.com'.PHP_EOL; $reader = Reader::createFromString($expected); $this->assertEmpty($reader->getInputBOM()); } public function testGetBomOnInputWithBOM() { - $expected = Reader::BOM_UTF32_BE."john,doe,john.doe@example.com".PHP_EOL - ."jane,doe,jane.doe@example.com".PHP_EOL; + $expected = Reader::BOM_UTF32_BE.'john,doe,john.doe@example.com'.PHP_EOL + .'jane,doe,jane.doe@example.com'.PHP_EOL; $reader = Reader::createFromString($expected); $this->assertSame(Reader::BOM_UTF32_BE, $reader->getInputBOM()); $this->assertSame(Reader::BOM_UTF32_BE, $reader->getInputBOM()); @@ -92,8 +90,8 @@ class ControlsTest extends PHPUnit_Framework_TestCase public function testChangingBOMOnOutput() { - $text = "john,doe,john.doe@example.com".PHP_EOL - ."jane,doe,jane.doe@example.com".PHP_EOL; + $text = 'john,doe,john.doe@example.com'.PHP_EOL + .'jane,doe,jane.doe@example.com'.PHP_EOL; $reader = Reader::createFromString(Reader::BOM_UTF32_BE.$text); $reader->setOutputBOM(Reader::BOM_UTF8); $this->assertSame(Reader::BOM_UTF8.$text, $reader->__toString()); @@ -200,8 +198,8 @@ class ControlsTest extends PHPUnit_Framework_TestCase if (defined('HHVM_VERSION')) { $this->markTestSkipped('HHVM CSV parsing is different'); } - $path = __DIR__."/data/tmp.txt"; - $obj = new SplFileObject($path, "w+"); + $path = __DIR__.'/data/tmp.txt'; + $obj = new SplFileObject($path, 'w+'); $obj->fwrite("1st\n2nd\n"); $reader = Reader::createFromFileObject($obj); $reader->setFlags($flag); @@ -212,16 +210,16 @@ class ControlsTest extends PHPUnit_Framework_TestCase public function appliedFlagsProvider() { return [ - "NONE" => [0, 3], - "DROP_NEW_LINE" => [SplFileObject::DROP_NEW_LINE, 3], - "READ_AHEAD" => [SplFileObject::READ_AHEAD, 3], - "SKIP_EMPTY" => [SplFileObject::SKIP_EMPTY, 2], - "READ_AHEAD|DROP_NEW_LINE" => [SplFileObject::READ_AHEAD|SplFileObject::DROP_NEW_LINE, 3], - "READ_AHEAD|SKIP_EMPTY" => [SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY, 2], - "DROP_NEW_LINE|SKIP_EMPTY" => [SplFileObject::DROP_NEW_LINE|SplFileObject::SKIP_EMPTY, 2], - "READ_AHEAD|DROP_NEW_LINE|SKIP_EMPTY" => [ - SplFileObject::READ_AHEAD|SplFileObject::DROP_NEW_LINE|SplFileObject::SKIP_EMPTY, - 2 + 'NONE' => [0, 3], + 'DROP_NEW_LINE' => [SplFileObject::DROP_NEW_LINE, 3], + 'READ_AHEAD' => [SplFileObject::READ_AHEAD, 3], + 'SKIP_EMPTY' => [SplFileObject::SKIP_EMPTY, 2], + 'READ_AHEAD|DROP_NEW_LINE' => [SplFileObject::READ_AHEAD | SplFileObject::DROP_NEW_LINE, 3], + 'READ_AHEAD|SKIP_EMPTY' => [SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY, 2], + 'DROP_NEW_LINE|SKIP_EMPTY' => [SplFileObject::DROP_NEW_LINE | SplFileObject::SKIP_EMPTY, 2], + 'READ_AHEAD|DROP_NEW_LINE|SKIP_EMPTY' => [ + SplFileObject::READ_AHEAD | SplFileObject::DROP_NEW_LINE | SplFileObject::SKIP_EMPTY, + 2, ], ]; } diff --git a/test/CsvTest.php b/test/CsvTest.php index 5cd2837..10992cb 100644 --- a/test/CsvTest.php +++ b/test/CsvTest.php @@ -3,10 +3,7 @@ namespace League\Csv\test; use League\Csv\Reader; -use League\Csv\Writer; use PHPUnit_Framework_TestCase; -use SplFileInfo; -use SplFileObject; use SplTempFileObject; /** @@ -44,7 +41,7 @@ class CsvTest extends PHPUnit_Framework_TestCase public function testToHTML() { - $this->assertContains("<table", $this->csv->toHTML()); + $this->assertContains('<table', $this->csv->toHTML()); } public function testToXML() @@ -82,7 +79,7 @@ class CsvTest extends PHPUnit_Framework_TestCase */ public function testOutputSize() { - $this->assertSame(60, $this->csv->output("test.csv")); + $this->assertSame(60, $this->csv->output('test.csv')); } /** @@ -93,11 +90,11 @@ class CsvTest extends PHPUnit_Framework_TestCase if (! function_exists('xdebug_get_headers')) { $this->markTestSkipped(); } - $this->csv->output("test.csv"); + $this->csv->output('test.csv'); $headers = \xdebug_get_headers(); - $this->assertSame($headers[0], "Content-Type: application/octet-stream"); - $this->assertSame($headers[1], "Content-Transfer-Encoding: binary"); - $this->assertSame($headers[2], "Content-Disposition: attachment; filename=\"test.csv\""); + $this->assertSame($headers[0], 'Content-Type: application/octet-stream'); + $this->assertSame($headers[1], 'Content-Transfer-Encoding: binary'); + $this->assertSame($headers[2], 'Content-Disposition: attachment; filename="test.csv"'); } public function testToString() diff --git a/test/FactoryTest.php b/test/FactoryTest.php index 0c11957..390ad1a 100644 --- a/test/FactoryTest.php +++ b/test/FactoryTest.php @@ -7,7 +7,6 @@ use PHPUnit_Framework_TestCase; use SplFileInfo; use SplFileObject; use SplTempFileObject; -use StdClass; /** * @group factory @@ -45,8 +44,8 @@ class FactoryTest extends PHPUnit_Framework_TestCase public function testCreateFromString() { - $expected = "john,doe,john.doe@example.com".PHP_EOL - ."jane,doe,jane.doe@example.com".PHP_EOL; + $expected = 'john,doe,john.doe@example.com'.PHP_EOL + .'jane,doe,jane.doe@example.com'.PHP_EOL; $reader = Reader::createFromString($expected); $this->assertInstanceof('League\Csv\Reader', $reader); } diff --git a/test/Plugin/ColumnConsistencyValidatorTest.php b/test/Plugin/ColumnConsistencyValidatorTest.php index 487f53d..50510ea 100644 --- a/test/Plugin/ColumnConsistencyValidatorTest.php +++ b/test/Plugin/ColumnConsistencyValidatorTest.php @@ -2,8 +2,8 @@ namespace League\Csv\Test\Plugin; -use League\Csv\Writer; use League\Csv\Plugin\ColumnConsistencyValidator; +use League\Csv\Writer; use PHPUnit_Framework_TestCase; use SplFileObject; use SplTempFileObject; @@ -24,7 +24,7 @@ class ColumnConsistencyValidatorTest extends PHPUnit_Framework_TestCase { $csv = new SplFileObject(dirname(__DIR__).'/foo.csv', 'w'); $csv->setCsvControl(); - $csv->fputcsv(["john", "doe", "john.doe@example.com"], ",", '"'); + $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"'); $this->csv = null; } diff --git a/test/Plugin/NullValidatorTest.php b/test/Plugin/NullValidatorTest.php index fd0336c..e9392ce 100644 --- a/test/Plugin/NullValidatorTest.php +++ b/test/Plugin/NullValidatorTest.php @@ -25,7 +25,7 @@ class NullValidatorTest extends PHPUnit_Framework_TestCase { $csv = new SplFileObject(dirname(__DIR__).'/foo.csv', 'w'); $csv->setCsvControl(); - $csv->fputcsv(["john", "doe", "john.doe@example.com"], ",", '"'); + $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"'); $this->csv = null; } diff --git a/test/Plugin/SkipNullValuesFormatterTest.php b/test/Plugin/SkipNullValuesFormatterTest.php index 97ac3be..3dfe802 100644 --- a/test/Plugin/SkipNullValuesFormatterTest.php +++ b/test/Plugin/SkipNullValuesFormatterTest.php @@ -2,8 +2,8 @@ namespace League\Csv\Test\Plugin; -use League\Csv\Writer; use League\Csv\Plugin\SkipNullValuesFormatter; +use League\Csv\Writer; use LimitIterator; use PHPUnit_Framework_TestCase; use SplFileObject; @@ -25,7 +25,7 @@ class SkipNullValuesFormatterTest extends PHPUnit_Framework_TestCase { $csv = new SplFileObject(dirname(__DIR__).'/foo.csv', 'w'); $csv->setCsvControl(); - $csv->fputcsv(["john", "doe", "john.doe@example.com"], ",", '"'); + $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"'); $this->csv = null; } diff --git a/test/ReaderTest.php b/test/ReaderTest.php index 4786d9d..1be57d6 100644 --- a/test/ReaderTest.php +++ b/test/ReaderTest.php @@ -174,7 +174,7 @@ class ReaderTest extends PHPUnit_Framework_TestCase $this->assertContains([ 'firstname' => 'JANE', 'lastname' => 'DOE', - 'email' => 'JANE.DOE@EXAMPLE.COM' + 'email' => 'JANE.DOE@EXAMPLE.COM', ], $res); } @@ -237,16 +237,16 @@ class ReaderTest extends PHPUnit_Framework_TestCase { return [ 'withBOM' => [[ - [Reader::BOM_UTF16_LE.'john', 'doe', 'john.doe@example.com', ], - ['jane', 'doe', 'jane.doe@example.com', ], + [Reader::BOM_UTF16_LE.'john', 'doe', 'john.doe@example.com'], + ['jane', 'doe', 'jane.doe@example.com'], ], 'john'], 'withDoubleBOM' => [[ - [Reader::BOM_UTF16_LE.Reader::BOM_UTF16_LE.'john', 'doe', 'john.doe@example.com', ], - ['jane', 'doe', 'jane.doe@example.com', ], + [Reader::BOM_UTF16_LE.Reader::BOM_UTF16_LE.'john', 'doe', 'john.doe@example.com'], + ['jane', 'doe', 'jane.doe@example.com'], ], Reader::BOM_UTF16_LE.'john'], 'withoutBOM' => [[ - ['john', 'doe', 'john.doe@example.com', ], - ['jane', 'doe', 'jane.doe@example.com', ], + ['john', 'doe', 'john.doe@example.com'], + ['jane', 'doe', 'jane.doe@example.com'], ], 'john'], ]; } @@ -254,8 +254,8 @@ class ReaderTest extends PHPUnit_Framework_TestCase public function testStripBOMWithFetchAssoc() { $source = [ - [Reader::BOM_UTF16_LE.'john', 'doe', 'john.doe@example.com', ], - ['jane', 'doe', 'jane.doe@example.com', ], + [Reader::BOM_UTF16_LE.'john', 'doe', 'john.doe@example.com'], + ['jane', 'doe', 'jane.doe@example.com'], ]; $tmp = new SplTempFileObject(); @@ -271,14 +271,14 @@ class ReaderTest extends PHPUnit_Framework_TestCase public function testStripBOMWithEnclosureFetchAssoc() { - $expected = ["parent name", "parentA"]; + $expected = ['parent name', 'parentA']; $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); $expected = [ - ["parent name" => "parentA", "child name" => "childA", "title" => "titleA"], + ['parent name' => 'parentA', 'child name' => 'childA', 'title' => 'titleA'], ]; $this->assertSame($expected, $csv->fetchAssoc()); } @@ -288,9 +288,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); - $this->assertContains("parent name", $csv->fetchColumn()); + $this->assertContains('parent name', $csv->fetchColumn()); } public function testStripBOMWithEnclosureFetchAll() @@ -298,9 +298,9 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); - $this->assertContains(["parent name", "child name", "title"], $csv->fetchAll()); + $this->assertContains(['parent name', 'child name', 'title'], $csv->fetchAll()); } public function testStripBOMWithEnclosureFetchOne() @@ -308,10 +308,10 @@ class ReaderTest extends PHPUnit_Framework_TestCase $source = Reader::BOM_UTF8.'"parent name","child name","title" "parentA","childA","titleA"'; $csv = Reader::createFromString($source); - $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->stripBom(true); $this->assertSame(Reader::BOM_UTF8, $csv->getInputBom()); - $expected = ["parent name", "child name", "title"]; + $expected = ['parent name', 'child name', 'title']; $this->assertEquals($expected, $csv->fetchOne()); } diff --git a/test/StreamFilterTest.php b/test/StreamFilterTest.php index ead990a..647e7ae 100644 --- a/test/StreamFilterTest.php +++ b/test/StreamFilterTest.php @@ -49,7 +49,7 @@ class StreamFilterTest extends PHPUnit_Framework_TestCase { $csv = Reader::createFromPath(__DIR__.'/foo.csv'); $csv->appendStreamFilter('string.toupper'); - $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); foreach ($csv->getIterator() as $row) { $this->assertSame($row, ['JOHN', 'DOE', 'JOHN.DOE@EXAMPLE.COM']); } @@ -81,7 +81,7 @@ class StreamFilterTest extends PHPUnit_Framework_TestCase public function testaddMultipleStreamFilter() { $csv = Reader::createFromPath(__DIR__.'/foo.csv'); - $csv->setFlags(SplFileObject::READ_AHEAD|SplFileObject::SKIP_EMPTY); + $csv->setFlags(SplFileObject::READ_AHEAD | SplFileObject::SKIP_EMPTY); $csv->appendStreamFilter('string.tolower'); $csv->prependStreamFilter('string.rot13'); $csv->appendStreamFilter('string.toupper'); diff --git a/test/WriterTest.php b/test/WriterTest.php index 1d0aa98..7c13a51 100644 --- a/test/WriterTest.php +++ b/test/WriterTest.php @@ -4,7 +4,6 @@ namespace League\Csv\test; use ArrayIterator; use League\Csv\Writer; -use LimitIterator; use PHPUnit_Framework_TestCase; use SplFileObject; use SplTempFileObject; @@ -25,7 +24,7 @@ class WriterTest extends PHPUnit_Framework_TestCase { $csv = new SplFileObject(__DIR__.'/foo.csv', 'w'); $csv->setCsvControl(); - $csv->fputcsv(["john", "doe", "john.doe@example.com"], ",", '"'); + $csv->fputcsv(['john', 'doe', 'john.doe@example.com'], ',', '"'); $this->csv = null; } @@ -110,15 +109,15 @@ class WriterTest extends PHPUnit_Framework_TestCase $this->assertSame("\n", $csv->getNewline()); $csv->setNewline("\r\n"); - $csv->insertOne(["jane", "doe"]); + $csv->insertOne(['jane', 'doe']); $this->assertSame("jane,doe\r\n", (string) $csv); } public function testCustomNewlineFromCreateFromString() { $expected = "\r\n"; - $raw = "john,doe,john.doe@example.com".PHP_EOL - ."jane,doe,jane.doe@example.com".PHP_EOL; + $raw = 'john,doe,john.doe@example.com'.PHP_EOL + .'jane,doe,jane.doe@example.com'.PHP_EOL; $csv = Writer::createFromString($raw, $expected); $this->assertSame($expected, $csv->getNewline()); } @@ -160,6 +159,6 @@ class WriterTest extends PHPUnit_Framework_TestCase ['jane', 'doe', 'jane.doe@example.com'], ['toto', 'le', 'herisson'], ]); - $this->assertStringStartsWith("<table", $this->csv->toHTML()); + $this->assertStringStartsWith('<table', $this->csv->toHTML()); } } |