mcndave/spout
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix code style

Browse Source
This commit is contained in:
Adrien Loison committed 2017-09-06 00:33:43 +02:00
1 parent 740fcfb8c1
commit b968513cb9
171 files changed
+517 -792
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Common/Helper/EncodingHelperTest.php
-2
View File
@@ -6,8 +6,6 @@ use Box\Spout\TestUsingResource;
/**
* Class EncodingHelperTest
*
* @package Box\Spout\Common\Helper
*/
class EncodingHelperTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Common/Helper/Escaper/ODSTest.php
+2 -4
View File
@@ -6,8 +6,6 @@ use Box\Spout\Common\Helper\Escaper;
/**
* Class ODSTest
*
* @package Box\Spout\Common\Helper\Escaper
*/
class ODSTest extends \PHPUnit_Framework_TestCase
{
@@ -22,8 +20,8 @@ class ODSTest extends \PHPUnit_Framework_TestCase
["\n", "\n"],
["\r", "\r"],
["\t", "\t"],
["\v", "�"],
["\f", "�"],
["\v", '�'],
["\f", '�'],
];
}
tests/Spout/Common/Helper/Escaper/XLSXTest.php
+4 -6
View File
@@ -6,8 +6,6 @@ use Box\Spout\Common\Helper\Escaper;
/**
* Class XLSXTest
*
* @package Box\Spout\Common\Helper\Escaper
*/
class XLSXTest extends \PHPUnit_Framework_TestCase
{
@@ -26,8 +24,8 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
[chr(4), '_x0004_'],
['_x0000_', '_x005F_x0000_'],
[chr(21), '_x0015_'],
['control '.chr(21).' character', 'control _x0015_ character'],
['control\'s '.chr(21).' "character"', 'control\'s _x0015_ "character"'],
['control ' . chr(21) . ' character', 'control _x0015_ character'],
['control\'s ' . chr(21) . ' "character"', 'control\'s _x0015_ "character"'],
];
}
@@ -61,8 +59,8 @@ class XLSXTest extends \PHPUnit_Framework_TestCase
['_x0004_', chr(4)],
['_x005F_x0000_', '_x0000_'],
['_x0015_', chr(21)],
['control _x0015_ character', 'control '.chr(21).' character'],
['control's _x0015_ "character"', 'control's '.chr(21).' "character"'],
['control _x0015_ character', 'control ' . chr(21) . ' character'],
['control's _x0015_ "character"', 'control's ' . chr(21) . ' "character"'],
];
}
tests/Spout/Common/Helper/FileSystemHelperTest.php
-2
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Common\Helper;
/**
* Class FileSystemHelperTest
*
* @package Box\Spout\Common\Helper
*/
class FileSystemHelperTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Common/Manager/OptionsManagerTest.php
-3
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Common\Manager;
/**
* Class OptionsManagerTest
*
* @package Box\Spout\Common\Manager
*/
class OptionsManagerTest extends \PHPUnit_Framework_TestCase
{
@@ -49,7 +47,6 @@ class OptionsManagerTest extends \PHPUnit_Framework_TestCase
}
}
// TODO: Convert this to anonymous class when PHP < 7 support is dropped
class FakeOptionsManager extends OptionsManagerAbstract
{
tests/Spout/Reader/CSV/ReaderTest.php
+8 -12
View File
@@ -3,19 +3,15 @@
namespace Box\Spout\Reader\CSV;
use Box\Spout\Common\Creator\HelperFactory;
use Box\Spout\Common\Helper\EncodingHelper;
use Box\Spout\Common\Helper\GlobalFunctionsHelper;
use Box\Spout\Reader\CSV\Creator\EntityFactory;
use Box\Spout\Reader\CSV\Manager\OptionsManager;
use Box\Spout\Reader\ReaderFactory;
use Box\Spout\Common\Type;
use Box\Spout\Common\Helper\EncodingHelper;
use Box\Spout\Reader\ReaderInterface;
use Box\Spout\TestUsingResource;
/**
* Class ReaderTest
*
* @package Box\Spout\Reader\CSV
*/
class ReaderTest extends \PHPUnit_Framework_TestCase
{
@@ -79,7 +75,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$reader->open($resourcePath);
}
/**
* @return void
*/
@@ -144,7 +139,9 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
{
$allRows = $this->getAllRowsForFile(
'csv_with_multiple_empty_lines.csv',
',', '"', EncodingHelper::ENCODING_UTF8,
',',
'"',
EncodingHelper::ENCODING_UTF8,
$shouldPreserveEmptyRows = true
);
@@ -379,7 +376,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$expectedRows = [
['A', 'B', 'C'],
['1', '2', '3'],
['0', '0', '0']
['0', '0', '0'],
];
$this->assertEquals($expectedRows, $allRows, 'There should be only 3 rows, because zeros (0) are valid values');
}
@@ -395,7 +392,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$expectedRows = [
['A', 'B', 'C'],
['0', '', ''],
['1', '1', '']
['1', '1', ''],
];
$this->assertEquals($expectedRows, $allRows, 'There should be 3 rows, with equal length');
}
@@ -490,8 +487,8 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$fieldDelimiter = ',',
$fieldEnclosure = '"',
$encoding = EncodingHelper::ENCODING_UTF8,
$shouldPreserveEmptyRows = false)
{
$shouldPreserveEmptyRows = false
) {
$allRows = [];
$resourcePath = $this->getResourcePath($fileName);
@@ -514,5 +511,4 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
return $allRows;
}
}
tests/Spout/Reader/CSV/SheetTest.php
-2
View File
@@ -8,8 +8,6 @@ use Box\Spout\TestUsingResource;
/**
* Class SheetTest
*
* @package Box\Spout\Reader\CSV
*/
class SheetTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Reader/CSV/SpoutTestStream.php
+4 -3
View File
@@ -6,8 +6,6 @@ namespace Box\Spout\Reader\CSV;
* Class SpoutTestStream
* Custom stream that reads CSV files located in the tests/resources/csv folder.
* For example: spout://foobar will point to tests/resources/csv/foobar.csv
*
* @package Box\Spout\Reader\CSV
*/
class SpoutTestStream
{
@@ -30,6 +28,7 @@ class SpoutTestStream
public function url_stat($path, $flag)
{
$filePath = $this->getFilePathFromStreamPath($path);
return stat($filePath);
}
@@ -40,6 +39,7 @@ class SpoutTestStream
private function getFilePathFromStreamPath($streamPath)
{
$fileName = parse_url($streamPath, PHP_URL_HOST);
return self::PATH_TO_CSV_RESOURCES . $fileName . self::CSV_EXTENSION;
}
@@ -68,6 +68,7 @@ class SpoutTestStream
public function stream_read($numBytes)
{
$this->position += $numBytes;
return fread($this->fileHandle, $numBytes);
}
@@ -93,7 +94,7 @@ class SpoutTestStream
if ($whence === SEEK_SET) {
$this->position = $offset;
} else if ($whence === SEEK_CUR) {
} elseif ($whence === SEEK_CUR) {
$this->position += $offset;
} else {
// not implemented
tests/Spout/Reader/ODS/ReaderTest.php
+6 -10
View File
@@ -9,8 +9,6 @@ use Box\Spout\TestUsingResource;
/**
* Class ReaderTest
*
* @package Box\Spout\Reader\ODS
*/
class ReaderTest extends \PHPUnit_Framework_TestCase
{
@@ -134,9 +132,9 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$allRows = $this->getAllRowsForFile($fileName);
$expectedRows = [
['header1','header2','header3','header4'],
['val11','val12','val13','val14'],
['val21','','val23','val23'],
['header1', 'header2', 'header3', 'header4'],
['val11', 'val12', 'val13', 'val14'],
['val21', '', 'val23', 'val23'],
['', 10.43, 29.11],
];
@@ -150,7 +148,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedRows, $allRows);
}
/**
* @return void
*/
@@ -278,7 +275,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals([$expectedRow], $allRows);
}
/**
* @NOTE: The LIBXML_NOENT is used to ACTUALLY substitute entities (and should therefore not be used)
*
@@ -450,7 +446,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$expectedRows = [
['A', 'B', 'C'],
['1', '2', '3'],
['0', '0', '0']
['0', '0', '0'],
];
$this->assertEquals($expectedRows, $allRows, 'There should be only 3 rows, because zeros (0) are valid values');
}
@@ -466,7 +462,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$expectedRows = [
['A', 'B', 'C'],
['0', '', ''],
['1', '1', '']
['1', '1', ''],
];
$this->assertEquals($expectedRows, $allRows, 'There should be 3 rows, with equal length');
}
@@ -513,7 +509,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$allRows = $this->getAllRowsForFile('sheet_with_inline_font_formatting.ods');
$expectedRows = [
['I am a yellow bird']
['I am a yellow bird'],
];
$this->assertEquals($expectedRows, $allRows, 'Text formatted inline should be read');
tests/Spout/Reader/ODS/SheetTest.php
-2
View File
@@ -8,8 +8,6 @@ use Box\Spout\TestUsingResource;
/**
* Class SheetTest
*
* @package Box\Spout\Reader\ODS
*/
class SheetTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Reader/ReaderFactoryTest.php
-2
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Reader;
/**
* Class ReaderFactoryTest
*
* @package Box\Spout\Writer
*/
class ReaderFactoryTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Reader/Wrapper/XMLReaderTest.php
-3
View File
@@ -3,12 +3,9 @@
namespace Box\Spout\Reader\Wrapper;
use Box\Spout\TestUsingResource;
use Box\Spout\Reader\Exception\XMLProcessingException;
/**
* Class XMLReaderTest
*
* @package Box\Spout\Reader\Wrapper
*/
class XMLReaderTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Reader/XLSX/Helper/CellHelperTest.php
+3 -5
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Reader\XLSX\Helper;
/**
* Class CellHelperTest
*
* @package Box\Spout\Reader\XLSX\Helper
*/
class CellHelperTest extends \PHPUnit_Framework_TestCase
{
@@ -15,9 +13,9 @@ class CellHelperTest extends \PHPUnit_Framework_TestCase
public function dataProviderForTestFillMissingArrayIndexes()
{
return [
[ null, [] ],
[ [], [] ],
[ [1 => 1, 3 => 3], ['FILL', 1, 'FILL', 3] ]
[null, []],
[[], []],
[[1 => 1, 3 => 3], ['FILL', 1, 'FILL', 3]],
];
}
tests/Spout/Reader/XLSX/Helper/CellValueFormatterTest.php
+2 -4
View File
@@ -6,8 +6,6 @@ use Box\Spout\Common\Helper\Escaper;
/**
* Class CellValueFormatterTest
*
* @package Box\Spout\Reader\XLSX\Helper
*/
class CellValueFormatterTest extends \PHPUnit_Framework_TestCase
{
@@ -47,7 +45,7 @@ class CellValueFormatterTest extends \PHPUnit_Framework_TestCase
->expects($this->atLeastOnce())
->method('item')
->with(0)
->will($this->returnValue((object)['nodeValue' => $nodeValue]));
->will($this->returnValue((object) ['nodeValue' => $nodeValue]));
$nodeMock = $this->getMockBuilder('DOMElement')->disableOriginalConstructor()->getMock();
@@ -162,7 +160,7 @@ class CellValueFormatterTest extends \PHPUnit_Framework_TestCase
->expects($this->atLeastOnce())
->method('item')
->with(0)
->will($this->returnValue((object)['nodeValue' => $value]));
->will($this->returnValue((object) ['nodeValue' => $value]));
$nodeMock = $this->getMockBuilder('DOMElement')->disableOriginalConstructor()->getMock();
$nodeMock
tests/Spout/Reader/XLSX/Helper/DateFormatHelperTest.php
-2
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Reader\XLSX\Helper;
/**
* Class DateFormatHelperTest
*
* @package Box\Spout\Reader\XLSX\Helper
*/
class DateFormatHelperTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Reader/XLSX/Manager/SharedStringsCaching/CachingStrategyFactoryTest.php
+2 -4
View File
@@ -6,8 +6,6 @@ use Box\Spout\Reader\XLSX\Creator\HelperFactory;
/**
* Class CachingStrategyFactoryTest
*
* @package Box\Spout\Reader\XLSX\Manager\SharedStringsCaching
*/
class CachingStrategyFactoryTest extends \PHPUnit_Framework_TestCase
{
@@ -21,9 +19,9 @@ class CachingStrategyFactoryTest extends \PHPUnit_Framework_TestCase
[CachingStrategyFactory::MAX_NUM_STRINGS_PER_TEMP_FILE, -1, 'FileBasedStrategy'],
[CachingStrategyFactory::MAX_NUM_STRINGS_PER_TEMP_FILE + 10, -1, 'FileBasedStrategy'],
[CachingStrategyFactory::MAX_NUM_STRINGS_PER_TEMP_FILE - 10, -1, 'InMemoryStrategy'],
[10 , CachingStrategyFactory::AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB * 10, 'FileBasedStrategy'],
[10, CachingStrategyFactory::AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB * 10, 'FileBasedStrategy'],
[15, CachingStrategyFactory::AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB * 10, 'FileBasedStrategy'],
[5 , CachingStrategyFactory::AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB * 10, 'InMemoryStrategy'],
[5, CachingStrategyFactory::AMOUNT_MEMORY_NEEDED_PER_STRING_IN_KB * 10, 'InMemoryStrategy'],
];
}
tests/Spout/Reader/XLSX/Manager/SharedStringsManagerTest.php
-2
View File
@@ -12,8 +12,6 @@ use Box\Spout\TestUsingResource;
/**
* Class SharedStringsManagerTest
*
* @package Box\Spout\Reader\XLSX\Manager
*/
class SharedStringsManagerTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Reader/XLSX/Manager/StyleManagerTest.php
-3
View File
@@ -9,12 +9,9 @@ use Box\Spout\Reader\XLSX\Manager\SharedStringsCaching\CachingStrategyFactory;
/**
* Class StyleManagerTest
*
* @package Box\Spout\Reader\XLSX\Manager
*/
class StyleManagerTest extends \PHPUnit_Framework_TestCase
{
/**
* @param array $styleAttributes
* @param array $customNumberFormats
tests/Spout/Reader/XLSX/ReaderTest.php
+5 -9
View File
@@ -9,8 +9,6 @@ use Box\Spout\TestUsingResource;
/**
* Class ReaderTest
*
* @package Box\Spout\Reader\XLSX
*/
class ReaderTest extends \PHPUnit_Framework_TestCase
{
@@ -51,7 +49,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
['one_sheet_with_shared_strings.xlsx', 5, 5],
['one_sheet_with_inline_strings.xlsx', 5, 5],
['two_sheets_with_shared_strings.xlsx', 10, 5],
['two_sheets_with_inline_strings.xlsx', 10, 5]
['two_sheets_with_inline_strings.xlsx', 10, 5],
];
}
@@ -236,7 +234,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
\DateTime::createFromFormat('Y-m-d H:i:s', '1900-02-28 23:59:59'),
\DateTime::createFromFormat('Y-m-d H:i:s', '1900-03-01 00:00:00'),
\DateTime::createFromFormat('Y-m-d H:i:s', '1900-02-28 11:00:00'), // 1900-02-29 should be converted to 1900-02-28
]
],
];
$this->assertEquals($expectedRows, $allRows);
}
@@ -258,7 +256,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
\DateTime::createFromFormat('Y-m-d H:i:s', '1900-01-01 23:29:00'),
\DateTime::createFromFormat('Y-m-d H:i:s', '1900-01-01 01:42:25'),
\DateTime::createFromFormat('Y-m-d H:i:s', '1900-01-01 13:42:25'),
]
],
];
$this->assertEquals($expectedRows, $allRows);
}
@@ -579,7 +577,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$expectedRows = [
['A', 'B', 'C'],
['1', '2', '3'],
['0', '0', '0']
['0', '0', '0'],
];
$this->assertEquals($expectedRows, $allRows, 'There should be only 3 rows, because zeros (0) are valid values');
}
@@ -595,12 +593,11 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$expectedRows = [
['A', 'B', 'C'],
['0', '', ''],
['1', '1', '']
['1', '1', ''],
];
$this->assertEquals($expectedRows, $allRows, 'There should be 3 rows, with equal length');
}
/**
* https://github.com/box/spout/issues/195
* @return void
@@ -618,7 +615,6 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$this->assertEquals($expectedRows, $allRows, 'Cell values should not be trimmed');
}
/**
* @param string $fileName
* @param bool $shouldFormatDates
tests/Spout/Reader/XLSX/SheetTest.php
-2
View File
@@ -8,8 +8,6 @@ use Box\Spout\TestUsingResource;
/**
* Class SheetTest
*
* @package Box\Spout\Reader\XLSX
*/
class SheetTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/ReflectionHelper.php
+2 -2
View File
@@ -5,7 +5,7 @@
*/
class ReflectionHelper
{
private static $privateVarsToReset = array();
private static $privateVarsToReset = [];
/**
* Resets any static vars that were set to their
@@ -20,7 +20,7 @@ class ReflectionHelper
self::setStaticValue($class, $valueName, $originalValue, $saveOriginalValue = false);
}
}
self::$privateVarsToReset = array();
self::$privateVarsToReset = [];
}
/**
tests/Spout/TestUsingResource.php
-2
View File
@@ -4,8 +4,6 @@ namespace Box\Spout;
/**
* Trait TestUsingResource
*
* @package Box\Spout
*/
trait TestUsingResource
{
tests/Spout/Writer/CSV/WriterTest.php
+4 -6
View File
@@ -2,16 +2,14 @@
namespace Box\Spout\Writer\CSV;
use Box\Spout\TestUsingResource;
use Box\Spout\Common\Type;
use Box\Spout\Common\Helper\EncodingHelper;
use Box\Spout\Common\Type;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Entity\Cell;
use Box\Spout\Writer\WriterFactory;
/**
* Class WriterTest
*
* @package Box\Spout\Writer\CSV
*/
class WriterTest extends \PHPUnit_Framework_TestCase
{
@@ -184,7 +182,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
public function testWriteShouldAcceptCellObjects()
{
$allRows = [
[new Cell('String Value'), new Cell(1)]
[new Cell('String Value'), new Cell(1)],
];
$writtenContent = $this->writeToCsvFileAndReturnWrittenContent($allRows, 'csv_with_cell_objects.csv');
$writtenContent = $this->trimWrittenContent($writtenContent);
@@ -197,7 +195,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
* @param string $fieldDelimiter
* @param string $fieldEnclosure
* @param bool $shouldAddBOM
* @return null|string
* @return string|null
*/
private function writeToCsvFileAndReturnWrittenContent($allRows, $fileName, $fieldDelimiter = ',', $fieldEnclosure = '"', $shouldAddBOM = true)
{
tests/Spout/Writer/Common/Creator/StyleBuilderTest.php
-2
View File
@@ -8,8 +8,6 @@ use Box\Spout\Writer\Common\Manager\Style\StyleMerger;
/**
* Class StyleManagerTest
*
* @package Box\Spout\Writer\Common\Creator\Style
*/
class StyleBuilderTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/Common/Entity/SheetTest.php
-2
View File
@@ -7,8 +7,6 @@ use Box\Spout\Writer\Common\Manager\SheetManager;
/**
* Class SheetTest
*
* @package Box\Spout\Writer\Common\Entity
*/
class SheetTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/Common/Entity/Style/BorderTest.php
+2 -4
View File
@@ -9,8 +9,6 @@ use Box\Spout\Writer\Common\Entity\Style\Color;
/**
* Class BorderTest
*
* @package Box\Spout\Writer\Common\EntityStyle
*/
class BorderTest extends \PHPUnit_Framework_TestCase
{
@@ -21,7 +19,7 @@ class BorderTest extends \PHPUnit_Framework_TestCase
{
$noConstructorParams = new Border();
$withConstructorParams = new Border([
new BorderPart(Border::LEFT)
new BorderPart(Border::LEFT),
]);
}
@@ -72,7 +70,7 @@ class BorderTest extends \PHPUnit_Framework_TestCase
{
$border = new Border();
$border->setParts([
new BorderPart(Border::LEFT)
new BorderPart(Border::LEFT),
]);
$this->assertEquals(1, count($border->getParts()), 'It should be possible to set the border parts');
tests/Spout/Writer/Common/Entity/Style/ColorTest.php
-3
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Writer\Common\Entity\Style;
/**
* Class ColorTest
*
* @package Box\Spout\Writer\Common\Entity\Style
*/
class ColorTest extends \PHPUnit_Framework_TestCase
{
@@ -14,7 +12,6 @@ class ColorTest extends \PHPUnit_Framework_TestCase
*/
public function dataProviderForTestRGB()
{
return [
[0, 0, 0, Color::BLACK],
[255, 255, 255, Color::WHITE],
tests/Spout/Writer/Common/Helper/CellHelperTest.php
+12 -14
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Writer\Common\Helper;
/**
* Class CellHelperTest
*
* @package Box\Spout\Writer\Common\Helper
*/
class CellHelperTest extends \PHPUnit_Framework_TestCase
{
@@ -41,14 +39,14 @@ class CellHelperTest extends \PHPUnit_Framework_TestCase
public function testIsEmpty()
{
$this->assertTrue(CellHelper::isEmpty(null));
$this->assertTrue(CellHelper::isEmpty(""));
$this->assertTrue(CellHelper::isEmpty(''));
$this->assertFalse(CellHelper::isEmpty("string"));
$this->assertFalse(CellHelper::isEmpty('string'));
$this->assertFalse(CellHelper::isEmpty(0));
$this->assertFalse(CellHelper::isEmpty(1));
$this->assertFalse(CellHelper::isEmpty(true));
$this->assertFalse(CellHelper::isEmpty(false));
$this->assertFalse(CellHelper::isEmpty(["string"]));
$this->assertFalse(CellHelper::isEmpty(['string']));
$this->assertFalse(CellHelper::isEmpty(new \stdClass()));
}
@@ -57,14 +55,14 @@ class CellHelperTest extends \PHPUnit_Framework_TestCase
*/
public function testIsNonEmptyString()
{
$this->assertTrue(CellHelper::isNonEmptyString("string"));
$this->assertTrue(CellHelper::isNonEmptyString('string'));
$this->assertFalse(CellHelper::isNonEmptyString(""));
$this->assertFalse(CellHelper::isNonEmptyString(''));
$this->assertFalse(CellHelper::isNonEmptyString(0));
$this->assertFalse(CellHelper::isNonEmptyString(1));
$this->assertFalse(CellHelper::isNonEmptyString(true));
$this->assertFalse(CellHelper::isNonEmptyString(false));
$this->assertFalse(CellHelper::isNonEmptyString(["string"]));
$this->assertFalse(CellHelper::isNonEmptyString(['string']));
$this->assertFalse(CellHelper::isNonEmptyString(new \stdClass()));
$this->assertFalse(CellHelper::isNonEmptyString(null));
}
@@ -83,8 +81,8 @@ class CellHelperTest extends \PHPUnit_Framework_TestCase
$this->assertTrue(CellHelper::isNumeric(0b10100111001));
$this->assertTrue(CellHelper::isNumeric(1337e0));
$this->assertFalse(CellHelper::isNumeric("0"));
$this->assertFalse(CellHelper::isNumeric("42"));
$this->assertFalse(CellHelper::isNumeric('0'));
$this->assertFalse(CellHelper::isNumeric('42'));
$this->assertFalse(CellHelper::isNumeric(true));
$this->assertFalse(CellHelper::isNumeric([2]));
$this->assertFalse(CellHelper::isNumeric(new \stdClass()));
@@ -101,10 +99,10 @@ class CellHelperTest extends \PHPUnit_Framework_TestCase
$this->assertFalse(CellHelper::isBoolean(0));
$this->assertFalse(CellHelper::isBoolean(1));
$this->assertFalse(CellHelper::isBoolean("0"));
$this->assertFalse(CellHelper::isBoolean("1"));
$this->assertFalse(CellHelper::isBoolean("true"));
$this->assertFalse(CellHelper::isBoolean("false"));
$this->assertFalse(CellHelper::isBoolean('0'));
$this->assertFalse(CellHelper::isBoolean('1'));
$this->assertFalse(CellHelper::isBoolean('true'));
$this->assertFalse(CellHelper::isBoolean('false'));
$this->assertFalse(CellHelper::isBoolean([true]));
$this->assertFalse(CellHelper::isBoolean(new \stdClass()));
$this->assertFalse(CellHelper::isBoolean(null));
tests/Spout/Writer/Common/Manager/Style/StyleManagerTest.php
-2
View File
@@ -6,8 +6,6 @@ use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
/**
* Class StyleManagerTest
*
* @package Box\Spout\Writer\Common\Manager\Style
*/
class StyleManagerTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/Common/Manager/Style/StyleMergerTest.php
-2
View File
@@ -8,8 +8,6 @@ use Box\Spout\Writer\Common\Entity\Style\Style;
/**
* Class StyleMergerTest
*
* @package Box\Spout\Writer\Common\Manager\Style
*/
class StyleMergerTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/Common/Manager/Style/StyleRegistryTest.php
-5
View File
@@ -2,16 +2,11 @@
namespace Box\Spout\Writer\Common\Manager\Style;
use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\Common\Entity\Style\Border;
use Box\Spout\Writer\Common\Entity\Style\Color;
use Box\Spout\Writer\Common\Entity\Style\Style;
/**
* Class StyleRegistryTest
*
* @package Box\Spout\Writer\Common\Manager\Style
*/
class StyleRegistryTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/ODS/Manager/Style/StyleRegistryTest.php
+3 -4
View File
@@ -6,8 +6,6 @@ use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
/**
* Class StyleRegistryTest
*
* @package Box\Spout\Writer\ODS\Manager\Style
*/
class StyleRegistryTest extends \PHPUnit_Framework_TestCase
{
@@ -17,6 +15,7 @@ class StyleRegistryTest extends \PHPUnit_Framework_TestCase
private function getStyleRegistry()
{
$defaultStyle = (new StyleBuilder())->build();
return new StyleRegistry($defaultStyle);
}
@@ -29,10 +28,10 @@ class StyleRegistryTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(1, count($styleRegistry->getUsedFonts()), 'There should only be the default font name');
$style1 = (new StyleBuilder())->setFontName("MyFont1")->build();
$style1 = (new StyleBuilder())->setFontName('MyFont1')->build();
$styleRegistry->registerStyle($style1);
$style2 = (new StyleBuilder())->setFontName("MyFont2")->build();
$style2 = (new StyleBuilder())->setFontName('MyFont2')->build();
$styleRegistry->registerStyle($style2);
$this->assertEquals(3, count($styleRegistry->getUsedFonts()), 'There should be 3 fonts registered');
tests/Spout/Writer/ODS/SheetTest.php
-2
View File
@@ -9,8 +9,6 @@ use Box\Spout\Writer\WriterFactory;
/**
* Class SheetTest
*
* @package Box\Spout\Writer\ODS
*/
class SheetTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/ODS/WriterTest.php
+6 -6
View File
@@ -6,14 +6,12 @@ use Box\Spout\Common\Exception\SpoutException;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Wrapper\XMLReader;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Helper\ZipHelper;
use Box\Spout\Writer\Common\Entity\Cell;
use Box\Spout\Writer\Common\Helper\ZipHelper;
use Box\Spout\Writer\WriterFactory;
/**
* Class WriterTest
*
* @package Box\Spout\Writer\ODS
*/
class WriterTest extends \PHPUnit_Framework_TestCase
{
@@ -280,6 +278,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
[['foo', 'bar'], 2, 0],
];
}
/**
* @dataProvider dataProviderForTestAddRowShouldUseNumberColumnsRepeatedForRepeatedValues
*
@@ -300,7 +299,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
if ($expectedNumTableCells === 1) {
$tableCellNode = $tableCellNodes->item(0);
$numColumnsRepeated = intval($tableCellNode->getAttribute('table:number-columns-repeated'));
$numColumnsRepeated = (int) ($tableCellNode->getAttribute('table:number-columns-repeated'));
$this->assertEquals($expectedNumColumnsRepeated, $numColumnsRepeated);
} else {
foreach ($tableCellNodes as $tableCellNode) {
@@ -501,7 +500,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
foreach ($dataRows as $dataRow) {
/** @var Cell $cell */
foreach ($dataRow as $cell) {
$this->assertValueWasWritten($fileName, (string)$cell->getValue(), '');
$this->assertValueWasWritten($fileName, (string) $cell->getValue(), '');
}
}
}
@@ -570,7 +569,6 @@ class WriterTest extends \PHPUnit_Framework_TestCase
$xmlContents = file_get_contents('zip://' . $pathToContentFile);
$this->assertContains($value, $xmlContents, $message);
}
/**
@@ -611,6 +609,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
private function getSheetXmlNode($fileName, $sheetIndex)
{
$xmlReader = $this->moveReaderToCorrectTableNode($fileName, $sheetIndex);
return $xmlReader->expand();
}
@@ -622,6 +621,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
private function getSheetXmlNodeAsString($fileName, $sheetIndex)
{
$xmlReader = $this->moveReaderToCorrectTableNode($fileName, $sheetIndex);
return $xmlReader->readOuterXml();
}
tests/Spout/Writer/ODS/WriterWithStyleTest.php
+2 -6
View File
@@ -5,18 +5,15 @@ namespace Box\Spout\Writer\ODS;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Wrapper\XMLReader;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\ODS\Helper\BorderHelper;
use Box\Spout\Writer\Common\Entity\Style\Border;
use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\Common\Entity\Style\Border;
use Box\Spout\Writer\Common\Entity\Style\Color;
use Box\Spout\Writer\Common\Entity\Style\Style;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\WriterFactory;
/**
* Class WriterWithStyleTest
*
* @package Box\Spout\Writer\ODS
*/
class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
{
@@ -277,7 +274,6 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
$borderBottomGreenThickSolid = (new BorderBuilder())
->setBorderBottom(Color::GREEN, Border::WIDTH_THICK, Border::STYLE_SOLID)->build();
$borderTopRedThinDashed = (new BorderBuilder())
->setBorderTop(Color::RED, Border::WIDTH_THIN, Border::STYLE_DASHED)->build();
tests/Spout/Writer/WriterFactoryTest.php
-2
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Writer;
/**
* Class WriterFactoryTest
*
* @package Box\Spout\Writer
*/
class WriterFactoryTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/XLSX/Manager/Style/StyleManagerTest.php
-2
View File
@@ -4,8 +4,6 @@ namespace Box\Spout\Writer\XLSX\Manager\Style;
/**
* Class StyleManagerTest
*
* @package Box\Spout\Writer\XLSX\Manager\Style
*/
class StyleManagerTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/XLSX/Manager/Style/StyleRegistryTest.php
+2 -3
View File
@@ -8,8 +8,6 @@ use Box\Spout\Writer\Common\Entity\Style\Color;
/**
* Class StyleRegistryTest
*
* @package Box\Spout\Writer\XLSX\Manager\Style
*/
class StyleRegistryTest extends \PHPUnit_Framework_TestCase
{
@@ -19,6 +17,7 @@ class StyleRegistryTest extends \PHPUnit_Framework_TestCase
private function getStyleRegistry()
{
$defaultStyle = (new StyleBuilder())->build();
return new StyleRegistry($defaultStyle);
}
@@ -53,7 +52,7 @@ class StyleRegistryTest extends \PHPUnit_Framework_TestCase
public function testRegisterStyleAlsoRegistersBorders()
{
$styleRegistry = $this->getStyleRegistry();
$borderLeft = (new BorderBuilder())->setBorderLeft()->build();
$borderRight = (new BorderBuilder())->setBorderRight()->build();
tests/Spout/Writer/XLSX/SheetTest.php
-2
View File
@@ -9,8 +9,6 @@ use Box\Spout\Writer\WriterFactory;
/**
* Class SheetTest
*
* @package Box\Spout\Writer\XLSX
*/
class SheetTest extends \PHPUnit_Framework_TestCase
{
tests/Spout/Writer/XLSX/WriterTest.php
+5 -7
View File
@@ -11,8 +11,6 @@ use Box\Spout\Writer\XLSX\Manager\WorksheetManager;
/**
* Class WriterTest
*
* @package Box\Spout\Writer\XLSX
*/
class WriterTest extends \PHPUnit_Framework_TestCase
{
@@ -485,7 +483,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
{
$fileName = 'test_add_row_should_escape_control_characters.xlsx';
$dataRows = [
['control '.chr(21).' character'],
['control ' . chr(21) . ' character'],
];
$this->writeToXLSXFile($dataRows, $fileName);
@@ -540,7 +538,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
[new Cell('i am a string')],
];
$dataRowsInline = [
[new Cell(51465), new Cell(true), new Cell(51465.5)]
[new Cell(51465), new Cell(true), new Cell(51465.5)],
];
$dataRows = array_merge($dataRowsShared, $dataRowsInline);
@@ -550,7 +548,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
foreach ($dataRowsShared as $dataRow) {
/** @var Cell $cell */
foreach ($dataRow as $cell) {
$this->assertSharedStringWasWritten($fileName, (string)$cell->getValue());
$this->assertSharedStringWasWritten($fileName, (string) $cell->getValue());
}
}
@@ -630,7 +628,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
$pathToSheetFile = $resourcePath . '#xl/worksheets/sheet' . $sheetIndex . '.xml';
$xmlContents = file_get_contents('zip://' . $pathToSheetFile);
$this->assertContains((string)$inlineData, $xmlContents, $message);
$this->assertContains((string) $inlineData, $xmlContents, $message);
}
/**
@@ -646,7 +644,7 @@ class WriterTest extends \PHPUnit_Framework_TestCase
$pathToSheetFile = $resourcePath . '#xl/worksheets/sheet' . $sheetIndex . '.xml';
$xmlContents = file_get_contents('zip://' . $pathToSheetFile);
$this->assertNotContains((string)$inlineData, $xmlContents, $message);
$this->assertNotContains((string) $inlineData, $xmlContents, $message);
}
/**
tests/Spout/Writer/XLSX/WriterWithStyleTest.php
+16 -19
View File
@@ -5,19 +5,17 @@ namespace Box\Spout\Writer\XLSX;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Wrapper\XMLReader;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Entity\Style\Border;
use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\Common\Entity\Style\Border;
use Box\Spout\Writer\Common\Entity\Style\Color;
use Box\Spout\Writer\Common\Entity\Style\Style;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\Common\Manager\Style\StyleMerger;
use Box\Spout\Writer\WriterFactory;
use Box\Spout\Writer\XLSX\Manager\OptionsManager;
/**
* Class WriterWithStyleTest
*
* @package Box\Spout\Writer\XLSX
*/
class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
{
@@ -289,7 +287,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
{
$fileName = 'test_add_background_color.xlsx';
$dataRows = [
["BgColor"],
['BgColor'],
];
$style = (new StyleBuilder())->setBackgroundColor(Color::WHITE)->build();
$this->writeToXLSXFile($dataRows, $fileName, $style);
@@ -307,7 +305,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
$this->assertEquals(2, $styleXfsElements->getAttribute('count'), '2 cell xfs present - a default one and a custom one');
$customFillId = $styleXfsElements->lastChild->getAttribute('fillId');
$this->assertEquals(2, (int)$customFillId, 'The custom fill id should have the index 2');
$this->assertEquals(2, (int) $customFillId, 'The custom fill id should have the index 2');
}
/**
@@ -317,13 +315,13 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
{
$fileName = 'test_add_background_color_shared_definition.xlsx';
$dataRows = [
["row-bold-background-red"],
["row-background-red"],
['row-bold-background-red'],
['row-background-red'],
];
$styles = [
(new StyleBuilder())->setBackgroundColor(Color::RED)->setFontBold()->build(),
(new StyleBuilder())->setBackgroundColor(Color::RED)->build()
(new StyleBuilder())->setBackgroundColor(Color::RED)->build(),
];
$this->writeToXLSXFileWithMultipleStyles($dataRows, $fileName, $styles);
@@ -343,10 +341,10 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
);
$firstCustomId = $styleXfsElements->childNodes->item(1)->getAttribute('fillId');
$this->assertEquals(2, (int)$firstCustomId, 'The first custom fill id should have the index 2');
$this->assertEquals(2, (int) $firstCustomId, 'The first custom fill id should have the index 2');
$secondCustomId = $styleXfsElements->childNodes->item(2)->getAttribute('fillId');
$this->assertEquals(2, (int)$secondCustomId, 'The second custom fill id should have the index 2');
$this->assertEquals(2, (int) $secondCustomId, 'The second custom fill id should have the index 2');
}
/**
@@ -365,7 +363,6 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
$borderBottomGreenThickSolid = (new BorderBuilder())
->setBorderBottom(Color::GREEN, Border::WIDTH_THICK, Border::STYLE_SOLID)->build();
$borderTopRedThinDashed = (new BorderBuilder())
->setBorderTop(Color::RED, Border::WIDTH_THIN, Border::STYLE_DASHED)->build();
@@ -407,15 +404,15 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
$borderElements = $this->getXmlSectionFromStylesXmlFile($fileName, 'borders');
$correctOrdering = [
'left', 'right', 'top', 'bottom'
'left', 'right', 'top', 'bottom',
];
/** @var $borderNode \DOMElement */
/** @var \DOMElement $borderNode */
foreach ($borderElements->childNodes as $borderNode) {
$borderParts = $borderNode->childNodes;
$ordering = [];
/** @var $part \DOMText */
/** @var \DOMText $part */
foreach ($borderParts as $part) {
if ($part instanceof \DOMElement) {
$ordering[] = $part->nodeName;
@@ -423,7 +420,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
}
$this->assertEquals($correctOrdering, $ordering, 'The border parts are in correct ordering');
};
}
}
/**
@@ -478,7 +475,7 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
$emptyStyle,
$fontStyle,
$borderRightStyle,
$borderRightFontBoldStyle
$borderRightFontBoldStyle,
];
$this->writeToXLSXFileWithMultipleStyles($dataRows, $fileName, $styles);
@@ -507,9 +504,9 @@ class WriterWithStyleTest extends \PHPUnit_Framework_TestCase
$shouldApplyBorder = ((int) $node->getAttribute('applyBorder') === 1);
if ($shouldApplyBorder) {
$bordersApplied++;
$this->assertTrue((int)$node->getAttribute('borderId') > 0, 'BorderId is greater than 0');
$this->assertTrue((int) $node->getAttribute('borderId') > 0, 'BorderId is greater than 0');
} else {
$this->assertTrue((int)$node->getAttribute('borderId') === 0, 'BorderId is 0');
$this->assertTrue((int) $node->getAttribute('borderId') === 0, 'BorderId is 0');
}
}