alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix spacing according to Scrutinizer

This commit is contained in:
Adrien Crivelli 2018-05-12 22:02:46 +09:00
parent d7751afbec
commit eda1c8a4d6
No known key found for this signature in database
GPG Key ID: B182FD79DC6DE92E
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/PhpSpreadsheet/Reader/Xlsx.php
View File

@ -1464,7 +1464,7 @@ class Xlsx extends BaseReader
// unparsed vmlDrawing // unparsed vmlDrawing
if ($unparsedVmlDrawings) { if ($unparsedVmlDrawings) {
foreach ($unparsedVmlDrawings as $rId => $relPath) { foreach ($unparsedVmlDrawings as $rId => $relPath) {
$rId = substr($rId, 3); // rIdXXX $rId = substr($rId, 3); // rIdXXX
$unparsedVmlDrawing = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['vmlDrawings']; $unparsedVmlDrawing = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['vmlDrawings'];
$unparsedVmlDrawing[$rId] = []; $unparsedVmlDrawing[$rId] = [];
$unparsedVmlDrawing[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $relPath); $unparsedVmlDrawing[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $relPath);
@ -2350,7 +2350,7 @@ class Xlsx extends BaseReader
$unparsedCtrlProps = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['ctrlProps']; $unparsedCtrlProps = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['ctrlProps'];
foreach ($ctrlProps as $rId => $ctrlProp) { foreach ($ctrlProps as $rId => $ctrlProp) {
$rId = substr($rId, 3); // rIdXXX $rId = substr($rId, 3); // rIdXXX
$unparsedCtrlProps[$rId] = []; $unparsedCtrlProps[$rId] = [];
$unparsedCtrlProps[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $ctrlProp['Target']); $unparsedCtrlProps[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $ctrlProp['Target']);
$unparsedCtrlProps[$rId]['relFilePath'] = (string) $ctrlProp['Target']; $unparsedCtrlProps[$rId]['relFilePath'] = (string) $ctrlProp['Target'];
@ -2382,7 +2382,7 @@ class Xlsx extends BaseReader
$unparsedPrinterSettings = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['printerSettings']; $unparsedPrinterSettings = &$unparsedLoadedData['sheets'][$docSheet->getCodeName()]['printerSettings'];
foreach ($sheetPrinterSettings as $rId => $printerSettings) { foreach ($sheetPrinterSettings as $rId => $printerSettings) {
$rId = substr($rId, 3); // rIdXXX $rId = substr($rId, 3); // rIdXXX
$unparsedPrinterSettings[$rId] = []; $unparsedPrinterSettings[$rId] = [];
$unparsedPrinterSettings[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $printerSettings['Target']); $unparsedPrinterSettings[$rId]['filePath'] = self::dirAdd("$dir/$fileWorksheet", $printerSettings['Target']);
$unparsedPrinterSettings[$rId]['relFilePath'] = (string) $printerSettings['Target']; $unparsedPrinterSettings[$rId]['relFilePath'] = (string) $printerSettings['Target'];

2
tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
View File

@ -17,7 +17,7 @@ class UnparsedDataTest extends TestCase
{ {
$sampleFilename = './data/Writer/XLSX/form_pass_print.xlsm'; $sampleFilename = './data/Writer/XLSX/form_pass_print.xlsm';
$resultFilename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test'); $resultFilename = tempnam(File::sysGetTempDir(), 'phpspreadsheet-test');
Settings::setLibXmlLoaderOptions(null); // reset to default options Settings::setLibXmlLoaderOptions(null); // reset to default options
$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx(); $reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
$excel = $reader->load($sampleFilename); $excel = $reader->load($sampleFilename);