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

Make CSV reader return Row objects

Browse Source
This commit is contained in:
Adrien Loison committed 2017-11-18 19:08:27 +01:00
1 parent 139f7fdfb3
commit a665b974fa
37 files changed
+664 -214
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/Spout/Reader/XLSX/Manager/SharedStringsManagerTest.php
+2 -2
View File
@@ -3,8 +3,8 @@
namespace Box\Spout\Reader\XLSX\Manager;
use Box\Spout\Reader\Exception\SharedStringNotFoundException;
use Box\Spout\Reader\XLSX\Creator\EntityFactory;
use Box\Spout\Reader\XLSX\Creator\HelperFactory;
use Box\Spout\Reader\XLSX\Creator\InternalEntityFactory;
use Box\Spout\Reader\XLSX\Creator\ManagerFactory;
use Box\Spout\Reader\XLSX\Manager\SharedStringsCaching\CachingStrategyFactory;
use Box\Spout\Reader\XLSX\Manager\SharedStringsCaching\FileBasedStrategy;
@@ -50,7 +50,7 @@ class SharedStringsManagerTest extends \PHPUnit_Framework_TestCase
$cachingStrategyFactory = new CachingStrategyFactory();
$helperFactory = new HelperFactory();
$managerFactory = new ManagerFactory($helperFactory, $cachingStrategyFactory);
$entityFactory = new EntityFactory($managerFactory, $helperFactory);
$entityFactory = new InternalEntityFactory($managerFactory, $helperFactory);
$workbookRelationshipsManager = new WorkbookRelationshipsManager($resourcePath, $entityFactory);
$this->sharedStringsManager = new SharedStringsManager(
tests/Spout/Reader/XLSX/Manager/StyleManagerTest.php
+2 -2
View File
@@ -2,7 +2,7 @@
namespace Box\Spout\Reader\XLSX\Manager;
use Box\Spout\Reader\XLSX\Creator\EntityFactory;
use Box\Spout\Reader\XLSX\Creator\InternalEntityFactory;
/**
* Class StyleManagerTest
@@ -16,7 +16,7 @@ class StyleManagerTest extends \PHPUnit_Framework_TestCase
*/
private function getStyleManagerMock($styleAttributes = [], $customNumberFormats = [])
{
$entityFactory = $this->createMock(EntityFactory::class);
$entityFactory = $this->createMock(InternalEntityFactory::class);
$workbookRelationshipsManager = $this->createMock(WorkbookRelationshipsManager::class);
/** @var StyleManager $styleManager */
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\ReaderFactory;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\TestUsingResource;
/**
@@ -570,7 +570,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$allRows = [];
$resourcePath = $this->getResourcePath('two_sheets_with_inline_strings.xlsx');
$reader = ReaderFactory::create(Type::XLSX);
$reader = EntityFactory::createReader(Type::XLSX);
$reader->open($resourcePath);
foreach ($reader->getSheetIterator() as $sheet) {
@@ -624,7 +624,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$this->expectException(IOException::class);
/** @var \Box\Spout\Reader\XLSX\Reader $reader */
$reader = ReaderFactory::create(Type::XLSX);
$reader = EntityFactory::createReader(Type::XLSX);
$reader->open('unsupported://foobar');
}
@@ -636,7 +636,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$this->expectException(IOException::class);
/** @var \Box\Spout\Reader\XLSX\Reader $reader */
$reader = ReaderFactory::create(Type::XLSX);
$reader = EntityFactory::createReader(Type::XLSX);
$reader->open('php://memory');
}
@@ -701,7 +701,7 @@ class ReaderTest extends \PHPUnit_Framework_TestCase
$resourcePath = $this->getResourcePath($fileName);
/** @var \Box\Spout\Reader\XLSX\Reader $reader */
$reader = ReaderFactory::create(Type::XLSX);
$reader = EntityFactory::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\ReaderFactory;
use Box\Spout\Reader\Common\Creator\EntityFactory;
use Box\Spout\TestUsingResource;
/**
@@ -48,7 +48,7 @@ class SheetTest extends \PHPUnit_Framework_TestCase
private function openFileAndReturnSheets($fileName)
{
$resourcePath = $this->getResourcePath($fileName);
$reader = ReaderFactory::create(Type::XLSX);
$reader = EntityFactory::createReader(Type::XLSX);
$reader->open($resourcePath);
$sheets = [];