From 1730b75cc6cbd95fef88238169a9c12f10959650 Mon Sep 17 00:00:00 2001 From: feline Date: Mon, 20 Jul 2020 14:32:43 +0800 Subject: [PATCH 1/8] Update WorksheetManager.php fix the merging cells problem --- src/Spout/Writer/XLSX/Manager/WorksheetManager.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php index 741d0aa..84278ec 100644 --- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php +++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php @@ -271,6 +271,17 @@ EOD; } \fwrite($worksheetFilePointer, ''); + // do sth to merging cells + $mergeRanges = $worksheet->getExternalSheet()->getMergeRanges(); + if(!empty($mergeRanges)) { + $startLine = ''; + $rangeLine = ''; + foreach ($mergeRanges as $key => $range) { + $rangeLine .= ''; + } + $endLine = ''; + \fwrite($worksheetFilePointer, $startLine.$rangeLine.$endLine); + } \fwrite($worksheetFilePointer, ''); \fclose($worksheetFilePointer); } From 094c34a60c13ad0dcb3940586c3f60dcfdadac0e Mon Sep 17 00:00:00 2001 From: feline Date: Mon, 20 Jul 2020 14:33:16 +0800 Subject: [PATCH 2/8] Update WorksheetManager.php fix the space --- src/Spout/Writer/XLSX/Manager/WorksheetManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php index 84278ec..7e99e38 100644 --- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php +++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php @@ -272,7 +272,7 @@ EOD; \fwrite($worksheetFilePointer, ''); // do sth to merging cells - $mergeRanges = $worksheet->getExternalSheet()->getMergeRanges(); + $mergeRanges = $worksheet->getExternalSheet()->getMergeRanges(); if(!empty($mergeRanges)) { $startLine = ''; $rangeLine = ''; From 3279c09e712c1ebdb600e3bca565697e8a6faeb3 Mon Sep 17 00:00:00 2001 From: feline Date: Mon, 20 Jul 2020 14:37:51 +0800 Subject: [PATCH 3/8] Update Sheet.php add the set and get function of the merge ranging --- src/Spout/Writer/Common/Entity/Sheet.php | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/Spout/Writer/Common/Entity/Sheet.php b/src/Spout/Writer/Common/Entity/Sheet.php index aabdd91..4a6d99a 100644 --- a/src/Spout/Writer/Common/Entity/Sheet.php +++ b/src/Spout/Writer/Common/Entity/Sheet.php @@ -27,6 +27,9 @@ class Sheet /** @var SheetManager Sheet manager */ private $sheetManager; + /** @var $mergeRanges merge cell */ + private $mergeRanges; + /** * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based) * @param string $associatedWorkbookId ID of the sheet's associated workbook @@ -108,4 +111,22 @@ class Sheet return $this; } + + /** + * @return merge + */ + public function getMergeRanges() + { + return $this->mergeRanges; + } + + /** + * @param $mergeRanges + * @return mixed + */ + public function setMergeRanges($mergeRanges) + { + return $this->mergeRanges = $mergeRanges; + } + } From 74357ffb711aac5e44f67bb822ee363aa2b72549 Mon Sep 17 00:00:00 2001 From: feline Date: Fri, 21 Aug 2020 14:24:43 +0800 Subject: [PATCH 4/8] Update .travis.yml update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ac931ed..c83ce27 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,4 +58,4 @@ after_script: if [[ "$WITH_COVERAGE" == "true" ]]; then wget https://scrutinizer-ci.com/ocular.phar php ocular.phar code-coverage:upload --format=php-clover build/logs/coverage.clover - fi + fi From 59343bae9110bfc1a99532ff3c708f560bcf4e0f Mon Sep 17 00:00:00 2001 From: xiaoxiali Date: Fri, 21 Aug 2020 14:51:02 +0800 Subject: [PATCH 5/8] fix by PHP-CS-Fixer --- src/Spout/Reader/ODS/SheetIterator.php | 4 ++-- .../Reader/XLSX/Manager/SharedStringsManager.php | 2 +- src/Spout/Reader/XLSX/RowIterator.php | 2 +- src/Spout/Writer/Common/Entity/Sheet.php | 11 +++++------ .../Writer/Common/Manager/WorkbookManagerAbstract.php | 2 +- src/Spout/Writer/ODS/Creator/ManagerFactory.php | 2 +- src/Spout/Writer/WriterAbstract.php | 2 +- src/Spout/Writer/XLSX/Creator/ManagerFactory.php | 2 +- src/Spout/Writer/XLSX/Manager/WorksheetManager.php | 4 ++-- tests/Spout/Reader/CSV/SpoutTestStream.php | 4 ++-- 10 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/Spout/Reader/ODS/SheetIterator.php b/src/Spout/Reader/ODS/SheetIterator.php index f35b852..c7b8cd9 100644 --- a/src/Spout/Reader/ODS/SheetIterator.php +++ b/src/Spout/Reader/ODS/SheetIterator.php @@ -28,13 +28,13 @@ class SheetIterator implements IteratorInterface const XML_ATTRIBUTE_TABLE_STYLE_NAME = 'table:style-name'; const XML_ATTRIBUTE_TABLE_DISPLAY = 'table:display'; - /** @var string $filePath Path of the file to be read */ + /** @var string Path of the file to be read */ protected $filePath; /** @var \Box\Spout\Common\Manager\OptionsManagerInterface Reader's options manager */ protected $optionsManager; - /** @var InternalEntityFactory $entityFactory Factory to create entities */ + /** @var InternalEntityFactory Factory to create entities */ protected $entityFactory; /** @var XMLReader The XMLReader object that will help read sheet's XML data */ diff --git a/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php b/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php index caaeed7..8850a69 100644 --- a/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php +++ b/src/Spout/Reader/XLSX/Manager/SharedStringsManager.php @@ -43,7 +43,7 @@ class SharedStringsManager /** @var InternalEntityFactory Factory to create entities */ protected $entityFactory; - /** @var HelperFactory $helperFactory Factory to create helpers */ + /** @var HelperFactory Factory to create helpers */ protected $helperFactory; /** @var CachingStrategyFactory Factory to create shared strings caching strategies */ diff --git a/src/Spout/Reader/XLSX/RowIterator.php b/src/Spout/Reader/XLSX/RowIterator.php index 4af4530..a54b8b1 100644 --- a/src/Spout/Reader/XLSX/RowIterator.php +++ b/src/Spout/Reader/XLSX/RowIterator.php @@ -35,7 +35,7 @@ class RowIterator implements IteratorInterface /** @var string Path of the XLSX file being read */ protected $filePath; - /** @var string $sheetDataXMLFilePath Path of the sheet data XML file as in [Content_Types].xml */ + /** @var string Path of the sheet data XML file as in [Content_Types].xml */ protected $sheetDataXMLFilePath; /** @var \Box\Spout\Reader\Wrapper\XMLReader The XMLReader object that will help read sheet's XML data */ diff --git a/src/Spout/Writer/Common/Entity/Sheet.php b/src/Spout/Writer/Common/Entity/Sheet.php index 4a6d99a..3407ec7 100644 --- a/src/Spout/Writer/Common/Entity/Sheet.php +++ b/src/Spout/Writer/Common/Entity/Sheet.php @@ -27,9 +27,9 @@ class Sheet /** @var SheetManager Sheet manager */ private $sheetManager; - /** @var $mergeRanges merge cell */ + /** @var merge cell */ private $mergeRanges; - + /** * @param int $sheetIndex Index of the sheet, based on order in the workbook (zero-based) * @param string $associatedWorkbookId ID of the sheet's associated workbook @@ -111,10 +111,10 @@ class Sheet return $this; } - + /** - * @return merge - */ + * @return merge + */ public function getMergeRanges() { return $this->mergeRanges; @@ -128,5 +128,4 @@ class Sheet { return $this->mergeRanges = $mergeRanges; } - } diff --git a/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php b/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php index b513555..653778c 100644 --- a/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php +++ b/src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php @@ -44,7 +44,7 @@ abstract class WorkbookManagerAbstract implements WorkbookManagerInterface /** @var InternalEntityFactory Factory to create entities */ protected $entityFactory; - /** @var ManagerFactoryInterface $managerFactory Factory to create managers */ + /** @var ManagerFactoryInterface Factory to create managers */ protected $managerFactory; /** @var Worksheet The worksheet where data will be written to */ diff --git a/src/Spout/Writer/ODS/Creator/ManagerFactory.php b/src/Spout/Writer/ODS/Creator/ManagerFactory.php index f38c500..a5b77ee 100644 --- a/src/Spout/Writer/ODS/Creator/ManagerFactory.php +++ b/src/Spout/Writer/ODS/Creator/ManagerFactory.php @@ -22,7 +22,7 @@ class ManagerFactory implements ManagerFactoryInterface /** @var InternalEntityFactory */ protected $entityFactory; - /** @var HelperFactory $helperFactory */ + /** @var HelperFactory */ protected $helperFactory; /** diff --git a/src/Spout/Writer/WriterAbstract.php b/src/Spout/Writer/WriterAbstract.php index d96a628..bbaa735 100644 --- a/src/Spout/Writer/WriterAbstract.php +++ b/src/Spout/Writer/WriterAbstract.php @@ -33,7 +33,7 @@ abstract class WriterAbstract implements WriterInterface /** @var GlobalFunctionsHelper Helper to work with global functions */ protected $globalFunctionsHelper; - /** @var HelperFactory $helperFactory */ + /** @var HelperFactory */ protected $helperFactory; /** @var OptionsManagerInterface Writer options manager */ diff --git a/src/Spout/Writer/XLSX/Creator/ManagerFactory.php b/src/Spout/Writer/XLSX/Creator/ManagerFactory.php index f27a2f2..aa3bcd5 100644 --- a/src/Spout/Writer/XLSX/Creator/ManagerFactory.php +++ b/src/Spout/Writer/XLSX/Creator/ManagerFactory.php @@ -24,7 +24,7 @@ class ManagerFactory implements ManagerFactoryInterface /** @var InternalEntityFactory */ protected $entityFactory; - /** @var HelperFactory $helperFactory */ + /** @var HelperFactory */ protected $helperFactory; /** diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php index 7e99e38..764b52f 100644 --- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php +++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php @@ -273,14 +273,14 @@ EOD; \fwrite($worksheetFilePointer, ''); // do sth to merging cells $mergeRanges = $worksheet->getExternalSheet()->getMergeRanges(); - if(!empty($mergeRanges)) { + if (!empty($mergeRanges)) { $startLine = ''; $rangeLine = ''; foreach ($mergeRanges as $key => $range) { $rangeLine .= ''; } $endLine = ''; - \fwrite($worksheetFilePointer, $startLine.$rangeLine.$endLine); + \fwrite($worksheetFilePointer, $startLine . $rangeLine . $endLine); } \fwrite($worksheetFilePointer, ''); \fclose($worksheetFilePointer); diff --git a/tests/Spout/Reader/CSV/SpoutTestStream.php b/tests/Spout/Reader/CSV/SpoutTestStream.php index 3bfd06e..d66e811 100644 --- a/tests/Spout/Reader/CSV/SpoutTestStream.php +++ b/tests/Spout/Reader/CSV/SpoutTestStream.php @@ -14,10 +14,10 @@ class SpoutTestStream const PATH_TO_CSV_RESOURCES = 'tests/resources/csv/'; const CSV_EXTENSION = '.csv'; - /** @var int $position */ + /** @var int */ private $position; - /** @var resource $fileHandle */ + /** @var resource */ private $fileHandle; /** From 26348e5558113e33e5ba6389b9f43fcc6f177da0 Mon Sep 17 00:00:00 2001 From: xiaoxiali Date: Thu, 27 Aug 2020 11:24:28 +0800 Subject: [PATCH 6/8] fix the annotation --- src/Spout/Writer/XLSX/Manager/WorksheetManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php index 764b52f..8013b8f 100644 --- a/src/Spout/Writer/XLSX/Manager/WorksheetManager.php +++ b/src/Spout/Writer/XLSX/Manager/WorksheetManager.php @@ -271,7 +271,7 @@ EOD; } \fwrite($worksheetFilePointer, ''); - // do sth to merging cells + // do something to merging cells $mergeRanges = $worksheet->getExternalSheet()->getMergeRanges(); if (!empty($mergeRanges)) { $startLine = ''; From cf3333f008c3abc43dd048163e23ee23ba134267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xiaoxiali=28=E6=9D=8E=E6=99=93=E5=A4=8F=29?= Date: Wed, 16 Sep 2020 19:53:53 +0800 Subject: [PATCH 7/8] fix --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8943469..8ad7472 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { - "name": "box/spout", + "name": "sirius-box/spout", "description": "PHP Library to read and write spreadsheet files (CSV, XLSX and ODS), in a fast and scalable way", "type": "library", "keywords": ["php","read","write","csv","xlsx","ods","odf","open","office","excel","spreadsheet","scale","memory","stream","ooxml"], "license": "Apache-2.0", - "homepage": "https://www.github.com/box/spout", + "homepage": "https://www.github.com/palfeline/spout", "authors": [ { "name": "Adrien Loison", From 51434243ac903deff521cc621f354e6d52bbcb4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?xiaoxiali=28=E6=9D=8E=E6=99=93=E5=A4=8F=29?= Date: Fri, 18 Sep 2020 15:02:59 +0800 Subject: [PATCH 8/8] fix composer --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 8ad7472..8943469 100644 --- a/composer.json +++ b/composer.json @@ -1,10 +1,10 @@ { - "name": "sirius-box/spout", + "name": "box/spout", "description": "PHP Library to read and write spreadsheet files (CSV, XLSX and ODS), in a fast and scalable way", "type": "library", "keywords": ["php","read","write","csv","xlsx","ods","odf","open","office","excel","spreadsheet","scale","memory","stream","ooxml"], "license": "Apache-2.0", - "homepage": "https://www.github.com/palfeline/spout", + "homepage": "https://www.github.com/box/spout", "authors": [ { "name": "Adrien Loison",