Now That SettingsTest Is Well-Behaved
7 tests that needed to invoke Settings::setLibXmlLoaderOptions no longer need to do so.
This commit is contained in:
Owen Leibman
parent
3bb574c302
commit
7b3585c76a
|
|
@ -6930,11 +6930,6 @@ parameters:
|
|||
count: 1
|
||||
path: tests/PhpSpreadsheetTests/Worksheet/RowCellIterator2Test.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
|
||||
count: 1
|
||||
path: tests/PhpSpreadsheetTests/Worksheet/WorksheetNamedRangesTest.php
|
||||
|
||||
-
|
||||
message: "#^Property PhpOffice\\\\PhpSpreadsheetTests\\\\Writer\\\\Csv\\\\CsvEnclosureTest\\:\\:\\$cellValues has no typehint specified\\.$#"
|
||||
count: 1
|
||||
|
|
@ -6980,11 +6975,6 @@ parameters:
|
|||
count: 1
|
||||
path: tests/PhpSpreadsheetTests/Writer/Html/ImagesRootTest.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
|
||||
count: 1
|
||||
path: tests/PhpSpreadsheetTests/Writer/Xlsx/FloatsRetainedTest.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#2 \\$locale of function setlocale expects string\\|null, string\\|false given\\.$#"
|
||||
count: 1
|
||||
|
|
@ -6995,16 +6985,6 @@ parameters:
|
|||
count: 1
|
||||
path: tests/PhpSpreadsheetTests/Writer/Xlsx/LocaleFloatsTest.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
|
||||
count: 2
|
||||
path: tests/PhpSpreadsheetTests/Writer/Xlsx/StartsWithHashTest.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
|
||||
count: 2
|
||||
path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
|
||||
|
||||
-
|
||||
message: "#^Cannot call method getDrawingCollection\\(\\) on PhpOffice\\\\PhpSpreadsheet\\\\Worksheet\\\\Worksheet\\|null\\.$#"
|
||||
count: 4
|
||||
|
|
@ -7015,11 +6995,6 @@ parameters:
|
|||
count: 4
|
||||
path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataCloneTest.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$options of static method PhpOffice\\\\PhpSpreadsheet\\\\Settings\\:\\:setLibXmlLoaderOptions\\(\\) expects int, null given\\.$#"
|
||||
count: 1
|
||||
path: tests/PhpSpreadsheetTests/Writer/Xlsx/UnparsedDataTest.php
|
||||
|
||||
-
|
||||
message: "#^Parameter \\#1 \\$data of function simplexml_load_string expects string, string\\|false given\\.$#"
|
||||
count: 2
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace PhpOffice\PhpSpreadsheetTests\Worksheet;
|
|||
|
||||
use PhpOffice\PhpSpreadsheet\Exception;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
|
||||
|
|
@ -17,8 +16,6 @@ class WorksheetNamedRangesTest extends TestCase
|
|||
|
||||
protected function setUp(): void
|
||||
{
|
||||
Settings::setLibXmlLoaderOptions(null); // reset to default options
|
||||
|
||||
$reader = new Xlsx();
|
||||
$this->spreadsheet = $reader->load('tests/data/Worksheet/namedRangeTest.xlsx');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Conditional;
|
||||
use PhpOffice\PhpSpreadsheet\Style\Fill;
|
||||
|
|
@ -11,24 +10,6 @@ use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
|
|||
|
||||
class ConditionalTest extends AbstractFunctional
|
||||
{
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
private $prevValue;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
$this->prevValue = Settings::getLibXmlLoaderOptions();
|
||||
|
||||
// Disable validating XML with the DTD
|
||||
Settings::setLibXmlLoaderOptions($this->prevValue & ~LIBXML_DTDVALID & ~LIBXML_DTDATTR & ~LIBXML_DTDLOAD);
|
||||
}
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
Settings::setLibXmlLoaderOptions($this->prevValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test check if conditional style with type 'notContainsText' works on xlsx.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -4,30 +4,11 @@ namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
|
|||
|
||||
use PhpOffice\PhpSpreadsheet\IOFactory;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx;
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\File;
|
||||
use PhpOffice\PhpSpreadsheetTests\Functional\AbstractFunctional;
|
||||
|
||||
class DrawingsTest extends AbstractFunctional
|
||||
{
|
||||
/**
|
||||
* @var int
|
||||
*/
|
||||
private $prevValue;
|
||||
|
||||
protected function setUp(): void
|
||||
{
|
||||
$this->prevValue = Settings::getLibXmlLoaderOptions();
|
||||
|
||||
// Disable validating XML with the DTD
|
||||
Settings::setLibXmlLoaderOptions($this->prevValue & ~LIBXML_DTDVALID & ~LIBXML_DTDATTR & ~LIBXML_DTDLOAD);
|
||||
}
|
||||
|
||||
protected function tearDown(): void
|
||||
{
|
||||
Settings::setLibXmlLoaderOptions($this->prevValue);
|
||||
}
|
||||
|
||||
/**
|
||||
* Test save and load XLSX file with drawing on 2nd worksheet.
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as Reader;
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\File;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as Writer;
|
||||
|
|
@ -19,7 +18,6 @@ class FloatsRetainedTest extends TestCase
|
|||
public function testIntyFloatsRetainedByWriter($value): void
|
||||
{
|
||||
$outputFilename = File::temporaryFilename();
|
||||
Settings::setLibXmlLoaderOptions(null);
|
||||
$sheet = new Spreadsheet();
|
||||
$sheet->getActiveSheet()->getCell('A1')->setValue($value);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
|
|||
|
||||
use PhpOffice\PhpSpreadsheet\Cell\DataType;
|
||||
use PhpOffice\PhpSpreadsheet\Reader\Xlsx as Reader;
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\File;
|
||||
use PhpOffice\PhpSpreadsheet\Spreadsheet;
|
||||
use PhpOffice\PhpSpreadsheet\Writer\Xlsx as Writer;
|
||||
|
|
@ -16,7 +15,6 @@ class StartsWithHashTest extends TestCase
|
|||
public function testStartWithHash(): void
|
||||
{
|
||||
$outputFilename = File::temporaryFilename();
|
||||
Settings::setLibXmlLoaderOptions(null);
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
$sheet->setCellValueExplicit('A1', '#define M', DataType::TYPE_STRING);
|
||||
|
|
@ -41,7 +39,6 @@ class StartsWithHashTest extends TestCase
|
|||
{
|
||||
// Make sure raw data indicates A3 is an error, but A2 isn't.
|
||||
$outputFilename = File::temporaryFilename();
|
||||
Settings::setLibXmlLoaderOptions(null);
|
||||
$spreadsheet = new Spreadsheet();
|
||||
$sheet = $spreadsheet->getActiveSheet();
|
||||
$sheet->setCellValueExplicit('A1', '#define M', DataType::TYPE_STRING);
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
|
||||
namespace PhpOffice\PhpSpreadsheetTests\Writer\Xlsx;
|
||||
|
||||
use PhpOffice\PhpSpreadsheet\Settings;
|
||||
use PhpOffice\PhpSpreadsheet\Shared\File;
|
||||
use PHPUnit\Framework\TestCase;
|
||||
use ZipArchive;
|
||||
|
|
@ -16,7 +15,6 @@ class UnparsedDataCloneTest extends TestCase
|
|||
{
|
||||
$sampleFilename = 'tests/data/Writer/XLSX/drawing_on_2nd_page.xlsx';
|
||||
$resultFilename = File::temporaryFilename();
|
||||
Settings::setLibXmlLoaderOptions(null); // reset to default options
|
||||
$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
|
||||
$spreadsheet = $reader->load($sampleFilename);
|
||||
$spreadsheet->setActiveSheetIndex(1);
|
||||
|
|
@ -63,7 +61,6 @@ class UnparsedDataCloneTest extends TestCase
|
|||
$resultFilename1 = File::temporaryFilename();
|
||||
$resultFilename2 = File::temporaryFilename();
|
||||
self::assertNotEquals($resultFilename1, $resultFilename2);
|
||||
Settings::setLibXmlLoaderOptions(null); // reset to default options
|
||||
$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
|
||||
$spreadsheet = $reader->load($sampleFilename);
|
||||
$sheet = $spreadsheet->setActiveSheetIndex(1);
|
||||
|
|
|
|||
|
|
@ -17,7 +17,6 @@ class UnparsedDataTest extends TestCase
|
|||
{
|
||||
$sampleFilename = 'tests/data/Writer/XLSX/form_pass_print.xlsm';
|
||||
$resultFilename = File::temporaryFilename();
|
||||
Settings::setLibXmlLoaderOptions(null); // reset to default options
|
||||
$reader = new \PhpOffice\PhpSpreadsheet\Reader\Xlsx();
|
||||
$excel = $reader->load($sampleFilename);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue