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

fix by PHP-CS-Fixer

Browse Source
This commit is contained in:
xiaoxiali 2020-08-21 14:51:02 +08:00
parent 74357ffb71
commit 59343bae91
10 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Spout/Reader/ODS/SheetIterator.php
View File

@ -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 */

2
src/Spout/Reader/XLSX/Manager/SharedStringsManager.php
View File

@ -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 */

2
src/Spout/Reader/XLSX/RowIterator.php
View File

@ -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 */

11
src/Spout/Writer/Common/Entity/Sheet.php
View File

@ -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;
}
}

2
src/Spout/Writer/Common/Manager/WorkbookManagerAbstract.php
View File

@ -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 */

2
src/Spout/Writer/ODS/Creator/ManagerFactory.php
View File

@ -22,7 +22,7 @@ class ManagerFactory implements ManagerFactoryInterface
/** @var InternalEntityFactory */
protected $entityFactory;
/** @var HelperFactory $helperFactory */
/** @var HelperFactory */
protected $helperFactory;
/**

2
src/Spout/Writer/WriterAbstract.php
View File

@ -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 */

2
src/Spout/Writer/XLSX/Creator/ManagerFactory.php
View File

@ -24,7 +24,7 @@ class ManagerFactory implements ManagerFactoryInterface
/** @var InternalEntityFactory */
protected $entityFactory;
/** @var HelperFactory $helperFactory */
/** @var HelperFactory */
protected $helperFactory;
/**

4
src/Spout/Writer/XLSX/Manager/WorksheetManager.php
View File

@ -273,14 +273,14 @@ EOD;
\fwrite($worksheetFilePointer, '</sheetData>');
// do sth to merging cells
$mergeRanges = $worksheet->getExternalSheet()->getMergeRanges();
if(!empty($mergeRanges)) {
if (!empty($mergeRanges)) {
$startLine = '<mergeCells count="1">';
$rangeLine = '';
foreach ($mergeRanges as $key => $range) {
$rangeLine .= '<mergeCell ref="' . $range . '"/>';
}
$endLine = '</mergeCells>';
\fwrite($worksheetFilePointer, $startLine.$rangeLine.$endLine);
\fwrite($worksheetFilePointer, $startLine . $rangeLine . $endLine);
}
\fwrite($worksheetFilePointer, '</worksheet>');
\fclose($worksheetFilePointer);

4
tests/Spout/Reader/CSV/SpoutTestStream.php
View File

@ -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;
/**