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

rename EntityFactory for writers and readers #526

Browse Source
This commit is contained in:
madflow authored and Adrien Loison committed 2018-09-03 11:15:09 +02:00
1 parent e1acdc1fc5
commit 8a1c48b6b0
18 files changed
+97 -97
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Reader/CSV/SheetTest.php
+2 -2
View File
@@ -3,7 +3,7 @@
namespace Box\Spout\Reader\CSV;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
use Box\Spout\TestUsingResource;
use PHPUnit\Framework\TestCase;
@@ -33,7 +33,7 @@ class SheetTest extends TestCase
private function openFileAndReturnSheet($fileName)
{
$resourcePath = $this->getResourcePath($fileName);
$reader = EntityFactory::createReader(Type::CSV);
$reader = ReaderEntityFactory::createReader(Type::CSV);
$reader->open($resourcePath);
$sheet = $reader->getSheetIterator()->current();
tests/Spout/Reader/ODS/ReaderTest.php
+6 -6
View File
@@ -4,7 +4,7 @@ namespace Box\Spout\Reader\ODS;
use Box\Spout\Common\Exception\IOException;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
use Box\Spout\Reader\Exception\IteratorNotRewindableException;
use Box\Spout\TestUsingResource;
use PHPUnit\Framework\TestCase;
@@ -354,7 +354,7 @@ class ReaderTest extends TestCase
$this->expectException(IteratorNotRewindableException::class);
$resourcePath = $this->getResourcePath('one_sheet_with_strings.ods');
$reader = EntityFactory::createReader(Type::ODS);
$reader = ReaderEntityFactory::createReader(Type::ODS);
$reader->open($resourcePath);
foreach ($reader->getSheetIterator() as $sheet) {
@@ -379,7 +379,7 @@ class ReaderTest extends TestCase
$resourcePath = $this->getResourcePath('two_sheets_with_strings.ods');
/** @var Reader $reader */
$reader = EntityFactory::createReader(Type::ODS);
$reader = ReaderEntityFactory::createReader(Type::ODS);
$reader->open($resourcePath);
foreach ($reader->getSheetIterator() as $sheet) {
@@ -423,7 +423,7 @@ class ReaderTest extends TestCase
$this->expectException(IOException::class);
/** @var \Box\Spout\Reader\ODS\Reader $reader */
$reader = EntityFactory::createReader(Type::ODS);
$reader = ReaderEntityFactory::createReader(Type::ODS);
$reader->open('unsupported://foobar');
}
@@ -435,7 +435,7 @@ class ReaderTest extends TestCase
$this->expectException(IOException::class);
/** @var \Box\Spout\Reader\ODS\Reader $reader */
$reader = EntityFactory::createReader(Type::ODS);
$reader = ReaderEntityFactory::createReader(Type::ODS);
$reader->open('php://memory');
}
@@ -531,7 +531,7 @@ class ReaderTest extends TestCase
$resourcePath = $this->getResourcePath($fileName);
/** @var \Box\Spout\Reader\ODS\Reader $reader */
$reader = EntityFactory::createReader(Type::ODS);
$reader = ReaderEntityFactory::createReader(Type::ODS);
$reader->setShouldFormatDates($shouldFormatDates);
$reader->setShouldPreserveEmptyRows($shouldPreserveEmptyRows);
$reader->open($resourcePath);
tests/Spout/Reader/ODS/SheetTest.php
+2 -2
View File
@@ -3,7 +3,7 @@
namespace Box\Spout\Reader\ODS;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
use Box\Spout\TestUsingResource;
use PHPUnit\Framework\TestCase;
@@ -61,7 +61,7 @@ class SheetTest extends TestCase
private function openFileAndReturnSheets($fileName)
{
$resourcePath = $this->getResourcePath($fileName);
$reader = EntityFactory::createReader(Type::ODS);
$reader = ReaderEntityFactory::createReader(Type::ODS);
$reader->open($resourcePath);
$sheets = [];
tests/Spout/Reader/XLSX/ReaderTest.php
+5 -5
View File
@@ -4,7 +4,7 @@ namespace Box\Spout\Reader\XLSX;
use Box\Spout\Common\Exception\IOException;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
use Box\Spout\TestUsingResource;
use PHPUnit\Framework\TestCase;
@@ -570,7 +570,7 @@ class ReaderTest extends TestCase
$allRows = [];
$resourcePath = $this->getResourcePath('two_sheets_with_inline_strings.xlsx');
$reader = EntityFactory::createReader(Type::XLSX);
$reader = ReaderEntityFactory::createReader(Type::XLSX);
$reader->open($resourcePath);
foreach ($reader->getSheetIterator() as $sheet) {
@@ -624,7 +624,7 @@ class ReaderTest extends TestCase
$this->expectException(IOException::class);
/** @var \Box\Spout\Reader\XLSX\Reader $reader */
$reader = EntityFactory::createReader(Type::XLSX);
$reader = ReaderEntityFactory::createReader(Type::XLSX);
$reader->open('unsupported://foobar');
}
@@ -636,7 +636,7 @@ class ReaderTest extends TestCase
$this->expectException(IOException::class);
/** @var \Box\Spout\Reader\XLSX\Reader $reader */
$reader = EntityFactory::createReader(Type::XLSX);
$reader = ReaderEntityFactory::createReader(Type::XLSX);
$reader->open('php://memory');
}
@@ -701,7 +701,7 @@ class ReaderTest extends TestCase
$resourcePath = $this->getResourcePath($fileName);
/** @var \Box\Spout\Reader\XLSX\Reader $reader */
$reader = EntityFactory::createReader(Type::XLSX);
$reader = ReaderEntityFactory::createReader(Type::XLSX);
$reader->setShouldFormatDates($shouldFormatDates);
$reader->setShouldPreserveEmptyRows($shouldPreserveEmptyRows);
$reader->open($resourcePath);
tests/Spout/Reader/XLSX/SheetTest.php
+2 -2
View File
@@ -3,7 +3,7 @@
namespace Box\Spout\Reader\XLSX;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\Reader\Common\Creator\ReaderEntityFactory;
use Box\Spout\TestUsingResource;
use PHPUnit\Framework\TestCase;
@@ -49,7 +49,7 @@ class SheetTest extends TestCase
private function openFileAndReturnSheets($fileName)
{
$resourcePath = $this->getResourcePath($fileName);
$reader = EntityFactory::createReader(Type::XLSX);
$reader = ReaderEntityFactory::createReader(Type::XLSX);
$reader->open($resourcePath);
$sheets = [];
tests/Spout/Writer/CSV/WriterTest.php
+7 -7
View File
@@ -8,7 +8,7 @@ use Box\Spout\Common\Exception\IOException;
use Box\Spout\Common\Helper\EncodingHelper;
use Box\Spout\Common\Type;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Exception\WriterNotOpenedException;
use Box\Spout\Writer\RowCreationHelper;
use PHPUnit\Framework\TestCase;
@@ -32,7 +32,7 @@ class WriterTest extends TestCase
$this->createUnwritableFolderIfNeeded();
$filePath = $this->getGeneratedUnwritableResourcePath($fileName);
$writer = EntityFactory::createWriter(Type::CSV);
$writer = WriterEntityFactory::createWriter(Type::CSV);
@$writer->openToFile($filePath);
$writer->addRow($this->createRowFromValues(['csv--11', 'csv--12']));
$writer->close();
@@ -45,7 +45,7 @@ class WriterTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::CSV);
$writer = WriterEntityFactory::createWriter(Type::CSV);
$writer->addRow($this->createRowFromValues(['csv--11', 'csv--12']));
$writer->close();
}
@@ -57,7 +57,7 @@ class WriterTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::CSV);
$writer = WriterEntityFactory::createWriter(Type::CSV);
$writer->addRow($this->createRowFromValues(['csv--11', 'csv--12']));
$writer->close();
}
@@ -69,7 +69,7 @@ class WriterTest extends TestCase
{
$this->expectException(InvalidArgumentException::class);
$writer = EntityFactory::createWriter(Type::CSV);
$writer = WriterEntityFactory::createWriter(Type::CSV);
$writer->addRows([['csv--11', 'csv--12']]);
$writer->close();
}
@@ -83,7 +83,7 @@ class WriterTest extends TestCase
$this->createGeneratedFolderIfNeeded($fileName);
$resourcePath = $this->getGeneratedResourcePath($fileName);
$writer = EntityFactory::createWriter(Type::CSV);
$writer = WriterEntityFactory::createWriter(Type::CSV);
$writer->close(); // This call should not cause any error
$writer->openToFile($resourcePath);
@@ -202,7 +202,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\CSV\Writer $writer */
$writer = EntityFactory::createWriter(Type::CSV);
$writer = WriterEntityFactory::createWriter(Type::CSV);
$writer->setFieldDelimiter($fieldDelimiter);
$writer->setFieldEnclosure($fieldEnclosure);
$writer->setShouldAddBOM($shouldAddBOM);
tests/Spout/Writer/ODS/SheetTest.php
+5 -5
View File
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\ODS;
use Box\Spout\Common\Type;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Common\Entity\Sheet;
use Box\Spout\Writer\Exception\InvalidSheetNameException;
use Box\Spout\Writer\RowCreationHelper;
@@ -66,7 +66,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$customSheetName = 'Sheet name';
@@ -105,7 +105,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$sheet = $writer->getCurrentSheet();
@@ -125,7 +125,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$writer->addRow($this->createRowFromValues(['ods--sheet1--11', 'ods--sheet1--12']));
@@ -147,7 +147,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$sheet = $writer->getCurrentSheet();
tests/Spout/Writer/ODS/WriterTest.php
+13 -13
View File
@@ -9,7 +9,7 @@ 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\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Exception\WriterAlreadyOpenedException;
use Box\Spout\Writer\Exception\WriterNotOpenedException;
use Box\Spout\Writer\RowCreationHelper;
@@ -34,7 +34,7 @@ class WriterTest extends TestCase
$this->createUnwritableFolderIfNeeded();
$filePath = $this->getGeneratedUnwritableResourcePath($fileName);
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
@$writer->openToFile($filePath);
}
@@ -45,7 +45,7 @@ class WriterTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->addRow($this->createRowFromValues(['ods--11', 'ods--12']));
}
@@ -56,7 +56,7 @@ class WriterTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->addRows([$this->createRowFromValues(['ods--11', 'ods--12'])]);
}
@@ -71,7 +71,7 @@ class WriterTest extends TestCase
$filePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($filePath);
$writer->setTempFolder('');
@@ -88,7 +88,7 @@ class WriterTest extends TestCase
$filePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($filePath);
$writer->setShouldCreateNewSheetsAutomatically(true);
@@ -127,7 +127,7 @@ class WriterTest extends TestCase
$tempFolderPath = $this->getTempFolderPath();
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->setTempFolder($tempFolderPath);
$writer->openToFile($resourcePath);
@@ -152,7 +152,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$writer->addNewSheetAndMakeItCurrent();
$writer->close();
@@ -172,7 +172,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$writer->addNewSheetAndMakeItCurrent();
@@ -195,7 +195,7 @@ class WriterTest extends TestCase
$this->createGeneratedFolderIfNeeded($fileName);
$resourcePath = $this->getGeneratedResourcePath($fileName);
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->close(); // This call should not cause any error
$writer->openToFile($resourcePath);
@@ -350,7 +350,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$writer->addRows($dataRowsSheet1);
@@ -486,7 +486,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->setShouldCreateNewSheetsAutomatically($shouldCreateSheetsAutomatically);
$writer->openToFile($resourcePath);
@@ -509,7 +509,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->setShouldCreateNewSheetsAutomatically($shouldCreateSheetsAutomatically);
$writer->openToFile($resourcePath);
tests/Spout/Writer/ODS/WriterWithStyleTest.php
+9 -9
View File
@@ -9,9 +9,9 @@ use Box\Spout\Common\Entity\Style\Style;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Wrapper\XMLReader;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Exception\WriterNotOpenedException;
use Box\Spout\Writer\RowCreationHelper;
use PHPUnit\Framework\TestCase;
@@ -42,7 +42,7 @@ class WriterWithStyleTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->addRow($this->createStyledRowFromValues(['ods--11', 'ods--12'], $this->defaultStyle));
}
@@ -53,7 +53,7 @@ class WriterWithStyleTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->addRow($this->createStyledRowFromValues(['ods--11', 'ods--12'], $this->defaultStyle));
}
@@ -215,10 +215,10 @@ class WriterWithStyleTest extends TestCase
$boldStyle = (new StyleBuilder())->setFontBold()->build();
$underlineStyle = (new StyleBuilder())->setFontUnderline()->build();
$dataRow = EntityFactory::createRow([
EntityFactory::createCell('ods--11', $boldStyle),
EntityFactory::createCell('ods--12', $underlineStyle),
EntityFactory::createCell('ods--13', $underlineStyle),
$dataRow = WriterEntityFactory::createRow([
WriterEntityFactory::createCell('ods--11', $boldStyle),
WriterEntityFactory::createCell('ods--12', $underlineStyle),
WriterEntityFactory::createCell('ods--13', $underlineStyle),
]);
$this->writeToODSFile([$dataRow], $fileName);
@@ -347,7 +347,7 @@ class WriterWithStyleTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->openToFile($resourcePath);
$writer->addRows($allRows);
@@ -368,7 +368,7 @@ class WriterWithStyleTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\ODS\Writer $writer */
$writer = EntityFactory::createWriter(Type::ODS);
$writer = WriterEntityFactory::createWriter(Type::ODS);
$writer->setDefaultRowStyle($defaultStyle);
$writer->openToFile($resourcePath);
tests/Spout/Writer/RowCreationHelper.php
+2 -2
View File
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer;
use Box\Spout\Common\Entity\Row;
use Box\Spout\Common\Entity\Style\Style;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
/**
* Trait RowCreationHelper
@@ -27,7 +27,7 @@ trait RowCreationHelper
*/
protected function createStyledRowFromValues(array $cellValues, Style $rowStyle = null)
{
return EntityFactory::createRowFromArray($cellValues, $rowStyle);
return WriterEntityFactory::createRowFromArray($cellValues, $rowStyle);
}
/**
tests/Spout/Writer/XLSX/SheetTest.php
+5 -5
View File
@@ -4,7 +4,7 @@ namespace Box\Spout\Writer\XLSX;
use Box\Spout\Common\Type;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Common\Entity\Sheet;
use Box\Spout\Writer\Exception\InvalidSheetNameException;
use Box\Spout\Writer\RowCreationHelper;
@@ -66,7 +66,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($resourcePath);
$customSheetName = 'Sheet name';
@@ -105,7 +105,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($resourcePath);
$sheet = $writer->getCurrentSheet();
@@ -127,7 +127,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($resourcePath);
$writer->addRow($this->createRowFromValues(['xlsx--sheet1--11', 'xlsx--sheet1--12']));
@@ -149,7 +149,7 @@ class SheetTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($resourcePath);
$sheet = $writer->getCurrentSheet();
tests/Spout/Writer/XLSX/WriterTest.php
+14 -14
View File
@@ -8,7 +8,7 @@ use Box\Spout\Common\Exception\IOException;
use Box\Spout\Common\Exception\SpoutException;
use Box\Spout\Common\Type;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Exception\WriterAlreadyOpenedException;
use Box\Spout\Writer\Exception\WriterNotOpenedException;
use Box\Spout\Writer\RowCreationHelper;
@@ -34,7 +34,7 @@ class WriterTest extends TestCase
$this->createUnwritableFolderIfNeeded();
$filePath = $this->getGeneratedUnwritableResourcePath($fileName);
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
@$writer->openToFile($filePath);
}
@@ -45,7 +45,7 @@ class WriterTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->addRow($this->createRowFromValues(['xlsx--11', 'xlsx--12']));
}
@@ -56,7 +56,7 @@ class WriterTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->addRows($this->createRowsFromValues([['xlsx--11', 'xlsx--12']]));
}
@@ -71,7 +71,7 @@ class WriterTest extends TestCase
$filePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($filePath);
$writer->setTempFolder('');
@@ -88,7 +88,7 @@ class WriterTest extends TestCase
$filePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($filePath);
$writer->setShouldUseInlineStrings(true);
@@ -105,7 +105,7 @@ class WriterTest extends TestCase
$filePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($filePath);
$writer->setShouldCreateNewSheetsAutomatically(true);
@@ -159,7 +159,7 @@ class WriterTest extends TestCase
$tempFolderPath = $this->getTempFolderPath();
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->setTempFolder($tempFolderPath);
$writer->openToFile($resourcePath);
@@ -184,7 +184,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($resourcePath);
$writer->addNewSheetAndMakeItCurrent();
$writer->close();
@@ -204,7 +204,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->openToFile($resourcePath);
$writer->addNewSheetAndMakeItCurrent();
@@ -227,7 +227,7 @@ class WriterTest extends TestCase
$this->createGeneratedFolderIfNeeded($fileName);
$resourcePath = $this->getGeneratedResourcePath($fileName);
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->close(); // This call should not cause any error
$writer->openToFile($resourcePath);
@@ -405,7 +405,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->setShouldUseInlineStrings(true);
$writer->openToFile($resourcePath);
@@ -545,7 +545,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->setShouldUseInlineStrings($shouldUseInlineStrings);
$writer->setShouldCreateNewSheetsAutomatically($shouldCreateSheetsAutomatically);
@@ -570,7 +570,7 @@ class WriterTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->setShouldUseInlineStrings($shouldUseInlineStrings);
$writer->setShouldCreateNewSheetsAutomatically($shouldCreateSheetsAutomatically);
tests/Spout/Writer/XLSX/WriterWithStyleTest.php
+9 -9
View File
@@ -10,9 +10,9 @@ use Box\Spout\Common\Entity\Style\Style;
use Box\Spout\Common\Type;
use Box\Spout\Reader\Wrapper\XMLReader;
use Box\Spout\TestUsingResource;
use Box\Spout\Writer\Common\Creator\EntityFactory;
use Box\Spout\Writer\Common\Creator\Style\BorderBuilder;
use Box\Spout\Writer\Common\Creator\Style\StyleBuilder;
use Box\Spout\Writer\Common\Creator\WriterEntityFactory;
use Box\Spout\Writer\Common\Manager\Style\StyleMerger;
use Box\Spout\Writer\Exception\WriterNotOpenedException;
use Box\Spout\Writer\RowCreationHelper;
@@ -45,7 +45,7 @@ class WriterWithStyleTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->addRow($this->createStyledRowFromValues(['xlsx--11', 'xlsx--12'], $this->defaultStyle));
}
@@ -56,7 +56,7 @@ class WriterWithStyleTest extends TestCase
{
$this->expectException(WriterNotOpenedException::class);
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->addRow($this->createStyledRowFromValues(['xlsx--11', 'xlsx--12'], $this->defaultStyle));
}
@@ -262,10 +262,10 @@ class WriterWithStyleTest extends TestCase
$boldStyle = (new StyleBuilder())->setFontBold()->build();
$underlineStyle = (new StyleBuilder())->setFontUnderline()->build();
$dataRow = EntityFactory::createRow([
EntityFactory::createCell('xlsx--11', $boldStyle),
EntityFactory::createCell('xlsx--12', $underlineStyle),
EntityFactory::createCell('xlsx--13', $underlineStyle),
$dataRow = WriterEntityFactory::createRow([
WriterEntityFactory::createCell('xlsx--11', $boldStyle),
WriterEntityFactory::createCell('xlsx--12', $underlineStyle),
WriterEntityFactory::createCell('xlsx--13', $underlineStyle),
]);
$this->writeToXLSXFile([$dataRow], $fileName);
@@ -519,7 +519,7 @@ class WriterWithStyleTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->setShouldUseInlineStrings(true);
$writer->openToFile($resourcePath);
@@ -541,7 +541,7 @@ class WriterWithStyleTest extends TestCase
$resourcePath = $this->getGeneratedResourcePath($fileName);
/** @var \Box\Spout\Writer\XLSX\Writer $writer */
$writer = EntityFactory::createWriter(Type::XLSX);
$writer = WriterEntityFactory::createWriter(Type::XLSX);
$writer->setShouldUseInlineStrings(true);
$writer->setDefaultRowStyle($defaultStyle);