Merge branch 'master' into custom-column-widths

# Conflicts:
#	src/Spout/Writer/ODS/Manager/WorksheetManager.php
#	src/Spout/Writer/XLSX/Manager/WorksheetManager.php
This commit is contained in:
Alexander Hofstede committed 2021-04-05 11:30:34 +02:00
commit 615c07649c
40 files changed
+323 -105

No files matched your search

+2 -2
View File
@@ -90,7 +90,7 @@ class SheetTest extends TestCase
$pathToWorkbookFile = $resourcePath . '#xl/workbook.xml';
$xmlContents = file_get_contents('zip://' . $pathToWorkbookFile);
$this->assertContains(' state="hidden"', $xmlContents, 'The sheet visibility should have been changed to "hidden"');
$this->assertStringContainsString(' state="hidden"', $xmlContents, 'The sheet visibility should have been changed to "hidden"');
}
public function testThrowsIfWorkbookIsNotInitialized()
@@ -299,6 +299,6 @@ class SheetTest extends TestCase
$pathToWorkbookFile = $resourcePath . '#xl/workbook.xml';
$xmlContents = file_get_contents('zip://' . $pathToWorkbookFile);
$this->assertContains("<sheet name=\"$expectedName\"", $xmlContents, $message);
$this->assertStringContainsString("<sheet name=\"$expectedName\"", $xmlContents, $message);
}
}